drm/i915: Some less complex FBC fixes
Subsystems (2)
cover drm/i915: Some less complex FBC fixes
From: Ville Syrjälä <[email protected]>
Since fixing the FBC locking is a bigger task that will take a while, I decided to pull all the simple fixes from my branch and post them right away.
Some of these I've posted before, some others have seen a bit of action by being in a public branch.
The FBC_FENCE_OFF change is just a guess at this point. The odd offset just caught my eye while reading throguh i915_reg.h.
Ville Syrjälä (10):
drm/i915: Don't write IVB_FBC_RT_BASE
drm/i915: Don't set persistent FBC mode on ILK/SNB drm/i915: Don't set DPFC_HT_MODIFY bit on CTG/ILK/SNB drm/i915: Improve FBC plane defines a bit
drm/i915: Use 1/2 compression ratio limit for 16bpp on FBC2 drm/i915: Actually write the correct bits to DPFC_CONTROL on CTG drm/i915: Don't preserve DPFC_CONTROL bits ILK/SNB drm/i915: Kill most of the FBC register save/restore drm/i915: Fix FBC1 enable message
drm/i915: Fix FBC_FENCE_OFF
drivers/gpu/drm/i915/i915_drv.h | 4 ---- drivers/gpu/drm/i915/i915_reg.h | 10 ++++----- drivers/gpu/drm/i915/i915_suspend.c | 32 +++++++---------------------- drivers/gpu/drm/i915/intel_pm.c | 41 ++++++++++++++++++++----------------- 4 files changed, 33 insertions(+), 54 deletions(-)
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/10 drm/i915: Don't write IVB_FBC_RT_BASE
From: Ville Syrjälä <[email protected]>
We use nuking instead of render tracking on IVB+, so there's no point in writing IVB_FBC_RT_BASE.
v2: Drop the IVB_FBC_RT_BASE write too
v3: Move the SNB stuff elsewhere, leaving only IVB+ here
--- drivers/gpu/drm/i915/intel_pm.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -2
@@ -283,8 +283,6 @@ static void gen7_enable_fbc(struct drm_crtc *crtc)struct drm_i915_gem_object *obj = intel_fb->obj;struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -I915_WRITE (IVB_FBC_RT_BASE ,i915_gem_obj_ggtt_offset (obj)); -I915_WRITE (ILK_DPFC_CONTROL ,DPFC_CTL_EN |DPFC_CTL_LIMIT_1X |IVB_DPFC_CTL_FENCE_EN | intel_crtc->plane <<IVB_DPFC_CTL_PLANE_SHIFT );
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/10 drm/i915: Don't set persistent FBC mode on ILK/SNB
In reply to [email protected]From: Ville Syrjälä <[email protected]>
The ILK/SNB docs are a bit unclear what the persistent mode does, but the CTG docs clearly state that it was meant to be used when we're tracking back buffer modifications. We never do that, so leave it in non-persistent mode.
--- drivers/gpu/drm/i915/intel_pm.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -2
@@ -230,8 +230,6 @@ static void ironlake_enable_fbc(struct drm_crtc *crtc) dpfc_ctl =I915_READ (ILK_DPFC_CONTROL ); dpfc_ctl &=DPFC_RESERVED ; dpfc_ctl |= (plane |DPFC_CTL_LIMIT_1X ); -/* Set persistent mode for front-buffer rendering, ala X. */ - dpfc_ctl |=DPFC_CTL_PERSISTENT_MODE ; dpfc_ctl |=DPFC_CTL_FENCE_EN ;if (IS_GEN5 (dev)) dpfc_ctl |= obj->fence_reg;
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/10 drm/i915: Don't set DPFC_HT_MODIFY bit on CTG/ILK/SNB
In reply to [email protected]From: Ville Syrjälä <[email protected]>
The ILK/SNB docs don't really mention the the DPFC_HT_MODIFY bit. CTG docs clearly state that it should be set only when tracking back buffer modification in persistent mode. The bit is supposed to be set by software after the first CPU modification to the back buffer, and it would get automagically cleared by the hardware on the next page flip.
Since we only track front buffer modification we don't need to set this bit. GTT modification tracking still appears to work on ILK and SNB with the bit unset. I don't have a CTG to verify how that behaves.
--- drivers/gpu/drm/i915/intel_pm.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -2
@@ -159,7 +159,6 @@ static void g4x_enable_fbc(struct drm_crtc *crtc) dpfc_ctl = plane |DPFC_SR_EN |DPFC_CTL_LIMIT_1X ; dpfc_ctl |=DPFC_CTL_FENCE_EN | obj->fence_reg; -I915_WRITE (DPFC_CHICKEN ,DPFC_HT_MODIFY );I915_WRITE (DPFC_FENCE_YOFF , crtc->y);
@@ -233,7 +232,6 @@ static void ironlake_enable_fbc(struct drm_crtc *crtc) dpfc_ctl |=DPFC_CTL_FENCE_EN ;if (IS_GEN5 (dev)) dpfc_ctl |= obj->fence_reg; -I915_WRITE (ILK_DPFC_CHICKEN ,DPFC_HT_MODIFY );I915_WRITE (ILK_DPFC_FENCE_YOFF , crtc->y);I915_WRITE (ILK_FBC_RT_BASE ,i915_gem_obj_ggtt_offset (obj) |ILK_FBC_RT_VALID );
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/10 drm/i915: Improve FBC plane defines a bit
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Make the FBC plane macros take the plane as a parameter.
--- drivers/gpu/drm/i915/i915_reg.h | 8 +++----- drivers/gpu/drm/i915/intel_pm.c | 13 +++++-------- 2 files changed, 8 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +3 -5
@@ -1047,8 +1047,7 @@#define FBC_CTL_IDLE_LINE (2<<2)#define FBC_CTL_IDLE_DEBUG (3<<2)#define FBC_CTL_CPU_FENCE (1<<1) -#define FBC_CTL_PLANEA (0<<0) -#define FBC_CTL_PLANEB (1<<0) +#define FBC_CTL_PLANE (plane) ((plane)<<0)#define FBC_FENCE_OFF 0x0321b#define FBC_TAG 0x03300
@@ -1058,9 +1057,8 @@#define DPFC_CB_BASE 0x3200#define DPFC_CONTROL 0x3208#define DPFC_CTL_EN (1<<31) -#define DPFC_CTL_PLANEA (0<<30) -#define DPFC_CTL_PLANEB (1<<30) -#define IVB_DPFC_CTL_PLANE_SHIFT (29) +#define DPFC_CTL_PLANE (plane) ((plane)<<30) +#define IVB_DPFC_CTL_PLANE (plane) ((plane)<<29)#define DPFC_CTL_FENCE_EN (1<<29)#define IVB_DPFC_CTL_FENCE_EN (1<<28)#define DPFC_CTL_PERSISTENT_MODE (1<<25)
drivers/gpu/drm/i915/intel_pm.c +5 -8
@@ -97,7 +97,7 @@ static void i8xx_enable_fbc(struct drm_crtc *crtc)struct drm_i915_gem_object *obj = intel_fb->obj;struct intel_crtc *intel_crtc =to_intel_crtc (crtc);int cfb_pitch; -int plane, i; +int i;u32 fbc_ctl; cfb_pitch = dev_priv->fbc.size /FBC_LL_SIZE ;
@@ -109,7 +109,6 @@ static void i8xx_enable_fbc(struct drm_crtc *crtc) cfb_pitch = (cfb_pitch /32 ) -1 ; else cfb_pitch = (cfb_pitch /64 ) -1 ; - plane = intel_crtc->plane ==0 ?FBC_CTL_PLANEA :FBC_CTL_PLANEB ;/* Clear old tags */ for (i =0 ; i < (FBC_LL_SIZE /32 ) +1 ; i++)
@@ -120,7 +119,7 @@ static void i8xx_enable_fbc(struct drm_crtc *crtc)/* Set it up... */ fbc_ctl2 =FBC_CTL_FENCE_DBL |FBC_CTL_IDLE_IMM |FBC_CTL_CPU_FENCE ; - fbc_ctl2 |= plane; + fbc_ctl2 |=FBC_CTL_PLANE (intel_crtc->plane);I915_WRITE (FBC_CONTROL2 , fbc_ctl2);I915_WRITE (FBC_FENCE_OFF , crtc->y); }
@@ -154,10 +153,9 @@ static void g4x_enable_fbc(struct drm_crtc *crtc)struct intel_framebuffer *intel_fb =to_intel_framebuffer (fb);struct drm_i915_gem_object *obj = intel_fb->obj;struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -int plane = intel_crtc->plane ==0 ?DPFC_CTL_PLANEA :DPFC_CTL_PLANEB ;u32 dpfc_ctl; - dpfc_ctl = plane |DPFC_SR_EN |DPFC_CTL_LIMIT_1X ; + dpfc_ctl =DPFC_CTL_PLANE (intel_crtc->plane) |DPFC_SR_EN |DPFC_CTL_LIMIT_1X ; dpfc_ctl |=DPFC_CTL_FENCE_EN | obj->fence_reg;I915_WRITE (DPFC_FENCE_YOFF , crtc->y);
@@ -223,12 +221,11 @@ static void ironlake_enable_fbc(struct drm_crtc *crtc)struct intel_framebuffer *intel_fb =to_intel_framebuffer (fb);struct drm_i915_gem_object *obj = intel_fb->obj;struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -int plane = intel_crtc->plane ==0 ?DPFC_CTL_PLANEA :DPFC_CTL_PLANEB ;u32 dpfc_ctl; dpfc_ctl =I915_READ (ILK_DPFC_CONTROL ); dpfc_ctl &=DPFC_RESERVED ; - dpfc_ctl |= (plane |DPFC_CTL_LIMIT_1X ); + dpfc_ctl |=DPFC_CTL_PLANE (intel_crtc->plane) |DPFC_CTL_LIMIT_1X ; dpfc_ctl |=DPFC_CTL_FENCE_EN ;if (IS_GEN5 (dev)) dpfc_ctl |= obj->fence_reg;
@@ -281,7 +278,7 @@ static void gen7_enable_fbc(struct drm_crtc *crtc)I915_WRITE (ILK_DPFC_CONTROL ,DPFC_CTL_EN |DPFC_CTL_LIMIT_1X |IVB_DPFC_CTL_FENCE_EN | - intel_crtc->plane <<IVB_DPFC_CTL_PLANE_SHIFT ); +IVB_DPFC_CTL_PLANE (intel_crtc->plane));if (IS_IVYBRIDGE (dev)) {/* WaFbcAsynchFlipDisableFbcQueue:ivb */
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/10 drm/i915: Use 1/2 compression ratio limit for 16bpp on FBC2
In reply to [email protected]From: Ville Syrjälä <[email protected]>
--- drivers/gpu/drm/i915/intel_pm.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +19 -5
@@ -155,7 +155,11 @@ static void g4x_enable_fbc(struct drm_crtc *crtc)struct intel_crtc *intel_crtc =to_intel_crtc (crtc);u32 dpfc_ctl; - dpfc_ctl =DPFC_CTL_PLANE (intel_crtc->plane) |DPFC_SR_EN |DPFC_CTL_LIMIT_1X ; + dpfc_ctl =DPFC_CTL_PLANE (intel_crtc->plane) |DPFC_SR_EN ; +if (drm_format_plane_cpp (fb->pixel_format,0 ) ==2 ) + dpfc_ctl |=DPFC_CTL_LIMIT_2X ; +else + dpfc_ctl |=DPFC_CTL_LIMIT_1X ; dpfc_ctl |=DPFC_CTL_FENCE_EN | obj->fence_reg;I915_WRITE (DPFC_FENCE_YOFF , crtc->y);
@@ -225,7 +229,11 @@ static void ironlake_enable_fbc(struct drm_crtc *crtc) dpfc_ctl =I915_READ (ILK_DPFC_CONTROL ); dpfc_ctl &=DPFC_RESERVED ; - dpfc_ctl |=DPFC_CTL_PLANE (intel_crtc->plane) |DPFC_CTL_LIMIT_1X ; + dpfc_ctl |=DPFC_CTL_PLANE (intel_crtc->plane); +if (drm_format_plane_cpp (fb->pixel_format,0 ) ==2 ) + dpfc_ctl |=DPFC_CTL_LIMIT_2X ; +else + dpfc_ctl |=DPFC_CTL_LIMIT_1X ; dpfc_ctl |=DPFC_CTL_FENCE_EN ;if (IS_GEN5 (dev)) dpfc_ctl |= obj->fence_reg;
@@ -275,10 +283,16 @@ static void gen7_enable_fbc(struct drm_crtc *crtc)struct intel_framebuffer *intel_fb =to_intel_framebuffer (fb);struct drm_i915_gem_object *obj = intel_fb->obj;struct intel_crtc *intel_crtc =to_intel_crtc (crtc); +u32 dpfc_ctl; -I915_WRITE (ILK_DPFC_CONTROL ,DPFC_CTL_EN |DPFC_CTL_LIMIT_1X | -IVB_DPFC_CTL_FENCE_EN | -IVB_DPFC_CTL_PLANE (intel_crtc->plane)); + dpfc_ctl =IVB_DPFC_CTL_PLANE (intel_crtc->plane); +if (drm_format_plane_cpp (fb->pixel_format,0 ) ==2 ) + dpfc_ctl |=DPFC_CTL_LIMIT_2X ; +else + dpfc_ctl |=DPFC_CTL_LIMIT_1X ; + dpfc_ctl |=IVB_DPFC_CTL_FENCE_EN ; + +I915_WRITE (ILK_DPFC_CONTROL , dpfc_ctl |DPFC_CTL_EN );if (IS_IVYBRIDGE (dev)) {/* WaFbcAsynchFlipDisableFbcQueue:ivb */
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 05/10] drm/i915: Use 1/2 compression ratio limit for 16bpp on FBC2
Quoted 3 lines · On Thu, Jan 23, 2014 at 04:49:12PM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Signed-off-by Ville Syrjälä <[email protected]>
Hm, running the fbc tests with a 16bpp fb would be neat ... -Daniel
Quoted 61 lines
--- drivers/gpu/drm/i915/intel_pm.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/intel_pm.c +19
-5@@ -155,7 +155,11 @@ static void g4x_enable_fbc(struct drm_crtc *crtc)struct intel_crtc *intel_crtc =to_intel_crtc (crtc);u32 dpfc_ctl; - dpfc_ctl =DPFC_CTL_PLANE (intel_crtc->plane) |DPFC_SR_EN |DPFC_CTL_LIMIT_1X ; + dpfc_ctl =DPFC_CTL_PLANE (intel_crtc->plane) |DPFC_SR_EN ; +if (drm_format_plane_cpp (fb->pixel_format,0 ) ==2 ) + dpfc_ctl |=DPFC_CTL_LIMIT_2X ; +else + dpfc_ctl |=DPFC_CTL_LIMIT_1X ; dpfc_ctl |=DPFC_CTL_FENCE_EN | obj->fence_reg;I915_WRITE (DPFC_FENCE_YOFF , crtc->y);@@ -225,7 +229,11 @@ static void ironlake_enable_fbc(struct drm_crtc *crtc) dpfc_ctl =I915_READ (ILK_DPFC_CONTROL ); dpfc_ctl &=DPFC_RESERVED ; - dpfc_ctl |=DPFC_CTL_PLANE (intel_crtc->plane) |DPFC_CTL_LIMIT_1X ; + dpfc_ctl |=DPFC_CTL_PLANE (intel_crtc->plane); +if (drm_format_plane_cpp (fb->pixel_format,0 ) ==2 ) + dpfc_ctl |=DPFC_CTL_LIMIT_2X ; +else + dpfc_ctl |=DPFC_CTL_LIMIT_1X ; dpfc_ctl |=DPFC_CTL_FENCE_EN ;if (IS_GEN5 (dev)) dpfc_ctl |= obj->fence_reg;@@ -275,10 +283,16 @@ static void gen7_enable_fbc(struct drm_crtc *crtc)struct intel_framebuffer *intel_fb =to_intel_framebuffer (fb);struct drm_i915_gem_object *obj = intel_fb->obj;struct intel_crtc *intel_crtc =to_intel_crtc (crtc); +u32 dpfc_ctl; -I915_WRITE (ILK_DPFC_CONTROL ,DPFC_CTL_EN |DPFC_CTL_LIMIT_1X | -IVB_DPFC_CTL_FENCE_EN | -IVB_DPFC_CTL_PLANE (intel_crtc->plane)); + dpfc_ctl =IVB_DPFC_CTL_PLANE (intel_crtc->plane); +if (drm_format_plane_cpp (fb->pixel_format,0 ) ==2 ) + dpfc_ctl |=DPFC_CTL_LIMIT_2X ; +else + dpfc_ctl |=DPFC_CTL_LIMIT_1X ; + dpfc_ctl |=IVB_DPFC_CTL_FENCE_EN ; + +I915_WRITE (ILK_DPFC_CONTROL , dpfc_ctl |DPFC_CTL_EN );if (IS_IVYBRIDGE (dev)) {/* WaFbcAsynchFlipDisableFbcQueue:ivb */ Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Re: [PATCH 05/10] drm/i915: Use 1/2 compression ratio limit for 16bpp on FBC2
Quoted 6 lines · Daniel Vetter
Quoted 3 lines · On Thu, Jan 23, 2014 at 04:49:12PM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Signed-off-by Ville Syrjälä <[email protected]>Hm, running the fbc tests with a 16bpp fb would be neat ...
Indeed. I'll put it on the list.
Quoted 68 lines
-Daniel
Quoted 61 lines
--- drivers/gpu/drm/i915/intel_pm.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/intel_pm.c +19
-5@@ -155,7 +155,11 @@ static void g4x_enable_fbc(struct drm_crtc *crtc)struct intel_crtc *intel_crtc =to_intel_crtc (crtc);u32 dpfc_ctl; - dpfc_ctl =DPFC_CTL_PLANE (intel_crtc->plane) |DPFC_SR_EN |DPFC_CTL_LIMIT_1X ; + dpfc_ctl =DPFC_CTL_PLANE (intel_crtc->plane) |DPFC_SR_EN ; +if (drm_format_plane_cpp (fb->pixel_format,0 ) ==2 ) + dpfc_ctl |=DPFC_CTL_LIMIT_2X ; +else + dpfc_ctl |=DPFC_CTL_LIMIT_1X ; dpfc_ctl |=DPFC_CTL_FENCE_EN | obj->fence_reg;I915_WRITE (DPFC_FENCE_YOFF , crtc->y);@@ -225,7 +229,11 @@ static void ironlake_enable_fbc(struct drm_crtc *crtc) dpfc_ctl =I915_READ (ILK_DPFC_CONTROL ); dpfc_ctl &=DPFC_RESERVED ; - dpfc_ctl |=DPFC_CTL_PLANE (intel_crtc->plane) |DPFC_CTL_LIMIT_1X ; + dpfc_ctl |=DPFC_CTL_PLANE (intel_crtc->plane); +if (drm_format_plane_cpp (fb->pixel_format,0 ) ==2 ) + dpfc_ctl |=DPFC_CTL_LIMIT_2X ; +else + dpfc_ctl |=DPFC_CTL_LIMIT_1X ; dpfc_ctl |=DPFC_CTL_FENCE_EN ;if (IS_GEN5 (dev)) dpfc_ctl |= obj->fence_reg;@@ -275,10 +283,16 @@ static void gen7_enable_fbc(struct drm_crtc *crtc)struct intel_framebuffer *intel_fb =to_intel_framebuffer (fb);struct drm_i915_gem_object *obj = intel_fb->obj;struct intel_crtc *intel_crtc =to_intel_crtc (crtc); +u32 dpfc_ctl; -I915_WRITE (ILK_DPFC_CONTROL ,DPFC_CTL_EN |DPFC_CTL_LIMIT_1X | -IVB_DPFC_CTL_FENCE_EN | -IVB_DPFC_CTL_PLANE (intel_crtc->plane)); + dpfc_ctl =IVB_DPFC_CTL_PLANE (intel_crtc->plane); +if (drm_format_plane_cpp (fb->pixel_format,0 ) ==2 ) + dpfc_ctl |=DPFC_CTL_LIMIT_2X ; +else + dpfc_ctl |=DPFC_CTL_LIMIT_1X ; + dpfc_ctl |=IVB_DPFC_CTL_FENCE_EN ; + +I915_WRITE (ILK_DPFC_CONTROL , dpfc_ctl |DPFC_CTL_EN );if (IS_IVYBRIDGE (dev)) {/* WaFbcAsynchFlipDisableFbcQueue:ivb */ Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Signature · 2 lines
Ville Syrjälä Intel OTC
PATCH 6/10 drm/i915: Actually write the correct bits to DPFC_CONTROL on CTG
In reply to [email protected]From: Ville Syrjälä <[email protected]>
We set up all the bits for DPFC_CONTROL but forgot to actually write them to the register. Oops.
--- drivers/gpu/drm/i915/intel_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -165,7 +165,7 @@ static void g4x_enable_fbc(struct drm_crtc *crtc)I915_WRITE (DPFC_FENCE_YOFF , crtc->y);/* enable it... */ -I915_WRITE (DPFC_CONTROL ,I915_READ (DPFC_CONTROL ) |DPFC_CTL_EN ); +I915_WRITE (DPFC_CONTROL , dpfc_ctl |DPFC_CTL_EN );DRM_DEBUG_KMS ("enabled fbc on plane %c\n" ,plane_name (intel_crtc->plane)); }
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 8/10 drm/i915: Kill most of the FBC register save/restore
In reply to [email protected]From: Ville Syrjälä <[email protected]>
We will anyway re-enable FBC normally after resume, so trying to save and restore the register makes little sense.
We do need to preserve the FBC1 interval bits in FBC_CONTROL since we only initialize them during driver load, and try to preserve them after that.
v2: s/I915_HAS_FBC/HAS_FBC/ and fix the check for gen4
--- drivers/gpu/drm/i915/i915_drv.h | 4 ---- drivers/gpu/drm/i915/i915_suspend.c | 32 +++++++------------------------- 2 files changed, 7 insertions(+), 29 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -4
@@ -859,11 +859,7 @@ struct i915_suspend_saved_registers {u32 savePFIT_CONTROL;u32 save_palette_a[256 ];u32 save_palette_b[256 ]; -u32 saveDPFC_CB_BASE; -u32 saveFBC_CFB_BASE; -u32 saveFBC_LL_BASE;u32 saveFBC_CONTROL; -u32 saveFBC_CONTROL2;u32 saveIER;u32 saveIIR;u32 saveIMR;
drivers/gpu/drm/i915/i915_suspend.c +7 -25
@@ -236,19 +236,9 @@ static void i915_save_display(struct drm_device *dev) dev_priv->regfile.savePP_DIVISOR =I915_READ (PP_DIVISOR ); } -/* Only regfile.save FBC state on the platform that supports FBC */ -if (HAS_FBC (dev)) { -if (HAS_PCH_SPLIT (dev)) { - dev_priv->regfile.saveDPFC_CB_BASE =I915_READ (ILK_DPFC_CB_BASE ); - }else if (IS_GM45 (dev)) { - dev_priv->regfile.saveDPFC_CB_BASE =I915_READ (DPFC_CB_BASE ); - }else { - dev_priv->regfile.saveFBC_CFB_BASE =I915_READ (FBC_CFB_BASE ); - dev_priv->regfile.saveFBC_LL_BASE =I915_READ (FBC_LL_BASE ); - dev_priv->regfile.saveFBC_CONTROL2 =I915_READ (FBC_CONTROL2 ); - dev_priv->regfile.saveFBC_CONTROL =I915_READ (FBC_CONTROL ); - } - } +/* save FBC interval */ +if (HAS_FBC (dev) &&INTEL_INFO (dev)->gen <=4 && !IS_G4X (dev)) + dev_priv->regfile.saveFBC_CONTROL =I915_READ (FBC_CONTROL );if (!drm_core_check_feature (dev,DRIVER_MODESET ))i915_save_vga (dev);
@@ -300,18 +290,10 @@ static void i915_restore_display(struct drm_device *dev)/* only restore FBC info on the platform that supports FBC*/ intel_disable_fbc (dev); -if (HAS_FBC (dev)) { -if (HAS_PCH_SPLIT (dev)) { -I915_WRITE (ILK_DPFC_CB_BASE , dev_priv->regfile.saveDPFC_CB_BASE); - }else if (IS_GM45 (dev)) { -I915_WRITE (DPFC_CB_BASE , dev_priv->regfile.saveDPFC_CB_BASE); - }else { -I915_WRITE (FBC_CFB_BASE , dev_priv->regfile.saveFBC_CFB_BASE); -I915_WRITE (FBC_LL_BASE , dev_priv->regfile.saveFBC_LL_BASE); -I915_WRITE (FBC_CONTROL2 , dev_priv->regfile.saveFBC_CONTROL2); -I915_WRITE (FBC_CONTROL , dev_priv->regfile.saveFBC_CONTROL); - } - } + +/* restore FBC interval */ +if (HAS_FBC (dev) &&INTEL_INFO (dev)->gen <=4 && !IS_G4X (dev)) +I915_WRITE (FBC_CONTROL , dev_priv->regfile.saveFBC_CONTROL);if (!drm_core_check_feature (dev,DRIVER_MODESET ))i915_restore_vga (dev);
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/10 drm/i915: Don't preserve DPFC_CONTROL bits ILK/SNB
In reply to [email protected]From: Ville Syrjälä <[email protected]>
On CTG and IVB+ we don't try to preserve any bits from the DPFC_CONTROL register. Follow suit on ILK/SNB.
--- drivers/gpu/drm/i915/intel_pm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +1 -3
@@ -227,9 +227,7 @@ static void ironlake_enable_fbc(struct drm_crtc *crtc)struct intel_crtc *intel_crtc =to_intel_crtc (crtc);u32 dpfc_ctl; - dpfc_ctl =I915_READ (ILK_DPFC_CONTROL ); - dpfc_ctl &=DPFC_RESERVED ; - dpfc_ctl |=DPFC_CTL_PLANE (intel_crtc->plane); + dpfc_ctl =DPFC_CTL_PLANE (intel_crtc->plane);if (drm_format_plane_cpp (fb->pixel_format,0 ) ==2 ) dpfc_ctl |=DPFC_CTL_LIMIT_2X ;else
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 9/10 drm/i915: Fix FBC1 enable message
In reply to [email protected]From: Ville Syrjälä <[email protected]>
The debug message telling FBC1 has been enabled is missing a newline. Add it.
--- drivers/gpu/drm/i915/intel_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -134,7 +134,7 @@ static void i8xx_enable_fbc(struct drm_crtc *crtc) fbc_ctl |= obj->fence_reg;I915_WRITE (FBC_CONTROL , fbc_ctl); -DRM_DEBUG_KMS ("enabled FBC, pitch %d, yoff %d, plane %c, " , +DRM_DEBUG_KMS ("enabled FBC, pitch %d, yoff %d, plane %c\n" , cfb_pitch, crtc->y,plane_name (intel_crtc->plane)); }
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 10/10 drm/i915: Fix FBC_FENCE_OFF
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Having a 4 byte register at 0x321b seems unlikely as that's not 4 byte aligned. Since later platforms have more or less the same FBC registers with new names, assume that FBC_FENCE_OFF is at 0x3218 just like DPFC_FENCE_YOFF.
This feels like a simple typo in BSpec. 321Bh looks a lot like 3218h after all.
Should still be tested on real hardware of course. But I don't have any mobile gen4 systems.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -1048,7 +1048,7 @@#define FBC_CTL_IDLE_DEBUG (3<<2)#define FBC_CTL_CPU_FENCE (1<<1)#define FBC_CTL_PLANE (plane) ((plane)<<0) -#define FBC_FENCE_OFF 0x0321b +#define FBC_FENCE_OFF 0x03218/* BSpec typo has 321Bh */ #define FBC_TAG 0x03300#define FBC_LL_SIZE (1536)
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · On Thu, Jan 23, 2014 at 04:49:07PM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Since fixing the FBC locking is a bigger task that will take a while, I decided to pull all the simple fixes from my branch and post them right away.
Some of these I've posted before, some others have seen a bit of action by being in a public branch.
The
FBC_FENCE_OFFchange is just a guess at this point. The odd offset just caught my eye while reading throguhi915_reg.h.
I didn't spot anything offensive in the series and each patch only does what it says on the tin. So I am going to stick my neck out and say
for the series. Being picky, I guess Fix FBC_FENCE_OFF should only be an acked-by since we have no way to review it...
-Chris
Signature · 1 line
Chris Wilson, Intel Open Source Technology Centre
Quoted 13 lines · Chris Wilson
Quoted 11 lines · On Thu, Jan 23, 2014 at 04:49:07PM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Since fixing the FBC locking is a bigger task that will take a while, I decided to pull all the simple fixes from my branch and post them right away.
Some of these I've posted before, some others have seen a bit of action by being in a public branch.
The
FBC_FENCE_OFFchange is just a guess at this point. The odd offset just caught my eye while reading throguhi915_reg.h.
Quoted 7 lines
I didn't spot anything offensive in the series and each patch only does what it says on the tin. So I am going to stick my neck out and say
Reviewed-by Chris Wilson <[email protected]>for the series. Being picky, I guess Fix
FBC_FENCE_OFFshould only be an acked-by since we have no way to review it...
Entire series merged, and I'll fire up my g4x here to see what happens ;-)
Thanks, Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 17 lines · Daniel Vetter
Quoted 16 lines · Chris Wilson
Quoted 11 lines · On Thu, Jan 23, 2014 at 04:49:07PM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Since fixing the FBC locking is a bigger task that will take a while, I decided to pull all the simple fixes from my branch and post them right away.
Some of these I've posted before, some others have seen a bit of action by being in a public branch.
The
FBC_FENCE_OFFchange is just a guess at this point. The odd offset just caught my eye while reading throguhi915_reg.h.I didn't spot anything offensive in the series and each patch only does what it says on the tin. So I am going to stick my neck out and say
Quoted 6 lines
Quoted 4 lines
Reviewed-by Chris Wilson <[email protected]>for the series. Being picky, I guess Fix
FBC_FENCE_OFFshould only be an acked-by since we have no way to review it...Entire series merged, and I'll fire up my g4x here to see what happens ;-)
Hm, seems to fail on my g4x when I enable fbc. This is on latest -nightly:
Quoted 1 line
IGT-Version: 1.5-gb5109e62cea1 (
x86_64) (Linux: 3.13.0-rc8+x86_64)
Subtest bad-pipe: SUCCESS
Subtest bad-source: SUCCESS
Subtest bad-nb-words-1: SUCCESS
Subtest bad-nb-words-3: SUCCESS
read-crc-pipe-A: Testing connector 5
Subtest read-crc-pipe-A: SUCCESS
read-crc-pipe-A-frame-sequence: Testing connector 5
Subtest read-crc-pipe-A-frame-sequence: SUCCESS
read-crc-pipe-B: Testing connector 5
Subtest read-crc-pipe-B: SUCCESS
read-crc-pipe-B-frame-sequence: Testing connector 5
Subtest read-crc-pipe-B-frame-sequence: SUCCESS
Test requirement not met in function test_read_crc, file kms_pipe_crc_basic.c:210:
Last errno: 0, Success
Test requirement: (!(valid_connectors))
No connector found for pipe 2
Subtest read-crc-pipe-C: SKIP
Test requirement not met in function test_read_crc, file kms_pipe_crc_basic.c:210:
Last errno: 0, Success
Test requirement: (!(valid_connectors))
No connector found for pipe 2
Subtest read-crc-pipe-C-frame-sequence: SKIP
root@gina:/home/daniel/xorg/intel-gpu-tools# tests/kms_fbc_crc IGT-Version: 1.5-gb5109e62cea1 (x86_64) (Linux: 3.13.0-rc8+ x86_64) Beginning page_flip on crtc 3, connector 5
page_flip on crtc 3, connector 5: PASSED
Beginning page_flip on crtc 4, connector 5
page_flip on crtc 4, connector 5: PASSED
Subtest page_flip: SUCCESS
Beginning mmap_cpu on crtc 3, connector 5
mmap_cpu on crtc 3, connector 5: PASSED
Beginning mmap_cpu on crtc 4, connector 5
mmap_cpu on crtc 4, connector 5: PASSED
Subtest mmap_cpu: SUCCESS
Beginning mmap_gtt on crtc 3, connector 5
mmap_gtt on crtc 3, connector 5: PASSED
Beginning mmap_gtt on crtc 4, connector 5
mmap_gtt on crtc 4, connector 5: PASSED
Subtest mmap_gtt: SUCCESS
Beginning blt on crtc 3, connector 5
blt on crtc 3, connector 5: PASSED
Beginning blt on crtc 4, connector 5
blt on crtc 4, connector 5: PASSED
Subtest blt: SUCCESS
Beginning render on crtc 3, connector 5
Test requirement not met in function fill_render, file kms_fbc_crc.c:212:
Last errno: 0, Success
Test requirement: (!rendercopy)
Subtest render: SKIP
Test requirement not met in function prepare_crtc, file kms_fbc_crc.c:398:
Last errno: 19, No such device
Test requirement: (!(data->ctx[0]))
Subtest context: SKIP
Beginning page_flip_and_mmap_cpu on crtc 3, connector 5
Test assertion failure function test_crc, file kms_fbc_crc.c:315:
Last errno: 0, Success
Failed assertion: !igt_crc_equal(&crcs[0], &data->ref_crc[1]) Subtest page_flip_and_mmap_cpu: FAIL
Beginning page_flip_and_mmap_gtt on crtc 3, connector 5
Test assertion failure function test_crc, file kms_fbc_crc.c:315:
Last errno: 0, Success
Failed assertion: !igt_crc_equal(&crcs[0], &data->ref_crc[1]) Subtest page_flip_and_mmap_gtt: FAIL
Beginning page_flip_and_blt on crtc 3, connector 5
page_flip_and_blt on crtc 3, connector 5: PASSED
Beginning page_flip_and_blt on crtc 4, connector 5
page_flip_and_blt on crtc 4, connector 5: PASSED
Subtest page_flip_and_blt: SUCCESS
Beginning page_flip_and_render on crtc 3, connector 5
Test requirement not met in function fill_render, file kms_fbc_crc.c:212:
Last errno: 0, Success
Test requirement: (!rendercopy)
Subtest page_flip_and_render: SKIP
Test requirement not met in function prepare_crtc, file kms_fbc_crc.c:398:
Last errno: 19, No such device
Test requirement: (!(data->ctx[0]))
Subtest page_flip_and_context: SKIP
So something with flip + frontbuffer access seems still busted. -Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 18 lines · Daniel Vetter
Quoted 17 lines · Daniel Vetter
Quoted 16 lines · Chris Wilson
Quoted 11 lines · On Thu, Jan 23, 2014 at 04:49:07PM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Since fixing the FBC locking is a bigger task that will take a while, I decided to pull all the simple fixes from my branch and post them right away.
Some of these I've posted before, some others have seen a bit of action by being in a public branch.
The
FBC_FENCE_OFFchange is just a guess at this point. The odd offset just caught my eye while reading throguhi915_reg.h.I didn't spot anything offensive in the series and each patch only does what it says on the tin. So I am going to stick my neck out and say
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Reviewed-by Chris Wilson <[email protected]>for the series. Being picky, I guess Fix
FBC_FENCE_OFFshould only be an acked-by since we have no way to review it...Entire series merged, and I'll fire up my g4x here to see what happens ;-)
Hm, seems to fail on my g4x when I enable fbc. This is on latest -nightly:
Also, shouldn't we enable fbc now on all gen5+ machines? Or is there still something outstanding to fix issues? Atm we only have it enabled on haswell :(
-Daniel
Quoted 107 lines
Quoted 3 lines
IGT-Version: 1.5-gb5109e62cea1 (
x86_64) (Linux: 3.13.0-rc8+x86_64)Subtest bad-pipe: SUCCESS
Subtest bad-source: SUCCESS
Subtest bad-nb-words-1: SUCCESS
Subtest bad-nb-words-3: SUCCESS
read-crc-pipe-A: Testing connector 5
Subtest read-crc-pipe-A: SUCCESS
read-crc-pipe-A-frame-sequence: Testing connector 5
Subtest read-crc-pipe-A-frame-sequence: SUCCESS
read-crc-pipe-B: Testing connector 5
Subtest read-crc-pipe-B: SUCCESS
read-crc-pipe-B-frame-sequence: Testing connector 5
Subtest read-crc-pipe-B-frame-sequence: SUCCESS
Test requirement not met in functiontest_read_crc, file kms_pipe_crc_basic.c:210:
Last errno: 0, Success
Test requirement: (!(valid_connectors))
No connector found for pipe 2
Subtest read-crc-pipe-C: SKIP
Test requirement not met in functiontest_read_crc, file kms_pipe_crc_basic.c:210:
Last errno: 0, Success
Test requirement: (!(valid_connectors))
No connector found for pipe 2
Subtest read-crc-pipe-C-frame-sequence: SKIProot@gina:/home/daniel/xorg/intel-gpu-tools# tests/kms_fbc_crc IGT-Version: 1.5-gb5109e62cea1 (x86_64) (Linux: 3.13.0-rc8+ x86_64) Beginning page_flip on crtc 3, connector 5
page_flipon crtc 3, connector 5: PASSEDBeginning
page_flipon crtc 4, connector 5
page_flipon crtc 4, connector 5: PASSEDSubtest
page_flip: SUCCESS
Beginningmmap_cpuon crtc 3, connector 5
mmap_cpuon crtc 3, connector 5: PASSEDBeginning
mmap_cpuon crtc 4, connector 5
mmap_cpuon crtc 4, connector 5: PASSEDSubtest
mmap_cpu: SUCCESS
Beginningmmap_gtton crtc 3, connector 5
mmap_gtton crtc 3, connector 5: PASSEDBeginning
mmap_gtton crtc 4, connector 5
mmap_gtton crtc 4, connector 5: PASSEDSubtest
mmap_gtt: SUCCESS
Beginning blt on crtc 3, connector 5blt on crtc 3, connector 5: PASSED
Beginning blt on crtc 4, connector 5
blt on crtc 4, connector 5: PASSED
Subtest blt: SUCCESS
Beginning render on crtc 3, connector 5
Test requirement not met in functionfill_render, file kms_fbc_crc.c:212:
Last errno: 0, Success
Test requirement: (!rendercopy)
Subtest render: SKIP
Test requirement not met in functionprepare_crtc, file kms_fbc_crc.c:398:
Last errno: 19, No such device
Test requirement: (!(data->ctx[0]))
Subtest context: SKIP
Beginningpage_flip_and_mmap_cpuon crtc 3, connector 5
Test assertion failure functiontest_crc, file kms_fbc_crc.c:315:
Last errno: 0, Success
Failed assertion: !igt_crc_equal(&crcs[0], &data->ref_crc[1]) Subtestpage_flip_and_mmap_cpu: FAIL
Beginningpage_flip_and_mmap_gtton crtc 3, connector 5
Test assertion failure functiontest_crc, file kms_fbc_crc.c:315:
Last errno: 0, Success
Failed assertion: !igt_crc_equal(&crcs[0], &data->ref_crc[1]) Subtestpage_flip_and_mmap_gtt: FAIL
Beginningpage_flip_and_blton crtc 3, connector 5
page_flip_and_blton crtc 3, connector 5: PASSEDBeginning
page_flip_and_blton crtc 4, connector 5
page_flip_and_blton crtc 4, connector 5: PASSEDSubtest
page_flip_and_blt: SUCCESS
Beginningpage_flip_and_renderon crtc 3, connector 5
Test requirement not met in functionfill_render, file kms_fbc_crc.c:212:
Last errno: 0, Success
Test requirement: (!rendercopy)
Subtestpage_flip_and_render: SKIP
Test requirement not met in functionprepare_crtc, file kms_fbc_crc.c:398:
Last errno: 19, No such device
Test requirement: (!(data->ctx[0]))
Subtestpage_flip_and_context: SKIPSo something with flip + frontbuffer access seems still busted. -Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Quoted 24 lines · Daniel Vetter
Quoted 23 lines · Daniel Vetter
Quoted 22 lines · Daniel Vetter
Quoted 20 lines · Chris Wilson
Quoted 11 lines · On Thu, Jan 23, 2014 at 04:49:07PM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Since fixing the FBC locking is a bigger task that will take a while, I decided to pull all the simple fixes from my branch and post them right away.
Some of these I've posted before, some others have seen a bit of action by being in a public branch.
The
FBC_FENCE_OFFchange is just a guess at this point. The odd offset just caught my eye while reading throguhi915_reg.h.I didn't spot anything offensive in the series and each patch only does what it says on the tin. So I am going to stick my neck out and say
Reviewed-by Chris Wilson <[email protected]>for the series. Being picky, I guess Fix
FBC_FENCE_OFFshould only be an acked-by since we have no way to review it...
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Entire series merged, and I'll fire up my g4x here to see what happens ;-)
Hm, seems to fail on my g4x when I enable fbc. This is on latest -nightly:
Also, shouldn't we enable fbc now on all gen5+ machines? Or is there still something outstanding to fix issues? Atm we only have it enabled on haswell :(
The render tracking bits are still broken. And the locking is crap. I started to fix it for real, but it turned out to be a fair amount of work, so I figured I'll get back to it after I've cleared out some other stuff from my desk.
Signature · 2 lines
Ville Syrjälä Intel OTC
Quoted 42 lines · Daniel Vetter
Quoted 17 lines · Daniel Vetter
Quoted 16 lines · Chris Wilson
Quoted 11 lines · On Thu, Jan 23, 2014 at 04:49:07PM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Since fixing the FBC locking is a bigger task that will take a while, I decided to pull all the simple fixes from my branch and post them right away.
Some of these I've posted before, some others have seen a bit of action by being in a public branch.
The
FBC_FENCE_OFFchange is just a guess at this point. The odd offset just caught my eye while reading throguhi915_reg.h.I didn't spot anything offensive in the series and each patch only does what it says on the tin. So I am going to stick my neck out and say
Quoted 6 lines
Quoted 4 lines
Reviewed-by Chris Wilson <[email protected]>for the series. Being picky, I guess Fix
FBC_FENCE_OFFshould only be an acked-by since we have no way to review it...Entire series merged, and I'll fire up my g4x here to see what happens ;-)
Hm, seems to fail on my g4x when I enable fbc. This is on latest -nightly:
Quoted 1 line
IGT-Version: 1.5-gb5109e62cea1 (
x86_64) (Linux: 3.13.0-rc8+x86_64)root@gina:/home/daniel/xorg/intel-gpu-tools# tests/kms_fbc_crc IGT-Version: 1.5-gb5109e62cea1 (x86_64) (Linux: 3.13.0-rc8+ x86_64) Beginning page_flip on crtc 3, connector 5
page_flipon crtc 3, connector 5: PASSEDBeginning
page_flipon crtc 4, connector 5
page_flipon crtc 4, connector 5: PASSEDSubtest
page_flip: SUCCESS
Beginningmmap_cpuon crtc 3, connector 5
Quoted 7 lines
mmap_cpuon crtc 3, connector 5: PASSEDBeginning
mmap_cpuon crtc 4, connector 5
mmap_cpuon crtc 4, connector 5: PASSEDSubtest
mmap_cpu: SUCCESS
That's surprising considering the nuke stuff isn't there. It should fail every time.
Quoted 29 lines
Beginning
mmap_gtton crtc 3, connector 5
mmap_gtton crtc 3, connector 5: PASSEDBeginning
mmap_gtton crtc 4, connector 5
mmap_gtton crtc 4, connector 5: PASSEDSubtest
mmap_gtt: SUCCESS
Beginning blt on crtc 3, connector 5blt on crtc 3, connector 5: PASSED
Beginning blt on crtc 4, connector 5
blt on crtc 4, connector 5: PASSED
Subtest blt: SUCCESS
Beginning render on crtc 3, connector 5
Test requirement not met in functionfill_render, file kms_fbc_crc.c:212:
Last errno: 0, Success
Test requirement: (!rendercopy)
Subtest render: SKIP
Test requirement not met in functionprepare_crtc, file kms_fbc_crc.c:398:
Last errno: 19, No such device
Test requirement: (!(data->ctx[0]))
Subtest context: SKIP
Beginningpage_flip_and_mmap_cpuon crtc 3, connector 5
Test assertion failure functiontest_crc, file kms_fbc_crc.c:315:
Quoted 8 lines
Last errno: 0, Success
Failed assertion: !igt_crc_equal(&crcs[0], &data->ref_crc[1]) Subtestpage_flip_and_mmap_cpu: FAIL
Beginningpage_flip_and_mmap_gtton crtc 3, connector 5 Test assertion failure functiontest_crc, file kms_fbc_crc.c:315:
Last errno: 0, Success
Failed assertion: !igt_crc_equal(&crcs[0], &data->ref_crc[1]) Subtestpage_flip_and_mmap_gtt: FAIL
And that's a bit weird since the fence is there. Although the FBC locking is fubar, in this case there shouldn't be any issues since the test doesn't try to do concurrent modesets or anything else that would cause thing to go bad due to locking issues. So it's not clear why it fails here.
Or could be my fence register fix was wrong after all. But then why doesn't it fail for the non page flipped case?
In any case I think the test may need to be made harder. We should really test the fence offset thing via panning, and probably write to the first and last lines of the display to make sure the Y offset is set up correctly.
Quoted 25 lines
Beginning
page_flip_and_blton crtc 3, connector 5
page_flip_and_blton crtc 3, connector 5: PASSEDBeginning
page_flip_and_blton crtc 4, connector 5
page_flip_and_blton crtc 4, connector 5: PASSEDSubtest
page_flip_and_blt: SUCCESS
Beginningpage_flip_and_renderon crtc 3, connector 5
Test requirement not met in functionfill_render, file kms_fbc_crc.c:212:
Last errno: 0, Success
Test requirement: (!rendercopy)
Subtestpage_flip_and_render: SKIP
Test requirement not met in functionprepare_crtc, file kms_fbc_crc.c:398:
Last errno: 19, No such device
Test requirement: (!(data->ctx[0]))
Subtestpage_flip_and_context: SKIPSo something with flip + frontbuffer access seems still busted. -Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Signature · 2 lines
Ville Syrjälä Intel OTC