openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Extract intel_crtc_ddb_weight() 

skl_ddb_get_pipe_allocation_limits() doesn't care how the weights
for distributing the ddb are caclculated for each pipe. Put that
calculation into a separate function so that such mundane details
are hidden from view.

v2: s/adjusted_mode/pipe_mode/

Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210122205633.18492-2-ville.syrjala@linux.intel.com
This commit is contained in:
Ville Syrjälä 2021-01-22 22:56:26 +02:00
parent d6a059e2d3
commit 2791a409a1
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/gpu/drm/i915/intel_pm.c
View File

@ -4077,6 +4077,24 @@ u32 skl_ddb_dbuf_slice_mask(struct drm_i915_private *dev_priv,
return slice_mask; return slice_mask;
} }
static unsigned int intel_crtc_ddb_weight(const struct intel_crtc_state *crtc_state)
{
const struct drm_display_mode *pipe_mode = &crtc_state->hw.pipe_mode;
int hdisplay, vdisplay;
if (!crtc_state->hw.active)
return 0;
/*
* Watermark/ddb requirement highly depends upon width of the
* framebuffer, So instead of allocating DDB equally among pipes
* distribute DDB based on resolution/width of the display.
*/
drm_mode_get_hv_timing(pipe_mode, &hdisplay, &vdisplay);
return hdisplay;
}
static u8 skl_compute_dbuf_slices(const struct intel_crtc_state *crtc_state, static u8 skl_compute_dbuf_slices(const struct intel_crtc_state *crtc_state,
u8 active_pipes); u8 active_pipes);
@ -4091,7 +4109,7 @@ skl_ddb_get_pipe_allocation_limits(struct drm_i915_private *dev_priv,
struct intel_atomic_state *intel_state = to_intel_atomic_state(state); struct intel_atomic_state *intel_state = to_intel_atomic_state(state);
struct drm_crtc *for_crtc = crtc_state->uapi.crtc; struct drm_crtc *for_crtc = crtc_state->uapi.crtc;
const struct intel_crtc *crtc; const struct intel_crtc *crtc;
u32 pipe_width = 0, total_width_in_range = 0, width_before_pipe_in_range = 0; unsigned int pipe_weight = 0, total_weight = 0, weight_before_pipe = 0;
enum pipe for_pipe = to_intel_crtc(for_crtc)->pipe; enum pipe for_pipe = to_intel_crtc(for_crtc)->pipe;
struct intel_dbuf_state *new_dbuf_state = struct intel_dbuf_state *new_dbuf_state =
intel_atomic_get_new_dbuf_state(intel_state); intel_atomic_get_new_dbuf_state(intel_state);
@ -4160,18 +4178,11 @@ skl_ddb_get_pipe_allocation_limits(struct drm_i915_private *dev_priv,
*/ */
ddb_range_size = hweight8(dbuf_slice_mask) * slice_size; ddb_range_size = hweight8(dbuf_slice_mask) * slice_size;
/*
* Watermark/ddb requirement highly depends upon width of the
* framebuffer, So instead of allocating DDB equally among pipes
* distribute DDB based on resolution/width of the display.
*/
total_slice_mask = dbuf_slice_mask; total_slice_mask = dbuf_slice_mask;
for_each_new_intel_crtc_in_state(intel_state, crtc, crtc_state, i) { for_each_new_intel_crtc_in_state(intel_state, crtc, crtc_state, i) {
const struct drm_display_mode *pipe_mode =
&crtc_state->hw.pipe_mode;
enum pipe pipe = crtc->pipe; enum pipe pipe = crtc->pipe;
int hdisplay, vdisplay; unsigned int weight;
u32 pipe_dbuf_slice_mask; u8 pipe_dbuf_slice_mask;
if (!crtc_state->hw.active) if (!crtc_state->hw.active)
continue; continue;
@ -4198,14 +4209,13 @@ skl_ddb_get_pipe_allocation_limits(struct drm_i915_private *dev_priv,
if (dbuf_slice_mask != pipe_dbuf_slice_mask) if (dbuf_slice_mask != pipe_dbuf_slice_mask)
continue; continue;
drm_mode_get_hv_timing(pipe_mode, &hdisplay, &vdisplay); weight = intel_crtc_ddb_weight(crtc_state);
total_weight += weight;
total_width_in_range += hdisplay;
if (pipe < for_pipe) if (pipe < for_pipe)
width_before_pipe_in_range += hdisplay; weight_before_pipe += weight;
else if (pipe == for_pipe) else if (pipe == for_pipe)
pipe_width = hdisplay; pipe_weight = weight;
} }
/* /*
@ -4220,9 +4230,8 @@ skl_ddb_get_pipe_allocation_limits(struct drm_i915_private *dev_priv,
return ret; return ret;
} }
start = ddb_range_size * width_before_pipe_in_range / total_width_in_range; start = ddb_range_size * weight_before_pipe / total_weight;
end = ddb_range_size * end = ddb_range_size * (weight_before_pipe + pipe_weight) / total_weight;
(width_before_pipe_in_range + pipe_width) / total_width_in_range;
alloc->start = offset + start; alloc->start = offset + start;
alloc->end = offset + end; alloc->end = offset + end;