From patchwork Fri Jan 20 12:08:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 13109684 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 D2EEEC05027 for ; Fri, 20 Jan 2023 12:08:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0943610EA34; Fri, 20 Jan 2023 12:08:42 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id EB78210EA36 for ; Fri, 20 Jan 2023 12:08:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674216516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zizGqLgDtMjJvJ8Y3gxXr4ehRe41Dz0Ln+Ptew+d+Lc=; b=AYQ+Yw7oytz3aKFLrgvCMYFXWEz4+CV6tCqzG8dHFk2cyTnh4WPrIpYxn2JaPs62XThakM k7SBdwjSVfMkTKDcaCv01RnIYb9kapycYGsA09fB2I6XikJlUhCqorLxwlTXL1Dcyp5vRC 2tLT1s0JTmCXncq2Np7TD7CSveubX7I= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-209-mLLV-Mr9Mvyg7GYx1bvGpg-1; Fri, 20 Jan 2023 07:08:30 -0500 X-MC-Unique: mLLV-Mr9Mvyg7GYx1bvGpg-1 Received: by mail-wm1-f69.google.com with SMTP id o22-20020a05600c511600b003db02b921f1so4681450wms.8 for ; Fri, 20 Jan 2023 04:08:29 -0800 (PST) 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 :subject:date:message-id:reply-to; bh=zizGqLgDtMjJvJ8Y3gxXr4ehRe41Dz0Ln+Ptew+d+Lc=; b=o0wG6dlFjkc6P2t1CgFkVnXfq1zDQIPrNNht8IPLbrMkREFUZgxOVIE1c9TG3mqCc+ KFLzVVwZ/GvifsQhZh4wld5hJdGw5vy9z2ux7SZ1YeaOkQnvV0onBOXQxZO9LOyxUDV0 3X1rZ53QSRdHbIHuxd3Ah95UqSZacZibPyMzr111loWquEIb8e7uQ4CQEodLdHFbsOHG dsj1oRaurJ3O0ZyEdL8+GlUwFOs3tNw44nc3vcY+jwIFPIULySme69RFmf25K4ncS/X1 WTKltE+tIfUdqtnxf4RQGTo+Lq0rl+XbRc9W2Ef/l6I7ASRu57cyI+ra3aR6fHJLi/7Z +GCA== X-Gm-Message-State: AFqh2kpd5KNum4vEiC4OfPd1pzxWxXn79BmCJidkNwBsFZePBdNf496o lbfXGgR6+mWC6IoO7hVKg+t5yuY3dAC/pTA04132llbOmThylU6tVZRmK0vR+7/HiNMRV3SL7SQ 1UXTcZZeUGgiFQUM2wXzJb4EgvV3/ X-Received: by 2002:a05:6000:178a:b0:2be:276c:fb60 with SMTP id e10-20020a056000178a00b002be276cfb60mr15613281wrg.64.1674216508964; Fri, 20 Jan 2023 04:08:28 -0800 (PST) X-Google-Smtp-Source: AMrXdXviXDLfJrvvimx9Nj+OGPkScIhm/b1eowt9jkmdc00+VtEL6f75NCTIAkwUkDVqtpQmvMRwHg== X-Received: by 2002:a05:6000:178a:b0:2be:276c:fb60 with SMTP id e10-20020a056000178a00b002be276cfb60mr15613257wrg.64.1674216508766; Fri, 20 Jan 2023 04:08:28 -0800 (PST) Received: from minerva.home (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id l4-20020a05600012c400b002bbb2d43f65sm32766336wrx.14.2023.01.20.04.08.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 04:08:27 -0800 (PST) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Subject: [PATCH 1/3] fbdev: Remove unused struct fb_deferred_io .first_io field Date: Fri, 20 Jan 2023 13:08:20 +0100 Message-Id: <20230120120822.2536032-2-javierm@redhat.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230120120822.2536032-1-javierm@redhat.com> References: <20230120120822.2536032-1-javierm@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-fbdev@vger.kernel.org, Thomas Zimmermann , Helge Deller , Javier Martinez Canillas , =?utf-8?q?Noralf_Tr=C3=B8nnes?= , dri-devel@lists.freedesktop.org, Jaya Kumar Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This optional callback was added in the commit 1f45f9dbb392 ("fb_defio: add first_io callback") but it was never used by a driver. Let's remove it since it's unlikely that will be used after a decade that was added. Signed-off-by: Javier Martinez Canillas Reviewed-by: Thomas Zimmermann --- drivers/video/fbdev/core/fb_defio.c | 4 ---- include/linux/fb.h | 1 - 2 files changed, 5 deletions(-) diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c index c730253ab85c..1b680742b7f3 100644 --- a/drivers/video/fbdev/core/fb_defio.c +++ b/drivers/video/fbdev/core/fb_defio.c @@ -157,10 +157,6 @@ static vm_fault_t fb_deferred_io_track_page(struct fb_info *info, unsigned long /* protect against the workqueue changing the page list */ mutex_lock(&fbdefio->lock); - /* first write in this cycle, notify the driver */ - if (fbdefio->first_io && list_empty(&fbdefio->pagereflist)) - fbdefio->first_io(info); - pageref = fb_deferred_io_pageref_get(info, offset, page); if (WARN_ON_ONCE(!pageref)) { ret = VM_FAULT_OOM; diff --git a/include/linux/fb.h b/include/linux/fb.h index 30183fd259ae..daf336385613 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -215,7 +215,6 @@ struct fb_deferred_io { struct mutex lock; /* mutex that protects the pageref list */ struct list_head pagereflist; /* list of pagerefs for touched pages */ /* callback */ - void (*first_io)(struct fb_info *info); void (*deferred_io)(struct fb_info *info, struct list_head *pagelist); }; #endif From patchwork Fri Jan 20 12:08:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 13109683 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 AB416C05027 for ; Fri, 20 Jan 2023 12:08:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D559710EA33; Fri, 20 Jan 2023 12:08:36 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 07E7110EA33 for ; Fri, 20 Jan 2023 12:08:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674216514; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XWxZ9+fZGD3CeqIp7txi3l7X00Lca9PNbV7a61jLAME=; b=WEzOpnz46jrABKLEr2OavUkLofOz03Ddt5KaMBw54yh3H82JuVfBbJccAOHxC0/YK0ADU5 pM3QdTeYnmcH3dhdpbeCMPC3ngariULxKNk4fqHnpUC/2ZBIn3Ix8PpGgw7Ob0E6LALHkh v73EPCYGjupuTHP+KMJ2U8oId/4cQQI= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-86-mo4WHQWDOmGnbE0U5qAGWA-1; Fri, 20 Jan 2023 07:08:32 -0500 X-MC-Unique: mo4WHQWDOmGnbE0U5qAGWA-1 Received: by mail-wm1-f71.google.com with SMTP id ay38-20020a05600c1e2600b003da7c41fafcso4687128wmb.7 for ; Fri, 20 Jan 2023 04:08:32 -0800 (PST) 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 :subject:date:message-id:reply-to; bh=XWxZ9+fZGD3CeqIp7txi3l7X00Lca9PNbV7a61jLAME=; b=3tam/8w5kxD7kKusNg7ajbyNrF21T/FuyrquXN112GQi9ECY0E7/wt3OmFKZM+TXJf eW6QyJ5++2vQ1RhOLEzJJTzpUbxhBjIGTtYMjmr+DowehbxVA1d+iQ0tGkLbsI/Bs3KO lwM+ajaP27dQMlkRQkcPO7QMTbq5hgmFPVao+3lVhsnOKAqK5MCuZILCRw2LbsLZLXPg TKgG5V6CMXIFhgdx5ZR4WHsEyFao8VLpfeTFcSkWjUC113I5Djf7YImYrtr5I+cDlhYO ZHVgJO5+v900nuV5Bq1Yl0BWsmSTEdwKnT52oW9WaM+ECTljKMf65pCFp7sk6tWiU7Rp No9g== X-Gm-Message-State: AFqh2kovFS2hm4yZqB+aRJuvdBQ/naMrXpCvdmf7RjrGO427i9GcpXZo UDuDX4E8epi09GcPij15TJJLuOOEHUADkAhK8XA/p3fvtDAI1T3kiI0U9kwBsX5CWRZ6xLmz8TM xG1jlYqOafopQdtQReJ7Bru7lwgZw X-Received: by 2002:a05:6000:1708:b0:2bd:daf1:9e4c with SMTP id n8-20020a056000170800b002bddaf19e4cmr14292635wrc.43.1674216511827; Fri, 20 Jan 2023 04:08:31 -0800 (PST) X-Google-Smtp-Source: AMrXdXsvGsPS+HlZRn7YsaFlYBOOufj3MRrLCyQgFoq48lMENq5yHr4MBJy40beCmvSbJT9GNsyOxg== X-Received: by 2002:a05:6000:1708:b0:2bd:daf1:9e4c with SMTP id n8-20020a056000170800b002bddaf19e4cmr14292621wrc.43.1674216511626; Fri, 20 Jan 2023 04:08:31 -0800 (PST) Received: from minerva.home (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id l4-20020a05600012c400b002bbb2d43f65sm32766336wrx.14.2023.01.20.04.08.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 04:08:30 -0800 (PST) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Subject: [PATCH 2/3] drm/fb-helper: Check fb_deferred_io_init() return value Date: Fri, 20 Jan 2023 13:08:21 +0100 Message-Id: <20230120120822.2536032-3-javierm@redhat.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230120120822.2536032-1-javierm@redhat.com> References: <20230120120822.2536032-1-javierm@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Zimmermann , Javier Martinez Canillas , =?utf-8?q?Noralf_Tr=C3=B8nne?= =?utf-8?q?s?= , dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The fb_deferred_io_init() can fail and return an errno code but currently there is no check for its return value. Fix that and propagate to errno to the caller in the case of a failure. Fixes: d536540f304c ("drm/fb-helper: Add generic fbdev emulation .fb_probe function") Signed-off-by: Javier Martinez Canillas Reviewed-by: Thomas Zimmermann --- drivers/gpu/drm/drm_fbdev_generic.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_fbdev_generic.c b/drivers/gpu/drm/drm_fbdev_generic.c index 0a4c160e0e58..b2df8c03594c 100644 --- a/drivers/gpu/drm/drm_fbdev_generic.c +++ b/drivers/gpu/drm/drm_fbdev_generic.c @@ -223,7 +223,9 @@ static int drm_fbdev_fb_probe(struct drm_fb_helper *fb_helper, fbi->flags |= FBINFO_VIRTFB | FBINFO_READS_FAST; fbi->fbdefio = &drm_fbdev_defio; - fb_deferred_io_init(fbi); + ret = fb_deferred_io_init(fbi); + if (ret) + return ret; } else { /* buffer is mapped for HW framebuffer */ ret = drm_client_buffer_vmap(fb_helper->buffer, &map); From patchwork Fri Jan 20 12:08:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 13109690 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 B445EC05027 for ; Fri, 20 Jan 2023 12:08:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 826CF10EA39; Fri, 20 Jan 2023 12:08:52 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0DAC210EA34 for ; Fri, 20 Jan 2023 12:08:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674216516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oqUuYSilJanvI6AcOWoQdMxrU3ZSpibdQFaGNCu/ttw=; b=EGhDdAldprAOYtuzq3wXJYYYKi1ihFDe8wRkvQYaf4M4KpPRaYxkzEfqsqAhRR7qjhkvFP hSug8f/hkSXLQIhR1p0+9thCsUljNaveChbCTdjyaZklX50zfXDmysbPTfqI9ycX3yzGLh i33eINac/RzeI67Yfs2CXIyyU7ScDyc= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-184-mCo79_AcMhyl8xtdDEIZnQ-1; Fri, 20 Jan 2023 07:08:34 -0500 X-MC-Unique: mCo79_AcMhyl8xtdDEIZnQ-1 Received: by mail-wm1-f69.google.com with SMTP id u12-20020a05600c210c00b003da1c092b83so1249911wml.7 for ; Fri, 20 Jan 2023 04:08:34 -0800 (PST) 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 :subject:date:message-id:reply-to; bh=oqUuYSilJanvI6AcOWoQdMxrU3ZSpibdQFaGNCu/ttw=; b=JN8qQI4xBwyKNbIU3nvzqmAnoeouIIHVkCj9YWNWuPH+ewLxYiINF+D5k1sZDR8mXx Lw+Zwx+zZuu4vMlx895rJRcvEpN3qqt2+5eN611fL4wp5TJ3BKc3IGVcpSRI4llJydFm CCL8bWBLxc27efbyWYp8Pp8A2ajLFEq38+0h8/y6AsjXQ+ktNqBm/0vh/C4Uop8dvamz 57uZwKn3FxIuNqNi3p5vhuWm/IocER/4dTCl7RH2Rw/OrWl0yACEGDaP8zdb7Bur8HF7 qUaDz9cIpROYwPFALgGE9ck4t/WRqSeInejOCVtYbGgf1RcvzucR/Q8XJGflTnvwhKzB WjXg== X-Gm-Message-State: AFqh2ko+unXYUPQlkTCK+GhJpl0IABpNC/dtnT+bvJ+CTKigNOGAgORc wNsBd2a/J0hTEaVh7NREx2YjRDazDhde1Wy1bCn0bwGshJ6WrUgqLIfWYisE131bY+Ewd9o7kdT rBSJ4g/MjiGOYWRA5GhKr73tDilDP X-Received: by 2002:a05:600c:1d19:b0:3db:1838:3f01 with SMTP id l25-20020a05600c1d1900b003db18383f01mr8394114wms.32.1674216513529; Fri, 20 Jan 2023 04:08:33 -0800 (PST) X-Google-Smtp-Source: AMrXdXsltWTsS74K+GwUiFBdFMOU5E3E3rABKvdj8rYfh/a6M4rEvqwkD4GXcTg7GFO09fFZSogS7g== X-Received: by 2002:a05:600c:1d19:b0:3db:1838:3f01 with SMTP id l25-20020a05600c1d1900b003db18383f01mr8394099wms.32.1674216513271; Fri, 20 Jan 2023 04:08:33 -0800 (PST) Received: from minerva.home (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id l4-20020a05600012c400b002bbb2d43f65sm32766336wrx.14.2023.01.20.04.08.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 04:08:32 -0800 (PST) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Subject: [PATCH 3/3] drm/fb-helper: Use a per-driver FB deferred I/O handler Date: Fri, 20 Jan 2023 13:08:22 +0100 Message-Id: <20230120120822.2536032-4-javierm@redhat.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230120120822.2536032-1-javierm@redhat.com> References: <20230120120822.2536032-1-javierm@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Zimmermann , Javier Martinez Canillas , =?utf-8?q?Noralf_Tr=C3=B8nne?= =?utf-8?q?s?= , dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The DRM fbdev emulation layer sets the struct fb_info .fbdefio field to a struct fb_deferred_io pointer, that is shared across all drivers that use the generic drm_fbdev_generic_setup() helper function. It is a problem because the fbdev core deferred I/O logic assumes that the struct fb_deferred_io data is not shared between devices, and it's stored there state such as the list of pages touched and a mutex that is use to synchronize between the fb_deferred_io_track_page() function that track the dirty pages and fb_deferred_io_work() workqueue handler doing the actual deferred I/O. The latter can lead to the following error, since it may happen that two drivers are probed and then one is removed, which causes the mutex bo be destroyed and not existing anymore by the time the other driver tries to grab it for the fbdev deferred I/O logic: [ 369.756553] ------------[ cut here ]------------ [ 369.756604] DEBUG_LOCKS_WARN_ON(lock->magic != lock) [ 369.756631] WARNING: CPU: 2 PID: 1023 at kernel/locking/mutex.c:582 __mutex_lock+0x348/0x424 [ 369.756744] Modules linked in: nf_conntrack_netbios_ns nf_conntrack_broadcast nft_fib_inet nft_fib_ipv4 nft_fib_ipv6 nft_fib nft_reject_inet nf_reject_ipv4 nf_reject_ipv6 nft_reject nft_ct nft_chain_nat nf_nat nf_conntrack nf_defrag_ip v6 nf_defrag_ipv4 ip_set nf_tables nfnetlink qrtr btsdio bluetooth sunrpc brcmfmac snd_soc_hdmi_codec cpufreq_dt cfg80211 vfat fat vc4 rfkill brcmutil raspberrypi_cpufreq i2c_bcm2835 iproc_rng200 bcm2711_thermal snd_soc_core snd_pcm_dmaen gine leds_gpio nvmem_rmem joydev hid_cherry uas usb_storage gpio_raspberrypi_exp v3d snd_pcm raspberrypi_hwmon gpu_sched bcm2835_wdt broadcom bcm_phy_lib snd_timer genet snd mdio_bcm_unimac clk_bcm2711_dvp soundcore drm_display_helper pci e_brcmstb cec ip6_tables ip_tables fuse [ 369.757400] CPU: 2 PID: 1023 Comm: fbtest Not tainted 5.19.0-rc6+ #94 [ 369.757455] Hardware name: raspberrypi,4-model-b Raspberry Pi 4 Model B Rev 1.4/Raspberry Pi 4 Model B Rev 1.4, BIOS 2022.10 10/01/2022 [ 369.757538] pstate: 00400005 (nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 369.757596] pc : __mutex_lock+0x348/0x424 [ 369.757635] lr : __mutex_lock+0x348/0x424 [ 369.757672] sp : ffff80000953bb00 [ 369.757703] x29: ffff80000953bb00 x28: ffff17fdc087c000 x27: 0000000000000002 [ 369.757771] x26: ffff17fdc349f9b0 x25: fffffc5ff72e0100 x24: 0000000000000000 [ 369.757838] x23: 0000000000000000 x22: 0000000000000002 x21: ffffa618df636f10 [ 369.757903] x20: ffff80000953bb68 x19: ffffa618e0f18138 x18: 0000000000000001 [ 369.757968] x17: 0000000020000000 x16: 0000000000000002 x15: 0000000000000000 [ 369.758032] x14: 0000000000000000 x13: 284e4f5f4e524157 x12: 5f534b434f4c5f47 [ 369.758097] x11: 00000000ffffdfff x10: ffffa618e0c79f88 x9 : ffffa618de472484 [ 369.758162] x8 : 000000000002ffe8 x7 : c0000000ffffdfff x6 : 00000000000affa8 [ 369.758227] x5 : 0000000000001fff x4 : 0000000000000000 x3 : 0000000000000027 [ 369.758292] x2 : 0000000000000001 x1 : ffff17fdc087c000 x0 : 0000000000000028 [ 369.758357] Call trace: [ 369.758383] __mutex_lock+0x348/0x424 [ 369.758420] mutex_lock_nested+0x4c/0x5c [ 369.758459] fb_deferred_io_mkwrite+0x78/0x1d8 [ 369.758507] do_page_mkwrite+0x5c/0x19c [ 369.758550] wp_page_shared+0x70/0x1a0 [ 369.758590] do_wp_page+0x3d0/0x510 [ 369.758628] handle_pte_fault+0x1c0/0x1e0 [ 369.758670] __handle_mm_fault+0x250/0x380 [ 369.758712] handle_mm_fault+0x17c/0x3a4 [ 369.758753] do_page_fault+0x158/0x530 [ 369.758792] do_mem_abort+0x50/0xa0 [ 369.758831] el0_da+0x78/0x19c [ 369.758864] el0t_64_sync_handler+0xbc/0x150 [ 369.758904] el0t_64_sync+0x190/0x194 [ 369.758942] irq event stamp: 11395 [ 369.758973] hardirqs last enabled at (11395): [] __up_console_sem+0x74/0x80 [ 369.759042] hardirqs last disabled at (11394): [] __up_console_sem+0x6c/0x80 [ 369.760554] softirqs last enabled at (11392): [] __do_softirq+0x4c4/0x6b8 [ 369.762060] softirqs last disabled at (11383): [] __irq_exit_rcu+0x104/0x214 [ 369.763564] ---[ end trace 0000000000000000 ]--- Fixes: d536540f304c ("drm/fb-helper: Add generic fbdev emulation .fb_probe function") Signed-off-by: Javier Martinez Canillas Reviewed-by: Thomas Zimmermann --- drivers/gpu/drm/drm_fbdev_generic.c | 11 +++++------ include/drm/drm_fb_helper.h | 10 ++++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_fbdev_generic.c b/drivers/gpu/drm/drm_fbdev_generic.c index b2df8c03594c..bd1f8f28297c 100644 --- a/drivers/gpu/drm/drm_fbdev_generic.c +++ b/drivers/gpu/drm/drm_fbdev_generic.c @@ -171,11 +171,6 @@ static const struct fb_ops drm_fbdev_fb_ops = { .fb_imageblit = drm_fbdev_fb_imageblit, }; -static struct fb_deferred_io drm_fbdev_defio = { - .delay = HZ / 20, - .deferred_io = drm_fb_helper_deferred_io, -}; - /* * This function uses the client API to create a framebuffer backed by a dumb buffer. */ @@ -222,7 +217,11 @@ static int drm_fbdev_fb_probe(struct drm_fb_helper *fb_helper, return -ENOMEM; fbi->flags |= FBINFO_VIRTFB | FBINFO_READS_FAST; - fbi->fbdefio = &drm_fbdev_defio; + /* Set a default deferred I/O handler */ + fb_helper->fbdefio.delay = HZ / 20; + fb_helper->fbdefio.deferred_io = drm_fb_helper_deferred_io; + + fbi->fbdefio = &fb_helper->fbdefio; ret = fb_deferred_io_init(fbi); if (ret) return ret; diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index f443e1f11654..39b42c1a1954 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h @@ -203,6 +203,16 @@ struct drm_fb_helper { * the smem_start field should always be cleared to zero. */ bool hint_leak_smem_start; + + /** + * @fbdefio: + * + * Temporary storage for the driver's FB deferred I/O handler. If the + * driver uses the DRM fbdev emulation layer, this is set by the core + * to a generic deferred I/O handler if a driver is preferring to use + * a shadow buffer. + */ + struct fb_deferred_io fbdefio; }; static inline struct drm_fb_helper *