On Tue, 25 Feb 2020, Ville Syrjala <[email protected]> wrote: > From: Ville Syrjälä <[email protected]> > > These things can never happen, and probably we'd have oopsed long ago > if they did. Just get rid of this pointless noise in the code. > > Cc: Stanislav Lisovskiy <[email protected]> > Signed-off-by: Ville Syrjälä <[email protected]>
Reviewed-by: Jani Nikula <[email protected]> > --- > drivers/gpu/drm/i915/intel_pm.c | 11 ----------- > 1 file changed, 11 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 543634d3e10c..59fc461bc454 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -4470,14 +4470,10 @@ skl_get_total_relative_data_rate(struct > intel_crtc_state *crtc_state, > u64 *plane_data_rate, > u64 *uv_plane_data_rate) > { > - struct drm_atomic_state *state = crtc_state->uapi.state; > struct intel_plane *plane; > const struct intel_plane_state *plane_state; > u64 total_data_rate = 0; > > - if (WARN_ON(!state)) > - return 0; > - > /* Calculate and cache data rate for each plane */ > intel_atomic_crtc_state_for_each_plane_state(plane, plane_state, > crtc_state) { > enum plane_id plane_id = plane->id; > @@ -4505,9 +4501,6 @@ icl_get_total_relative_data_rate(struct > intel_crtc_state *crtc_state, > const struct intel_plane_state *plane_state; > u64 total_data_rate = 0; > > - if (WARN_ON(!crtc_state->uapi.state)) > - return 0; > - > /* Calculate and cache data rate for each plane */ > intel_atomic_crtc_state_for_each_plane_state(plane, plane_state, > crtc_state) { > enum plane_id plane_id = plane->id; > @@ -4548,7 +4541,6 @@ icl_get_total_relative_data_rate(struct > intel_crtc_state *crtc_state, > static int > skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state) > { > - struct drm_atomic_state *state = crtc_state->uapi.state; > struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); > struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > struct skl_ddb_entry *alloc = &crtc_state->wm.skl.ddb; > @@ -4567,9 +4559,6 @@ skl_allocate_pipe_ddb(struct intel_crtc_state > *crtc_state) > memset(crtc_state->wm.skl.plane_ddb_y, 0, > sizeof(crtc_state->wm.skl.plane_ddb_y)); > memset(crtc_state->wm.skl.plane_ddb_uv, 0, > sizeof(crtc_state->wm.skl.plane_ddb_uv)); > > - if (drm_WARN_ON(&dev_priv->drm, !state)) > - return 0; > - > if (!crtc_state->hw.active) { > alloc->start = alloc->end = 0; > return 0; -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
