Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCHv3] drm/xe/display: check for error on drmm_mutex_init
@ 2024-04-03 14:01 Arun R Murthy
  2024-04-03 14:16 ` ✓ CI.Patch_applied: success for drm/xe/display: check for error on drmm_mutex_init (rev4) Patchwork
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: Arun R Murthy @ 2024-04-03 14:01 UTC (permalink / raw)
  To: intel-gfx, intel-xe; +Cc: Arun R Murthy

Check return value for drmm_mutex_init as it can fail and return on
failure.

v2: Removed nested if (Lucas)
v3: Revert back to nested if (Andi)

Signed-off-by: Arun R Murthy <arun.r.murthy@intel.com>
---
 drivers/gpu/drm/xe/display/xe_display.c | 30 ++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index e4db069f0db3..04b83ca5168c 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -107,12 +107,30 @@ int xe_display_create(struct xe_device *xe)
 
 	xe->display.hotplug.dp_wq = alloc_ordered_workqueue("xe-dp", 0);
 
-	drmm_mutex_init(&xe->drm, &xe->sb_lock);
-	drmm_mutex_init(&xe->drm, &xe->display.backlight.lock);
-	drmm_mutex_init(&xe->drm, &xe->display.audio.mutex);
-	drmm_mutex_init(&xe->drm, &xe->display.wm.wm_mutex);
-	drmm_mutex_init(&xe->drm, &xe->display.pps.mutex);
-	drmm_mutex_init(&xe->drm, &xe->display.hdcp.hdcp_mutex);
+	err = drmm_mutex_init(&xe->drm, &xe->sb_lock);
+	if (err)
+		return err;
+
+	err = drmm_mutex_init(&xe->drm, &xe->display.backlight.lock);
+	if (err)
+		return err;
+
+	err = drmm_mutex_init(&xe->drm, &xe->display.audio.mutex);
+	if (err)
+		return err;
+
+	err = drmm_mutex_init(&xe->drm, &xe->display.wm.wm_mutex);
+	if (err)
+		return err;
+
+	err = drmm_mutex_init(&xe->drm, &xe->display.pps.mutex);
+	if (err)
+		return err;
+
+	err = drmm_mutex_init(&xe->drm, &xe->display.hdcp.hdcp_mutex);
+	if (err)
+		return err;
+
 	xe->enabled_irq_mask = ~0;
 
 	err = drmm_add_action_or_reset(&xe->drm, display_destroy, NULL);
-- 
2.25.1


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

end of thread, other threads:[~2024-04-04 11:41 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-03 14:01 [PATCHv3] drm/xe/display: check for error on drmm_mutex_init Arun R Murthy
2024-04-03 14:16 ` ✓ CI.Patch_applied: success for drm/xe/display: check for error on drmm_mutex_init (rev4) Patchwork
2024-04-03 14:17 ` ✓ CI.checkpatch: " Patchwork
2024-04-03 14:18 ` ✓ CI.KUnit: " Patchwork
2024-04-03 14:29 ` ✓ CI.Build: " Patchwork
2024-04-03 14:32 ` ✓ CI.Hooks: " Patchwork
2024-04-03 14:33 ` ✓ CI.checksparse: " Patchwork
2024-04-03 15:07 ` ✓ CI.BAT: " Patchwork
2024-04-04 11:40 ` [PATCHv3] drm/xe/display: check for error on drmm_mutex_init Ghimiray, Himal Prasad

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