| Message ID | 1457968504-20469-1-git-send-email-gabriel.feceoru@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 2016-03-14 at 17:15 +0200, Gabriel Feceoru wrote: > Since I915_MAX_PLANES = PLANE_CURSOR + 1, explicit clearing the wm > values for PLANE_CURSOR is already done earlier by a memset. This is a leftover from commit 4969d33ed91d ('drm/i915/skl: Simplify wm structures slightly (v2)'). Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com> > > Signed-off-by: Gabriel Feceoru <gabriel.feceoru@intel.com> > --- > drivers/gpu/drm/i915/intel_pm.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index f65e841..f6afeae 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -3641,7 +3641,6 @@ static void skl_clear_wm(struct skl_wm_values > *watermarks, enum pipe pipe) > sizeof(uint32_t) * 8 * I915_MAX_PLANES); > memset(watermarks->plane_trans[pipe], > 0, sizeof(uint32_t) * I915_MAX_PLANES); > - watermarks->plane_trans[pipe][PLANE_CURSOR] = 0; > > /* Clear ddb entries for pipe */ > memset(&watermarks->ddb.pipe[pipe], 0, sizeof(struct skl_ddb_entry)); > @@ -3649,9 +3648,6 @@ static void skl_clear_wm(struct skl_wm_values > *watermarks, enum pipe pipe) > sizeof(struct skl_ddb_entry) * I915_MAX_PLANES); > memset(&watermarks->ddb.y_plane[pipe], 0, > sizeof(struct skl_ddb_entry) * I915_MAX_PLANES); > - memset(&watermarks->ddb.plane[pipe][PLANE_CURSOR], 0, > - sizeof(struct skl_ddb_entry)); > - > } > > static void skl_update_wm(struct drm_crtc *crtc)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index f65e841..f6afeae 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -3641,7 +3641,6 @@ static void skl_clear_wm(struct skl_wm_values *watermarks, enum pipe pipe) sizeof(uint32_t) * 8 * I915_MAX_PLANES); memset(watermarks->plane_trans[pipe], 0, sizeof(uint32_t) * I915_MAX_PLANES); - watermarks->plane_trans[pipe][PLANE_CURSOR] = 0; /* Clear ddb entries for pipe */ memset(&watermarks->ddb.pipe[pipe], 0, sizeof(struct skl_ddb_entry)); @@ -3649,9 +3648,6 @@ static void skl_clear_wm(struct skl_wm_values *watermarks, enum pipe pipe) sizeof(struct skl_ddb_entry) * I915_MAX_PLANES); memset(&watermarks->ddb.y_plane[pipe], 0, sizeof(struct skl_ddb_entry) * I915_MAX_PLANES); - memset(&watermarks->ddb.plane[pipe][PLANE_CURSOR], 0, - sizeof(struct skl_ddb_entry)); - } static void skl_update_wm(struct drm_crtc *crtc)
Since I915_MAX_PLANES = PLANE_CURSOR + 1, explicit clearing the wm values for PLANE_CURSOR is already done earlier by a memset. Signed-off-by: Gabriel Feceoru <gabriel.feceoru@intel.com> --- drivers/gpu/drm/i915/intel_pm.c | 4 ---- 1 file changed, 4 deletions(-)