drm/i915/skl: Eliminate usage of pipe_wm_parameters from SKL-style WM (v4)
Subsystems (2)
PATCH 1/1 drm/i915/skl: Eliminate usage of pipe_wm_parameters from SKL-style WM (v4)
Just pull the info out of the state structures rather than staging it in an additional set of structures. To make this more straightforward, we change the signature of several internal WM functions to take the crtc state as a parameter.
v2:
- Don't forget to skip cursor planes on a loop in the DDB allocation function to match original behavior. (Ander)
- Change a use of intel_crtc->active to cstate->active. They should be identical, but it's better to be consistent. (Ander)
- Rework more function signatures to pass states rather than crtc for consistency. (Ander)
v3:
- Add missing "+ 1" to skl_wm_plane_id()'s 'overlay' case. (Maarten)
- Packed formats should pass '0' to drm_format_plane_cpp(), not 1. (Maarten)
- Drop unwanted WARN_ON() for disabled planes when calculating data rate for SKL. (Maarten)
v4:
- Don't include cursor plane in total relative data rate calculation; we've already handled the cursor allocation earlier.
- Fix 'bytes_per_pixel' calculation braindamage. Somehow I hardcoded the NV12 format as a parameter rather than the actual fb->pixel_format, and even then still managed to get the format plane wrong. (Ville)
- Use plane->state->fb rather than plane->fb in skl_allocate_pipe_ddb(); the plane->fb pointer isn't updated until after we've done our watermark recalculation, so it has stale values. (Bob Paauwe)
Reviewed-by(v3): Maarten Lankhorst <[email protected]>
Cc: Paauwe, Bob J <[email protected]>
Cc: Ville Syrjälä <[email protected]>
Cc: Paulo Zanoni <[email protected]>
References: http://lists.freedesktop.org/archives/intel-gfx/2015-September/077060.html
References: http://lists.freedesktop.org/archives/intel-gfx/2015-October/077721.html
---
Paulo, would you mind trying this patch out when you have some free time and see whether you still experience watermark problems? This is the patch that you bisected your problems to and there were at least three bugs in the version of this patch that was merged before; I'm hoping that with these three bugfixes your problems will be gone.
drivers/gpu/drm/i915/intel_pm.c | 327 +++++++++++++++++++--------------------- 1 file changed, 152 insertions(+), 175 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +152 -175
@@ -1708,13 +1708,6 @@ static uint32_t ilk_wm_fbc(uint32_t pri_val, uint32_t horiz_pixels,return DIV_ROUND_UP (pri_val *64 , horiz_pixels * bytes_per_pixel) +2 ; } -struct skl_pipe_wm_parameters { -bool active; -uint32_t pipe_htotal; -uint32_t pixel_rate;/* in KHz */ -struct intel_plane_wm_parameters plane[I915_MAX_PLANES ]; -}; -struct ilk_wm_maximums {uint16_t pri;uint16_t spr;
@@ -2755,18 +2748,40 @@ static bool ilk_disable_lp_wm(struct drm_device *dev)#define SKL_DDB_SIZE 896/* in blocks */ #define BXT_DDB_SIZE 512 +/* +* Return the index of a plane in the SKL DDB and wm result arrays. Primary +* plane is always in slot 0, cursor is always in slot I915_MAX_PLANES-1, and +* other universal planes are in indices 1..n. Note that this may leave unused +* indices between the top "sprite" plane and the cursor. +*/ +static int +skl_wm_plane_id (const struct intel_plane *plane) +{ +switch (plane->base.type) { +case DRM_PLANE_TYPE_PRIMARY : +return 0 ; +case DRM_PLANE_TYPE_CURSOR : +return PLANE_CURSOR ; +case DRM_PLANE_TYPE_OVERLAY : +return plane->plane +1 ; +default : +MISSING_CASE (plane->base.type); +return plane->plane; + } +} +static void skl_ddb_get_pipe_allocation_limits (struct drm_device *dev, -struct drm_crtc *for_crtc, +const struct intel_crtc_state *cstate,const struct intel_wm_config *config, -const struct skl_pipe_wm_parameters *params,struct skl_ddb_entry *alloc/* out */ ) { +struct drm_crtc *for_crtc = cstate->base.crtc;struct drm_crtc *crtc;unsigned int pipe_size, ddb_size;int nth_active_pipe; -if (!params->active) { +if (!cstate->base.active) { alloc->start =0 ; alloc->end =0 ;return ;
@@ -2832,19 +2847,29 @@ void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv, }static unsigned int -skl_plane_relative_data_rate (const struct intel_plane_wm_parameters *p,int y) +skl_plane_relative_data_rate (const struct intel_crtc_state *cstate, +const struct drm_plane_state *pstate, +int y) { +struct intel_crtc *intel_crtc =to_intel_crtc (cstate->base.crtc); +struct drm_framebuffer *fb = pstate->fb;/* for planar format */ -if (p->y_bytes_per_pixel) { +if (fb->pixel_format ==DRM_FORMAT_NV12 ) {if (y)/* y-plane data rate */ -return p->horiz_pixels * p->vert_pixels * p->y_bytes_per_pixel; +return intel_crtc->config->pipe_src_w * + intel_crtc->config->pipe_src_h * +drm_format_plane_cpp (fb->pixel_format,0 );else /* uv-plane data rate */ -return (p->horiz_pixels/2 ) * (p->vert_pixels/2 ) * p->bytes_per_pixel; +return (intel_crtc->config->pipe_src_w/2 ) * + (intel_crtc->config->pipe_src_h/2 ) * +drm_format_plane_cpp (fb->pixel_format,1 ); }/* for packed formats */ -return p->horiz_pixels * p->vert_pixels * p->bytes_per_pixel; +return intel_crtc->config->pipe_src_w * + intel_crtc->config->pipe_src_h * +drm_format_plane_cpp (fb->pixel_format,0 ); }/*
@@ -2853,46 +2878,54 @@ skl_plane_relative_data_rate(const struct intel_plane_wm_parameters *p, int y)* 3 * 4096 * 8192 * 4 < 2^32 */ static unsigned int -skl_get_total_relative_data_rate (struct intel_crtc *intel_crtc, -const struct skl_pipe_wm_parameters *params) +skl_get_total_relative_data_rate (const struct intel_crtc_state *cstate) { +struct intel_crtc *intel_crtc =to_intel_crtc (cstate->base.crtc); +struct drm_device *dev = intel_crtc->base.dev; +const struct intel_plane *intel_plane;unsigned int total_data_rate =0 ; -int plane; -for (plane =0 ; plane <intel_num_planes (intel_crtc); plane++) { -const struct intel_plane_wm_parameters *p; +for_each_intel_plane_on_crtc (dev, intel_crtc, intel_plane) { +const struct drm_plane_state *pstate = intel_plane->base.state; - p = ¶ms->plane[plane]; -if (!p->enabled) +if (pstate->fb ==NULL )continue ; - total_data_rate +=skl_plane_relative_data_rate (p,0 );/* packed/uv */ -if (p->y_bytes_per_pixel) { - total_data_rate +=skl_plane_relative_data_rate (p,1 );/* y-plane */ - } +if (intel_plane->base.type ==DRM_PLANE_TYPE_CURSOR ) +continue ; + +/* packed/uv */ + total_data_rate +=skl_plane_relative_data_rate (cstate, + pstate, +0 ); + +if (pstate->fb->pixel_format ==DRM_FORMAT_NV12 ) +/* y-plane */ + total_data_rate +=skl_plane_relative_data_rate (cstate, + pstate, +1 ); }return total_data_rate; }static void -skl_allocate_pipe_ddb (struct drm_crtc *crtc, +skl_allocate_pipe_ddb (struct intel_crtc_state *cstate,const struct intel_wm_config *config, -const struct skl_pipe_wm_parameters *params,struct skl_ddb_allocation *ddb/* out */ ) { +struct drm_crtc *crtc = cstate->base.crtc;struct drm_device *dev = crtc->dev; -struct drm_i915_private *dev_priv = dev->dev_private;struct intel_crtc *intel_crtc =to_intel_crtc (crtc); +struct intel_plane *intel_plane;enum pipe pipe = intel_crtc->pipe;struct skl_ddb_entry *alloc = &ddb->pipe[pipe];uint16_t alloc_size, start, cursor_blocks;uint16_t minimum[I915_MAX_PLANES ];uint16_t y_minimum[I915_MAX_PLANES ];unsigned int total_data_rate; -int plane; -skl_ddb_get_pipe_allocation_limits (dev, crtc, config, params, alloc); +skl_ddb_get_pipe_allocation_limits (dev, cstate, config, alloc); alloc_size =skl_ddb_entry_size (alloc);if (alloc_size ==0 ) {memset (ddb->plane[pipe],0 ,sizeof (ddb->plane[pipe]));
@@ -2909,17 +2942,20 @@ skl_allocate_pipe_ddb(struct drm_crtc *crtc, alloc->end -= cursor_blocks;/* 1. Allocate the mininum required blocks for each active plane */ -for_each_plane (dev_priv, pipe, plane) { -const struct intel_plane_wm_parameters *p; +for_each_intel_plane_on_crtc (dev, intel_crtc, intel_plane) { +struct drm_plane *plane = &intel_plane->base; +struct drm_framebuffer *fb = plane->state->fb; +int id =skl_wm_plane_id (intel_plane); - p = ¶ms->plane[plane]; -if (!p->enabled) +if (fb ==NULL ) +continue ; +if (plane->type ==DRM_PLANE_TYPE_CURSOR )continue ; - minimum[plane] =8 ; - alloc_size -= minimum[plane]; - y_minimum[plane] = p->y_bytes_per_pixel ?8 :0 ; - alloc_size -= y_minimum[plane]; + minimum[id] =8 ; + alloc_size -= minimum[id]; + y_minimum[id] = (fb->pixel_format ==DRM_FORMAT_NV12 ) ?8 :0 ; + alloc_size -= y_minimum[id]; }/*
@@ -2928,45 +2964,50 @@ skl_allocate_pipe_ddb(struct drm_crtc *crtc,* * FIXME: we may not allocate every single block here. */ - total_data_rate =skl_get_total_relative_data_rate (intel_crtc, params); + total_data_rate =skl_get_total_relative_data_rate (cstate); start = alloc->start; -for (plane =0 ; plane <intel_num_planes (intel_crtc); plane++) { -const struct intel_plane_wm_parameters *p; +for_each_intel_plane_on_crtc (dev, intel_crtc, intel_plane) { +struct drm_plane *plane = &intel_plane->base; +struct drm_plane_state *pstate = intel_plane->base.state;unsigned int data_rate, y_data_rate;uint16_t plane_blocks, y_plane_blocks =0 ; +int id =skl_wm_plane_id (intel_plane); - p = ¶ms->plane[plane]; -if (!p->enabled) +if (pstate->fb ==NULL ) +continue ; +if (plane->type ==DRM_PLANE_TYPE_CURSOR )continue ; - data_rate =skl_plane_relative_data_rate (p,0 ); + data_rate =skl_plane_relative_data_rate (cstate, pstate,0 );/* * allocation for (packed formats) or (uv-plane part of planar format): * promote the expression to 64 bits to avoid overflowing, the * result is < available as data_rate / total_data_rate < 1 */ - plane_blocks = minimum[plane]; + plane_blocks = minimum[id]; plane_blocks +=div_u64 ((uint64_t )alloc_size * data_rate, total_data_rate); - ddb->plane[pipe][plane].start = start; - ddb->plane[pipe][plane].end = start + plane_blocks; + ddb->plane[pipe][id].start = start; + ddb->plane[pipe][id].end = start + plane_blocks; start += plane_blocks;/* * allocation for y_plane part of planar format: */ -if (p->y_bytes_per_pixel) { - y_data_rate =skl_plane_relative_data_rate (p,1 ); - y_plane_blocks = y_minimum[plane]; +if (pstate->fb->pixel_format ==DRM_FORMAT_NV12 ) { + y_data_rate =skl_plane_relative_data_rate (cstate, + pstate, +1 ); + y_plane_blocks = y_minimum[id]; y_plane_blocks +=div_u64 ((uint64_t )alloc_size * y_data_rate, total_data_rate); - ddb->y_plane[pipe][plane].start = start; - ddb->y_plane[pipe][plane].end = start + y_plane_blocks; + ddb->y_plane[pipe][id].start = start; + ddb->y_plane[pipe][id].end = start + y_plane_blocks; start += y_plane_blocks; }
@@ -3067,73 +3108,16 @@ static void skl_compute_wm_global_parameters(struct drm_device *dev, } } -static void skl_compute_wm_pipe_parameters (struct drm_crtc *crtc, -struct skl_pipe_wm_parameters *p) -{ -struct drm_device *dev = crtc->dev; -struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -enum pipe pipe = intel_crtc->pipe; -struct drm_plane *plane; -struct drm_framebuffer *fb; -int i =1 ;/* Index for sprite planes start */ - - p->active = intel_crtc->active; -if (p->active) { - p->pipe_htotal = intel_crtc->config->base.adjusted_mode.crtc_htotal; - p->pixel_rate =skl_pipe_pixel_rate (intel_crtc->config); - - fb = crtc->primary->state->fb; -/* For planar: Bpp is for uv plane, y_Bpp is for y plane */ -if (fb) { - p->plane[0 ].enabled = true; - p->plane[0 ].bytes_per_pixel = fb->pixel_format ==DRM_FORMAT_NV12 ? -drm_format_plane_cpp (fb->pixel_format,1 ) : -drm_format_plane_cpp (fb->pixel_format,0 ); - p->plane[0 ].y_bytes_per_pixel = fb->pixel_format ==DRM_FORMAT_NV12 ? -drm_format_plane_cpp (fb->pixel_format,0 ) :0 ; - p->plane[0 ].tiling = fb->modifier[0 ]; - }else { - p->plane[0 ].enabled = false; - p->plane[0 ].bytes_per_pixel =0 ; - p->plane[0 ].y_bytes_per_pixel =0 ; - p->plane[0 ].tiling =DRM_FORMAT_MOD_NONE ; - } - p->plane[0 ].horiz_pixels = intel_crtc->config->pipe_src_w; - p->plane[0 ].vert_pixels = intel_crtc->config->pipe_src_h; - p->plane[0 ].rotation = crtc->primary->state->rotation; - - fb = crtc->cursor->state->fb; - p->plane[PLANE_CURSOR ].y_bytes_per_pixel =0 ; -if (fb) { - p->plane[PLANE_CURSOR ].enabled = true; - p->plane[PLANE_CURSOR ].bytes_per_pixel = fb->bits_per_pixel /8 ; - p->plane[PLANE_CURSOR ].horiz_pixels = crtc->cursor->state->crtc_w; - p->plane[PLANE_CURSOR ].vert_pixels = crtc->cursor->state->crtc_h; - }else { - p->plane[PLANE_CURSOR ].enabled = false; - p->plane[PLANE_CURSOR ].bytes_per_pixel =0 ; - p->plane[PLANE_CURSOR ].horiz_pixels =64 ; - p->plane[PLANE_CURSOR ].vert_pixels =64 ; - } - } - -list_for_each_entry (plane, &dev->mode_config.plane_list, head) { -struct intel_plane *intel_plane =to_intel_plane (plane); - -if (intel_plane->pipe == pipe && - plane->type ==DRM_PLANE_TYPE_OVERLAY ) - p->plane[i++] = intel_plane->wm; - } -} -static bool skl_compute_plane_wm (const struct drm_i915_private *dev_priv, -struct skl_pipe_wm_parameters *p, -struct intel_plane_wm_parameters *p_params, +struct intel_crtc_state *cstate, +struct intel_plane *intel_plane,uint16_t ddb_allocation,int level,uint16_t *out_blocks,/* out */ uint8_t *out_lines/* out */ ) { +struct drm_plane *plane = &intel_plane->base; +struct drm_framebuffer *fb = plane->state->fb;uint32_t latency = dev_priv->wm.skl_latency[level];uint32_t method1, method2;uint32_t plane_bytes_per_line, plane_blocks_per_line;
@@ -3141,31 +3125,33 @@ static bool skl_compute_plane_wm(const struct drm_i915_private *dev_priv,uint32_t selected_result;uint8_t bytes_per_pixel; -if (latency ==0 || !p->active || !p_params->enabled) +if (latency ==0 || !cstate->base.active || !fb)return false; - bytes_per_pixel = p_params->y_bytes_per_pixel ? - p_params->y_bytes_per_pixel : - p_params->bytes_per_pixel; - method1 =skl_wm_method1 (p->pixel_rate, + bytes_per_pixel =drm_format_plane_cpp (fb->pixel_format,0 ); + method1 =skl_wm_method1 (skl_pipe_pixel_rate (cstate), bytes_per_pixel, latency); - method2 =skl_wm_method2 (p->pixel_rate, - p->pipe_htotal, - p_params->horiz_pixels, + method2 =skl_wm_method2 (skl_pipe_pixel_rate (cstate), + cstate->base.adjusted_mode.crtc_htotal, + cstate->pipe_src_w, bytes_per_pixel, - p_params->tiling, + fb->modifier[0 ], latency); - plane_bytes_per_line = p_params->horiz_pixels * bytes_per_pixel; + plane_bytes_per_line = cstate->pipe_src_w * bytes_per_pixel; plane_blocks_per_line =DIV_ROUND_UP (plane_bytes_per_line,512 ); -if (p_params->tiling ==I915_FORMAT_MOD_Y_TILED || - p_params->tiling == I915_FORMAT_MOD_Yf_TILED) { +if (fb->modifier[0 ] ==I915_FORMAT_MOD_Y_TILED || + fb->modifier[0 ] == I915_FORMAT_MOD_Yf_TILED) {uint32_t min_scanlines =4 ;uint32_t y_tile_minimum; -if (intel_rotation_90_or_270 (p_params->rotation)) { -switch (p_params->bytes_per_pixel) { +if (intel_rotation_90_or_270 (plane->state->rotation)) { +int bpp = (fb->pixel_format ==DRM_FORMAT_NV12 ) ? +drm_format_plane_cpp (fb->pixel_format,1 ) : +drm_format_plane_cpp (fb->pixel_format,0 ); + +switch (bpp) {case 1 : min_scanlines =16 ;break ;
@@ -3189,8 +3175,8 @@ static bool skl_compute_plane_wm(const struct drm_i915_private *dev_priv, res_lines =DIV_ROUND_UP (selected_result, plane_blocks_per_line);if (level >=1 && level <=7 ) { -if (p_params->tiling ==I915_FORMAT_MOD_Y_TILED || - p_params->tiling == I915_FORMAT_MOD_Yf_TILED) +if (fb->modifier[0 ] ==I915_FORMAT_MOD_Y_TILED || + fb->modifier[0 ] == I915_FORMAT_MOD_Yf_TILED) res_lines +=4 ;else res_blocks++;
@@ -3207,84 +3193,80 @@ static bool skl_compute_plane_wm(const struct drm_i915_private *dev_priv,static void skl_compute_wm_level (const struct drm_i915_private *dev_priv,struct skl_ddb_allocation *ddb, -struct skl_pipe_wm_parameters *p, -enum pipe pipe, +struct intel_crtc_state *cstate,int level, -int num_planes,struct skl_wm_level *result) { +struct drm_device *dev = dev_priv->dev; +struct intel_crtc *intel_crtc =to_intel_crtc (cstate->base.crtc); +struct intel_plane *intel_plane;uint16_t ddb_blocks; -int i; +enum pipe pipe = intel_crtc->pipe; + +for_each_intel_plane_on_crtc (dev, intel_crtc, intel_plane) { +int i =skl_wm_plane_id (intel_plane); -for (i =0 ; i < num_planes; i++) { ddb_blocks =skl_ddb_entry_size (&ddb->plane[pipe][i]); result->plane_en[i] =skl_compute_plane_wm (dev_priv, - p, &p->plane[i], + cstate, + intel_plane, ddb_blocks, level, &result->plane_res_b[i], &result->plane_res_l[i]); } - - ddb_blocks =skl_ddb_entry_size (&ddb->plane[pipe][PLANE_CURSOR ]); - result->plane_en[PLANE_CURSOR ] =skl_compute_plane_wm (dev_priv, p, - &p->plane[PLANE_CURSOR ], - ddb_blocks, level, - &result->plane_res_b[PLANE_CURSOR ], - &result->plane_res_l[PLANE_CURSOR ]); }static uint32_t -skl_compute_linetime_wm (struct drm_crtc *crtc,struct skl_pipe_wm_parameters *p) +skl_compute_linetime_wm (struct intel_crtc_state *cstate) { -if (!to_intel_crtc (crtc)->active) +if (!cstate->base.active)return 0 ; -if (WARN_ON (p->pixel_rate ==0 )) +if (WARN_ON (skl_pipe_pixel_rate (cstate) ==0 ))return 0 ; -return DIV_ROUND_UP (8 * p->pipe_htotal *1000 , p->pixel_rate); +return DIV_ROUND_UP (8 * cstate->base.adjusted_mode.crtc_htotal *1000 , +skl_pipe_pixel_rate (cstate)); } -static void skl_compute_transition_wm (struct drm_crtc *crtc, -struct skl_pipe_wm_parameters *params, +static void skl_compute_transition_wm (struct intel_crtc_state *cstate,struct skl_wm_level *trans_wm/* out */ ) { +struct drm_crtc *crtc = cstate->base.crtc;struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -int i; +struct intel_plane *intel_plane; -if (!params->active) +if (!cstate->base.active)return ;/* Until we know more, just disable transition WMs */ -for (i =0 ; i <intel_num_planes (intel_crtc); i++) +for_each_intel_plane_on_crtc (crtc->dev, intel_crtc, intel_plane) { +int i =skl_wm_plane_id (intel_plane); + trans_wm->plane_en[i] = false; - trans_wm->plane_en[PLANE_CURSOR ] = false; + } } -static void skl_compute_pipe_wm (struct drm_crtc *crtc, +static void skl_compute_pipe_wm (struct intel_crtc_state *cstate,struct skl_ddb_allocation *ddb, -struct skl_pipe_wm_parameters *params,struct skl_pipe_wm *pipe_wm) { -struct drm_device *dev = crtc->dev; +struct drm_device *dev = cstate->base.crtc->dev;const struct drm_i915_private *dev_priv = dev->dev_private; -struct intel_crtc *intel_crtc =to_intel_crtc (crtc);int level, max_level =ilk_wm_max_level (dev);for (level =0 ; level <= max_level; level++) { -skl_compute_wm_level (dev_priv, ddb, params, intel_crtc->pipe, - level,intel_num_planes (intel_crtc), - &pipe_wm->wm[level]); +skl_compute_wm_level (dev_priv, ddb, cstate, + level, &pipe_wm->wm[level]); } - pipe_wm->linetime =skl_compute_linetime_wm (crtc, params); + pipe_wm->linetime =skl_compute_linetime_wm (cstate); -skl_compute_transition_wm (crtc, params, &pipe_wm->trans_wm); +skl_compute_transition_wm (cstate, &pipe_wm->trans_wm); }static void skl_compute_wm_results (struct drm_device *dev, -struct skl_pipe_wm_parameters *p,struct skl_pipe_wm *p_wm,struct skl_wm_values *r,struct intel_crtc *intel_crtc)
@@ -3528,16 +3510,15 @@ static void skl_flush_wm_values(struct drm_i915_private *dev_priv, }static bool skl_update_pipe_wm (struct drm_crtc *crtc, -struct skl_pipe_wm_parameters *params,struct intel_wm_config *config,struct skl_ddb_allocation *ddb,/* out */ struct skl_pipe_wm *pipe_wm/* out */ ) {struct intel_crtc *intel_crtc =to_intel_crtc (crtc); +struct intel_crtc_state *cstate =to_intel_crtc_state (crtc->state); -skl_compute_wm_pipe_parameters (crtc, params); -skl_allocate_pipe_ddb (crtc, config, params, ddb); -skl_compute_pipe_wm (crtc, ddb, params, pipe_wm); +skl_allocate_pipe_ddb (cstate, config, ddb); +skl_compute_pipe_wm (cstate, ddb, pipe_wm);if (!memcmp (&intel_crtc->wm.skl_active, pipe_wm,sizeof (*pipe_wm)))return false;
@@ -3570,7 +3551,6 @@ static void skl_update_other_pipe_wm(struct drm_device *dev,*/ list_for_each_entry (intel_crtc, &dev->mode_config.crtc_list, base.head) { -struct skl_pipe_wm_parameters params = {};struct skl_pipe_wm pipe_wm = {};bool wm_changed;
@@ -3580,8 +3560,7 @@ static void skl_update_other_pipe_wm(struct drm_device *dev,if (!intel_crtc->active)continue ; - wm_changed =skl_update_pipe_wm (&intel_crtc->base, - ¶ms, config, + wm_changed =skl_update_pipe_wm (&intel_crtc->base, config, &r->ddb, &pipe_wm);/*
@@ -3591,7 +3570,7 @@ static void skl_update_other_pipe_wm(struct drm_device *dev,*/ WARN_ON (!wm_changed); -skl_compute_wm_results (dev, ¶ms, &pipe_wm, r, intel_crtc); +skl_compute_wm_results (dev, &pipe_wm, r, intel_crtc); r->dirty[intel_crtc->pipe] = true; } }
@@ -3621,7 +3600,6 @@ static void skl_update_wm(struct drm_crtc *crtc)struct intel_crtc *intel_crtc =to_intel_crtc (crtc);struct drm_device *dev = crtc->dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct skl_pipe_wm_parameters params = {};struct skl_wm_values *results = &dev_priv->wm.skl_results;struct skl_pipe_wm pipe_wm = {};struct intel_wm_config config = {};
@@ -3634,11 +3612,10 @@ static void skl_update_wm(struct drm_crtc *crtc)skl_compute_wm_global_parameters (dev, &config); -if (!skl_update_pipe_wm (crtc, ¶ms, &config, - &results->ddb, &pipe_wm)) +if (!skl_update_pipe_wm (crtc, &config, &results->ddb, &pipe_wm))return ; -skl_compute_wm_results (dev, ¶ms, &pipe_wm, results, intel_crtc); +skl_compute_wm_results (dev, &pipe_wm, results, intel_crtc); results->dirty[intel_crtc->pipe] = true;skl_update_other_pipe_wm (dev, crtc, &config, results);
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Em Qui, 2015-10-15 às 15:42 -0700, Matt Roper escreveu:
Quoted 49 lines
Just pull the info out of the state structures rather than staging it in an additional set of structures. To make this more straightforward, we change the signature of several internal WM functions to take the crtc state as a parameter.
v2:
- Don't forget to skip cursor planes on a loop in the DDB allocation function to match original behavior. (Ander)
- Change a use ofintel_crtc->activeto cstate->active. They should be identical, but it's better to be consistent. (Ander)
- Rework more function signatures to pass states rather than crtc for
consistency. (Ander)v3:
- Add missing "+ 1" to skl_wm_plane_id()'s 'overlay' case. (Maarten)
- Packed formats should pass '0' todrm_format_plane_cpp(), not 1. (Maarten)
- Drop unwantedWARN_ON()for disabled planes when calculating data rate for SKL. (Maarten)v4:
- Don't include cursor plane in total relative data rate calculation;
we've already handled the cursor allocation earlier.
- Fix 'bytes_per_pixel' calculation braindamage. Somehow I hardcoded
the NV12 format as a parameter rather than the actualfb->pixel_format, and even then still managed to get the format plane
wrong. (Ville)
- Useplane->state->fbrather thanplane->fbinskl_allocate_pipe_ddb(); theplane->fbpointer isn't updated until after we've done our watermark recalculation, so it has stale values. (Bob Paauwe)Signed-off-by Matt Roper <[email protected]>Reviewed-by(v3): Maarten Lankhorst <[email protected]
Quoted 1 line
Cc: Paauwe, Bob J <[email protected]>
Cc: Ville Syrjälä <[email protected]>
Cc: Paulo Zanoni <[email protected]>
References: http://lists.freedesktop.org/archives/intel-gfx/2015-Sept
ember/077060.html
References: http://lists.freedesktop.org/archives/intel-gfx/2015-Octo
ber/077721.html
---
Paulo, would you mind trying this patch out when you have some free
Quoted 8 lines
time and
see whether you still experience watermark problems? This is the patch that
you bisected your problems to and there were at least three bugs in the version
of this patch that was merged before; I'm hoping that with these three bugfixes
your problems will be gone.
Just tested this patch on top of today's -nightly and FBC still works after it.
Thanks,
Paulo
Quoted 703 lines
drivers/gpu/drm/i915/intel_pm.c | 327 +++++++++++++++++++-----------
----------1 file changed, 152 insertions(+), 175 deletions(-)drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -1708,13 +1708,6 @@ static uint32_t ilk_wm_fbc(uint32_t pri_val, uint32_t horiz_pixels,return
DIV_ROUND_UP(pri_val * 64, horiz_pixels * bytes_per_pixel)+ 2;
}drivers/gpu/drm/i915/intel_pm.c +0
-7-struct skl_pipe_wm_parameters { -bool active; -uint32_t pipe_htotal; -uint32_t pixel_rate;/* in KHz */ -struct intel_plane_wm_parameters plane[I915_MAX_PLANES ]; -}; -struct
ilk_wm_maximums{
uint16_tpri;
uint16_tspr;drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -2755,18 +2748,40 @@ static bool ilk_disable_lp_wm(struct drm_device *dev) #define SKL_DDB_SIZE 896 /* in blocks */ #define BXT_DDB_SIZE 512
+/*
+ * Return the index of a plane in the SKL DDB and wm result arrays. Primary
+ * plane is always in slot 0, cursor is always in slot I915_MAX_PLANES-1, and
+ * other universal planes are in indices 1..n. Note that this may leave unused
+ * indices between the top "sprite" plane and the cursor.
+ */drivers/gpu/drm/i915/intel_pm.c +16
-0+static int +skl_wm_plane_id (const struct intel_plane *plane) +{ +switch (plane->base.type) { +case DRM_PLANE_TYPE_PRIMARY : +return 0 ; +case DRM_PLANE_TYPE_CURSOR : +return PLANE_CURSOR ; +case DRM_PLANE_TYPE_OVERLAY : +return plane->plane +1 ; +default : +MISSING_CASE (plane->base.type); +return plane->plane; + } +} +static void skl_ddb_get_pipe_allocation_limits(struct
drm_device*dev,drivers/gpu/drm/i915/intel_pm.c +1
-1- struct drm_crtc *for_crtc, + const struct intel_crtc_state*cstate,
const structintel_wm_config*config,drivers/gpu/drm/i915/intel_pm.c +0
-1- const struct
skl_pipe_wm_parameters*params,
structskl_ddb_entry*alloc /* out */)
{drivers/gpu/drm/i915/intel_pm.c +1
-0+struct drm_crtc *for_crtc = cstate->base.crtc;struct
drm_crtc*crtc;
unsigned intpipe_size,ddb_size;
intnth_active_pipe;drivers/gpu/drm/i915/intel_pm.c +1
-1-if (!params->active) { +if (!cstate->base.active) {
alloc->start= 0;
alloc->end= 0;
return;drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -2832,19 +2847,29 @@ void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv, }
static unsigned int
-skl_plane_relative_data_rate(const structintel_plane_wm_parameters*p, int y)drivers/gpu/drm/i915/intel_pm.c +3
-0+skl_plane_relative_data_rate(const struct intel_crtc_state *cstate, + const struct drm_plane_state *pstate, + int y){
drivers/gpu/drm/i915/intel_pm.c +1
-0+ struct intel_crtc *intel_crtc = to_intel_crtc(cstate-Quoted 1 line
base.crtc);
drivers/gpu/drm/i915/intel_pm.c +1
-0+struct drm_framebuffer *fb = pstate->fb;
/* for planar format */drivers/gpu/drm/i915/intel_pm.c +1
-1-if (p->y_bytes_per_pixel) { +if (fb->pixel_format ==DRM_FORMAT_NV12 ) {if (y) /* y-plane data rate */
drivers/gpu/drm/i915/intel_pm.c +0
-1- return p->horiz_pixels * p->vert_pixels * p-Quoted 1 line
y_bytes_per_pixel;drivers/gpu/drm/i915/intel_pm.c +3
-0+return intel_crtc->config->pipe_src_w * + intel_crtc->config->pipe_src_h * + drm_format_plane_cpp(fb-Quoted 1 line
pixel_format, 0);else /* uv-plane data rate */
drivers/gpu/drm/i915/intel_pm.c +0
-1- return (p->horiz_pixels/2) * (p-Quoted 1 line
vert_pixels/2) *
p->bytes_per_pixel;drivers/gpu/drm/i915/intel_pm.c +3
-0+return (intel_crtc->config->pipe_src_w/2 ) * + (intel_crtc->config->pipe_src_h/2 ) * + drm_format_plane_cpp(fb-Quoted 1 line
pixel_format, 1);}
/* for packed formats */drivers/gpu/drm/i915/intel_pm.c +0
-1- return p->horiz_pixels * p->vert_pixels * p-Quoted 1 line
bytes_per_pixel;drivers/gpu/drm/i915/intel_pm.c +3
-0+return intel_crtc->config->pipe_src_w * + intel_crtc->config->pipe_src_h * +drm_format_plane_cpp (fb->pixel_format,0 );}
/*drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -2853,46 +2878,54 @@ skl_plane_relative_data_rate(const structintel_plane_wm_parameters *p, int y) * 3 * 4096 * 8192 * 4 < 2^32 */ static unsigned int
drivers/gpu/drm/i915/intel_pm.c +0
-2-skl_get_total_relative_data_rate(struct intel_crtc *intel_crtc, - const struct skl_pipe_wm_parameters*params)
+skl_get_total_relative_data_rate(const structintel_crtc_state*cstate)
{drivers/gpu/drm/i915/intel_pm.c +1
-0+ struct intel_crtc *intel_crtc = to_intel_crtc(cstate-Quoted 1 line
base.crtc);
drivers/gpu/drm/i915/intel_pm.c +2
-0+struct drm_device *dev = intel_crtc->base.dev; +const struct intel_plane *intel_plane;unsigned int
total_data_rate= 0;drivers/gpu/drm/i915/intel_pm.c +0
-1-int plane;drivers/gpu/drm/i915/intel_pm.c +0
-1- for (plane = 0; plane < intel_num_planes(intel_crtc);plane++) {
drivers/gpu/drm/i915/intel_pm.c +2
-1-const struct intel_plane_wm_parameters *p; +for_each_intel_plane_on_crtc (dev, intel_crtc, intel_plane) { + const struct drm_plane_state *pstate = intel_plane-Quoted 1 line
base.state;
drivers/gpu/drm/i915/intel_pm.c +1
-2- p = ¶ms->plane[plane]; -if (!p->enabled) +if (pstate->fb ==NULL )continue;
drivers/gpu/drm/i915/intel_pm.c +0
-1- total_data_rate += skl_plane_relative_data_rate(p,0); /* packed/uv */
drivers/gpu/drm/i915/intel_pm.c +0
-2-if (p->y_bytes_per_pixel) { - total_data_rate +=
skl_plane_relative_data_rate(p, 1); /* y-plane */drivers/gpu/drm/i915/intel_pm.c +5
-1- } +if (intel_plane->base.type ==DRM_PLANE_TYPE_CURSOR ) +continue ; + +/* packed/uv */ + total_data_rate +=skl_plane_relative_data_rate(cstate,
drivers/gpu/drm/i915/intel_pm.c +1
-0+ pstate,
drivers/gpu/drm/i915/intel_pm.c +5
-0+ 0); + +if (pstate->fb->pixel_format ==DRM_FORMAT_NV12 ) +/* y-plane */ + total_data_rate +=skl_plane_relative_data_rate(cstate,
drivers/gpu/drm/i915/intel_pm.c +1
-0+pstate,
drivers/gpu/drm/i915/intel_pm.c +1
-0+1);
}
returntotal_data_rate;
}
static voiddrivers/gpu/drm/i915/intel_pm.c +1
-1-skl_allocate_pipe_ddb(struct drm_crtc *crtc, +skl_allocate_pipe_ddb(struct intel_crtc_state *cstate,const struct
intel_wm_config*config,drivers/gpu/drm/i915/intel_pm.c +0
-1- const struct skl_pipe_wm_parameters *params,struct
skl_ddb_allocation*ddb /* out */) {drivers/gpu/drm/i915/intel_pm.c +1
-0+struct drm_crtc *crtc = cstate->base.crtc;struct
drm_device*dev =crtc->dev;drivers/gpu/drm/i915/intel_pm.c +0
-1-struct drm_i915_private *dev_priv = dev->dev_private;struct
intel_crtc*intel_crtc=to_intel_crtc(crtc);drivers/gpu/drm/i915/intel_pm.c +1
-0+struct intel_plane *intel_plane;enum pipe pipe =
intel_crtc->pipe; structskl_ddb_entry*alloc = &ddb->pipe[pipe];uint16_talloc_size, start,cursor_blocks;uint16_tminimum[I915_MAX_PLANES];uint16_ty_minimum[I915_MAX_PLANES]; unsigned inttotal_data_rate;drivers/gpu/drm/i915/intel_pm.c +0
-1-int plane;drivers/gpu/drm/i915/intel_pm.c +0
-1- skl_ddb_get_pipe_allocation_limits(dev, crtc, config,params, alloc);
drivers/gpu/drm/i915/intel_pm.c +1
-0+ skl_ddb_get_pipe_allocation_limits(dev, cstate, config,alloc);
alloc_size=skl_ddb_entry_size(alloc); if (alloc_size== 0) { memset(ddb->plane[pipe], 0, sizeof(ddb-Quoted 1 line
plane[pipe]));
drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -2909,17 +2942,20 @@ skl_allocate_pipe_ddb(struct drm_crtc *crtc, alloc->end -= cursor_blocks;
/* 1. Allocate the mininum required blocks for each active plane */drivers/gpu/drm/i915/intel_pm.c +4
-2-for_each_plane (dev_priv, pipe, plane) { -const struct intel_plane_wm_parameters *p; +for_each_intel_plane_on_crtc (dev, intel_crtc, intel_plane) { +struct drm_plane *plane = &intel_plane->base; +struct drm_framebuffer *fb = plane->state->fb; +int id =skl_wm_plane_id (intel_plane);drivers/gpu/drm/i915/intel_pm.c +3
-2- p = ¶ms->plane[plane]; -if (!p->enabled) +if (fb ==NULL ) +continue ; +if (plane->type ==DRM_PLANE_TYPE_CURSOR )continue;
drivers/gpu/drm/i915/intel_pm.c +3
-4- minimum[plane] =8 ; - alloc_size -= minimum[plane]; - y_minimum[plane] = p->y_bytes_per_pixel ?8 :0 ; - alloc_size -= y_minimum[plane]; + minimum[id] =8 ; + alloc_size -= minimum[id]; + y_minimum[id] = (fb->pixel_format ==
DRM_FORMAT_NV12) ? 8 : 0;drivers/gpu/drm/i915/intel_pm.c +1
-0+ alloc_size -= y_minimum[id];}
/*drivers/gpu/drm/i915/intel_pm.c +1
-1@@ -2928,45 +2964,50 @@ skl_allocate_pipe_ddb(struct drm_crtc *crtc,* * FIXME: we may not allocate every single block here. */ - total_data_rate =skl_get_total_relative_data_rate (intel_crtc, params); + total_data_rate =skl_get_total_relative_data_rate (cstate);
start =alloc->start;drivers/gpu/drm/i915/intel_pm.c +0
-1- for (plane = 0; plane < intel_num_planes(intel_crtc);plane++) {
drivers/gpu/drm/i915/intel_pm.c +3
-1-const struct intel_plane_wm_parameters *p; +for_each_intel_plane_on_crtc (dev, intel_crtc, intel_plane) { +struct drm_plane *plane = &intel_plane->base; + struct drm_plane_state *pstate = intel_plane-Quoted 1 line
base.state;
unsigned int
data_rate,y_data_rate;uint16_tplane_blocks,y_plane_blocks= 0;drivers/gpu/drm/i915/intel_pm.c +1
-0+int id =skl_wm_plane_id (intel_plane);drivers/gpu/drm/i915/intel_pm.c +3
-2- p = ¶ms->plane[plane]; -if (!p->enabled) +if (pstate->fb ==NULL ) +continue ; +if (plane->type ==DRM_PLANE_TYPE_CURSOR )continue;
drivers/gpu/drm/i915/intel_pm.c +1
-1- data_rate =skl_plane_relative_data_rate (p,0 ); + data_rate = skl_plane_relative_data_rate(cstate,pstate, 0);
/*
* allocation for (packed formats) or (uv-plane part of planar format):
* promote the expression to 64 bits to avoid overflowing, the
* result is < available asdata_rate/total_data_rate< 1
*/drivers/gpu/drm/i915/intel_pm.c +1
-1- plane_blocks = minimum[plane]; + plane_blocks = minimum[id];
plane_blocks+= div_u64((uint64_t)alloc_size *data_rate,
total_data_rate);drivers/gpu/drm/i915/intel_pm.c +2
-2- ddb->plane[pipe][plane].start = start; - ddb->plane[pipe][plane].end = start + plane_blocks; + ddb->plane[pipe][id].start = start; + ddb->plane[pipe][id].end = start + plane_blocks;
start +=plane_blocks;
/*
* allocation fory_planepart of planar format:
*/drivers/gpu/drm/i915/intel_pm.c +0
-2-if (p->y_bytes_per_pixel) { - y_data_rate =
skl_plane_relative_data_rate(p, 1);drivers/gpu/drm/i915/intel_pm.c +2
-1- y_plane_blocks = y_minimum[plane]; +if (pstate->fb->pixel_format ==DRM_FORMAT_NV12 ) { + y_data_rate =skl_plane_relative_data_rate(cstate,
drivers/gpu/drm/i915/intel_pm.c +1
-0+ pstate,
drivers/gpu/drm/i915/intel_pm.c +1
-0+ 1);
drivers/gpu/drm/i915/intel_pm.c +1
-0+ y_plane_blocks = y_minimum[id];
y_plane_blocks+=div_u64((uint64_t)alloc_size * y_data_rate, total_data_rate);drivers/gpu/drm/i915/intel_pm.c +0
-2- ddb->y_plane[pipe][plane].start = start; - ddb->y_plane[pipe][plane].end = start +
y_plane_blocks;drivers/gpu/drm/i915/intel_pm.c +2
-0+ ddb->y_plane[pipe][id].start = start; + ddb->y_plane[pipe][id].end = start +
y_plane_blocks;
start +=y_plane_blocks;
}drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -3067,73 +3108,16 @@ static void skl_compute_wm_global_parameters(struct drm_device *dev, } }drivers/gpu/drm/i915/intel_pm.c +0
-2-static void skl_compute_wm_pipe_parameters(struct drm_crtc *crtc, - struct
skl_pipe_wm_parameters*p)drivers/gpu/drm/i915/intel_pm.c +0
-11-{ -struct drm_device *dev = crtc->dev; -struct intel_crtc *intel_crtc =to_intel_crtc (crtc); -enum pipe pipe = intel_crtc->pipe; -struct drm_plane *plane; -struct drm_framebuffer *fb; -int i =1 ;/* Index for sprite planes start */ - - p->active = intel_crtc->active; -if (p->active) { - p->pipe_htotal = intel_crtc->config-Quoted 1 line
base.adjusted_mode.crtc_htotal;
drivers/gpu/drm/i915/intel_pm.c +0
-1- p->pixel_rate = skl_pipe_pixel_rate(intel_crtc-Quoted 1 line
config);
drivers/gpu/drm/i915/intel_pm.c +0
-3- - fb = crtc->primary->state->fb; -/* For planar: Bpp is for uv plane, y_Bpp is for y plane */
drivers/gpu/drm/i915/intel_pm.c +0
-3-if (fb) { - p->plane[0 ].enabled = true; - p->plane[0].bytes_per_pixel = fb-Quoted 1 line
pixel_format==DRM_FORMAT_NV12?drivers/gpu/drm/i915/intel_pm.c +0
-1- drm_format_plane_cpp(fb-Quoted 1 line
pixel_format, 1) :drivers/gpu/drm/i915/intel_pm.c +0
-1- drm_format_plane_cpp(fb-Quoted 1 line
pixel_format, 0);drivers/gpu/drm/i915/intel_pm.c +0
-1- p->plane[0].y_bytes_per_pixel = fb-Quoted 1 line
pixel_format==DRM_FORMAT_NV12?drivers/gpu/drm/i915/intel_pm.c +0
-1- drm_format_plane_cpp(fb-Quoted 1 line
pixel_format, 0) : 0;drivers/gpu/drm/i915/intel_pm.c +0
-8- p->plane[0 ].tiling = fb->modifier[0 ]; - }else { - p->plane[0 ].enabled = false; - p->plane[0 ].bytes_per_pixel =0 ; - p->plane[0 ].y_bytes_per_pixel =0 ; - p->plane[0 ].tiling =DRM_FORMAT_MOD_NONE ; - } - p->plane[0].horiz_pixels = intel_crtc->config-Quoted 1 line
pipe_src_w;drivers/gpu/drm/i915/intel_pm.c +0
-1- p->plane[0].vert_pixels = intel_crtc->config-Quoted 1 line
pipe_src_h;drivers/gpu/drm/i915/intel_pm.c +0
-1- p->plane[0].rotation = crtc->primary->state-Quoted 1 line
rotation;
drivers/gpu/drm/i915/intel_pm.c +0
-6- - fb = crtc->cursor->state->fb; - p->plane[PLANE_CURSOR ].y_bytes_per_pixel =0 ; -if (fb) { - p->plane[PLANE_CURSOR ].enabled = true; - p->plane[PLANE_CURSOR].bytes_per_pixel = fb-Quoted 1 line
bits_per_pixel/ 8;drivers/gpu/drm/i915/intel_pm.c +0
-1- p->plane[PLANE_CURSOR].horiz_pixels = crtc-Quoted 1 line
cursor->state->crtc_w;drivers/gpu/drm/i915/intel_pm.c +0
-1- p->plane[PLANE_CURSOR].vert_pixels = crtc-Quoted 1 line
cursor->state->crtc_h;drivers/gpu/drm/i915/intel_pm.c +0
-9- }else { - p->plane[PLANE_CURSOR ].enabled = false; - p->plane[PLANE_CURSOR ].bytes_per_pixel =0 ; - p->plane[PLANE_CURSOR ].horiz_pixels =64 ; - p->plane[PLANE_CURSOR ].vert_pixels =64 ; - } - } - - list_for_each_entry(plane, &dev->mode_config.plane_list,head) {
drivers/gpu/drm/i915/intel_pm.c +0
-1- struct intel_plane *intel_plane =
to_intel_plane(plane);drivers/gpu/drm/i915/intel_pm.c +0
-7- -if (intel_plane->pipe == pipe && - plane->type ==DRM_PLANE_TYPE_OVERLAY ) - p->plane[i++] = intel_plane->wm; - } -} -static bool skl_compute_plane_wm(const struct
drm_i915_private*dev_priv,drivers/gpu/drm/i915/intel_pm.c +0
-2- struct skl_pipe_wm_parameters *p, - struct intel_plane_wm_parameters
*p_params,drivers/gpu/drm/i915/intel_pm.c +2
-0+ struct intel_crtc_state *cstate, + struct intel_plane *intel_plane,uint16_t
ddb_allocation, int level,
uint16_t*out_blocks, /* out */uint8_t*out_lines/* out */) {drivers/gpu/drm/i915/intel_pm.c +2
-0+struct drm_plane *plane = &intel_plane->base; +struct drm_framebuffer *fb = plane->state->fb;
uint32_tlatency = dev_priv->wm.skl_latency[level];uint32_tmethod1, method2;
uint32_tplane_bytes_per_line,plane_blocks_per_line;drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -3141,31 +3125,33 @@ static bool skl_compute_plane_wm(const structdrm_i915_private *dev_priv, uint32_t selected_result; uint8_t bytes_per_pixel;drivers/gpu/drm/i915/intel_pm.c +1
-1-if (latency ==0 || !p->active || !p_params->enabled) +if (latency ==0 || !cstate->base.active || !fb)return false;
drivers/gpu/drm/i915/intel_pm.c +2
-4- bytes_per_pixel = p_params->y_bytes_per_pixel ? - p_params->y_bytes_per_pixel : - p_params->bytes_per_pixel; - method1 = skl_wm_method1(p->pixel_rate, + bytes_per_pixel =drm_format_plane_cpp (fb->pixel_format,0 ); + method1 = skl_wm_method1(skl_pipe_pixel_rate(cstate),bytes_per_pixel,
latency);drivers/gpu/drm/i915/intel_pm.c +2
-3- method2 = skl_wm_method2(p->pixel_rate, - p->pipe_htotal, - p_params->horiz_pixels, + method2 = skl_wm_method2(skl_pipe_pixel_rate(cstate), + cstate-Quoted 1 line
base.adjusted_mode.crtc_htotal,
drivers/gpu/drm/i915/intel_pm.c +1
-0+ cstate->pipe_src_w,bytes_per_pixel,
drivers/gpu/drm/i915/intel_pm.c +1
-1- p_params->tiling, + fb->modifier[0],latency);
drivers/gpu/drm/i915/intel_pm.c +0
-1- plane_bytes_per_line = p_params->horiz_pixels *
bytes_per_pixel;drivers/gpu/drm/i915/intel_pm.c +1
-0+ plane_bytes_per_line = cstate->pipe_src_w * bytes_per_pixel;
plane_blocks_per_line=DIV_ROUND_UP(plane_bytes_per_line, 512);drivers/gpu/drm/i915/intel_pm.c +2
-2-if (p_params->tiling ==I915_FORMAT_MOD_Y_TILED || - p_params->tiling == I915_FORMAT_MOD_Yf_TILED) { +if (fb->modifier[0 ] ==I915_FORMAT_MOD_Y_TILED || + fb->modifier[0] == I915_FORMAT_MOD_Yf_TILED) {
uint32_tmin_scanlines= 4;
uint32_ty_tile_minimum;drivers/gpu/drm/i915/intel_pm.c +1
-2-if (intel_rotation_90_or_270 (p_params->rotation)) { -switch (p_params->bytes_per_pixel) { + if (intel_rotation_90_or_270(plane->state-Quoted 1 line
rotation)) {
drivers/gpu/drm/i915/intel_pm.c +1
-0+ int bpp = (fb->pixel_format ==
DRM_FORMAT_NV12) ?drivers/gpu/drm/i915/intel_pm.c +1
-0+ drm_format_plane_cpp(fb-Quoted 1 line
pixel_format, 1) :drivers/gpu/drm/i915/intel_pm.c +1
-0+ drm_format_plane_cpp(fb-Quoted 1 line
pixel_format, 0);drivers/gpu/drm/i915/intel_pm.c +2
-0+ +switch (bpp) {case 1:
min_scanlines= 16; break;drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -3189,8 +3175,8 @@ static bool skl_compute_plane_wm(const structdrm_i915_private *dev_priv, res_lines = DIV_ROUND_UP(selected_result, plane_blocks_per_line);
if (level >= 1 && level <= 7) {drivers/gpu/drm/i915/intel_pm.c +2
-2-if (p_params->tiling ==I915_FORMAT_MOD_Y_TILED || - p_params->tiling == I915_FORMAT_MOD_Yf_TILED) +if (fb->modifier[0 ] ==I915_FORMAT_MOD_Y_TILED || + fb->modifier[0] == I915_FORMAT_MOD_Yf_TILED)
res_lines+= 4;
else
res_blocks++;drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -3207,84 +3193,80 @@ static bool skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
static void skl_compute_wm_level(const structdrm_i915_private*dev_priv,
structskl_ddb_allocation*ddb,drivers/gpu/drm/i915/intel_pm.c +1
-2- struct skl_pipe_wm_parameters *p, - enum pipe pipe, + struct intel_crtc_state *cstate,int level,
drivers/gpu/drm/i915/intel_pm.c +0
-1- int num_planes,struct
skl_wm_level*result) {drivers/gpu/drm/i915/intel_pm.c +2
-0+struct drm_device *dev = dev_priv->dev; + struct intel_crtc *intel_crtc = to_intel_crtc(cstate-Quoted 1 line
base.crtc);
drivers/gpu/drm/i915/intel_pm.c +1
-0+struct intel_plane *intel_plane;
uint16_tddb_blocks;drivers/gpu/drm/i915/intel_pm.c +4
-1-int i; +enum pipe pipe = intel_crtc->pipe; + +for_each_intel_plane_on_crtc (dev, intel_crtc, intel_plane) { +int i =skl_wm_plane_id (intel_plane);drivers/gpu/drm/i915/intel_pm.c +0
-1-for (i =0 ; i < num_planes; i++) {
ddb_blocks= skl_ddb_entry_size(&ddb-Quoted 1 line
plane[pipe][i]);
result->plane_en[i] = skl_compute_plane_wm(dev_priv,drivers/gpu/drm/i915/intel_pm.c +2
-1- p, &p->plane[i], + cstate, + intel_plane,
ddb_blocks, level, &result-Quoted 1 line
plane_res_b[i],
&result-
Quoted 1 line
plane_res_l[i]);
}
drivers/gpu/drm/i915/intel_pm.c +0
-2- - ddb_blocks = skl_ddb_entry_size(&ddb-Quoted 1 line
plane[pipe][PLANE_CURSOR]);
drivers/gpu/drm/i915/intel_pm.c +0
-1- result->plane_en[PLANE_CURSOR] =skl_compute_plane_wm(dev_priv, p,
drivers/gpu/drm/i915/intel_pm.c +0
-1- &p-Quoted 1 line
plane[PLANE_CURSOR],
drivers/gpu/drm/i915/intel_pm.c +0
-2- ddb_blocks, level, - &result-Quoted 1 line
plane_res_b[PLANE_CURSOR],
drivers/gpu/drm/i915/intel_pm.c +0
-1- &result-Quoted 1 line
plane_res_l[PLANE_CURSOR]);
}
staticuint32_t
-skl_compute_linetime_wm(structdrm_crtc*crtc, structskl_pipe_wm_parameters*p) +skl_compute_linetime_wm(structintel_crtc_state*cstate) {drivers/gpu/drm/i915/intel_pm.c +1
-1-if (!to_intel_crtc (crtc)->active) +if (!cstate->base.active)return 0;
drivers/gpu/drm/i915/intel_pm.c +1
-1-if (WARN_ON (p->pixel_rate ==0 )) +if (WARN_ON (skl_pipe_pixel_rate (cstate) ==0 ))return 0;
drivers/gpu/drm/i915/intel_pm.c +0
-1- return DIV_ROUND_UP(8 * p->pipe_htotal * 1000, p-Quoted 1 line
pixel_rate);drivers/gpu/drm/i915/intel_pm.c +1
-0+ return DIV_ROUND_UP(8 * cstate-Quoted 1 line
base.adjusted_mode.crtc_htotal * 1000,
drivers/gpu/drm/i915/intel_pm.c +1
-0+ skl_pipe_pixel_rate(cstate));}
drivers/gpu/drm/i915/intel_pm.c +0
-2-static void skl_compute_transition_wm (struct drm_crtc *crtc, - struct skl_pipe_wm_parameters*params,
+static void skl_compute_transition_wm(structintel_crtc_state*cstate,
structskl_wm_level*trans_wm/* out */)
{drivers/gpu/drm/i915/intel_pm.c +1
-0+struct drm_crtc *crtc = cstate->base.crtc;struct
intel_crtc*intel_crtc=to_intel_crtc(crtc);drivers/gpu/drm/i915/intel_pm.c +1
-1-int i; +struct intel_plane *intel_plane;drivers/gpu/drm/i915/intel_pm.c +1
-1-if (!params->active) +if (!cstate->base.active)return;
/* Until we know more, just disable transition WMs */drivers/gpu/drm/i915/intel_pm.c +1
-1-for (i =0 ; i <intel_num_planes (intel_crtc); i++) + for_each_intel_plane_on_crtc(crtc->dev, intel_crtc,
intel_plane) {drivers/gpu/drm/i915/intel_pm.c +2
-0+int i =skl_wm_plane_id (intel_plane); +trans_wm->plane_en[i] = false;
drivers/gpu/drm/i915/intel_pm.c +1
-1- trans_wm->plane_en[PLANE_CURSOR ] = false; + }}
drivers/gpu/drm/i915/intel_pm.c +1
-1-static void skl_compute_pipe_wm(struct drm_crtc *crtc, +static void skl_compute_pipe_wm(struct intel_crtc_state *cstate,struct
skl_ddb_allocation*ddb,drivers/gpu/drm/i915/intel_pm.c +0
-1-struct skl_pipe_wm_parameters *params,
structskl_pipe_wm*pipe_wm) {drivers/gpu/drm/i915/intel_pm.c +1
-1-struct drm_device *dev = crtc->dev; +struct drm_device *dev = cstate->base.crtc->dev;const struct
drm_i915_private*dev_priv=dev->dev_private;drivers/gpu/drm/i915/intel_pm.c +0
-1-struct intel_crtc *intel_crtc =to_intel_crtc (crtc);int level,
max_level=ilk_wm_max_level(dev);
for (level = 0; level <=max_level; level++) {drivers/gpu/drm/i915/intel_pm.c +0
-1- skl_compute_wm_level(dev_priv, ddb, params,
intel_crtc->pipe,drivers/gpu/drm/i915/intel_pm.c +0
-1- level,
intel_num_planes(intel_crtc),drivers/gpu/drm/i915/intel_pm.c +2
-1- &pipe_wm->wm[level]); +skl_compute_wm_level (dev_priv, ddb, cstate, + level, &pipe_wm->wm[level]);}
drivers/gpu/drm/i915/intel_pm.c +1
-1- pipe_wm->linetime =skl_compute_linetime_wm (crtc, params); + pipe_wm->linetime =skl_compute_linetime_wm (cstate);drivers/gpu/drm/i915/intel_pm.c +1
-1-skl_compute_transition_wm (crtc, params, &pipe_wm->trans_wm); +skl_compute_transition_wm (cstate, &pipe_wm->trans_wm);}
static void skl_compute_wm_results(structdrm_device*dev,drivers/gpu/drm/i915/intel_pm.c +0
-1- struct skl_pipe_wm_parameters *p,struct
skl_pipe_wm*p_wm, structskl_wm_values*r, structintel_crtc*intel_crtc)drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -3528,16 +3510,15 @@ static void skl_flush_wm_values(struct drm_i915_private *dev_priv, }
static bool skl_update_pipe_wm(structdrm_crtc*crtc,drivers/gpu/drm/i915/intel_pm.c +0
-1- struct skl_pipe_wm_parameters*params,
structintel_wm_config*config, structskl_ddb_allocation*ddb, /* out */
structskl_pipe_wm*pipe_wm/* out */)
{
structintel_crtc*intel_crtc=to_intel_crtc(crtc);drivers/gpu/drm/i915/intel_pm.c +1
-0+ struct intel_crtc_state *cstate = to_intel_crtc_state(crtc-Quoted 1 line
state);
drivers/gpu/drm/i915/intel_pm.c +2
-3-skl_compute_wm_pipe_parameters (crtc, params); -skl_allocate_pipe_ddb (crtc, config, params, ddb); -skl_compute_pipe_wm (crtc, ddb, params, pipe_wm); +skl_allocate_pipe_ddb (cstate, config, ddb); +skl_compute_pipe_wm (cstate, ddb, pipe_wm);
if (!memcmp(&intel_crtc->wm.skl_active,pipe_wm,sizeof(*pipe_wm)))
return false;drivers/gpu/drm/i915/intel_pm.c +0
-1@@ -3570,7 +3551,6 @@ static void skl_update_other_pipe_wm(structdrm_device *dev, */ list_for_each_entry(intel_crtc, &dev->mode_config.crtc_list, base.head) { -struct skl_pipe_wm_parameters params = {}; struct skl_pipe_wm pipe_wm = {}; bool wm_changed;drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -3580,8 +3560,7 @@ static void skl_update_other_pipe_wm(struct drm_device *dev, if (!intel_crtc->active) continue;drivers/gpu/drm/i915/intel_pm.c +1
-2- wm_changed = skl_update_pipe_wm(&intel_crtc->base, - ¶ms, config, + wm_changed = skl_update_pipe_wm(&intel_crtc->base,config,
&r->ddb,&pipe_wm);
/*drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -3591,7 +3570,7 @@ static void skl_update_other_pipe_wm(structdrm_device *dev, */ WARN_ON(!wm_changed);drivers/gpu/drm/i915/intel_pm.c +0
-1- skl_compute_wm_results(dev, ¶ms, &pipe_wm, r,
intel_crtc);drivers/gpu/drm/i915/intel_pm.c +1
-0+ skl_compute_wm_results(dev, &pipe_wm, r,
intel_crtc);
r->dirty[intel_crtc->pipe] = true; }
}drivers/gpu/drm/i915/intel_pm.c +0
-1@@ -3621,7 +3600,6 @@ static void skl_update_wm(struct drm_crtc *crtc) struct intel_crtc *intel_crtc = to_intel_crtc(crtc); struct drm_device *dev = crtc->dev; struct drm_i915_private *dev_priv = dev->dev_private; -struct skl_pipe_wm_parameters params = {}; struct skl_wm_values *results = &dev_priv->wm.skl_results; struct skl_pipe_wm pipe_wm = {};struct
intel_wm_configconfig = {};drivers/gpu/drm/i915/intel_pm.c +0
-0@@ -3634,11 +3612,10 @@ static void skl_update_wm(struct drm_crtc *crtc)
skl_compute_wm_global_parameters(dev, &config);drivers/gpu/drm/i915/intel_pm.c +1
-2-if (!skl_update_pipe_wm (crtc, ¶ms, &config, - &results->ddb, &pipe_wm)) + if (!skl_update_pipe_wm(crtc, &config, &results->ddb,
&pipe_wm))
return;drivers/gpu/drm/i915/intel_pm.c +0
-1- skl_compute_wm_results(dev, ¶ms, &pipe_wm, results,
intel_crtc);drivers/gpu/drm/i915/intel_pm.c +1
-0+skl_compute_wm_results (dev, &pipe_wm, results, intel_crtc);
Quoted 3 lines
results->dirty[intel_crtc->pipe] = true;
skl_update_other_pipe_wm(dev, crtc, &config, results);
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx