Merge tag 'drm-intel-next-2018-07-09' of git://anongit.freedesktop.org/drm/drm-intel...

[muen/linux.git] / drivers / gpu / drm / i915 / intel_dpll_mgr.c

diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c
index 058696b7d6c375e1d1d4f3e959aa9138b953cecc..b51ad2917dbef4528d9a7c528e603f9602cd39fd 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dpll_mgr.c
+++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c
@@ -163,8 +163,8 @@ void intel_enable_shared_dpll(struct intel_crtc *crtc)
        struct drm_device *dev = crtc->base.dev;
        struct drm_i915_private *dev_priv = to_i915(dev);
        struct intel_shared_dpll *pll = crtc->config->shared_dpll;
        struct drm_device *dev = crtc->base.dev;
        struct drm_i915_private *dev_priv = to_i915(dev);
        struct intel_shared_dpll *pll = crtc->config->shared_dpll;

-       unsigned crtc_mask = 1 << drm_crtc_index(&crtc->base);
-       unsigned old_mask;
+       unsigned int crtc_mask = drm_crtc_mask(&crtc->base);
+       unsigned int old_mask;

 
        if (WARN_ON(pll == NULL))
                return;
 
        if (WARN_ON(pll == NULL))
                return;


@@ -207,7 +207,7 @@ void intel_disable_shared_dpll(struct intel_crtc *crtc)
 {
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
        struct intel_shared_dpll *pll = crtc->config->shared_dpll;
 {
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
        struct intel_shared_dpll *pll = crtc->config->shared_dpll;

-       unsigned crtc_mask = 1 << drm_crtc_index(&crtc->base);
+       unsigned int crtc_mask = drm_crtc_mask(&crtc->base);

 
        /* PCH only available on ILK+ */
        if (INTEL_GEN(dev_priv) < 5)
 
        /* PCH only available on ILK+ */
        if (INTEL_GEN(dev_priv) < 5)