]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/i915: Remove garbage WARNs
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 25 Feb 2020 17:11:07 +0000 (19:11 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 2 Mar 2020 14:41:43 +0000 (16:41 +0200)
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>
drivers/gpu/drm/i915/intel_pm.c

index 1c78dca928e38bbcafd57d222a7159b9e87b582e..cdc02b6cea19395a2c6a01e69ddc987d199f32b3 100644 (file)
@@ -4460,14 +4460,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;
@@ -4495,9 +4491,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;
@@ -4538,7 +4531,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;
@@ -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_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;