[PATCH] drm/i915: Move CUR_SURFLIFE definition to a better place.

[PATCH] drm/i915: Move CUR_SURFLIFE definition to a better place.

[Rodrigo Vivi]

No functional change. But let's keep definitions clean
and cursor related register definitions together.

Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/i915_reg.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index abdc513a9edd..561bf0fda746 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -6009,6 +6009,7 @@ enum {
 #define CURSIZE			_MMIO(0x700a0) /* 845/865 */
 #define _CUR_FBC_CTL_A		0x700a0 /* ivb+ */
 #define   CUR_FBC_CTL_EN	(1 << 31)
+#define _CUR_SURLIVE		0x700aC /* g4x+ */
 #define _CURBCNTR		0x700c0
 #define _CURBBASE		0x700c4
 #define _CURBPOS		0x700c8
@@ -6025,6 +6026,7 @@ enum {
 #define CURBASE(pipe) _CURSOR2(pipe, _CURABASE)
 #define CURPOS(pipe) _CURSOR2(pipe, _CURAPOS)
 #define CUR_FBC_CTL(pipe) _CURSOR2(pipe, _CUR_FBC_CTL_A)
+#define CUR_SURLIVE(pipe) _CURSOR2(pipe, _CUR_SURLIVE)
 
 #define CURSOR_A_OFFSET 0x70080
 #define CURSOR_B_OFFSET 0x700c0
@@ -6032,9 +6034,6 @@ enum {
 #define IVB_CURSOR_B_OFFSET 0x71080
 #define IVB_CURSOR_C_OFFSET 0x72080
 
-#define _CUR_SURLIVE		0x700AC
-#define CUR_SURLIVE(pipe)	_CURSOR2(pipe, _CUR_SURLIVE)
-
 /* Display A control */
 #define _DSPACNTR				0x70180
 #define   DISPLAY_PLANE_ENABLE			(1<<31)
-- 
2.13.6

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Move CUR_SURFLIFE definition to a better place.

[Ville Syrjälä]

On Mon, Mar 12, 2018 at 01:27:03PM -0700, Rodrigo Vivi wrote:
> No functional change. But let's keep definitions clean
> and cursor related register definitions together.
> 
> Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_reg.h | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index abdc513a9edd..561bf0fda746 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -6009,6 +6009,7 @@ enum {
>  #define CURSIZE			_MMIO(0x700a0) /* 845/865 */
>  #define _CUR_FBC_CTL_A		0x700a0 /* ivb+ */
>  #define   CUR_FBC_CTL_EN	(1 << 31)
> +#define _CUR_SURLIVE		0x700aC /* g4x+ */

To caps or not to caps? (referring to the aC part)

Name should be _CURASURFLIVE to match the original name
of the register for pipe A. And I suppose the parametrized version
shouldn't have the '_' either then.

With that
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

>  #define _CURBCNTR		0x700c0
>  #define _CURBBASE		0x700c4
>  #define _CURBPOS		0x700c8
> @@ -6025,6 +6026,7 @@ enum {
>  #define CURBASE(pipe) _CURSOR2(pipe, _CURABASE)
>  #define CURPOS(pipe) _CURSOR2(pipe, _CURAPOS)
>  #define CUR_FBC_CTL(pipe) _CURSOR2(pipe, _CUR_FBC_CTL_A)
> +#define CUR_SURLIVE(pipe) _CURSOR2(pipe, _CUR_SURLIVE)
>  
>  #define CURSOR_A_OFFSET 0x70080
>  #define CURSOR_B_OFFSET 0x700c0
> @@ -6032,9 +6034,6 @@ enum {
>  #define IVB_CURSOR_B_OFFSET 0x71080
>  #define IVB_CURSOR_C_OFFSET 0x72080
>  
> -#define _CUR_SURLIVE		0x700AC
> -#define CUR_SURLIVE(pipe)	_CURSOR2(pipe, _CUR_SURLIVE)
> -
>  /* Display A control */
>  #define _DSPACNTR				0x70180
>  #define   DISPLAY_PLANE_ENABLE			(1<<31)
> -- 
> 2.13.6

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Move CUR_SURFLIFE definition to a better place.

[Rodrigo Vivi]

On Mon, Mar 12, 2018 at 10:35:30PM +0200, Ville Syrjälä wrote:
> On Mon, Mar 12, 2018 at 01:27:03PM -0700, Rodrigo Vivi wrote:
> > No functional change. But let's keep definitions clean
> > and cursor related register definitions together.
> > 
> > Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_reg.h | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> > index abdc513a9edd..561bf0fda746 100644
> > --- a/drivers/gpu/drm/i915/i915_reg.h
> > +++ b/drivers/gpu/drm/i915/i915_reg.h
> > @@ -6009,6 +6009,7 @@ enum {
> >  #define CURSIZE			_MMIO(0x700a0) /* 845/865 */
> >  #define _CUR_FBC_CTL_A		0x700a0 /* ivb+ */
> >  #define   CUR_FBC_CTL_EN	(1 << 31)
> > +#define _CUR_SURLIVE		0x700aC /* g4x+ */
> 
> To caps or not to caps? (referring to the aC part)

Self mental note refresh: Never rush in with simple patches
Never rush in with simple patches
Never rush in with simple patches

> 
> Name should be _CURASURFLIVE to match the original name
> of the register for pipe A. And I suppose the parametrized version
> shouldn't have the '_' either then.
> 
> With that
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

double thanks

> 
> >  #define _CURBCNTR		0x700c0
> >  #define _CURBBASE		0x700c4
> >  #define _CURBPOS		0x700c8
> > @@ -6025,6 +6026,7 @@ enum {
> >  #define CURBASE(pipe) _CURSOR2(pipe, _CURABASE)
> >  #define CURPOS(pipe) _CURSOR2(pipe, _CURAPOS)
> >  #define CUR_FBC_CTL(pipe) _CURSOR2(pipe, _CUR_FBC_CTL_A)
> > +#define CUR_SURLIVE(pipe) _CURSOR2(pipe, _CUR_SURLIVE)
> >  
> >  #define CURSOR_A_OFFSET 0x70080
> >  #define CURSOR_B_OFFSET 0x700c0
> > @@ -6032,9 +6034,6 @@ enum {
> >  #define IVB_CURSOR_B_OFFSET 0x71080
> >  #define IVB_CURSOR_C_OFFSET 0x72080
> >  
> > -#define _CUR_SURLIVE		0x700AC
> > -#define CUR_SURLIVE(pipe)	_CURSOR2(pipe, _CUR_SURLIVE)
> > -
> >  /* Display A control */
> >  #define _DSPACNTR				0x70180
> >  #define   DISPLAY_PLANE_ENABLE			(1<<31)
> > -- 
> > 2.13.6
> 
> -- 
> Ville Syrjälä
> Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH v2] drm/i915: Move CUR SURFLIVE definition to a better place.

[Rodrigo Vivi]

No functional change. But let's keep definitions clean
and cursor related register definitions together.

v2: Fix caps x no caps on same reg. Change name to match
    original reg name. (by Ville).
    Also fix name on code s/surlive/surflive and on subject
    s/cur_surlife/cur surflive/.

Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/i915_reg.h  | 5 ++---
 drivers/gpu/drm/i915/intel_psr.c | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index abdc513a9edd..395b806ddbab 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -6009,6 +6009,7 @@ enum {
 #define CURSIZE			_MMIO(0x700a0) /* 845/865 */
 #define _CUR_FBC_CTL_A		0x700a0 /* ivb+ */
 #define   CUR_FBC_CTL_EN	(1 << 31)
+#define _CURASURFLIVE		0x700ac /* g4x+ */
 #define _CURBCNTR		0x700c0
 #define _CURBBASE		0x700c4
 #define _CURBPOS		0x700c8
@@ -6025,6 +6026,7 @@ enum {
 #define CURBASE(pipe) _CURSOR2(pipe, _CURABASE)
 #define CURPOS(pipe) _CURSOR2(pipe, _CURAPOS)
 #define CUR_FBC_CTL(pipe) _CURSOR2(pipe, _CUR_FBC_CTL_A)
+#define CURSURFLIVE(pipe) _CURSOR2(pipe, _CURASURFLIVE)
 
 #define CURSOR_A_OFFSET 0x70080
 #define CURSOR_B_OFFSET 0x700c0
@@ -6032,9 +6034,6 @@ enum {
 #define IVB_CURSOR_B_OFFSET 0x71080
 #define IVB_CURSOR_C_OFFSET 0x72080
 
-#define _CUR_SURLIVE		0x700AC
-#define CUR_SURLIVE(pipe)	_CURSOR2(pipe, _CUR_SURLIVE)
-
 /* Display A control */
 #define _DSPACNTR				0x70180
 #define   DISPLAY_PLANE_ENABLE			(1<<31)
diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index d93ecfc5d739..2861add9d678 100644
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -1038,11 +1038,11 @@ void intel_psr_flush(struct drm_i915_private *dev_priv,
 			 * This documented WA for bxt can be safely applied
 			 * broadly so we can force HW tracking to exit PSR
 			 * instead of disabling and re-enabling.
-			 * Workaround tells us to write 0 to CUR_SURLIVE_A,
+			 * Workaround tells us to write 0 to CUR_SURFLIVE_A,
 			 * but it makes more sense write to the current active
 			 * pipe.
 			 */
-			I915_WRITE(CUR_SURLIVE(pipe), 0);
+			I915_WRITE(CURSURFLIVE(pipe), 0);
 		}
 	}
 
-- 
2.13.6

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Move CUR_SURFLIFE definition to a better place.

[Rodrigo Vivi]

On Mon, Mar 12, 2018 at 10:35:30PM +0200, Ville Syrjälä wrote:
> On Mon, Mar 12, 2018 at 01:27:03PM -0700, Rodrigo Vivi wrote:
> > No functional change. But let's keep definitions clean
> > and cursor related register definitions together.
> > 
> > Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> >  drivers/gpu/drm/i915/i915_reg.h | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> > index abdc513a9edd..561bf0fda746 100644
> > --- a/drivers/gpu/drm/i915/i915_reg.h
> > +++ b/drivers/gpu/drm/i915/i915_reg.h
> > @@ -6009,6 +6009,7 @@ enum {
> >  #define CURSIZE			_MMIO(0x700a0) /* 845/865 */
> >  #define _CUR_FBC_CTL_A		0x700a0 /* ivb+ */
> >  #define   CUR_FBC_CTL_EN	(1 << 31)
> > +#define _CUR_SURLIVE		0x700aC /* g4x+ */
> 
> To caps or not to caps? (referring to the aC part)
> 
> Name should be _CURASURFLIVE to match the original name
> of the register for pipe A. And I suppose the parametrized version
> shouldn't have the '_' either then.
> 
> With that
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

changed, ci'ed and pushed. Thanks for suggestions and review.

> 
> >  #define _CURBCNTR		0x700c0
> >  #define _CURBBASE		0x700c4
> >  #define _CURBPOS		0x700c8
> > @@ -6025,6 +6026,7 @@ enum {
> >  #define CURBASE(pipe) _CURSOR2(pipe, _CURABASE)
> >  #define CURPOS(pipe) _CURSOR2(pipe, _CURAPOS)
> >  #define CUR_FBC_CTL(pipe) _CURSOR2(pipe, _CUR_FBC_CTL_A)
> > +#define CUR_SURLIVE(pipe) _CURSOR2(pipe, _CUR_SURLIVE)
> >  
> >  #define CURSOR_A_OFFSET 0x70080
> >  #define CURSOR_B_OFFSET 0x700c0
> > @@ -6032,9 +6034,6 @@ enum {
> >  #define IVB_CURSOR_B_OFFSET 0x71080
> >  #define IVB_CURSOR_C_OFFSET 0x72080
> >  
> > -#define _CUR_SURLIVE		0x700AC
> > -#define CUR_SURLIVE(pipe)	_CURSOR2(pipe, _CUR_SURLIVE)
> > -
> >  /* Display A control */
> >  #define _DSPACNTR				0x70180
> >  #define   DISPLAY_PLANE_ENABLE			(1<<31)
> > -- 
> > 2.13.6
> 
> -- 
> Ville Syrjälä
> Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for drm/i915: Move CUR_SURFLIFE definition to a better place. (rev2)

[Patchwork]

== Series Details ==

Series: drm/i915: Move CUR_SURFLIFE definition to a better place. (rev2)
URL   : https://patchwork.freedesktop.org/series/39812/
State : success

== Summary ==

Series 39812v2 drm/i915: Move CUR_SURFLIFE definition to a better place.
https://patchwork.freedesktop.org/api/1.0/series/39812/revisions/2/mbox/

fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:432s
fi-bdw-gvtdvm    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:432s
fi-blb-e6850     total:288  pass:223  dwarn:1   dfail:0   fail:0   skip:64  time:385s
fi-bsw-n3050     total:288  pass:242  dwarn:0   dfail:0   fail:0   skip:46  time:528s
fi-bwr-2160      total:288  pass:183  dwarn:0   dfail:0   fail:0   skip:105 time:298s
fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:508s
fi-byt-j1900     total:288  pass:253  dwarn:0   dfail:0   fail:0   skip:35  time:512s
fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:506s
fi-cfl-8700k     total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:411s
fi-cfl-s2        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:583s
fi-elk-e7500     total:288  pass:229  dwarn:0   dfail:0   fail:0   skip:59  time:428s
fi-gdg-551       total:288  pass:179  dwarn:0   dfail:0   fail:1   skip:108 time:314s
fi-glk-1         total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:537s
fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:403s
fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:418s
fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:458s
fi-ivb-3770      total:288  pass:255  dwarn:0   dfail:0   fail:0   skip:33  time:428s
fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:472s
fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:467s
fi-kbl-r         total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:513s
fi-pnv-d510      total:288  pass:222  dwarn:1   dfail:0   fail:0   skip:65  time:639s
fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:441s
fi-skl-6600u     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:531s
fi-skl-6700hq    total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:537s
fi-skl-6700k2    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:503s
fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:489s
fi-skl-guc       total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:427s
fi-snb-2520m     total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:539s
fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:400s
Blacklisted hosts:
fi-cfl-u         total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:510s
fi-cnl-drrs      total:288  pass:257  dwarn:3   dfail:0   fail:0   skip:28  time:533s
fi-bxt-dsi failed to collect. IGT log at Patchwork_8314/fi-bxt-dsi/run0.log

1b5fa1f85d1cc65aec1229aeef67835af5d15864 drm-tip: 2018y-03m-12d-20h-30m-34s UTC integration manifest
849d51ce8b6f drm/i915: Move CUR SURFLIVE definition to a better place.

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8314/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.IGT: warning for drm/i915: Move CUR_SURFLIFE definition to a better place. (rev2)

[Patchwork]

== Series Details ==

Series: drm/i915: Move CUR_SURFLIFE definition to a better place. (rev2)
URL   : https://patchwork.freedesktop.org/series/39812/
State : warning

== Summary ==

---- Possible new issues:

Test drv_suspend:
        Subgroup forcewake:
                pass       -> SKIP       (shard-snb)

---- Known issues:

Test kms_cursor_crc:
        Subgroup cursor-256x256-suspend:
                skip       -> PASS       (shard-hsw) fdo#103375
Test kms_frontbuffer_tracking:
        Subgroup fbc-1p-primscrn-spr-indfb-draw-mmap-cpu:
                pass       -> FAIL       (shard-apl) fdo#103167
Test kms_mmap_write_crc:
                fail       -> PASS       (shard-apl) fdo#103286
Test kms_setmode:
        Subgroup basic:
                pass       -> FAIL       (shard-apl) fdo#99912

fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103286 https://bugs.freedesktop.org/show_bug.cgi?id=103286
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912

shard-apl        total:3473 pass:1829 dwarn:1   dfail:0   fail:8   skip:1634 time:13027s
shard-hsw        total:3473 pass:1777 dwarn:1   dfail:0   fail:2   skip:1692 time:11962s
shard-snb        total:3473 pass:1364 dwarn:1   dfail:0   fail:3   skip:2105 time:7254s
Blacklisted hosts:
shard-kbl        total:3473 pass:1950 dwarn:1   dfail:0   fail:9   skip:1513 time:9733s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8314/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx