From patchwork Tue May 23 15:06:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 98033 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:3046:b0:115:7a1d:dabb with SMTP id p6csp2201392rwl; Tue, 23 May 2023 08:15:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7OyjIc0w9PjdV3DOQQNeT2YPxnuNa6Gs+o6V4nFX0633DwRJ/pCaK3wFH+bMuWw4uZ86v7 X-Received: by 2002:a05:6a00:b45:b0:64f:3fc8:5d0f with SMTP id p5-20020a056a000b4500b0064f3fc85d0fmr3603943pfo.8.1684854907124; Tue, 23 May 2023 08:15:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684854907; cv=none; d=google.com; s=arc-20160816; b=FxefQCIqHpGh+9IRoECnkHYetWjlhyLC8dJXLVIAxriEEB5T8medKW1Ul535P2FqJ5 XJ1KbRgI20oeFMi4+xA/sGeJQY/UxC59moDvIOwsPlO4tWbHZNeZ7lW/JE6t8c/0n0AV QkvSRWWMtHxXyZQ4jy+SagjaFA6ebZWlvf2S37apgTjo7Y5izlmxyTTfVpZb9YV/HWWX 9ECNpcUR6c7hMMfX6K3IY6uDowJ/NAklhbNkz1fBi99u0I7eE/ZDJD4o4KZZGt/RwCxF CfwzLGOQhF48Rz+wEZjX8MZQ+9KgwYDpyT/gN88l7KtN765IfZAjRoqViuuGLd9VOwNp Ublw== 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; bh=Mk91qK7//EAc7kgyx+9oL2j9VYpXxZ/Kh3Agx0fPfR0=; b=J7xmeMGrgKNke3kr5pt03HOCQH9zbxR227UJ1y2o7LFcFSBmZ7ybmSG/Vikf+ftDeZ sJycYjcU6hBQV4/n3K6cXpq+d4rA1NZ2mDrZcs9Mj85aGfVGbg8gpsB/s92eRVdMYCFl C7++A4bBFunW2TKt1KHIKDtqOtcUPmUecTIow2kJ2kcUo1uL+mLdTgoPnk2MqT9WPuy8 z1cM6bOnk4b3fjITud3tOPFH9UOIV7CRDfeIbmK44lXbJiuV6xQd1aDcwEEgEUkkSIB5 FF0/XvMkpjtHqPnQy7EEjTFUdwMYq8B4swzQGt78Vz7aG+MBqfyvG5RP6U/x/AcpdSb+ Jg7g== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e30-20020aa798de000000b0064d72691d73si1653315pfm.316.2023.05.23.08.14.54; Tue, 23 May 2023 08:15:07 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237275AbjEWPGc (ORCPT + 99 others); Tue, 23 May 2023 11:06:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237135AbjEWPGb (ORCPT ); Tue, 23 May 2023 11:06:31 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E23F5FA for ; Tue, 23 May 2023 08:06:26 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed30:b0ac:7afd:272:4cff]) by baptiste.telenet-ops.be with bizsmtp id 0F6N2A0050Jkz7G01F6N0Z; Tue, 23 May 2023 17:06:24 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1q1TaR-002svP-Hg; Tue, 23 May 2023 17:06:22 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1q1Taf-00CkGs-VW; Tue, 23 May 2023 17:06:21 +0200 From: Geert Uytterhoeven To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Javier Martinez Canillas Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven , Daniel Vetter , Sui Jingfeng Subject: [PATCH v2] drm/fb-helper: Fix height, width, and accel_flags in fb_var Date: Tue, 23 May 2023 17:06:20 +0200 Message-Id: <57e6b334dae8148b1b8ae6ef308ce9a83810a850.1684854344.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE 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?1766698419057029216?= X-GMAIL-MSGID: =?utf-8?q?1766698419057029216?= Fbtest contains some very simple validation of the fbdev userspace API contract. When used with shmob-drm, it reports the following warnings and errors: height changed from 68 to 0 height was rounded down width changed from 111 to 0 width was rounded down accel_flags changed from 0 to 1 The first part happens because __fill_var() resets the physical dimensions of the first connector, as filled in by drm_setup_crtcs_fb(). Fix this by retaining the original values. The last part happens because __fill_var() forces the FB_ACCELF_TEXT flag on, while fbtest disables all acceleration on purpose, so it can draw safely to the frame buffer. Fix this by setting accel_flags to zero, as DRM does not implement any text console acceleration. Note that this issue can also be seen in the output of fbset, which reports "accel true". Fixes: ee4cce0a8f03a333 ("drm/fb-helper: fix input validation gaps in check_var") Signed-off-by: Geert Uytterhoeven Reviewed-by: Daniel Vetter Tested-by: Sui Jingfeng --- v2: - Add Reviewed-by, Tested-by. --- drivers/gpu/drm/drm_fb_helper.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index f0e9549b6bd751de..8dc376b771d2cf22 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -1379,17 +1379,19 @@ static void drm_fb_helper_fill_pixel_fmt(struct fb_var_screeninfo *var, } } -static void __fill_var(struct fb_var_screeninfo *var, +static void __fill_var(struct fb_var_screeninfo *var, struct fb_info *info, struct drm_framebuffer *fb) { int i; var->xres_virtual = fb->width; var->yres_virtual = fb->height; - var->accel_flags = FB_ACCELF_TEXT; + var->accel_flags = 0; var->bits_per_pixel = drm_format_info_bpp(fb->format, 0); - var->height = var->width = 0; + var->height = info->var.height; + var->width = info->var.width; + var->left_margin = var->right_margin = 0; var->upper_margin = var->lower_margin = 0; var->hsync_len = var->vsync_len = 0; @@ -1452,7 +1454,7 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var, return -EINVAL; } - __fill_var(var, fb); + __fill_var(var, info, fb); /* * fb_pan_display() validates this, but fb_set_par() doesn't and just @@ -1908,7 +1910,7 @@ static void drm_fb_helper_fill_var(struct fb_info *info, info->pseudo_palette = fb_helper->pseudo_palette; info->var.xoffset = 0; info->var.yoffset = 0; - __fill_var(&info->var, fb); + __fill_var(&info->var, info, fb); info->var.activate = FB_ACTIVATE_NOW; drm_fb_helper_fill_pixel_fmt(&info->var, format);