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: [PATCH] drm/xe/display: check for error on drmm_mutex_init
Date: Tue, 19 Mar 2024 08:33:41 +0530 [thread overview]
Message-ID: <20240319030341.3907617-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 | 24 ++++++++++++++++++------
1 file changed, 18 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..c59fa832758d 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -107,12 +107,24 @@ 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
next reply other threads:[~2024-03-19 3:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-19 3:03 Arun R Murthy [this message]
2024-03-19 4:58 ` ✓ CI.Patch_applied: success for drm/xe/display: check for error on drmm_mutex_init Patchwork
2024-03-19 4:58 ` ✓ CI.checkpatch: " Patchwork
2024-03-19 4:59 ` ✓ CI.KUnit: " Patchwork
2024-03-19 5:10 ` ✓ CI.Build: " Patchwork
2024-03-19 5:13 ` ✓ CI.Hooks: " Patchwork
2024-03-19 5:14 ` ✓ CI.checksparse: " Patchwork
2024-03-19 5:36 ` ✓ CI.BAT: " Patchwork
2024-03-20 0:35 ` [PATCH] " Lucas De Marchi
2024-03-21 5:04 ` Murthy, Arun R
2024-03-21 5:43 ` Lucas De Marchi
-- strict thread matches above, loose matches on Subject: below --
2024-03-21 6:01 Arun R Murthy
2024-03-21 9:43 ` Jani Nikula
2024-03-22 20:51 ` Lucas De Marchi
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=20240319030341.3907617-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