AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-24 06:36:09 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/i915: Remove garbage WARNs

Browse Source 
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 <stanislav.lisovskiy@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200225171125.28885-3-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Ville Syrjälä 2020-02-25 19:11:07 +02:00
parent 2a67054b7b
commit 5ef2c353d9
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4460,14 +4460,10 @@ skl_get_total_relative_data_rate(struct intel_crtc_state *crtc_state,
u64 *plane_data_rate, u64 *plane_data_rate,
u64 *uv_plane_data_rate) u64 *uv_plane_data_rate)
{ {
struct drm_atomic_state *state = crtc_state->uapi.state;
struct intel_plane *plane; struct intel_plane *plane;
const struct intel_plane_state *plane_state; const struct intel_plane_state *plane_state;
u64 total_data_rate = 0; u64 total_data_rate = 0;
if (WARN_ON(!state))
return 0;
/* Calculate and cache data rate for each plane */ /* Calculate and cache data rate for each plane */
intel_atomic_crtc_state_for_each_plane_state(plane, plane_state, crtc_state) { intel_atomic_crtc_state_for_each_plane_state(plane, plane_state, crtc_state) {
enum plane_id plane_id = plane->id; enum plane_id plane_id = plane->id;
@ -4495,9 +4491,6 @@ icl_get_total_relative_data_rate(struct intel_crtc_state *crtc_state,
const struct intel_plane_state *plane_state; const struct intel_plane_state *plane_state;
u64 total_data_rate = 0; u64 total_data_rate = 0;
if (WARN_ON(!crtc_state->uapi.state))
return 0;
/* Calculate and cache data rate for each plane */ /* Calculate and cache data rate for each plane */
intel_atomic_crtc_state_for_each_plane_state(plane, plane_state, crtc_state) { intel_atomic_crtc_state_for_each_plane_state(plane, plane_state, crtc_state) {
enum plane_id plane_id = plane->id; enum plane_id plane_id = plane->id;
@ -4538,7 +4531,6 @@ icl_get_total_relative_data_rate(struct intel_crtc_state *crtc_state,
static int static int
skl_allocate_pipe_ddb(struct intel_crtc_state *crtc_state) 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 intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
struct skl_ddb_entry *alloc = &crtc_state->wm.skl.ddb; struct skl_ddb_entry *alloc = &crtc_state->wm.skl.ddb;
@ -4557,9 +4549,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_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)); 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) { if (!crtc_state->hw.active) {
alloc->start = alloc->end = 0; alloc->start = alloc->end = 0;
return 0; return 0;