From nobody Fri Apr 10 20:16:10 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10622C00140 for ; Fri, 19 Aug 2022 00:29:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242695AbiHSA3T (ORCPT ); Thu, 18 Aug 2022 20:29:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242164AbiHSA3Q (ORCPT ); Thu, 18 Aug 2022 20:29:16 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AF3F6BD63 for ; Thu, 18 Aug 2022 17:29:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660868954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZdQAnurZVFdXXS4WbKVSyp7TafzRJAbZ0GKKLX98Mwk=; b=AKGvG4UwczM9Ggu1EsQ5nLqVKB5e8J0cW9ruXIZm6DO9xmPlhht20vU33tX3dOPVOpGAg6 B5ieJLnwExZ1YlE7sXKdbUhGqBN7fKyfV91q0l8FSVNgh44F8NESjYkR9hD+v6/vOF1Eh/ cdxEAPaYyy0xeCkuAfJ2pkYJ+9KpPBg= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-522-5vILv9Y1M_O2GTz-en7-uQ-1; Thu, 18 Aug 2022 20:29:13 -0400 X-MC-Unique: 5vILv9Y1M_O2GTz-en7-uQ-1 Received: by mail-ed1-f70.google.com with SMTP id z3-20020a056402274300b0043d4da3b4b5so1834573edd.12 for ; Thu, 18 Aug 2022 17:29:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=ZdQAnurZVFdXXS4WbKVSyp7TafzRJAbZ0GKKLX98Mwk=; b=LEWl1xXDKHDdCJmS4pyPLovMEeBLooZTC8mS+L4b+QPs1tzb2LgloHooRTYfdfU0bs iC1lriuTGaU8YQlRHV+EwkdR+/8/VjeddXLBwG84uuglt+Vru/G3M+zDM7rYkFH+61Ti 3EAKN9fKIDXEC+LlPhdNes4iXGvp84Vb0KOCCdl5Br0ow2V9HSWlhdo4VeVTB3vwDJOy 178f7jv/2EpRaPgD+/FoFGz19rPA3LhgMWhTdisY8FACTABM2aOkOiaAg0u6oLyJ1W6x VtUe9+lOYEn2fqajcWpSzPUzMnPZnRYPjNBLQOIXr0Q8/7rSPz0YCwgq7dTzTcKCyqs5 dgkA== X-Gm-Message-State: ACgBeo1j6U3x5fq0hNACon7oY1Mj3pzu9sF4m3q/qnqQaVyLRUoDK89f AzCJqhE7bEdHQnVHEN8C2gDbd6C9V+yrTVuMs2r+z6UeYqcgiR8dlYATzmdQkAkIWSoT3W2vYQO 9/W6VDsSg0DYAZGP2Hw+ue4HX X-Received: by 2002:a05:6402:554:b0:446:1013:c898 with SMTP id i20-20020a056402055400b004461013c898mr3898710edx.269.1660868951860; Thu, 18 Aug 2022 17:29:11 -0700 (PDT) X-Google-Smtp-Source: AA6agR7vEVnE89EQFAzGx7Rjk8MdzgcItMbGIbKShh9H17mhg7mQ2H1lZaOWswF7giUus2phpUqZew== X-Received: by 2002:a05:6402:554:b0:446:1013:c898 with SMTP id i20-20020a056402055400b004461013c898mr3898697edx.269.1660868951704; Thu, 18 Aug 2022 17:29:11 -0700 (PDT) Received: from pollux.redhat.com ([2a02:810d:4b40:2ee8:642:1aff:fe31:a15c]) by smtp.gmail.com with ESMTPSA id b26-20020aa7cd1a000000b004460b020ffdsm2027913edw.83.2022.08.18.17.29.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 17:29:11 -0700 (PDT) From: Danilo Krummrich To: daniel@ffwll.ch, airlied@linux.ie, tzimmermann@suse.de, mripard@kernel.org Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH drm-misc-next 1/3] drm/vc4: hdmi: unlock mutex when device is unplugged Date: Fri, 19 Aug 2022 02:29:03 +0200 Message-Id: <20220819002905.82095-2-dakr@redhat.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220819002905.82095-1-dakr@redhat.com> References: <20220819002905.82095-1-dakr@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In vc4_hdmi_encoder_{pre,post}_crtc_enable() commit cd00ed5187bf ("drm/vc4: hdmi: Protect device resources after removal") missed to unlock the mutex before returning due to drm_dev_enter() indicating the device being unplugged. Fixes: cd00ed5187bf ("drm/vc4: hdmi: Protect device resources after removal= ") Signed-off-by: Danilo Krummrich --- drivers/gpu/drm/vc4/vc4_hdmi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 84e5a91c2ea7..4d3ff51ad2a8 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -1425,7 +1425,7 @@ static void vc4_hdmi_encoder_pre_crtc_enable(struct d= rm_encoder *encoder, mutex_lock(&vc4_hdmi->mutex); =20 if (!drm_dev_enter(drm, &idx)) - return; + goto out; =20 if (vc4_hdmi->variant->csc_setup) vc4_hdmi->variant->csc_setup(vc4_hdmi, conn_state, mode); @@ -1436,6 +1436,7 @@ static void vc4_hdmi_encoder_pre_crtc_enable(struct d= rm_encoder *encoder, =20 drm_dev_exit(idx); =20 +out: mutex_unlock(&vc4_hdmi->mutex); } =20 @@ -1455,7 +1456,7 @@ static void vc4_hdmi_encoder_post_crtc_enable(struct = drm_encoder *encoder, mutex_lock(&vc4_hdmi->mutex); =20 if (!drm_dev_enter(drm, &idx)) - return; + goto out; =20 spin_lock_irqsave(&vc4_hdmi->hw_lock, flags); =20 @@ -1516,6 +1517,8 @@ static void vc4_hdmi_encoder_post_crtc_enable(struct = drm_encoder *encoder, vc4_hdmi_enable_scrambling(encoder); =20 drm_dev_exit(idx); + +out: mutex_unlock(&vc4_hdmi->mutex); } =20 --=20 2.37.2 From nobody Fri Apr 10 20:16:10 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3D3FC00140 for ; Fri, 19 Aug 2022 00:29:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243402AbiHSA3X (ORCPT ); Thu, 18 Aug 2022 20:29:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239966AbiHSA3R (ORCPT ); Thu, 18 Aug 2022 20:29:17 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 933A56BD7A for ; Thu, 18 Aug 2022 17:29:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660868955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AJnA1gWIAKMVWb7er1TKy0XozOPw4mLsXagd+kCHnAI=; b=IlEaZ1QLJTS1nTjC5fYZf79ahuDDsf8+7jAae4/u6iolYZ8Gq1gJ2jIC8CodAjLEvVveru Tdd2+GF/HueQmaqbJHs2yEE62xe+OozzRfCTmzpMpxAuUaaITvPTHUlmFwbrXL3c9ny8MC sNYNVgEdEwbi8RdDoxz+daNfR5sEeQ4= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-318-wI_ZBhyiP127I2RAQFn04Q-1; Thu, 18 Aug 2022 20:29:14 -0400 X-MC-Unique: wI_ZBhyiP127I2RAQFn04Q-1 Received: by mail-ed1-f70.google.com with SMTP id j19-20020a05640211d300b0043ddce5c23aso1838373edw.14 for ; Thu, 18 Aug 2022 17:29:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=AJnA1gWIAKMVWb7er1TKy0XozOPw4mLsXagd+kCHnAI=; b=WK8/SBYccj9e0vaIhEuroUAMkz9k/iY/6nI+AH1rkImZHrWrAmZ7CCoClMfgtH52aA M9cfSkK5Y0gwv+74OAOmo+NxeDMzE1x5O5nWU7i7nkK4+wYPL0rGwJxJQiTgux9333hc h7c5GCAYMhwLlmbWeKse9QoEcZM8kv1D90GSFyTTy69Wcw85YmAG28dsQDtzcb+gab7T E47ffHZLmKJ6l3kz4dyc4Gja1zK5oQXKcHtzjOZ7xGjDbpY/XXgI5X3YI7rSn9OHZWdA KnbF0ttklpCO3+/SUcX84blGO6l/+HHfBQeA4Z1CoWjFtcMmmUjaRt4CEAxWsurNCSou 47wA== X-Gm-Message-State: ACgBeo3j59vEFR/9pJKCEsnYY7Re7RPp3Z8NLZpXwpv+N9H12NYsO0uB PBSKXosBnEuiU9aJ/AgBn878lKsEe4rR3p5Fuzhy/FbV/LzvFbXvRJCXSRxzBHuTKd+ICM4yVzi frxUGzhVrsjqp5sbuUcHuYkZd X-Received: by 2002:a17:907:a07b:b0:735:6744:c6be with SMTP id ia27-20020a170907a07b00b007356744c6bemr3118221ejc.685.1660868953214; Thu, 18 Aug 2022 17:29:13 -0700 (PDT) X-Google-Smtp-Source: AA6agR4bPd1mGGbe4dYNjuUk6IBg2CW64/qzKlChk1S6e92cEUNZnl9nwhQOXUa5thhN1mFXZmO1Mw== X-Received: by 2002:a17:907:a07b:b0:735:6744:c6be with SMTP id ia27-20020a170907a07b00b007356744c6bemr3118217ejc.685.1660868953026; Thu, 18 Aug 2022 17:29:13 -0700 (PDT) Received: from pollux.redhat.com ([2a02:810d:4b40:2ee8:642:1aff:fe31:a15c]) by smtp.gmail.com with ESMTPSA id b26-20020aa7cd1a000000b004460b020ffdsm2027913edw.83.2022.08.18.17.29.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 17:29:12 -0700 (PDT) From: Danilo Krummrich To: daniel@ffwll.ch, airlied@linux.ie, tzimmermann@suse.de, mripard@kernel.org Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH drm-misc-next 2/3] drm/vc4: plane: protect device resources after removal Date: Fri, 19 Aug 2022 02:29:04 +0200 Message-Id: <20220819002905.82095-3-dakr@redhat.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220819002905.82095-1-dakr@redhat.com> References: <20220819002905.82095-1-dakr@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" (Hardware) resources which are bound to the driver and device lifecycle must not be accessed after the device and driver are unbound. However, the DRM device isn't freed as long as the last user closed it, hence userspace can still call into the driver. Therefore protect the critical sections which are accessing those resources with drm_dev_enter() and drm_dev_exit(). Fixes: 9872c7a31921 ("drm/vc4: plane: Switch to drmm_universal_plane_alloc(= )") Signed-off-by: Danilo Krummrich --- drivers/gpu/drm/vc4/vc4_drv.h | 1 + drivers/gpu/drm/vc4/vc4_plane.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h index 418a8242691f..80da9a9337cc 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -341,6 +341,7 @@ struct vc4_hvs { =20 struct vc4_plane { struct drm_plane base; + struct drm_device *dev; }; =20 static inline struct vc4_plane * diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plan= e.c index eff9c63adfa7..cb13bb583546 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -1218,14 +1219,22 @@ static void vc4_plane_atomic_update(struct drm_plan= e *plane, u32 vc4_plane_write_dlist(struct drm_plane *plane, u32 __iomem *dlist) { struct vc4_plane_state *vc4_state =3D to_vc4_plane_state(plane->state); + struct vc4_plane *vc4_plane =3D to_vc4_plane(plane); int i; + int idx; =20 vc4_state->hw_dlist =3D dlist; =20 + if (!drm_dev_enter(vc4_plane->dev, &idx)) + goto out; + /* Can't memcpy_toio() because it needs to be 32-bit writes. */ for (i =3D 0; i < vc4_state->dlist_count; i++) writel(vc4_state->dlist[i], &dlist[i]); =20 + drm_dev_exit(idx); + +out: return vc4_state->dlist_count; } =20 @@ -1243,8 +1252,10 @@ u32 vc4_plane_dlist_size(const struct drm_plane_stat= e *state) void vc4_plane_async_set_fb(struct drm_plane *plane, struct drm_framebuffe= r *fb) { struct vc4_plane_state *vc4_state =3D to_vc4_plane_state(plane->state); + struct vc4_plane *vc4_plane =3D to_vc4_plane(plane); struct drm_gem_dma_object *bo =3D drm_fb_dma_get_gem_obj(fb, 0); uint32_t addr; + int idx; =20 /* We're skipping the address adjustment for negative origin, * because this is only called on the primary plane. @@ -1252,12 +1263,17 @@ void vc4_plane_async_set_fb(struct drm_plane *plane= , struct drm_framebuffer *fb) WARN_ON_ONCE(plane->state->crtc_x < 0 || plane->state->crtc_y < 0); addr =3D bo->dma_addr + fb->offsets[0]; =20 + if (!drm_dev_enter(vc4_plane->dev, &idx)) + return; + /* Write the new address into the hardware immediately. The * scanout will start from this address as soon as the FIFO * needs to refill with pixels. */ writel(addr, &vc4_state->hw_dlist[vc4_state->ptr0_offset]); =20 + drm_dev_exit(idx); + /* Also update the CPU-side dlist copy, so that any later * atomic updates that don't do a new modeset on our plane * also use our updated address. @@ -1271,6 +1287,8 @@ static void vc4_plane_atomic_async_update(struct drm_= plane *plane, struct drm_plane_state *new_plane_state =3D drm_atomic_get_new_plane_stat= e(state, plane); struct vc4_plane_state *vc4_state, *new_vc4_state; + struct vc4_plane *vc4_plane =3D to_vc4_plane(plane); + int idx; =20 swap(plane->state->fb, new_plane_state->fb); plane->state->crtc_x =3D new_plane_state->crtc_x; @@ -1323,6 +1341,9 @@ static void vc4_plane_atomic_async_update(struct drm_= plane *plane, vc4_state->dlist[vc4_state->ptr0_offset] =3D new_vc4_state->dlist[vc4_state->ptr0_offset]; =20 + if (!drm_dev_enter(vc4_plane->dev, &idx)) + return; + /* Note that we can't just call vc4_plane_write_dlist() * because that would smash the context data that the HVS is * currently using. @@ -1333,6 +1354,8 @@ static void vc4_plane_atomic_async_update(struct drm_= plane *plane, &vc4_state->hw_dlist[vc4_state->pos2_offset]); writel(vc4_state->dlist[vc4_state->ptr0_offset], &vc4_state->hw_dlist[vc4_state->ptr0_offset]); + + drm_dev_exit(idx); } =20 static int vc4_plane_atomic_async_check(struct drm_plane *plane, @@ -1521,6 +1544,8 @@ struct drm_plane *vc4_plane_init(struct drm_device *d= ev, modifiers, type, NULL); if (IS_ERR(vc4_plane)) return ERR_CAST(vc4_plane); + + vc4_plane->dev =3D dev; plane =3D &vc4_plane->base; =20 if (vc4->is_vc5) --=20 2.37.2 From nobody Fri Apr 10 20:16:10 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BBE4C00140 for ; Fri, 19 Aug 2022 00:29:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240896AbiHSA30 (ORCPT ); Thu, 18 Aug 2022 20:29:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231424AbiHSA3T (ORCPT ); Thu, 18 Aug 2022 20:29:19 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2039772EE5 for ; Thu, 18 Aug 2022 17:29:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660868957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nZkz/OabS5gsWkkQKjM89j1/6sZadLuGX+5mWMwAoOc=; b=Ozy6dr5GgILkZIv2s6jb4Fbw4InbqoleQT3/1uHs8H44jTKeYmw7YWEfC3neNj5lJtGJQJ 09HLvhyLjlYqeTOZwGxX7j5DdftGGNejwKYq9NxAuDMmE7JFNcRhkFtRmCFIxxGR8OS2Xo 899IzOev64Sp9NpT1U8vfTIK8zzp47s= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-21-CpF31JujOwiOZR8wZITIig-1; Thu, 18 Aug 2022 20:29:15 -0400 X-MC-Unique: CpF31JujOwiOZR8wZITIig-1 Received: by mail-ed1-f72.google.com with SMTP id q32-20020a05640224a000b004462f105fa9so738934eda.4 for ; Thu, 18 Aug 2022 17:29:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=nZkz/OabS5gsWkkQKjM89j1/6sZadLuGX+5mWMwAoOc=; b=4z458NPtovL/rxP7J3UP5MGK2qerwaF79Me/C18Qvr6Mwz3yeVWK7uCGLxtg1/qBXg D+dEpqdnd/mNPTs2wmeEWKGIEUS1D5lEaa2KQdD04HQjcBeMBWczpMQHWye5CyIWnZKB Oppqry8Ag3Lg9W4vJ1xzmKFa088FA04OC/UktHS4gO3yFEuEHomki696jKAASg+MFNVk Z6sGMEHntfTgg/o8IrHvqr3b6hcAIxILRwoB774kFsWEryKNyHHodzhkDad4Hf6aJF0l gMTOR7Favnez+uEZV/rfJFrvK0qsRUFboHq973fr8ERgRKXei2kMy76YnbaaIDLq6kN0 hyyg== X-Gm-Message-State: ACgBeo2RQ591r3lVPrL0K9N6c28fanMF6PrnBurCjxZ+sc+fcRhWLCgt I8xHTN2Dkh+1cMly+OA4y/zFv4lKG57JfJDUb9hi47FuqqXFVmk1Zwclh3KzdFZAXYbtxLMwK6w zMIJmcV8gOR+ito6PdZmqllG7 X-Received: by 2002:a17:907:69b0:b0:730:a1f0:63e7 with SMTP id ra48-20020a17090769b000b00730a1f063e7mr3230741ejc.364.1660868954669; Thu, 18 Aug 2022 17:29:14 -0700 (PDT) X-Google-Smtp-Source: AA6agR69VOlMq30KnwZaAQTSrGpxNLSfPxSOQvLe3+fq+Fwv51y4m04N1qfRfTUdN5d2gTKsUNEPdQ== X-Received: by 2002:a17:907:69b0:b0:730:a1f0:63e7 with SMTP id ra48-20020a17090769b000b00730a1f063e7mr3230736ejc.364.1660868954509; Thu, 18 Aug 2022 17:29:14 -0700 (PDT) Received: from pollux.redhat.com ([2a02:810d:4b40:2ee8:642:1aff:fe31:a15c]) by smtp.gmail.com with ESMTPSA id b26-20020aa7cd1a000000b004460b020ffdsm2027913edw.83.2022.08.18.17.29.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 17:29:14 -0700 (PDT) From: Danilo Krummrich To: daniel@ffwll.ch, airlied@linux.ie, tzimmermann@suse.de, mripard@kernel.org Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH drm-misc-next 3/3] drm/vc4: crtc: protect device resources after removal Date: Fri, 19 Aug 2022 02:29:05 +0200 Message-Id: <20220819002905.82095-4-dakr@redhat.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220819002905.82095-1-dakr@redhat.com> References: <20220819002905.82095-1-dakr@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" (Hardware) resources which are bound to the driver and device lifecycle must not be accessed after the device and driver are unbound. However, the DRM device isn't freed as long as the last user closed it, hence userspace can still call into the driver. Therefore protect the critical sections which are accessing those resources with drm_dev_enter() and drm_dev_exit(). Fixes: 7cc4214c27cf ("drm/vc4: crtc: Switch to drmm_kzalloc") Signed-off-by: Danilo Krummrich --- drivers/gpu/drm/vc4/vc4_crtc.c | 41 +++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c index 2def6e2ad6f0..51daf190196e 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -295,10 +296,17 @@ struct drm_encoder *vc4_get_crtc_encoder(struct drm_c= rtc *crtc, static void vc4_crtc_pixelvalve_reset(struct drm_crtc *crtc) { struct vc4_crtc *vc4_crtc =3D to_vc4_crtc(crtc); + struct drm_device *dev =3D crtc->dev; + int idx; + + if (!drm_dev_enter(dev, &idx)) + return; =20 /* The PV needs to be disabled before it can be flushed */ CRTC_WRITE(PV_CONTROL, CRTC_READ(PV_CONTROL) & ~PV_CONTROL_EN); CRTC_WRITE(PV_CONTROL, CRTC_READ(PV_CONTROL) | PV_CONTROL_FIFO_CLR); + + drm_dev_exit(idx); } =20 static void vc4_crtc_config_pv(struct drm_crtc *crtc, struct drm_encoder *= encoder, @@ -321,6 +329,10 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc, = struct drm_encoder *encode u32 format =3D is_dsi1 ? PV_CONTROL_FORMAT_DSIV_24 : PV_CONTROL_FORMAT_24; u8 ppc =3D pv_data->pixels_per_clock; bool debug_dump_regs =3D false; + int idx; + + if (!drm_dev_enter(dev, &idx)) + return; =20 if (debug_dump_regs) { struct drm_printer p =3D drm_info_printer(&vc4_crtc->pdev->dev); @@ -410,6 +422,8 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc, s= truct drm_encoder *encode drm_crtc_index(crtc)); drm_print_regset32(&p, &vc4_crtc->regset); } + + drm_dev_exit(idx); } =20 static void require_hvs_enabled(struct drm_device *dev) @@ -430,13 +444,18 @@ static int vc4_crtc_disable(struct drm_crtc *crtc, struct vc4_crtc *vc4_crtc =3D to_vc4_crtc(crtc); struct drm_device *dev =3D crtc->dev; struct vc4_dev *vc4 =3D to_vc4_dev(dev); - int ret; + int idx, ret; + + if (!drm_dev_enter(dev, &idx)) + return -ENODEV; =20 CRTC_WRITE(PV_V_CONTROL, CRTC_READ(PV_V_CONTROL) & ~PV_VCONTROL_VIDEN); ret =3D wait_for(!(CRTC_READ(PV_V_CONTROL) & PV_VCONTROL_VIDEN), 1); WARN_ONCE(ret, "Timeout waiting for !PV_VCONTROL_VIDEN\n"); =20 + drm_dev_exit(idx); + /* * This delay is needed to avoid to get a pixel stuck in an * unflushable FIFO between the pixelvalve and the HDMI @@ -588,6 +607,7 @@ static void vc4_crtc_atomic_enable(struct drm_crtc *crt= c, struct vc4_crtc *vc4_crtc =3D to_vc4_crtc(crtc); struct drm_encoder *encoder =3D vc4_get_crtc_encoder(crtc, new_state); struct vc4_encoder *vc4_encoder =3D to_vc4_encoder(encoder); + int idx; =20 drm_dbg(dev, "Enabling CRTC %s (%u) connected to Encoder %s (%u)", crtc->name, crtc->base.id, encoder->name, encoder->base.id); @@ -606,6 +626,9 @@ static void vc4_crtc_atomic_enable(struct drm_crtc *crt= c, =20 vc4_crtc_config_pv(crtc, encoder, state); =20 + if (!drm_dev_enter(dev, &idx)) + return; + CRTC_WRITE(PV_CONTROL, CRTC_READ(PV_CONTROL) | PV_CONTROL_EN); =20 if (vc4_encoder->pre_crtc_enable) @@ -617,6 +640,8 @@ static void vc4_crtc_atomic_enable(struct drm_crtc *crt= c, CRTC_WRITE(PV_V_CONTROL, CRTC_READ(PV_V_CONTROL) | PV_VCONTROL_VIDEN); =20 + drm_dev_exit(idx); + if (vc4_encoder->post_crtc_enable) vc4_encoder->post_crtc_enable(encoder, state); } @@ -711,17 +736,31 @@ static int vc4_crtc_atomic_check(struct drm_crtc *crt= c, static int vc4_enable_vblank(struct drm_crtc *crtc) { struct vc4_crtc *vc4_crtc =3D to_vc4_crtc(crtc); + struct drm_device *dev =3D crtc->dev; + int idx; + + if (!drm_dev_enter(dev, &idx)) + return -ENODEV; =20 CRTC_WRITE(PV_INTEN, PV_INT_VFP_START); =20 + drm_dev_exit(idx); + return 0; } =20 static void vc4_disable_vblank(struct drm_crtc *crtc) { struct vc4_crtc *vc4_crtc =3D to_vc4_crtc(crtc); + struct drm_device *dev =3D crtc->dev; + int idx; + + if (!drm_dev_enter(dev, &idx)) + return; =20 CRTC_WRITE(PV_INTEN, 0); + + drm_dev_exit(idx); } =20 static void vc4_crtc_handle_page_flip(struct vc4_crtc *vc4_crtc) --=20 2.37.2