drm/i915: Moar plane update optimizations (v2)
Subsystems (2)
v2 cover drm/i915: Moar plane update optimizations (v2)
From: Ville Syrjälä <[email protected]>
Here are the easy leftovers from the previous series. I left out the more experimental parts (single lock/unlock, posting read elimination) for now. I'll have to revisit those after we get this stuff in.
This time I even took the precaution of testing this on one of my gen2 machines. Still seemed to work correctly, so apparently I didn't mess up anything with the tile vs. linear offset stuff.
Ville Syrjälä (6):
drm/i915: Extract i9xx_plane_ctl() and ironlake_plane_ctl() drm/i915: Nuke ironlake_plane_ctl()
drm/i915: Pre-compute plane control register value drm/i915: Introduce i9xx_check_plane_surface() drm/i915: Eliminate ironlake_update_primary_plane() drm/i915: Use i9xx_check_plane_surface() for sprite planes as well
drivers/gpu/drm/i915/intel_display.c | 238 +++++++++++++++-------------------- drivers/gpu/drm/i915/intel_drv.h | 4 + drivers/gpu/drm/i915/intel_sprite.c | 93 ++++++-------- 3 files changed, 138 insertions(+), 197 deletions(-)
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/6 drm/i915: Extract i9xx_plane_ctl() and ironlake_plane_ctl()
From: Ville Syrjälä <[email protected]>
Pull the code to calculate the pre-SKL primary plane control register value into separate functions. Allows us to pre-compute it in the future.
v2: Split the pre-ilk vs. ilk+ unification to a separate patch (Chris)
--- drivers/gpu/drm/i915/intel_display.c | 104 ++++++++++++++++++++++------------- 1 file changed, 66 insertions(+), 38 deletions(-)
drivers/gpu/drm/i915/intel_display.c +66 -38
@@ -2962,28 +2962,23 @@ int skl_check_plane_surface(struct intel_plane_state *plane_state)return 0 ; } -static void i9xx_update_primary_plane (struct drm_plane *primary, -const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state) +static u32 i9xx_plane_ctl (const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state) { -struct drm_i915_private *dev_priv =to_i915 (primary->dev); -struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->base.crtc); -struct drm_framebuffer *fb = plane_state->base.fb; -int plane = intel_crtc->plane; -u32 linear_offset; -u32 dspcntr; -i915_reg_t reg =DSPCNTR (plane); +struct drm_i915_private *dev_priv = +to_i915 (plane_state->base.plane->dev); +struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc); +const struct drm_framebuffer *fb = plane_state->base.fb;unsigned int rotation = plane_state->base.rotation; -int x = plane_state->base.src.x1 >>16 ; -int y = plane_state->base.src.y1 >>16 ; -unsigned long irqflags; +u32 dspcntr; - dspcntr =DISPPLANE_GAMMA_ENABLE ; + dspcntr =DISPLAY_PLANE_ENABLE |DISPPLANE_GAMMA_ENABLE ; - dspcntr |=DISPLAY_PLANE_ENABLE ; +if (IS_G4X (dev_priv)) + dspcntr |=DISPPLANE_TRICKLE_FEED_DISABLE ;if (INTEL_GEN (dev_priv) <4 ) { -if (intel_crtc->pipe ==PIPE_B ) +if (crtc->pipe ==PIPE_B ) dspcntr |=DISPPLANE_SEL_PIPE_B ; }
@@ -3010,7 +3005,8 @@ static void i9xx_update_primary_plane(struct drm_plane *primary, dspcntr |=DISPPLANE_RGBX101010 ;break ;default : -BUG (); +MISSING_CASE (fb->format->format); +return 0 ; } if (INTEL_GEN(dev_priv) >= 4 &&
@@ -3023,8 +3019,26 @@ static void i9xx_update_primary_plane(struct drm_plane *primary,if (rotation &DRM_REFLECT_X ) dspcntr |=DISPPLANE_MIRROR ; -if (IS_G4X (dev_priv)) - dspcntr |=DISPPLANE_TRICKLE_FEED_DISABLE ; +return dspcntr; +} + +static void i9xx_update_primary_plane (struct drm_plane *primary, +const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state) +{ +struct drm_i915_private *dev_priv =to_i915 (primary->dev); +struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->base.crtc); +struct drm_framebuffer *fb = plane_state->base.fb; +int plane = intel_crtc->plane; +u32 linear_offset; +u32 dspcntr; +i915_reg_t reg =DSPCNTR (plane); +unsigned int rotation = plane_state->base.rotation; +int x = plane_state->base.src.x1 >>16 ; +int y = plane_state->base.src.y1 >>16 ; +unsigned long irqflags; + + dspcntr =i9xx_plane_ctl (crtc_state, plane_state);intel_add_fb_offsets (&x, &y, plane_state,0 );
@@ -3105,25 +3119,19 @@ static void i9xx_disable_primary_plane(struct drm_plane *primary,spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); } -static void ironlake_update_primary_plane (struct drm_plane *primary, -const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state) +static u32 ironlake_plane_ctl (const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state) { -struct drm_device *dev = primary->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->base.crtc); -struct drm_framebuffer *fb = plane_state->base.fb; -int plane = intel_crtc->plane; -u32 linear_offset; -u32 dspcntr; -i915_reg_t reg =DSPCNTR (plane); +struct drm_i915_private *dev_priv = +to_i915 (plane_state->base.plane->dev); +const struct drm_framebuffer *fb = plane_state->base.fb;unsigned int rotation = plane_state->base.rotation; -int x = plane_state->base.src.x1 >>16 ; -int y = plane_state->base.src.y1 >>16 ; -unsigned long irqflags; +u32 dspcntr; - dspcntr =DISPPLANE_GAMMA_ENABLE ; - dspcntr |=DISPLAY_PLANE_ENABLE ; + dspcntr =DISPLAY_PLANE_ENABLE |DISPPLANE_GAMMA_ENABLE ; + +if (!IS_HASWELL (dev_priv) && !IS_BROADWELL (dev_priv)) + dspcntr |=DISPPLANE_TRICKLE_FEED_DISABLE ;if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) dspcntr |=DISPPLANE_PIPE_CSC_ENABLE ;
@@ -3148,7 +3156,8 @@ static void ironlake_update_primary_plane(struct drm_plane *primary, dspcntr |=DISPPLANE_RGBX101010 ;break ;default : -BUG (); +MISSING_CASE (fb->format->format); +return 0 ; }if (fb->modifier ==I915_FORMAT_MOD_X_TILED )
@@ -3157,8 +3166,27 @@ static void ironlake_update_primary_plane(struct drm_plane *primary,if (rotation &DRM_ROTATE_180 ) dspcntr |=DISPPLANE_ROTATE_180 ; -if (!IS_HASWELL (dev_priv) && !IS_BROADWELL (dev_priv)) - dspcntr |=DISPPLANE_TRICKLE_FEED_DISABLE ; +return dspcntr; +} + +static void ironlake_update_primary_plane (struct drm_plane *primary, +const struct intel_crtc_state *crtc_state, +const struct intel_plane_state *plane_state) +{ +struct drm_device *dev = primary->dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->base.crtc); +struct drm_framebuffer *fb = plane_state->base.fb; +int plane = intel_crtc->plane; +u32 linear_offset; +u32 dspcntr; +i915_reg_t reg =DSPCNTR (plane); +unsigned int rotation = plane_state->base.rotation; +int x = plane_state->base.src.x1 >>16 ; +int y = plane_state->base.src.y1 >>16 ; +unsigned long irqflags; + + dspcntr =ironlake_plane_ctl (crtc_state, plane_state);intel_add_fb_offsets (&x, &y, plane_state,0 );
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 1/6] drm/i915: Extract i9xx_plane_ctl() and ironlake_plane_ctl()
Quoted 10 lines · On Thu, Mar 23, 2017 at 09:27:07PM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Pull the code to calculate the pre-SKL primary plane control register value into separate functions. Allows us to pre-compute it in the future.
v2: Split the pre-ilk vs. ilk+ unification to a separate patch (Chris)
Cc Chris Wilson <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/6 drm/i915: Nuke ironlake_plane_ctl()
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Share the code to compute the primary plane control register value between the i9xx and ilk codepaths as the differences are minimal. Actually there are no differences between g4x and ilk, so the current split doesn't really make any sense.
--- drivers/gpu/drm/i915/intel_display.c | 58 ++++-------------------------------- 1 file changed, 6 insertions(+), 52 deletions(-)
drivers/gpu/drm/i915/intel_display.c +6 -52
@@ -2974,9 +2974,13 @@ static u32 i9xx_plane_ctl(const struct intel_crtc_state *crtc_state, dspcntr =DISPLAY_PLANE_ENABLE |DISPPLANE_GAMMA_ENABLE ; -if (IS_G4X (dev_priv)) +if (IS_G4X (dev_priv) ||IS_GEN5 (dev_priv) || +IS_GEN6 (dev_priv) ||IS_IVYBRIDGE (dev_priv)) dspcntr |=DISPPLANE_TRICKLE_FEED_DISABLE ; +if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) + dspcntr |=DISPPLANE_PIPE_CSC_ENABLE ; +if (INTEL_GEN (dev_priv) <4 ) {if (crtc->pipe ==PIPE_B ) dspcntr |=DISPPLANE_SEL_PIPE_B ;
@@ -3119,56 +3123,6 @@ static void i9xx_disable_primary_plane(struct drm_plane *primary,spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); } -static u32 ironlake_plane_ctl (const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state) -{ -struct drm_i915_private *dev_priv = -to_i915 (plane_state->base.plane->dev); -const struct drm_framebuffer *fb = plane_state->base.fb; -unsigned int rotation = plane_state->base.rotation; -u32 dspcntr; - - dspcntr =DISPLAY_PLANE_ENABLE |DISPPLANE_GAMMA_ENABLE ; - -if (!IS_HASWELL (dev_priv) && !IS_BROADWELL (dev_priv)) - dspcntr |=DISPPLANE_TRICKLE_FEED_DISABLE ; - -if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) - dspcntr |=DISPPLANE_PIPE_CSC_ENABLE ; - -switch (fb->format->format) { -case DRM_FORMAT_C8 : - dspcntr |=DISPPLANE_8BPP ; -break ; -case DRM_FORMAT_RGB565 : - dspcntr |=DISPPLANE_BGRX565 ; -break ; -case DRM_FORMAT_XRGB8888 : - dspcntr |=DISPPLANE_BGRX888 ; -break ; -case DRM_FORMAT_XBGR8888 : - dspcntr |=DISPPLANE_RGBX888 ; -break ; -case DRM_FORMAT_XRGB2101010 : - dspcntr |=DISPPLANE_BGRX101010 ; -break ; -case DRM_FORMAT_XBGR2101010 : - dspcntr |=DISPPLANE_RGBX101010 ; -break ; -default : -MISSING_CASE (fb->format->format); -return 0 ; - } - -if (fb->modifier ==I915_FORMAT_MOD_X_TILED ) - dspcntr |=DISPPLANE_TILED ; - -if (rotation &DRM_ROTATE_180 ) - dspcntr |=DISPPLANE_ROTATE_180 ; - -return dspcntr; -} -static void ironlake_update_primary_plane (struct drm_plane *primary,const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state)
@@ -3186,7 +3140,7 @@ static void ironlake_update_primary_plane(struct drm_plane *primary,int y = plane_state->base.src.y1 >>16 ;unsigned long irqflags; - dspcntr =ironlake_plane_ctl (crtc_state, plane_state); + dspcntr =i9xx_plane_ctl (crtc_state, plane_state);intel_add_fb_offsets (&x, &y, plane_state,0 );
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/6] drm/i915: Nuke ironlake_plane_ctl()
Quoted 9 lines · On Thu, Mar 23, 2017 at 09:27:08PM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Share the code to compute the primary plane control register value between the i9xx and ilk codepaths as the differences are minimal. Actually there are no differences between g4x and ilk, so the current split doesn't really make any sense.
Cc Chris Wilson <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>
Quoted 9 lines
--- drivers/gpu/drm/i915/intel_display.c | 58 ++++-------------------------------- 1 file changed, 6 insertions(+), 52 deletions(-)drivers/gpu/drm/i915/intel_display.c +0
-0
drivers/gpu/drm/i915/intel_display.c static u32 i9xx_plane_ctl(const struct intel_crtc_state *crtc_state, · line 2979
Quoted 7 lines
drivers/gpu/drm/i915/intel_display.c +2
-1@@ -2974,9 +2974,13 @@ static u32 i9xx_plane_ctl(const struct intel_crtc_state *crtc_state, dspcntr =DISPLAY_PLANE_ENABLE |DISPPLANE_GAMMA_ENABLE ; -if (IS_G4X (dev_priv)) +if (IS_G4X (dev_priv) ||IS_GEN5 (dev_priv) || +IS_GEN6 (dev_priv) ||IS_IVYBRIDGE (dev_priv)) dspcntr |=DISPPLANE_TRICKLE_FEED_DISABLE ;
Fortunately I remembered the explanation last time about vlv and chv, and yes this does make that much more obvious.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/6 drm/i915: Pre-compute plane control register value
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Computing the plane control register value is branchy so moving it out from the plane commit hook seems prudent. Let's pre-compute it during the atomic check phase and store the result in the plane state.
--- drivers/gpu/drm/i915/intel_display.c | 41 ++++++++++++++++++------------------ drivers/gpu/drm/i915/intel_drv.h | 3 +++ drivers/gpu/drm/i915/intel_sprite.c | 24 ++++++++++----------- 3 files changed, 36 insertions(+), 32 deletions(-)
drivers/gpu/drm/i915/intel_display.c +21 -20
@@ -3035,15 +3035,13 @@ static void i9xx_update_primary_plane(struct drm_plane *primary,struct drm_framebuffer *fb = plane_state->base.fb;int plane = intel_crtc->plane;u32 linear_offset; -u32 dspcntr; +u32 dspcntr = plane_state->ctl;i915_reg_t reg =DSPCNTR (plane);unsigned int rotation = plane_state->base.rotation;int x = plane_state->base.src.x1 >>16 ;int y = plane_state->base.src.y1 >>16 ;unsigned long irqflags; - dspcntr =i9xx_plane_ctl (crtc_state, plane_state); -intel_add_fb_offsets (&x, &y, plane_state,0 );if (INTEL_GEN (dev_priv) >=4 )
@@ -3133,15 +3131,13 @@ static void ironlake_update_primary_plane(struct drm_plane *primary,struct drm_framebuffer *fb = plane_state->base.fb;int plane = intel_crtc->plane;u32 linear_offset; -u32 dspcntr; +u32 dspcntr = plane_state->ctl;i915_reg_t reg =DSPCNTR (plane);unsigned int rotation = plane_state->base.rotation;int x = plane_state->base.src.x1 >>16 ;int y = plane_state->base.src.y1 >>16 ;unsigned long irqflags; - dspcntr =i9xx_plane_ctl (crtc_state, plane_state); -intel_add_fb_offsets (&x, &y, plane_state,0 ); intel_crtc->dspaddr_offset =
@@ -3358,7 +3354,7 @@ static void skylake_update_primary_plane(struct drm_plane *plane,struct drm_framebuffer *fb = plane_state->base.fb;enum plane_id plane_id =to_intel_plane (plane)->id;enum pipe pipe =to_intel_plane (plane)->pipe; -u32 plane_ctl; +u32 plane_ctl = plane_state->ctl;unsigned int rotation = plane_state->base.rotation;u32 stride =skl_plane_stride (fb,0 , rotation);u32 surf_addr = plane_state->main.offset;
@@ -3373,8 +3369,6 @@ static void skylake_update_primary_plane(struct drm_plane *plane,int dst_h =drm_rect_height (&plane_state->base.dst);unsigned long irqflags; - plane_ctl =skl_plane_ctl (crtc_state, plane_state); -/* Sizes are 0 based */ src_w--; src_h--;
@@ -9187,7 +9181,6 @@ static u32 i845_cursor_ctl(const struct intel_crtc_state *crtc_state, }static void i845_update_cursor (struct drm_crtc *crtc,u32 base, -const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state) {struct drm_device *dev = crtc->dev;
@@ -9199,7 +9192,7 @@ static void i845_update_cursor(struct drm_crtc *crtc, u32 base,unsigned int width = plane_state->base.crtc_w;unsigned int height = plane_state->base.crtc_h; - cntl =i845_cursor_ctl (crtc_state, plane_state); + cntl = plane_state->ctl; size = (height <<12 ) | width; }
@@ -9270,7 +9263,6 @@ static u32 i9xx_cursor_ctl(const struct intel_crtc_state *crtc_state, }static void i9xx_update_cursor (struct drm_crtc *crtc,u32 base, -const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state) {struct drm_device *dev = crtc->dev;
@@ -9280,7 +9272,7 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base,uint32_t cntl =0 ;if (plane_state && plane_state->base.visible) - cntl =i9xx_cursor_ctl (crtc_state, plane_state); + cntl = plane_state->ctl;if (intel_crtc->cursor_cntl != cntl) {I915_WRITE_FW (CURCNTR (pipe), cntl);
@@ -9297,7 +9289,6 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base,/* If no-part of the cursor is visible on the framebuffer, then the GPU may hang... */ static void intel_crtc_update_cursor (struct drm_crtc *crtc, -const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state) {struct drm_device *dev = crtc->dev;
@@ -9337,9 +9328,9 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc,I915_WRITE_FW (CURPOS (pipe), pos);if (IS_I845G (dev_priv) ||IS_I865G (dev_priv)) -i845_update_cursor (crtc, base, crtc_state, plane_state); +i845_update_cursor (crtc, base, plane_state);else -i9xx_update_cursor (crtc, base, crtc_state, plane_state); +i9xx_update_cursor (crtc, base, plane_state);spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); }
@@ -13371,6 +13362,10 @@ intel_check_primary_plane(struct drm_plane *plane, ret =skl_check_plane_surface (state);if (ret)return ret; + + state->ctl =skl_plane_ctl (crtc_state, state); + }else { + state->ctl =i9xx_plane_ctl (crtc_state, state); }return 0 ;
@@ -13706,6 +13701,7 @@ intel_check_cursor_plane(struct drm_plane *plane,struct intel_crtc_state *crtc_state, struct intel_plane_state *state) { + struct drm_i915_private *dev_priv = to_i915(plane->dev);struct drm_framebuffer *fb = state->base.fb;struct drm_i915_gem_object *obj =intel_fb_obj (fb);enum pipe pipe =to_intel_plane (plane)->pipe;
@@ -13725,7 +13721,7 @@ intel_check_cursor_plane(struct drm_plane *plane,return 0 ;/* Check for which cursor types we support */ -if (!cursor_size_ok (to_i915 (plane->dev), state->base.crtc_w, +if (!cursor_size_ok (dev_priv, state->base.crtc_w, state->base.crtc_h)) {DRM_DEBUG ("Cursor dimension %dx%d not supported\n" , state->base.crtc_w, state->base.crtc_h);
@@ -13753,12 +13749,17 @@ intel_check_cursor_plane(struct drm_plane *plane,* display power well must be turned off and on again. * Refuse the put the cursor into that compromised position. */ -if (IS_CHERRYVIEW (to_i915 (plane->dev)) && pipe ==PIPE_C && +if (IS_CHERRYVIEW (dev_priv) && pipe ==PIPE_C && state->base.visible && state->base.crtc_x <0 ) {DRM_DEBUG_KMS ("CHV cursor C not allowed to straddle the left screen edge\n" );return -EINVAL ; } +if (IS_I845G (dev_priv) ||IS_I865G (dev_priv)) + state->ctl =i845_cursor_ctl (crtc_state, state); +else + state->ctl =i9xx_cursor_ctl (crtc_state, state); +return 0 ; }
@@ -13769,7 +13770,7 @@ intel_disable_cursor_plane(struct drm_plane *plane,struct intel_crtc *intel_crtc =to_intel_crtc (crtc); intel_crtc->cursor_addr =0 ; -intel_crtc_update_cursor (crtc,NULL ,NULL ); +intel_crtc_update_cursor (crtc,NULL ); } static void
@@ -13791,7 +13792,7 @@ intel_update_cursor_plane(struct drm_plane *plane, addr = obj->phys_handle->busaddr; intel_crtc->cursor_addr = addr; -intel_crtc_update_cursor (crtc, crtc_state, state); +intel_crtc_update_cursor (crtc, state); } static struct intel_plane *
drivers/gpu/drm/i915/intel_drv.h +3 -0
@@ -398,6 +398,9 @@ struct intel_plane_state {int x, y; } aux; +/* plane control register */ +u32 ctl; +/* * scaler_id * = -1 : not using a scaler
drivers/gpu/drm/i915/intel_sprite.c +12 -12
@@ -217,7 +217,7 @@ skl_update_plane(struct drm_plane *drm_plane,struct drm_framebuffer *fb = plane_state->base.fb;enum plane_id plane_id = intel_plane->id;enum pipe pipe = intel_plane->pipe; -u32 plane_ctl; +u32 plane_ctl = plane_state->ctl;const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;u32 surf_addr = plane_state->main.offset;unsigned int rotation = plane_state->base.rotation;
@@ -232,8 +232,6 @@ skl_update_plane(struct drm_plane *drm_plane,uint32_t src_h =drm_rect_height (&plane_state->base.src) >>16 ;unsigned long irqflags; - plane_ctl =skl_plane_ctl (crtc_state, plane_state); -/* Sizes are 0 based */ src_w--; src_h--;
@@ -420,7 +418,7 @@ vlv_update_plane(struct drm_plane *dplane,struct drm_framebuffer *fb = plane_state->base.fb;enum pipe pipe = intel_plane->pipe;enum plane_id plane_id = intel_plane->id; -u32 sprctl; +u32 sprctl = plane_state->ctl;u32 sprsurf_offset, linear_offset;unsigned int rotation = plane_state->base.rotation;const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
@@ -434,8 +432,6 @@ vlv_update_plane(struct drm_plane *dplane,uint32_t src_h =drm_rect_height (&plane_state->base.src) >>16 ;unsigned long irqflags; - sprctl =vlv_sprite_ctl (crtc_state, plane_state); -/* Sizes are 0 based */ src_w--; src_h--;
@@ -569,7 +565,7 @@ ivb_update_plane(struct drm_plane *plane,struct intel_plane *intel_plane =to_intel_plane (plane);struct drm_framebuffer *fb = plane_state->base.fb;enum pipe pipe = intel_plane->pipe; -u32 sprctl, sprscale =0 ; +u32 sprctl = plane_state->ctl, sprscale =0 ;u32 sprsurf_offset, linear_offset;unsigned int rotation = plane_state->base.rotation;const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
@@ -583,8 +579,6 @@ ivb_update_plane(struct drm_plane *plane,uint32_t src_h =drm_rect_height (&plane_state->base.src) >>16 ;unsigned long irqflags; - sprctl =ivb_sprite_ctl (crtc_state, plane_state); -/* Sizes are 0 based */ src_w--; src_h--;
@@ -722,7 +716,7 @@ ilk_update_plane(struct drm_plane *plane,struct intel_plane *intel_plane =to_intel_plane (plane);struct drm_framebuffer *fb = plane_state->base.fb;int pipe = intel_plane->pipe; -u32 dvscntr, dvsscale; +u32 dvscntr = plane_state->ctl, dvsscale;u32 dvssurf_offset, linear_offset;unsigned int rotation = plane_state->base.rotation;const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
@@ -736,8 +730,6 @@ ilk_update_plane(struct drm_plane *plane,uint32_t src_h =drm_rect_height (&plane_state->base.src) >>16 ;unsigned long irqflags; - dvscntr =ilk_sprite_ctl (crtc_state, plane_state); -/* Sizes are 0 based */ src_w--; src_h--;
@@ -986,6 +978,14 @@ intel_check_sprite_plane(struct drm_plane *plane, ret =skl_check_plane_surface (state);if (ret)return ret; + + state->ctl =skl_plane_ctl (crtc_state, state); + }else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) { + state->ctl =vlv_sprite_ctl (crtc_state, state); + }else if (INTEL_GEN (dev_priv) >=7 ) { + state->ctl =ivb_sprite_ctl (crtc_state, state); + }else { + state->ctl =ilk_sprite_ctl (crtc_state, state); }return 0 ;
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/6 drm/i915: Introduce i9xx_check_plane_surface()
In reply to [email protected]From: Ville Syrjälä <[email protected]>
Extract the primary plane surfae offset/x/y calculations for pre-SKL platforms into a common function, and call it during the atomic check phase to reduce the amount of stuff we have to do during the commit phase. SKL is already doing this.
v2: Update the comment about the rotation adjustments to
match the code better (Chris)
--- drivers/gpu/drm/i915/intel_display.c | 82 ++++++++++++++++++++++-------------- 1 file changed, 50 insertions(+), 32 deletions(-)
drivers/gpu/drm/i915/intel_display.c +50 -32
@@ -3026,6 +3026,43 @@ static u32 i9xx_plane_ctl(const struct intel_crtc_state *crtc_state,return dspcntr; } +static int i9xx_check_plane_surface (struct intel_plane_state *plane_state) +{ +struct drm_i915_private *dev_priv = +to_i915 (plane_state->base.plane->dev); +int src_x = plane_state->base.src.x1 >>16 ; +int src_y = plane_state->base.src.y1 >>16 ; +u32 offset; + +intel_add_fb_offsets (&src_x, &src_y, plane_state,0 ); + +if (INTEL_GEN (dev_priv) >=4 ) + offset =intel_compute_tile_offset (&src_x, &src_y, + plane_state,0 ); +else + offset =0 ; + +/* HSW/BDW do this automagically in hardware */ +if (!IS_HASWELL (dev_priv) && !IS_BROADWELL (dev_priv)) { +unsigned int rotation = plane_state->base.rotation; +int src_w =drm_rect_width (&plane_state->base.src) >>16 ; +int src_h =drm_rect_height (&plane_state->base.src) >>16 ; + +if (rotation &DRM_ROTATE_180 ) { + src_x += src_w -1 ; + src_y += src_h -1 ; + }else if (rotation &DRM_REFLECT_X ) { + src_x += src_w -1 ; + } + } + + plane_state->main.offset = offset; + plane_state->main.x = src_x; + plane_state->main.y = src_y; + +return 0 ; +} +static void i9xx_update_primary_plane (struct drm_plane *primary,const struct intel_crtc_state *crtc_state,const struct intel_plane_state *plane_state)
@@ -3037,27 +3074,15 @@ static void i9xx_update_primary_plane(struct drm_plane *primary,u32 linear_offset;u32 dspcntr = plane_state->ctl;i915_reg_t reg =DSPCNTR (plane); -unsigned int rotation = plane_state->base.rotation; -int x = plane_state->base.src.x1 >>16 ; -int y = plane_state->base.src.y1 >>16 ; +int x = plane_state->main.x; +int y = plane_state->main.y;unsigned long irqflags; -intel_add_fb_offsets (&x, &y, plane_state,0 ); - -if (INTEL_GEN (dev_priv) >=4 ) - intel_crtc->dspaddr_offset = -intel_compute_tile_offset (&x, &y, plane_state,0 ); - -if (rotation &DRM_ROTATE_180 ) { - x += crtc_state->pipe_src_w -1 ; - y += crtc_state->pipe_src_h -1 ; - }else if (rotation &DRM_REFLECT_X ) { - x += crtc_state->pipe_src_w -1 ; - } - linear_offset =intel_fb_xy_to_linear (x, y, plane_state,0 ); -if (INTEL_GEN (dev_priv) <4 ) +if (INTEL_GEN (dev_priv) >=4 ) + intel_crtc->dspaddr_offset = plane_state->main.offset; +else intel_crtc->dspaddr_offset = linear_offset; intel_crtc->adjusted_x = x;
@@ -3133,25 +3158,14 @@ static void ironlake_update_primary_plane(struct drm_plane *primary,u32 linear_offset;u32 dspcntr = plane_state->ctl;i915_reg_t reg =DSPCNTR (plane); -unsigned int rotation = plane_state->base.rotation; -int x = plane_state->base.src.x1 >>16 ; -int y = plane_state->base.src.y1 >>16 ; +int x = plane_state->main.x; +int y = plane_state->main.y;unsigned long irqflags; -intel_add_fb_offsets (&x, &y, plane_state,0 ); - - intel_crtc->dspaddr_offset = -intel_compute_tile_offset (&x, &y, plane_state,0 ); - -/* HSW+ does this automagically in hardware */ -if (!IS_HASWELL (dev_priv) && !IS_BROADWELL (dev_priv) && - rotation &DRM_ROTATE_180 ) { - x += crtc_state->pipe_src_w -1 ; - y += crtc_state->pipe_src_h -1 ; - } - linear_offset =intel_fb_xy_to_linear (x, y, plane_state,0 ); + intel_crtc->dspaddr_offset = plane_state->main.offset; + intel_crtc->adjusted_x = x; intel_crtc->adjusted_y = y;
@@ -13365,6 +13379,10 @@ intel_check_primary_plane(struct drm_plane *plane, state->ctl =skl_plane_ctl (crtc_state, state); }else { + ret =i9xx_check_plane_surface (state); +if (ret) +return ret; + state->ctl =i9xx_plane_ctl (crtc_state, state); }
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 5/6 drm/i915: Eliminate ironlake_update_primary_plane()
In reply to [email protected]From: Ville Syrjälä <[email protected]>
The effective difference between i9xx_update_primary_plane() and ironlake_update_primary_plane() is only the HSW/BDW DSPOFFSET special case. So bring that over into i9xx_update_primary_plane() and eliminate the duplicated code.
--- drivers/gpu/drm/i915/intel_display.c | 55 ++++-------------------------------- 1 file changed, 6 insertions(+), 49 deletions(-)
drivers/gpu/drm/i915/intel_display.c +6 -49
@@ -3109,7 +3109,12 @@ static void i9xx_update_primary_plane(struct drm_plane *primary,I915_WRITE_FW (reg, dspcntr);I915_WRITE_FW (DSPSTRIDE (plane), fb->pitches[0 ]); -if (INTEL_GEN (dev_priv) >=4 ) { +if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) { +I915_WRITE_FW (DSPSURF (plane), +intel_plane_ggtt_offset (plane_state) + + intel_crtc->dspaddr_offset); +I915_WRITE_FW (DSPOFFSET (plane), (y <<16 ) | x); + }else if (INTEL_GEN (dev_priv) >=4 ) {I915_WRITE_FW (DSPSURF (plane),intel_plane_ggtt_offset (plane_state) + intel_crtc->dspaddr_offset);
@@ -3146,48 +3151,6 @@ static void i9xx_disable_primary_plane(struct drm_plane *primary,spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); } -static void ironlake_update_primary_plane (struct drm_plane *primary, -const struct intel_crtc_state *crtc_state, -const struct intel_plane_state *plane_state) -{ -struct drm_device *dev = primary->dev; -struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_crtc *intel_crtc =to_intel_crtc (crtc_state->base.crtc); -struct drm_framebuffer *fb = plane_state->base.fb; -int plane = intel_crtc->plane; -u32 linear_offset; -u32 dspcntr = plane_state->ctl; -i915_reg_t reg =DSPCNTR (plane); -int x = plane_state->main.x; -int y = plane_state->main.y; -unsigned long irqflags; - - linear_offset =intel_fb_xy_to_linear (x, y, plane_state,0 ); - - intel_crtc->dspaddr_offset = plane_state->main.offset; - - intel_crtc->adjusted_x = x; - intel_crtc->adjusted_y = y; - -spin_lock_irqsave (&dev_priv->uncore.lock, irqflags); - -I915_WRITE_FW (reg, dspcntr); - -I915_WRITE_FW (DSPSTRIDE (plane), fb->pitches[0 ]); -I915_WRITE_FW (DSPSURF (plane), -intel_plane_ggtt_offset (plane_state) + - intel_crtc->dspaddr_offset); -if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv)) { -I915_WRITE_FW (DSPOFFSET (plane), (y <<16 ) | x); - }else { -I915_WRITE_FW (DSPTILEOFF (plane), (y <<16 ) | x); -I915_WRITE_FW (DSPLINOFF (plane), linear_offset); - } -POSTING_READ_FW (reg); - -spin_unlock_irqrestore (&dev_priv->uncore.lock, irqflags); -} -static u32 intel_fb_stride_alignment (const struct drm_framebuffer *fb,int plane) {
@@ -13642,12 +13605,6 @@ intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) primary->update_plane = skylake_update_primary_plane; primary->disable_plane = skylake_disable_primary_plane; - }else if (HAS_PCH_SPLIT (dev_priv)) { - intel_primary_formats = i965_primary_formats; - num_formats =ARRAY_SIZE (i965_primary_formats); - - primary->update_plane = ironlake_update_primary_plane; - primary->disable_plane = i9xx_disable_primary_plane; }else if (INTEL_GEN (dev_priv) >=4 ) { intel_primary_formats = i965_primary_formats; num_formats =ARRAY_SIZE (i965_primary_formats);
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 6/6 drm/i915: Use i9xx_check_plane_surface() for sprite planes as well
In reply to [email protected]From: Ville Syrjälä <[email protected]>
All the pre-SKL sprite planes compute the x/y/tile offsets in a similar way. There are a couple of minor differences but the primary planes have those as well. Thus i9xx_check_plane_surface() already does what we need, so let's use it.
--- drivers/gpu/drm/i915/intel_display.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_sprite.c | 71 +++++++++++++----------------------- 3 files changed, 27 insertions(+), 47 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
@@ -3026,7 +3026,7 @@ static u32 i9xx_plane_ctl(const struct intel_crtc_state *crtc_state,return dspcntr; } -static int i9xx_check_plane_surface (struct intel_plane_state *plane_state) +int i9xx_check_plane_surface (struct intel_plane_state *plane_state) {struct drm_i915_private *dev_priv =to_i915 (plane_state->base.plane->dev);
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -1453,6 +1453,7 @@ u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state,u32 skl_plane_stride (const struct drm_framebuffer *fb,int plane,unsigned int rotation);int skl_check_plane_surface (struct intel_plane_state *plane_state); +int i9xx_check_plane_surface (struct intel_plane_state *plane_state);/* intel_csr.c */ void intel_csr_ucode_init (struct drm_i915_private *);
drivers/gpu/drm/i915/intel_sprite.c +25 -46
135 lines not on this page · raw message
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 6/6] drm/i915: Use i9xx_check_plane_surface() for sprite planes as well
Quoted 8 lines · On Thu, Mar 23, 2017 at 09:27:12PM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
All the pre-SKL sprite planes compute the x/y/tile offsets in a similar way. There are a couple of minor differences but the primary planes have those as well. Thus
i9xx_check_plane_surface()already does what we need, so let's use it.Signed-off-by Ville Syrjälä <[email protected]>
Looks right to me, but I'd recommend a second opinion here.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 6/6] drm/i915: Use i9xx_check_plane_surface() for sprite planes as well
Quoted 8 lines · Chris Wilson
Quoted 7 lines · On Thu, Mar 23, 2017 at 09:27:12PM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
All the pre-SKL sprite planes compute the x/y/tile offsets in a similar way. There are a couple of minor differences but the primary planes have those as well. Thus
i9xx_check_plane_surface()already does what we need, so let's use it.
Quoted 4 lines
Quoted 1 line
Signed-off-by Ville Syrjälä <[email protected]>Looks right to me, but I'd recommend a second opinion here.
Reviewed-by Chris Wilson <[email protected]>
I'm feeling lucky. Entire series pushed to dinq. Thanks for the review.
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Moar plane update optimizations (rev4)
In reply to [email protected]== Series Details ==
== Series Details ==
Series: drm/i915: Moar plane update optimizations (rev4)
URL : https://patchwork.freedesktop.org/series/21475/
State : success
== Summary ==
Series 21475v4 drm/i915: Moar plane update optimizations
https://patchwork.freedesktop.org/api/1.0/series/21475/revisions/4/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
pass -> FAIL (fi-snb-2600) fdo#100007
Test gem_exec_suspend:
Subgroup basic-s4-devices:
pass -> DMESG-WARN (fi-bxt-t5700) fdo#100125fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time: 464s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time: 462s fi-bsw-n3050 total:278 pass:239 dwarn:0 dfail:0 fail:0 skip:39 time: 576s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time: 539s fi-bxt-t5700 total:278 pass:257 dwarn:1 dfail:0 fail:0 skip:20 time: 576s fi-byt-j1900 total:278 pass:251 dwarn:0 dfail:0 fail:0 skip:27 time: 509s fi-byt-n2820 total:278 pass:247 dwarn:0 dfail:0 fail:0 skip:31 time: 502s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 436s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 430s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time: 441s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 526s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 495s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 487s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 480s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time: 597s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time: 484s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 527s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time: 464s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time: 548s fi-snb-2600 total:278 pass:248 dwarn:0 dfail:0 fail:1 skip:29 time: 424s
fd27e1e4c9b5dc11966b4953432bd6e0510da308 drm-tip: 2017y-03m-24d-08h-39m-20s UTC integration manifest f0802c0 drm/i915: Use i9xx_check_plane_surface() for sprite planes as well
faabda6 drm/i915: Eliminate ironlake_update_primary_plane()
8c56d06 drm/i915: Introduce i9xx_check_plane_surface()
0e8a06b drm/i915: Pre-compute plane control register value
3d6d2c0 drm/i915: Nuke ironlake_plane_ctl()
bc357e8 drm/i915: Extract i9xx_plane_ctl() and ironlake_plane_ctl()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4284/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx