From: Maarten Lankhorst <dev@lankhorst.se>
To: intel-xe@lists.freedesktop.org
Cc: Maarten Lankhorst <dev@lankhorst.se>
Subject: [Intel-xe] [CI 1/4] fixup! drm/xe/display: Implement display support
Date: Thu, 14 Sep 2023 16:18:53 +0200 [thread overview]
Message-ID: <20230914141856.5647-2-dev@lankhorst.se> (raw)
In-Reply-To: <20230914141856.5647-1-dev@lankhorst.se>
Add null check to make cursor magic work.
Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>
---
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 3422942a9951..ac0d4474cd88 100644
--- a/drivers/gpu/drm/xe/display/xe_fb_pin.c
+++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c
@@ -308,6 +308,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
next prev parent reply other threads:[~2023-09-14 14:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-14 14:18 [Intel-xe] [CI 0/4] Cursor tests for CI Maarten Lankhorst
2023-09-14 14:18 ` Maarten Lankhorst [this message]
2023-09-14 14:18 ` [Intel-xe] [CI 2/4] drm/i915: Swap ggtt_vma during legacy cursor update Maarten Lankhorst
2023-09-14 14:18 ` [Intel-xe] [CI 3/4] SorryNotSorryCancelling Maarten Lankhorst
2023-09-14 14:18 ` [Intel-xe] [CI 4/4] drm/i915: Handle legacy cursor update as normal update Maarten Lankhorst
2023-09-14 14:32 ` [Intel-xe] ✓ CI.Patch_applied: success for Cursor tests for CI Patchwork
2023-09-14 14:32 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-09-14 14:33 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-09-14 14:40 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-09-14 14:41 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-09-14 14:42 ` [Intel-xe] ✗ CI.checksparse: warning " Patchwork
2023-09-14 15:13 ` [Intel-xe] ✓ CI.BAT: success " 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=20230914141856.5647-2-dev@lankhorst.se \
--to=dev@lankhorst.se \
--cc=intel-xe@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