From patchwork Mon Oct 31 06:49:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 13126 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2150071wru; Sun, 30 Oct 2022 23:51:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM49HMUKd7/NuKa/dUUxIVw9xAbg3L19bNqGBbLgfSCKHConoAaiKsTv+JWsQoeKJWu2p04M X-Received: by 2002:a17:90b:f06:b0:212:cb07:fb82 with SMTP id br6-20020a17090b0f0600b00212cb07fb82mr29685084pjb.221.1667199089705; Sun, 30 Oct 2022 23:51:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667199089; cv=none; d=google.com; s=arc-20160816; b=gHGYHZxaRqEqe9m/I6RYpTOJyQimAHgF6MBh/bPHVn0pIo2fMPcbe58asl6PQocJMj zWuIAHriAOpzovfECqY0mlrT9Bs+9Tgw+iLnVemzJpmlb/UBHutlt/Ih56HF3B1zlzPx r99lboHAY00rzmErpVnvaHRogMvxFSjxPMxruI0xjyvXVLpCUMf6rWlqHjShJDCuxh94 PMvxmBC+iXr8LVQvcXE/eTdrBpWpwB5gfzvrxUr3IWzb8Gn7Pie9/r2MxyaGHulH6sn8 gzyYrihsuoLoKOjrzgUcHufxbSRwRUTOPwe6MIPrg40RTci/yCRzxODbuQgdfRXhKwKo Bf1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature:dkim-signature; bh=0gFm01OHWbj+XsDZdv3TJX5nsOjli+kx7EDEAKVTL8Y=; b=E7D4o4BoPTQJs72/y8qhwBYOjFSUseyNpSeLv3qojKkcRCx8451h8WGVP0llOO1ouA Zr43gfGL4GSVZx64g3V7bBoha22NHGEEEIeDMEMYp2FaH4+GJn3hiJXBVKdigo66jDz1 azEPrdHctXRiPBNFS8cndHdrHKQr2iXrE56xyhgc4emHJNUlMkRKH1BVIUcEZbXsulpq Bsp/865qfC+PM3Q7BfTLALFMB4pagcOgWakbn+wrQ7puDbUhE8tuO0VxR6rmRJgpQRFs RM/dJ1U3RskgDZEB10D2TXnmON0MIG0XlBk/ftrp9MiHDPM5YxpiLRhCnZtJdvQXpeL2 36WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=N+uZXUAL; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u13-20020a170903124d00b00186af8159desi8367351plh.523.2022.10.30.23.51.14; Sun, 30 Oct 2022 23:51:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=N+uZXUAL; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229566AbiJaGtZ (ORCPT + 99 others); Mon, 31 Oct 2022 02:49:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229441AbiJaGtY (ORCPT ); Mon, 31 Oct 2022 02:49:24 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C422E9FF8 for ; Sun, 30 Oct 2022 23:49:22 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 64CA81F86C; Mon, 31 Oct 2022 06:49:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1667198961; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=0gFm01OHWbj+XsDZdv3TJX5nsOjli+kx7EDEAKVTL8Y=; b=N+uZXUALEGXXc3IoVl7BMnua/r1pMEbVnX5vRTbdZA5sJR7Mc11H568DT4SS1QYeFj9STp ij2IIzzfAKrSvqS4LXhrRWbOKMzIN/+VADVzpuEHJbVsADmqD3bbfyktLYymw1RZ+kasTG erPwFbeiQ8ctVPgL3zG8sf8rfItXoUk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1667198961; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=0gFm01OHWbj+XsDZdv3TJX5nsOjli+kx7EDEAKVTL8Y=; b=XMCem/z6POVnz7jeoJ/nK5GR5s86SuSbgbCvQKdjqU8zWu3GeYmFsMYtuzqBte5MzOZ9wI pyvPOkUad1ysz8DQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 1E09213AAD; Mon, 31 Oct 2022 06:49:21 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id +1/KBfFvX2M+DwAAMHmgww (envelope-from ); Mon, 31 Oct 2022 06:49:21 +0000 From: Takashi Iwai To: Alex Deucher Cc: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/radeon: Use a local mutex for bind/unbind protection Date: Mon, 31 Oct 2022 07:49:18 +0100 Message-Id: <20221031064918.14178-1-tiwai@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748184952669931465?= X-GMAIL-MSGID: =?utf-8?q?1748184952669931465?= We used drm_modeset_lock_all() for protecting the audio component bind/unbind operations against the notification, but it seems leading to kernel WARNING and Oops. Moreover, the use of drm_modeset_lock_all() is rather an overkill only for this protection. This patch introduces a new mutex that protects just the bind/unbind and the notify calls and replaces the drm_modeset_lock with it. Fixes: 34d84636e5e0 ("drm/radeon: Add HD-audio component notifier support (v4)") Link: https://gitlab.freedesktop.org/drm/amd/-/issues/1569 Signed-off-by: Takashi Iwai --- drivers/gpu/drm/radeon/radeon.h | 1 + drivers/gpu/drm/radeon/radeon_audio.c | 21 ++++++++++++--------- drivers/gpu/drm/radeon/radeon_device.c | 1 + 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index d82424525f5a..2e7161acd443 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -1799,6 +1799,7 @@ struct r600_audio { struct radeon_audio_basic_funcs *funcs; struct drm_audio_component *component; bool component_registered; + struct mutex component_mutex; }; /* diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c index 4ceb90556127..71b67d4efe08 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.c +++ b/drivers/gpu/drm/radeon/radeon_audio.c @@ -181,8 +181,7 @@ static struct radeon_audio_funcs dce6_dp_funcs = { .dpms = evergreen_dp_enable, }; -static void radeon_audio_component_notify(struct drm_audio_component *acomp, - int port); +static void radeon_audio_component_notify(struct radeon_device *rdev, int port); static void radeon_audio_enable(struct radeon_device *rdev, struct r600_audio_pin *pin, u8 enable_mask) @@ -212,7 +211,7 @@ static void radeon_audio_enable(struct radeon_device *rdev, if (rdev->audio.funcs->enable) rdev->audio.funcs->enable(rdev, pin, enable_mask); - radeon_audio_component_notify(rdev->audio.component, pin->id); + radeon_audio_component_notify(rdev, pin->id); } static void radeon_audio_interface_init(struct radeon_device *rdev) @@ -731,12 +730,16 @@ unsigned int radeon_audio_decode_dfs_div(unsigned int div) /* * Audio component support */ -static void radeon_audio_component_notify(struct drm_audio_component *acomp, - int port) +static void radeon_audio_component_notify(struct radeon_device *rdev, int port) { + struct drm_audio_component *acomp; + + mutex_lock(&rdev->audio.component_mutex); + acomp = rdev->audio.component; if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify) acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr, port, -1); + mutex_unlock(&rdev->audio.component_mutex); } static int radeon_audio_component_get_eld(struct device *kdev, int port, @@ -787,11 +790,11 @@ static int radeon_audio_component_bind(struct device *kdev, if (WARN_ON(!device_link_add(hda_kdev, kdev, DL_FLAG_STATELESS))) return -ENOMEM; - drm_modeset_lock_all(dev); + mutex_lock(&rdev->audio.component_mutex); acomp->ops = &radeon_audio_component_ops; acomp->dev = kdev; rdev->audio.component = acomp; - drm_modeset_unlock_all(dev); + mutex_unlock(&rdev->audio.component_mutex); return 0; } @@ -805,11 +808,11 @@ static void radeon_audio_component_unbind(struct device *kdev, device_link_remove(hda_kdev, kdev); - drm_modeset_lock_all(dev); + mutex_lock(&rdev->audio.component_mutex); rdev->audio.component = NULL; acomp->ops = NULL; acomp->dev = NULL; - drm_modeset_unlock_all(dev); + mutex_unlock(&rdev->audio.component_mutex); } static const struct component_ops radeon_audio_component_bind_ops = { diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 17bfbbe906c8..2e13ce2b65d3 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -1312,6 +1312,7 @@ int radeon_device_init(struct radeon_device *rdev, mutex_init(&rdev->pm.mutex); mutex_init(&rdev->gpu_clock_mutex); mutex_init(&rdev->srbm_mutex); + mutex_init(&rdev->audio.component_mutex); init_rwsem(&rdev->pm.mclk_lock); init_rwsem(&rdev->exclusive_lock); init_waitqueue_head(&rdev->irq.vblank_queue);