drm/i915/skl+: Perform wm level calculations in separate function
Instead of iterating over planes & wm levels in a single function use skl_compute_wm_level function to interate over WM levels. Change name of function to skl_compute_wm_levels (Matt). These changes are to clean-up WM code & will help in making only new ddb algorithm related changes in later patch in series. Signed-off-by: Mahesh Kumar <mahesh1.kumar@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170517115831.13830-10-mahesh1.kumar@intel.com
This commit is contained in:
parent
eb2fdcdf82
commit
d2f5e36df6
|
@ -4382,18 +4382,18 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
|
|||
}
|
||||
|
||||
static int
|
||||
skl_compute_wm_level(const struct drm_i915_private *dev_priv,
|
||||
skl_compute_wm_levels(const struct drm_i915_private *dev_priv,
|
||||
struct skl_ddb_allocation *ddb,
|
||||
struct intel_crtc_state *cstate,
|
||||
const struct intel_plane_state *intel_pstate,
|
||||
int level,
|
||||
struct skl_wm_level *result)
|
||||
struct skl_plane_wm *wm)
|
||||
{
|
||||
struct intel_crtc *intel_crtc = to_intel_crtc(cstate->base.crtc);
|
||||
struct drm_plane *plane = intel_pstate->base.plane;
|
||||
struct intel_plane *intel_plane = to_intel_plane(plane);
|
||||
uint16_t ddb_blocks;
|
||||
enum pipe pipe = intel_crtc->pipe;
|
||||
int level, max_level = ilk_wm_max_level(dev_priv);
|
||||
int ret;
|
||||
|
||||
if (WARN_ON(!intel_pstate->base.fb))
|
||||
|
@ -4401,6 +4401,9 @@ skl_compute_wm_level(const struct drm_i915_private *dev_priv,
|
|||
|
||||
ddb_blocks = skl_ddb_entry_size(&ddb->plane[pipe][intel_plane->id]);
|
||||
|
||||
for (level = 0; level <= max_level; level++) {
|
||||
struct skl_wm_level *result = &wm->wm[level];
|
||||
|
||||
ret = skl_compute_plane_wm(dev_priv,
|
||||
cstate,
|
||||
intel_pstate,
|
||||
|
@ -4411,6 +4414,7 @@ skl_compute_wm_level(const struct drm_i915_private *dev_priv,
|
|||
&result->plane_en);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -4461,7 +4465,6 @@ static int skl_build_pipe_wm(struct intel_crtc_state *cstate,
|
|||
struct drm_plane *plane;
|
||||
const struct drm_plane_state *pstate;
|
||||
struct skl_plane_wm *wm;
|
||||
int level, max_level = ilk_wm_max_level(dev_priv);
|
||||
int ret;
|
||||
|
||||
/*
|
||||
|
@ -4477,13 +4480,10 @@ static int skl_build_pipe_wm(struct intel_crtc_state *cstate,
|
|||
|
||||
wm = &pipe_wm->planes[plane_id];
|
||||
|
||||
for (level = 0; level <= max_level; level++) {
|
||||
ret = skl_compute_wm_level(dev_priv, ddb, cstate,
|
||||
intel_pstate, level,
|
||||
&wm->wm[level]);
|
||||
ret = skl_compute_wm_levels(dev_priv, ddb, cstate,
|
||||
intel_pstate, wm);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
skl_compute_transition_wm(cstate, &wm->trans_wm);
|
||||
}
|
||||
pipe_wm->linetime = skl_compute_linetime_wm(cstate);
|
||||
|
|
Loading…
Reference in New Issue