]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Revert "drm/i915: Fix NULL ptr deref by checking new_crtc_state"
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 12 Feb 2025 16:43:22 +0000 (18:43 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Sat, 15 Feb 2025 07:28:33 +0000 (09:28 +0200)
This reverts commit 1d5b09f8daf859247a1ea65b0d732a24d88980d8.

Now that the root cause the missing crtc state has been fixed
we can get rid of the duct tape.

Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250212164330.16891-3-ville.syrjala@linux.intel.com
drivers/gpu/drm/i915/display/intel_atomic_plane.c

index 8a49d87d9bd9c97b036903c14e6def45c6c5ee11..f26b82b6821ad683a426a24a0fc0fa7bdb23569d 100644 (file)
@@ -1132,7 +1132,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
                 * This should only fail upon a hung GPU, in which case we
                 * can safely continue.
                 */
-               if (new_crtc_state && intel_crtc_needs_modeset(new_crtc_state)) {
+               if (intel_crtc_needs_modeset(new_crtc_state)) {
                        ret = add_dma_resv_fences(old_obj->resv,
                                                  &new_plane_state->uapi);
                        if (ret < 0)