From: Arun R Murthy <arun.r.murthy@intel.com>
To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Cc: Arun R Murthy <arun.r.murthy@intel.com>
Subject: [PATCHv2] drm/xe/display: check for error on drmm_mutex_init
Date: Thu, 28 Mar 2024 13:30:05 +0530 [thread overview]
Message-ID: <20240328080005.410961-1-arun.r.murthy@intel.com> (raw)
Check return value for drmm_mutex_init as it can fail and return on
failure.
Signed-off-by: Arun R Murthy <arun.r.murthy@intel.com>
---
drivers/gpu/drm/xe/display/xe_display.c | 14 ++++++++------
1 file changed, 8 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..b2f58b3afabe 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -107,12 +107,14 @@ 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);
+ if (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))
+ return -ENOMEM;
+
xe->enabled_irq_mask = ~0;
err = drmm_add_action_or_reset(&xe->drm, display_destroy, NULL);
--
2.25.1
next reply other threads:[~2024-03-28 8:10 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-28 8:00 Arun R Murthy [this message]
2024-03-28 8:15 ` ✓ CI.Patch_applied: success for drm/xe/display: check for error on drmm_mutex_init (rev3) Patchwork
2024-03-28 8:15 ` ✓ CI.checkpatch: " Patchwork
2024-03-28 8:16 ` ✓ CI.KUnit: " Patchwork
2024-03-28 8:31 ` [PATCHv2] drm/xe/display: check for error on drmm_mutex_init Andi Shyti
2024-03-28 10:33 ` Jani Nikula
2024-03-28 10:45 ` Andi Shyti
2024-03-28 10:55 ` Murthy, Arun R
2024-03-28 11:07 ` Andi Shyti
2024-03-30 12:05 ` Murthy, Arun R
2024-04-03 15:32 ` Lucas De Marchi
2024-03-28 8:34 ` ✓ CI.Build: success for drm/xe/display: check for error on drmm_mutex_init (rev3) Patchwork
2024-03-28 8:37 ` ✓ CI.Hooks: " Patchwork
2024-03-28 8:38 ` ✓ CI.checksparse: " Patchwork
2024-03-28 9:22 ` ✓ CI.BAT: " 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=20240328080005.410961-1-arun.r.murthy@intel.com \
--to=arun.r.murthy@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--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