On Mon, Jan 22, 2018 at 09:44:47PM +0000, Pandiyan, Dhinakaran wrote: > On Fri, 2018-01-19 at 16:05 -0800, Rodrigo Vivi wrote: > > Since when it got introduced with commit '555e38d27317 > > ("drm/i915/cnl: DDI - PLL mapping")' the support for Port F > > was wrong, because Port F bits are far from bits used > > for A to E. > > > > Since Port F is not used so far we don't need to propagate > > Fixes back there. > > > > v2: Reuse _SHIFT definition to avoid complicated duplication (DK). > > > > Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@xxxxxxxxx> > > Cc: Lucas De Marchi <lucas.demarchi@xxxxxxxxx> > > Cc: Manasi Navare <manasi.d.navare@xxxxxxxxx> > > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> > > --- > > drivers/gpu/drm/i915/i915_reg.h | 10 ++++++---- > > 1 file changed, 6 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > > index 3ad9ad4a7918..861a7d5a27af 100644 > > --- a/drivers/gpu/drm/i915/i915_reg.h > > +++ b/drivers/gpu/drm/i915/i915_reg.h > > @@ -8838,10 +8838,12 @@ enum skl_power_gate { > > * CNL Clocks > > */ > > #define DPCLKA_CFGCR0 _MMIO(0x6C200) > > -#define DPCLKA_CFGCR0_DDI_CLK_OFF(port) (1 << ((port)+10)) > > -#define DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(port) (3 << ((port)*2)) > > -#define DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT(port) ((port)*2) > > -#define DPCLKA_CFGCR0_DDI_CLK_SEL(pll, port) ((pll) << ((port)*2)) > > +#define DPCLKA_CFGCR0_DDI_CLK_OFF(port) (1 << ((port) == PORT_F ? 23 : \ > > + (port)+10)) > > +#define DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT(port) ((port) == PORT_F ? 21 : \ > > + (port)*2) > > nit: I wouldn't bother with the new line, more readable without it. And > there seems to be plenty of places in that file where the 80 char limit > is exceeded. well, it depends on the screen size. If not cut the screen size will limit that and in my current case it gets worse... > > > Either way, patch looks correct. > Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@xxxxxxxxx> Thanks, Rodrigo. > > > > +#define DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(port) (3 << DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT(port)) > > +#define DPCLKA_CFGCR0_DDI_CLK_SEL(pll, port) ((pll) << DPCLKA_CFGCR0_DDI_CLK_SEL_SHIFT(port)) > > > > /* CNL PLL */ > > #define DPLL0_ENABLE 0x46010 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx