| Message ID | 1443070374-10434-1-git-send-email-sonika.jindal@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On to, 2015-09-24 at 10:22 +0530, Sonika Jindal wrote: > Bspec update tells that we have to enable oscaledcompmethod instead of > ouniqetrangenmethod for enabling scale value during swing programming. > > v2: Adding back 'don't care' values to bxt_ddi_translations_dp and add > error message if ouniquetrangemethod was set (Imre) > > Signed-off-by: Sonika Jindal <sonika.jindal@intel.com> > Reviewed-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>(v1) Reviewed-by: Imre Deak <imre.deak@intel.com> > --- > drivers/gpu/drm/i915/i915_reg.h | 3 ++- > drivers/gpu/drm/i915/intel_ddi.c | 8 ++++++-- > 2 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 812b7b2..3f2135d 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -1395,7 +1395,8 @@ enum skl_disp_power_wells { > #define BXT_PORT_TX_DW3_LN0(port) _PORT3(port, _PORT_TX_DW3_LN0_A, \ > _PORT_TX_DW3_LN0_B, \ > _PORT_TX_DW3_LN0_C) > -#define UNIQE_TRANGE_EN_METHOD (1 << 27) > +#define SCALE_DCOMP_METHOD (1 << 26) > +#define UNIQUE_TRANGE_EN_METHOD (1 << 27) > > #define _PORT_TX_DW4_LN0_A 0x162510 > #define _PORT_TX_DW4_LN0_B 0x6C510 > diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c > index fec51df..7705bc9 100644 > --- a/drivers/gpu/drm/i915/intel_ddi.c > +++ b/drivers/gpu/drm/i915/intel_ddi.c > @@ -2151,9 +2151,13 @@ static void bxt_ddi_vswing_sequence(struct drm_device *dev, u32 level, > I915_WRITE(BXT_PORT_TX_DW2_GRP(port), val); > > val = I915_READ(BXT_PORT_TX_DW3_LN0(port)); > - val &= ~UNIQE_TRANGE_EN_METHOD; > + val &= ~SCALE_DCOMP_METHOD; > if (ddi_translations[level].enable) > - val |= UNIQE_TRANGE_EN_METHOD; > + val |= SCALE_DCOMP_METHOD; > + > + if ((val & UNIQUE_TRANGE_EN_METHOD) && !(val & SCALE_DCOMP_METHOD)) > + DRM_ERROR("Disabled scaling while ouniqetrangenmethod was set"); > + > I915_WRITE(BXT_PORT_TX_DW3_GRP(port), val); > > val = I915_READ(BXT_PORT_TX_DW4_LN0(port));
On Thu, Sep 24, 2015 at 02:12:02PM +0300, Imre Deak wrote: > On to, 2015-09-24 at 10:22 +0530, Sonika Jindal wrote: > > Bspec update tells that we have to enable oscaledcompmethod instead of > > ouniqetrangenmethod for enabling scale value during swing programming. > > > > v2: Adding back 'don't care' values to bxt_ddi_translations_dp and add > > error message if ouniquetrangemethod was set (Imre) > > > > Signed-off-by: Sonika Jindal <sonika.jindal@intel.com> > > Reviewed-by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>(v1) > > Reviewed-by: Imre Deak <imre.deak@intel.com> Queued for -next, thanks for the patch. -Daniel > > > --- > > drivers/gpu/drm/i915/i915_reg.h | 3 ++- > > drivers/gpu/drm/i915/intel_ddi.c | 8 ++++++-- > > 2 files changed, 8 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > > index 812b7b2..3f2135d 100644 > > --- a/drivers/gpu/drm/i915/i915_reg.h > > +++ b/drivers/gpu/drm/i915/i915_reg.h > > @@ -1395,7 +1395,8 @@ enum skl_disp_power_wells { > > #define BXT_PORT_TX_DW3_LN0(port) _PORT3(port, _PORT_TX_DW3_LN0_A, \ > > _PORT_TX_DW3_LN0_B, \ > > _PORT_TX_DW3_LN0_C) > > -#define UNIQE_TRANGE_EN_METHOD (1 << 27) > > +#define SCALE_DCOMP_METHOD (1 << 26) > > +#define UNIQUE_TRANGE_EN_METHOD (1 << 27) > > > > #define _PORT_TX_DW4_LN0_A 0x162510 > > #define _PORT_TX_DW4_LN0_B 0x6C510 > > diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c > > index fec51df..7705bc9 100644 > > --- a/drivers/gpu/drm/i915/intel_ddi.c > > +++ b/drivers/gpu/drm/i915/intel_ddi.c > > @@ -2151,9 +2151,13 @@ static void bxt_ddi_vswing_sequence(struct drm_device *dev, u32 level, > > I915_WRITE(BXT_PORT_TX_DW2_GRP(port), val); > > > > val = I915_READ(BXT_PORT_TX_DW3_LN0(port)); > > - val &= ~UNIQE_TRANGE_EN_METHOD; > > + val &= ~SCALE_DCOMP_METHOD; > > if (ddi_translations[level].enable) > > - val |= UNIQE_TRANGE_EN_METHOD; > > + val |= SCALE_DCOMP_METHOD; > > + > > + if ((val & UNIQUE_TRANGE_EN_METHOD) && !(val & SCALE_DCOMP_METHOD)) > > + DRM_ERROR("Disabled scaling while ouniqetrangenmethod was set"); > > + > > I915_WRITE(BXT_PORT_TX_DW3_GRP(port), val); > > > > val = I915_READ(BXT_PORT_TX_DW4_LN0(port)); > > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 812b7b2..3f2135d 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -1395,7 +1395,8 @@ enum skl_disp_power_wells { #define BXT_PORT_TX_DW3_LN0(port) _PORT3(port, _PORT_TX_DW3_LN0_A, \ _PORT_TX_DW3_LN0_B, \ _PORT_TX_DW3_LN0_C) -#define UNIQE_TRANGE_EN_METHOD (1 << 27) +#define SCALE_DCOMP_METHOD (1 << 26) +#define UNIQUE_TRANGE_EN_METHOD (1 << 27) #define _PORT_TX_DW4_LN0_A 0x162510 #define _PORT_TX_DW4_LN0_B 0x6C510 diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index fec51df..7705bc9 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -2151,9 +2151,13 @@ static void bxt_ddi_vswing_sequence(struct drm_device *dev, u32 level, I915_WRITE(BXT_PORT_TX_DW2_GRP(port), val); val = I915_READ(BXT_PORT_TX_DW3_LN0(port)); - val &= ~UNIQE_TRANGE_EN_METHOD; + val &= ~SCALE_DCOMP_METHOD; if (ddi_translations[level].enable) - val |= UNIQE_TRANGE_EN_METHOD; + val |= SCALE_DCOMP_METHOD; + + if ((val & UNIQUE_TRANGE_EN_METHOD) && !(val & SCALE_DCOMP_METHOD)) + DRM_ERROR("Disabled scaling while ouniqetrangenmethod was set"); + I915_WRITE(BXT_PORT_TX_DW3_GRP(port), val); val = I915_READ(BXT_PORT_TX_DW4_LN0(port));