From patchwork Wed Feb 2 13:55:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 12732956 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 1C14DC433EF for ; Wed, 2 Feb 2022 13:55:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240471AbiBBNzh (ORCPT ); Wed, 2 Feb 2022 08:55:37 -0500 Received: from mout.gmx.net ([212.227.15.18]:59959 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232546AbiBBNzg (ORCPT ); Wed, 2 Feb 2022 08:55:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1643810132; bh=iKQpfY0iiqXhVwAZkTe76JPy7b6ddREFdPI70aFnkn8=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=CBzPMi3WhntY/GbexXSx8V28O51sKiXnXN6yAUYdTOM0x/UF267sP3C5LOsLw/Hf9 BrixjeSAOhFJp5x7SpMPgzPWfE3sOzkfn81VnlPGcQDJ7DainaQtetB87KE6rpLkOM fKSJJ/hHCLq7IPea9VxINDKbRtoA0WDaCix/yxZ0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from p100.fritz.box ([92.116.163.171]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MK3W0-1mw4GQ2az8-00LZBZ; Wed, 02 Feb 2022 14:55:32 +0100 From: Helge Deller To: Daniel Vetter , linux-fbdev@vger.kernel.org, DRI Development Subject: [PATCH v4 2/3] Revert "fbcon: Disable accelerated scrolling" Date: Wed, 2 Feb 2022 14:55:30 +0100 Message-Id: <20220202135531.92183-3-deller@gmx.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220202135531.92183-1-deller@gmx.de> References: <20220202135531.92183-1-deller@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:qP7TbaKW11YACYwrb9iNOo5kTg4GOe2s7NC5hJDCIvAzDiAwCmy Os0so9YloPkMC6LBbYP/5itFhezR4yoL+OuZpsBpOokiwRfUkty+ajMm/P8aI319aupou8d zCPssuGb65ehGa1By7oCDaRWJ1RdNGVXqFx8XMKY2Ct0RFFJX439tb7aPNtFh0hxPqhuk0a O2fKy9vlS3bP4B8QeOp6A== X-UI-Out-Filterresults: notjunk:1;V03:K0:6pbmLe/2S+Y=:jXymyTJsAWlDFXXg24l9Cj wmYECnJi9MOPW9qxz9a8v07YUg0PDLsJrviFHua0C8sPe3ws1MwBaKcIDshQ0rhsI/HIoNKgm SgayC1NxIDwIakEQHcjx5V730oXqQ2GST/QJpkyqoLSDExgfzCX5cAl/tAMWm6yENfc1EvKc6 xAn1aAu8A9HEIlB4iCu22tGltILpT4rS4ktX+T4M/fiDaKMNuvw4qqk/erVfzcuOJyhVMdFhb uoeW7ivo8uxvWiuWVHxFIWv7juF55YqpC6u4HWOZ3N3DyuOjXmmgc27H4cOAL6e6SaIdnf2pw Zd/mm7hJzge3CLgz+41kW97//H23xVXTU0fM2LCLJ2v3gbAAGtyCHq0vbu+n6vbAERJyJQf7D zfQLRq14v6aG1Q9oTbZ6wcOh8oFWi/kCaq5yK5Q+Qf+WNjJnRO+qFfTc5jwCPJ7JjPKjDt25d SRHD59VvOdzGVCKTiSe2lALft2sCwNtpIPVPPc4tpD6hRh+U7FinCtJZjM7rY0RJplIBAOSnU pj/KLvLRza88UvdCbUbTMbG8DsdIDU1T9V1QlhvShJm75JHH+JGzZz7Iv0IeZqHnz+CQa7JIj iRo86nrmrPTLnN+/61VkBJffRoXL2zZGhEDOBGJRB8eJUmMmQItUO3sb69V34p9KTZx51BunW jUYpU/y9ZctBH37N9ZHMqhXmt6/GoZWzPmigS3gyFqcbV3kwbqOTGwqgsjUurPGKS4d1AENOS J8P/Ahxrln/XYQmkxsELwVxziB1vqaEcwsVnccakTPr/KQnCTVpMaYudREmf7wGwgRcP9Once 6qw+sRCNkSRz1KvfbYx8YaJ9qT77XlQfevdb7tw4gzC6l0TgNpFDCxaiemrnGxIECme/uRPEC nYUY5md4yhaYs/f36NxdCJktPUjZUfrORp/IM3YdHOrXnpAPlwizt8mvQ4VCq2XqBREynTjre RMZo7SXr12+e6mVn+nQtwdQzYGbm7V5T/mPznz/H8zhBPUeY0ZM8QMVwyosZty4CLRCopPXn7 MqnNa4zvHJshznoNS2O0yVmdiO9Q9lR+8Cnn/c1y5o5f8tYR5/a/CFYIFLylAH6Q8+sQF/J44 CNcpn/jp4GxHKo= Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org This reverts commit 39aead8373b3c20bb5965c024dfb51a94e526151. Revert the first (of 2) commits which disabled scrolling acceleration in fbcon/fbdev. It introduced a regression for fbdev-supported graphic cards because of the performance penalty by doing screen scrolling by software instead of using the existing graphic card 2D hardware acceleration. Console scrolling acceleration was disabled by dropping code which checked at runtime the driver hardware capabilities for the BINFO_HWACCEL_COPYAREA or FBINFO_HWACCEL_FILLRECT flags and if set, it enabled scrollmode SCROLL_MOVE which uses hardware acceleration to move screen contents. After dropping those checks scrollmode was hard-wired to SCROLL_REDRAW instead, which forces all graphic cards to redraw every character at the new screen position when scrolling. This change effectively disabled all hardware-based scrolling acceleration for ALL drivers, because now all kind of 2D hardware acceleration (bitblt, fillrect) in the drivers isn't used any longer. The original commit message mentions that only 3 DRM drivers (nouveau, omapdrm and gma500) used hardware acceleration in the past and thus code for checking and using scrolling acceleration is obsolete. This statement is NOT TRUE, because beside the DRM drivers there are around 35 other fbdev drivers which depend on fbdev/fbcon and still provide hardware acceleration for fbdev/fbcon. The original commit message also states that syzbot found lots of bugs in fbcon and thus it's "often the solution to just delete code and remove features". This is true, and the bugs - which actually affected all users of fbcon, including DRM - were fixed, or code was dropped like e.g. the support for software scrollback in vgacon (commit 973c096f6a85). So to further analyze which bugs were found by syzbot, I've looked through all patches in drivers/video which were tagged with syzbot or syzkaller back to year 2005. The vast majority fixed the reported issues on a higher level, e.g. when screen is to be resized, or when font size is to be changed. The few ones which touched driver code fixed a real driver bug, e.g. by adding a check. But NONE of those patches touched code of either the SCROLL_MOVE or the SCROLL_REDRAW case. That means, there was no real reason why SCROLL_MOVE had to be ripped-out and just SCROLL_REDRAW had to be used instead. The only reason I can imagine so far was that SCROLL_MOVE wasn't used by DRM and as such it was assumed that it could go away. That argument completely missed the fact that SCROLL_MOVE is still heavily used by fbdev (non-DRM) drivers. Some people mention that using memcpy() instead of the hardware acceleration is pretty much the same speed. But that's not true, at least not for older graphic cards and machines where we see speed decreases by factor 10 and more and thus this change leads to console responsiveness way worse than before. That's why the original commit is to be reverted. By reverting we reintroduce hardware-based scrolling acceleration and fix the performance regression for fbdev drivers. There isn't any impact on DRM when reverting those patches. Signed-off-by: Helge Deller Acked-by: Geert Uytterhoeven Acked-by: Sven Schnelle Cc: stable@vger.kernel.org # v5.10+ Signed-off-by: Helge Deller --- Documentation/gpu/todo.rst | 21 --------------- drivers/video/fbdev/core/fbcon.c | 45 ++++++++++++++++++++++++++------ 2 files changed, 37 insertions(+), 29 deletions(-) -- 2.34.1 diff --git a/Documentation/gpu/todo.rst b/Documentation/gpu/todo.rst index 29506815d24a..a1212b5b3026 100644 --- a/Documentation/gpu/todo.rst +++ b/Documentation/gpu/todo.rst @@ -300,27 +300,6 @@ Contact: Daniel Vetter, Noralf Tronnes Level: Advanced -Garbage collect fbdev scrolling acceleration --------------------------------------------- - -Scroll acceleration is disabled in fbcon by hard-wiring p->scrollmode = -SCROLL_REDRAW. There's a ton of code this will allow us to remove: - -- lots of code in fbcon.c - -- a bunch of the hooks in fbcon_ops, maybe the remaining hooks could be called - directly instead of the function table (with a switch on p->rotate) - -- fb_copyarea is unused after this, and can be deleted from all drivers - -Note that not all acceleration code can be deleted, since clearing and cursor -support is still accelerated, which might be good candidates for further -deletion projects. - -Contact: Daniel Vetter - -Level: Intermediate - idr_init_base() --------------- diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 22bb3892f6bd..b813985f1403 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -1025,7 +1025,7 @@ static void fbcon_init(struct vc_data *vc, int init) struct vc_data *svc = *default_mode; struct fbcon_display *t, *p = &fb_display[vc->vc_num]; int logo = 1, new_rows, new_cols, rows, cols; - int ret; + int cap, ret; if (WARN_ON(info_idx == -1)) return; @@ -1034,6 +1034,7 @@ static void fbcon_init(struct vc_data *vc, int init) con2fb_map[vc->vc_num] = info_idx; info = registered_fb[con2fb_map[vc->vc_num]]; + cap = info->flags; if (logo_shown < 0 && console_loglevel <= CONSOLE_LOGLEVEL_QUIET) logo_shown = FBCON_LOGO_DONTSHOW; @@ -1135,13 +1136,11 @@ static void fbcon_init(struct vc_data *vc, int init) ops->graphics = 0; - /* - * No more hw acceleration for fbcon. - * - * FIXME: Garbage collect all the now dead code after sufficient time - * has passed. - */ - p->scrollmode = SCROLL_REDRAW; + if ((cap & FBINFO_HWACCEL_COPYAREA) && + !(cap & FBINFO_HWACCEL_DISABLED)) + p->scrollmode = SCROLL_MOVE; + else /* default to something safe */ + p->scrollmode = SCROLL_REDRAW; /* * ++guenther: console.c:vc_allocate() relies on initializing @@ -1953,15 +1952,45 @@ static void updatescrollmode(struct fbcon_display *p, { struct fbcon_ops *ops = info->fbcon_par; int fh = vc->vc_font.height; + int cap = info->flags; + u16 t = 0; + int ypan = FBCON_SWAP(ops->rotate, info->fix.ypanstep, + info->fix.xpanstep); + int ywrap = FBCON_SWAP(ops->rotate, info->fix.ywrapstep, t); int yres = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres); int vyres = FBCON_SWAP(ops->rotate, info->var.yres_virtual, info->var.xres_virtual); + int good_pan = (cap & FBINFO_HWACCEL_YPAN) && + divides(ypan, vc->vc_font.height) && vyres > yres; + int good_wrap = (cap & FBINFO_HWACCEL_YWRAP) && + divides(ywrap, vc->vc_font.height) && + divides(vc->vc_font.height, vyres) && + divides(vc->vc_font.height, yres); + int reading_fast = cap & FBINFO_READS_FAST; + int fast_copyarea = (cap & FBINFO_HWACCEL_COPYAREA) && + !(cap & FBINFO_HWACCEL_DISABLED); + int fast_imageblit = (cap & FBINFO_HWACCEL_IMAGEBLIT) && + !(cap & FBINFO_HWACCEL_DISABLED); p->vrows = vyres/fh; if (yres > (fh * (vc->vc_rows + 1))) p->vrows -= (yres - (fh * vc->vc_rows)) / fh; if ((yres % fh) && (vyres % fh < yres % fh)) p->vrows--; + + if (good_wrap || good_pan) { + if (reading_fast || fast_copyarea) + p->scrollmode = good_wrap ? + SCROLL_WRAP_MOVE : SCROLL_PAN_MOVE; + else + p->scrollmode = good_wrap ? SCROLL_REDRAW : + SCROLL_PAN_REDRAW; + } else { + if (reading_fast || (fast_copyarea && !fast_imageblit)) + p->scrollmode = SCROLL_MOVE; + else + p->scrollmode = SCROLL_REDRAW; + } } #define PITCH(w) (((w) + 7) >> 3)