From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx49sQchak1636QvehZ6/4cxKLRQOAs2dqxTNWWm4psvre3H3Mv3nYjVeBv6rCVnapPUZpASg ARC-Seal: i=1; a=rsa-sha256; t=1523473253; cv=none; d=google.com; s=arc-20160816; b=JtsWyk049FLscMVr/nkcQ4ibkhXBEt2XXeCJ7/ikRPq/1qgMlf1kL1/Rn9K+v81x6T MQKRmz1l9m4JEHVExsd0iZEujKdVse6lHLaYxlK7mDHAU2j7JnV7bQOANoTzSUvZX1q6 rhTYWS9vPvn4w6PlsmJ4qqWdFwcIkEN9CJk/DtUcOQWYt92SFBz6C009/IHwj48QaWV2 RAFoGiw6hw0vIHB56i77Wb6NTGDZ+yvUSRcPrQ5JVAO9phijkDW+4UMGm1VcwhniX2n9 pUzW9Kn2Z9cFmnpFE5QfcQV0cJQmmKbhpM32L00tk6FpbJ0nA/ECAQjr+GOA5KLo7wcI Hn0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=zM/33oko9ljXzVj28bnE0cJo/2e1wl0cn/CytvPqtAc=; b=LPeehtWGn+S7gTEKvAOgUHmSFNqbBdyAPrDYcSH1VTlYin6VKmuaISQUo9ai1cF0Xe ZITTncBw6KUNI1bTDOGCJrdIH4hi1Y9tJ6y2zkItRwWunwLhksAbMITEPRa+Ge9UE2cH g+WtLEq+aWED3ynB7d9f3rjP8LnizvS9ILrqMFQO48NVq2SpkWJKdF8QqMenXxRDytdL /m1Z97wpT81FgHvpl8dz6ZKRnRBjvMT6y1kI/V0mkib5DSroFPLDwIzv9Yg3N8xfn0Xm buMWcCnrAvndQEsP3eq6adP4zBrvh+o0DPpS9KjXiZpJNutav1fCAsZBV69BeBbgMkg3 w3uA== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Pieter \"PoroCYon\" Sluys" , Geert Uytterhoeven , Bartlomiej Zolnierkiewicz , Sasha Levin Subject: [PATCH 4.9 139/310] vfb: fix video mode and line_length being set when loaded Date: Wed, 11 Apr 2018 20:34:38 +0200 Message-Id: <20180411183628.428799314@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183622.305902791@linuxfoundation.org> References: <20180411183622.305902791@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1597476277787799866?= X-GMAIL-MSGID: =?utf-8?q?1597477490460606632?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: "Pieter \\\"PoroCYon\\\" Sluys" [ Upstream commit 7b9faf5df0ac495a1a3d7cdb64921c179f9008ac ] Currently, when loading the vfb module, the newly created fbdev has a line_length of 0, and its video mode would be PSEUDOCOLOR regardless of color depth. (The former could be worked around by calling the FBIOPUT_VSCREENINFO ioctl with having the FBACTIVIATE_FORCE flag set.) This patch automatically sets the line_length correctly, and the video mode is derived from the bit depth now as well. Thanks to Geert Uytterhoeven for confirming the bug and helping me with the patch. Output of `fbset -i' before the patch: mode "1366x768-60" # D: 72.432 MHz, H: 47.403 kHz, V: 60.004 Hz geometry 1366 768 1366 768 32 timings 13806 120 10 14 3 32 5 rgba 8/0,8/8,8/16,8/24 endmode Frame buffer device information: Name : Virtual FB Address : 0xffffaa1405d85000 Size : 4196352 Type : PACKED PIXELS Visual : PSEUDOCOLOR XPanStep : 1 YPanStep : 1 YWrapStep : 1 LineLength : 0 <-- note this Accelerator : No After: mode "1366x768-60" # D: 72.432 MHz, H: 47.403 kHz, V: 60.004 Hz geometry 1366 768 1366 768 32 timings 13806 120 10 14 3 32 5 rgba 8/0,8/8,8/16,8/24 endmode Frame buffer device information: Name : Virtual FB Address : 0xffffaa1405d85000 Size : 4196352 Type : PACKED PIXELS Visual : TRUECOLOR XPanStep : 1 YPanStep : 1 YWrapStep : 1 LineLength : 5464 Accelerator : No Signed-off-by: "Pieter \"PoroCYon\" Sluys" Reviewed-by: Geert Uytterhoeven [b.zolnierkie: minor fixups] Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/video/fbdev/vfb.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) --- a/drivers/video/fbdev/vfb.c +++ b/drivers/video/fbdev/vfb.c @@ -239,8 +239,23 @@ static int vfb_check_var(struct fb_var_s */ static int vfb_set_par(struct fb_info *info) { + switch (info->var.bits_per_pixel) { + case 1: + info->fix.visual = FB_VISUAL_MONO01; + break; + case 8: + info->fix.visual = FB_VISUAL_PSEUDOCOLOR; + break; + case 16: + case 24: + case 32: + info->fix.visual = FB_VISUAL_TRUECOLOR; + break; + } + info->fix.line_length = get_line_length(info->var.xres_virtual, info->var.bits_per_pixel); + return 0; } @@ -450,6 +465,8 @@ static int vfb_probe(struct platform_dev goto err2; platform_set_drvdata(dev, info); + vfb_set_par(info); + fb_info(info, "Virtual frame buffer device, using %ldK of video memory\n", videomemorysize >> 10); return 0;