]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
drm/i915/cnl: don't hardcode DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Fri, 25 Aug 2017 19:40:04 +0000 (16:40 -0300)
committerPaulo Zanoni <paulo.r.zanoni@intel.com>
Sat, 26 Aug 2017 00:12:45 +0000 (21:12 -0300)
We have the macro, use it. Makes the code a little easier to
understand.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170825194004.26571-1-paulo.r.zanoni@intel.com
drivers/gpu/drm/i915/intel_display.c

index eda1aa0c343c700d70e2db1ea47545bcd0b668c9..7cd392f2cd94d33ed8e63d2f964fce44813daa6d 100644 (file)
@@ -9022,7 +9022,7 @@ static void cannonlake_get_ddi_pll(struct drm_i915_private *dev_priv,
        u32 temp;
 
        temp = I915_READ(DPCLKA_CFGCR0) & DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(port);
-       id = temp >> (port * 2);
+       id = temp >> DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT(port);
 
        if (WARN_ON(id < SKL_DPLL0 || id > SKL_DPLL2))
                return;