From: Ville Syrjälä Date: Wed, 12 Feb 2025 16:43:22 +0000 (+0200) Subject: Revert "drm/i915: Fix NULL ptr deref by checking new_crtc_state" X-Git-Tag: v6.15-rc1~120^2~16^2~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58456143cc849ebd2e338d28d64747179e220a40;p=thirdparty%2Fkernel%2Flinux.git Revert "drm/i915: Fix NULL ptr deref by checking new_crtc_state" 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 Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20250212164330.16891-3-ville.syrjala@linux.intel.com --- diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c index 8a49d87d9bd9c..f26b82b6821ad 100644 --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c @@ -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)