Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/xe/display/xe_hdcp_gsc: Free arbiter on driver removal
@ 2024-07-08 12:59 Nirmoy Das
  2024-07-08 13:19 ` ✓ CI.Patch_applied: success for " Patchwork
                   ` (16 more replies)
  0 siblings, 17 replies; 19+ messages in thread
From: Nirmoy Das @ 2024-07-08 12:59 UTC (permalink / raw)
  To: intel-xe
  Cc: Nirmoy Das, Suraj Kandpal, Arun R Murthy, Lucas De Marchi,
	Rodrigo Vivi

Free arbiter allocated in intel_hdcp_gsc_init().

Fixes: 152f2df954d8 ("drm/xe/hdcp: Enable HDCP for XE")
Cc: Suraj Kandpal <suraj.kandpal@intel.com>
Cc: Arun R Murthy <arun.r.murthy@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
---
 drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
index 14b8b4278317..990285aa9b26 100644
--- a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
+++ b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
@@ -160,12 +160,16 @@ void intel_hdcp_gsc_fini(struct xe_device *xe)
 {
 	struct intel_hdcp_gsc_message *hdcp_message =
 					xe->display.hdcp.hdcp_message;
+	struct i915_hdcp_arbiter *arb = xe->display.hdcp.arbiter;
 
-	if (!hdcp_message)
-		return;
+	if (hdcp_message) {
+		xe_bo_unpin_map_no_vm(hdcp_message->hdcp_bo);
+		kfree(hdcp_message);
+		xe->display.hdcp.hdcp_message = NULL;
+	}
 
-	xe_bo_unpin_map_no_vm(hdcp_message->hdcp_bo);
-	kfree(hdcp_message);
+	kfree(arb);
+	xe->display.hdcp.arbiter = NULL;
 }
 
 static int xe_gsc_send_sync(struct xe_device *xe,
-- 
2.42.0


^ permalink raw reply related	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2024-07-10 10:45 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-08 12:59 [PATCH] drm/xe/display/xe_hdcp_gsc: Free arbiter on driver removal Nirmoy Das
2024-07-08 13:19 ` ✓ CI.Patch_applied: success for " Patchwork
2024-07-08 13:20 ` ✓ CI.checkpatch: " Patchwork
2024-07-08 13:21 ` ✓ CI.KUnit: " Patchwork
2024-07-08 13:33 ` ✓ CI.Build: " Patchwork
2024-07-08 13:36 ` ✓ CI.Hooks: " Patchwork
2024-07-08 13:39 ` ✓ CI.checksparse: " Patchwork
2024-07-08 13:57 ` ✗ CI.BAT: failure " Patchwork
2024-07-08 14:41 ` ✓ CI.Patch_applied: success for drm/xe/display/xe_hdcp_gsc: Free arbiter on driver removal (rev2) Patchwork
2024-07-08 14:41 ` ✓ CI.checkpatch: " Patchwork
2024-07-08 14:42 ` ✓ CI.KUnit: " Patchwork
2024-07-08 14:54 ` ✓ CI.Build: " Patchwork
2024-07-08 14:56 ` ✓ CI.Hooks: " Patchwork
2024-07-08 14:58 ` ✓ CI.checksparse: " Patchwork
2024-07-08 15:20 ` ✓ CI.BAT: " Patchwork
2024-07-08 17:26 ` ✗ CI.FULL: failure for drm/xe/display/xe_hdcp_gsc: Free arbiter on driver removal Patchwork
2024-07-08 19:40 ` ✓ CI.FULL: success for drm/xe/display/xe_hdcp_gsc: Free arbiter on driver removal (rev2) Patchwork
2024-07-09 19:12 ` [PATCH] drm/xe/display/xe_hdcp_gsc: Free arbiter on driver removal Rodrigo Vivi
2024-07-10 10:45   ` Nirmoy Das

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox