[Intel-xe] [PATCH] drm/xe/display: Handle NULL ggtt_vma unpinning.

maarten.lankhorst at linux.intel.com maarten.lankhorst at linux.intel.com
Fri Oct 13 15:14:52 UTC 2023


From: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>

Makes cursor patches work on xe. Probably best to commit to xe as well.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
---
 drivers/gpu/drm/xe/display/xe_fb_pin.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/xe/display/xe_fb_pin.c b/drivers/gpu/drm/xe/display/xe_fb_pin.c
index 2c36e5032433..48d394e152d8 100644
--- a/drivers/gpu/drm/xe/display/xe_fb_pin.c
+++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c
@@ -324,6 +324,7 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state)
 
 void intel_plane_unpin_fb(struct intel_plane_state *old_plane_state)
 {
-	__xe_unpin_fb_vma(old_plane_state->ggtt_vma);
+	if (old_plane_state->ggtt_vma)
+		__xe_unpin_fb_vma(old_plane_state->ggtt_vma);
 	old_plane_state->ggtt_vma = NULL;
 }
-- 
2.40.1



More information about the Intel-xe mailing list