Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 02/11] Revert "drm/i915: Fix NULL ptr deref by checking new_crtc_state"
Date: Mon, 27 Jan 2025 19:21:47 +0200	[thread overview]
Message-ID: <20250127172156.21928-3-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20250127172156.21928-1-ville.syrjala@linux.intel.com>

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

This reverts commit 1d5b09f8daf859247a1ea65b0d732a24d88980d8.

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

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_atomic_plane.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
index c558143f4f82..b7af33c5dd3f 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
@@ -1124,7 +1124,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)
-- 
2.45.3


  parent reply	other threads:[~2025-01-27 17:22 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-27 17:21 [PATCH 00/11] drm/i915: joiner and Y plane fixes and reorganization Ville Syrjala
2025-01-27 17:21 ` [PATCH 01/11] drm/i915: Make sure all planes in use by the joiner have their crtc included Ville Syrjala
2025-01-27 17:21 ` Ville Syrjala [this message]
2025-01-27 17:21 ` [PATCH 03/11] drm/i915: Rework joiner and Y plane dependency handling Ville Syrjala
2025-01-27 17:21 ` [PATCH 04/11] drm/i915: s/planar_slave/is_y_plane/ Ville Syrjala
2025-01-27 17:21 ` [PATCH 05/11] drm/i915: Extract unlink_nv12_plane() Ville Syrjala
2025-01-27 17:21 ` [PATCH 06/11] drm/i915: Remove pointless visible check in unlink_nv12_plane() Ville Syrjala
2025-01-27 17:21 ` [PATCH 07/11] drm/i915: Extract link_nv12_planes() Ville Syrjala
2025-01-27 17:21 ` [PATCH 08/11] drm/i915: Rename the variables in icl_check_nv12_planes() Ville Syrjala
2025-01-27 17:21 ` [PATCH 09/11] drm/i915: Move icl+ nv12 plane register mangling into skl_universal_plane.c Ville Syrjala
2025-01-27 17:21 ` [PATCH 10/11] drm/i915: Relocate intel_atomic_check_planes() Ville Syrjala
2025-01-27 17:21 ` [PATCH 11/11] drm/i915: Pimp the Y plane selection debugs Ville Syrjala
2025-02-12  9:39   ` Maarten Lankhorst
2025-02-12 16:46     ` Ville Syrjälä
2025-01-27 21:59 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: joiner and Y plane fixes and reorganization Patchwork
2025-01-27 21:59 ` ✗ Fi.CI.SPARSE: " Patchwork
2025-01-27 22:14 ` ✓ i915.CI.BAT: success " Patchwork
2025-01-28 11:40 ` ✗ i915.CI.Full: failure " Patchwork
2025-02-08 12:41 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: joiner and Y plane fixes and reorganization (rev2) Patchwork
2025-02-08 12:41 ` ✗ Fi.CI.SPARSE: " Patchwork
2025-02-08 15:12 ` ✗ i915.CI.BAT: failure " Patchwork
2025-02-08 16:12 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: joiner and Y plane fixes and reorganization (rev3) Patchwork
2025-02-08 16:12 ` ✗ Fi.CI.SPARSE: " Patchwork
2025-02-08 18:37 ` ✗ i915.CI.BAT: failure " Patchwork
2025-02-09 18:32 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: joiner and Y plane fixes and reorganization (rev4) Patchwork
2025-02-09 18:32 ` ✗ Fi.CI.SPARSE: " Patchwork
2025-02-09 20:21 ` ✗ i915.CI.BAT: failure " Patchwork
2025-02-09 22:47 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: joiner and Y plane fixes and reorganization (rev5) Patchwork
2025-02-09 22:47 ` ✗ Fi.CI.SPARSE: " Patchwork
2025-02-10  0:44 ` ✓ i915.CI.BAT: success " Patchwork
2025-02-10  2:13 ` ✗ i915.CI.Full: failure " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250127172156.21928-3-ville.syrjala@linux.intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox