diff mbox

drm/i915/cnl: Fix the CURSOR_COEFF_MASK used in DDI Vswing Programming

Message ID 1498785241-21138-1-git-send-email-manasi.d.navare@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Navare, Manasi June 30, 2017, 1:14 a.m. UTC
The Cursor Coeff is lower 6 bits in the PORT_TX_DW4 register
and hence the CURSOR_COEFF_MASK should be (0x3F << 0)

Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/i915_reg.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Rodrigo Vivi June 30, 2017, 4:13 a.m. UTC | #1
the patch that introduces this error didn't land yet....

so, could we squash to the original patch whenever that is reworked to
be resent?


On Thu, Jun 29, 2017 at 6:14 PM, Manasi Navare
<manasi.d.navare@intel.com> wrote:
> The Cursor Coeff is lower 6 bits in the PORT_TX_DW4 register
> and hence the CURSOR_COEFF_MASK should be (0x3F << 0)
>
> Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_reg.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index c8647cf..64cc674 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -1802,7 +1802,7 @@ enum skl_disp_power_wells {
>  #define   POST_CURSOR_2(x)             ((x) << 6)
>  #define   POST_CURSOR_2_MASK           (0x3F << 6)
>  #define   CURSOR_COEFF(x)              ((x) << 0)
> -#define   CURSOR_COEFF_MASK            (0x3F << 6)
> +#define   CURSOR_COEFF_MASK            (0x3F << 0)
>
>  #define _CNL_PORT_TX_DW5_GRP_AE                0x162354
>  #define _CNL_PORT_TX_DW5_GRP_B         0x1623D4
> --
> 2.1.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi June 30, 2017, 2:15 p.m. UTC | #2
Oh! nevermind, please fully ignore my last email!

Fixes: 04416108ccea ("drm/i915/cnl: Add registers related to voltage
swing sequences.")
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

On Thu, Jun 29, 2017 at 9:13 PM, Rodrigo Vivi <rodrigo.vivi@gmail.com> wrote:
> the patch that introduces this error didn't land yet....
>
> so, could we squash to the original patch whenever that is reworked to
> be resent?
>
>
> On Thu, Jun 29, 2017 at 6:14 PM, Manasi Navare
> <manasi.d.navare@intel.com> wrote:
>> The Cursor Coeff is lower 6 bits in the PORT_TX_DW4 register
>> and hence the CURSOR_COEFF_MASK should be (0x3F << 0)
>>
>> Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> ---
>>  drivers/gpu/drm/i915/i915_reg.h | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
>> index c8647cf..64cc674 100644
>> --- a/drivers/gpu/drm/i915/i915_reg.h
>> +++ b/drivers/gpu/drm/i915/i915_reg.h
>> @@ -1802,7 +1802,7 @@ enum skl_disp_power_wells {
>>  #define   POST_CURSOR_2(x)             ((x) << 6)
>>  #define   POST_CURSOR_2_MASK           (0x3F << 6)
>>  #define   CURSOR_COEFF(x)              ((x) << 0)
>> -#define   CURSOR_COEFF_MASK            (0x3F << 6)
>> +#define   CURSOR_COEFF_MASK            (0x3F << 0)
>>
>>  #define _CNL_PORT_TX_DW5_GRP_AE                0x162354
>>  #define _CNL_PORT_TX_DW5_GRP_B         0x1623D4
>> --
>> 2.1.4
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
>
>
> --
> Rodrigo Vivi
> Blog: http://blog.vivi.eng.br
Rodrigo Vivi June 30, 2017, 2:58 p.m. UTC | #3
Patch merged to dinq.

With the proper "Fixes:".

Thanks,
Rodrigo.

On Fri, 2017-06-30 at 07:15 -0700, Rodrigo Vivi wrote:
> Oh! nevermind, please fully ignore my last email!

> 

> Fixes: 04416108ccea ("drm/i915/cnl: Add registers related to voltage

> swing sequences.")

> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

> 

> On Thu, Jun 29, 2017 at 9:13 PM, Rodrigo Vivi <rodrigo.vivi@gmail.com> wrote:

> > the patch that introduces this error didn't land yet....

> >

> > so, could we squash to the original patch whenever that is reworked to

> > be resent?

> >

> >

> > On Thu, Jun 29, 2017 at 6:14 PM, Manasi Navare

> > <manasi.d.navare@intel.com> wrote:

> >> The Cursor Coeff is lower 6 bits in the PORT_TX_DW4 register

> >> and hence the CURSOR_COEFF_MASK should be (0x3F << 0)

> >>

> >> Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>

> >> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>

> >> ---

> >>  drivers/gpu/drm/i915/i915_reg.h | 2 +-

> >>  1 file changed, 1 insertion(+), 1 deletion(-)

> >>

> >> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h

> >> index c8647cf..64cc674 100644

> >> --- a/drivers/gpu/drm/i915/i915_reg.h

> >> +++ b/drivers/gpu/drm/i915/i915_reg.h

> >> @@ -1802,7 +1802,7 @@ enum skl_disp_power_wells {

> >>  #define   POST_CURSOR_2(x)             ((x) << 6)

> >>  #define   POST_CURSOR_2_MASK           (0x3F << 6)

> >>  #define   CURSOR_COEFF(x)              ((x) << 0)

> >> -#define   CURSOR_COEFF_MASK            (0x3F << 6)

> >> +#define   CURSOR_COEFF_MASK            (0x3F << 0)

> >>

> >>  #define _CNL_PORT_TX_DW5_GRP_AE                0x162354

> >>  #define _CNL_PORT_TX_DW5_GRP_B         0x1623D4

> >> --

> >> 2.1.4

> >>

> >> _______________________________________________

> >> Intel-gfx mailing list

> >> Intel-gfx@lists.freedesktop.org

> >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

> >

> >

> >

> > --

> > Rodrigo Vivi

> > Blog: http://blog.vivi.eng.br

> 

> 

>
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index c8647cf..64cc674 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -1802,7 +1802,7 @@  enum skl_disp_power_wells {
 #define   POST_CURSOR_2(x)		((x) << 6)
 #define   POST_CURSOR_2_MASK		(0x3F << 6)
 #define   CURSOR_COEFF(x)		((x) << 0)
-#define   CURSOR_COEFF_MASK		(0x3F << 6)
+#define   CURSOR_COEFF_MASK		(0x3F << 0)
 
 #define _CNL_PORT_TX_DW5_GRP_AE		0x162354
 #define _CNL_PORT_TX_DW5_GRP_B		0x1623D4