From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E3B3FC54E68 for ; Thu, 21 Mar 2024 09:43:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 81D6A10E313; Thu, 21 Mar 2024 09:43:38 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="QlRnZ1/z"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id D86B410E313; Thu, 21 Mar 2024 09:43:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711014218; x=1742550218; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=Je2vhRlva+KhL6z+AzSFbzNbjzyNLma6V8AO7vygbrs=; b=QlRnZ1/zyl/tXTo3OiaJRYEfvMElcdgY9LlzAs/hww1bphL0cxGTFMAZ ufIMEw4b6RvCBenYXRi38tT5wSPI22+0RAArsrlpo0RzgPx4w9dSF5EO0 Al6RTdVnje3dDKVgJc3OFOayhphCKgnInDNVSt7RZPjI9KPf4b8ALkBqr lJZ4DK66pQNHZzf1S/DtE1hQhT3dH26gaw/fPJV8x9rKJ2MSlSmfLlGbk mHp3X8kVSn3CtqkCDBpJ72WeFkLedMVOlQD8fwJy/XhVueLVE7s6cHyQb AHBht9hA2omYWj89NS9WReqiwIb48YIYFpanPnwth+Eom5yO++tmANkpN A==; X-IronPort-AV: E=McAfee;i="6600,9927,11019"; a="5877490" X-IronPort-AV: E=Sophos;i="6.07,142,1708416000"; d="scan'208";a="5877490" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2024 02:43:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,142,1708416000"; d="scan'208";a="45442774" Received: from amaslenx-mobl.ger.corp.intel.com (HELO localhost) ([10.252.54.141]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2024 02:43:36 -0700 From: Jani Nikula To: Arun R Murthy , intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: Arun R Murthy Subject: Re: [PATCH] drm/xe/display: check for error on drmm_mutex_init In-Reply-To: <20240321060124.4074773-1-arun.r.murthy@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20240321060124.4074773-1-arun.r.murthy@intel.com> Date: Thu, 21 Mar 2024 11:43:31 +0200 Message-ID: <87jzlvncn0.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On Thu, 21 Mar 2024, Arun R Murthy wrote: > Check return value for drmm_mutex_init as it can fail and return on > failure. > > Signed-off-by: Arun R Murthy > --- > 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..ac2e58d1fa82 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))) Excessive parentheses. BR, Jani. > + return -ENOMEM; > + > xe->enabled_irq_mask = ~0; > > err = drmm_add_action_or_reset(&xe->drm, display_destroy, NULL); -- Jani Nikula, Intel