From patchwork Tue Feb 15 11:21:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 12746930 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 55FFBC433F5 for ; Tue, 15 Feb 2022 11:21:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237040AbiBOLVs (ORCPT ); Tue, 15 Feb 2022 06:21:48 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:41300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237037AbiBOLVr (ORCPT ); Tue, 15 Feb 2022 06:21:47 -0500 Received: from michel.telenet-ops.be (michel.telenet-ops.be [IPv6:2a02:1800:110:4::f00:18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80781A9A7E for ; Tue, 15 Feb 2022 03:21:36 -0800 (PST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:8c73:faf1:1d11:4a47]) by michel.telenet-ops.be with bizsmtp id vPMY2600n3BmCM306PMZ0u; Tue, 15 Feb 2022 12:21:33 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1nJvtk-000rqd-Gw; Tue, 15 Feb 2022 12:21:32 +0100 Received: from geert by rox.of.borg with local (Exim 4.93) (envelope-from ) id 1nJvtk-00B34n-50; Tue, 15 Feb 2022 12:21:32 +0100 From: Geert Uytterhoeven To: Helge Deller Cc: Michael Schmitz , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-m68k@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 1/3] video: fbdev: atari: Fix TT High video mode Date: Tue, 15 Feb 2022 12:21:24 +0100 Message-Id: <20220215112126.2633383-2-geert@linux-m68k.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220215112126.2633383-1-geert@linux-m68k.org> References: <20220215112126.2633383-1-geert@linux-m68k.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org The horizontal resolution (640) for the TT High video mode (1280x960) is definitely bogus. While fixing that, correct the timings to match the TTM195 service manual. Signed-off-by: Geert Uytterhoeven --- Untested on actual hardware. v3: - Adjust pixclock from 7761 to 7760 to match 4 * 32.215905 MHz crystal oscillator frequency, - Make it part of a series. v2[1]: - Use correct base. [1] https://lore.kernel.org/r/20201101102759.2890612-1-geert@linux-m68k.org/ --- drivers/video/fbdev/atafb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/atafb.c b/drivers/video/fbdev/atafb.c index e3812a8ff55a4fb8..a9f25cab4a1e6737 100644 --- a/drivers/video/fbdev/atafb.c +++ b/drivers/video/fbdev/atafb.c @@ -487,8 +487,8 @@ static struct fb_videomode atafb_modedb[] __initdata = { "tt-mid", 60, 640, 480, 31041, 120, 100, 8, 16, 140, 30, 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP }, { - /* 1280x960, 29 kHz, 60 Hz (TT high) */ - "tt-high", 57, 640, 960, 31041, 120, 100, 8, 16, 140, 30, + /* 1280x960, 72 kHz, 72 Hz (TT high) */ + "tt-high", 57, 1280, 960, 7760, 260, 60, 36, 4, 192, 4, 0, FB_VMODE_NONINTERLACED | FB_VMODE_YWRAP }, From patchwork Tue Feb 15 11:21:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 12746931 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 A8EC9C43217 for ; Tue, 15 Feb 2022 11:21:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237037AbiBOLVt (ORCPT ); Tue, 15 Feb 2022 06:21:49 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:41310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234197AbiBOLVr (ORCPT ); Tue, 15 Feb 2022 06:21:47 -0500 Received: from michel.telenet-ops.be (michel.telenet-ops.be [IPv6:2a02:1800:110:4::f00:18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BD42AB460 for ; Tue, 15 Feb 2022 03:21:36 -0800 (PST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:8c73:faf1:1d11:4a47]) by michel.telenet-ops.be with bizsmtp id vPMZ260013BmCM306PMZ0v; Tue, 15 Feb 2022 12:21:33 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1nJvtk-000rqe-KZ; Tue, 15 Feb 2022 12:21:32 +0100 Received: from geert by rox.of.borg with local (Exim 4.93) (envelope-from ) id 1nJvtk-00B34u-5o; Tue, 15 Feb 2022 12:21:32 +0100 From: Geert Uytterhoeven To: Helge Deller Cc: Michael Schmitz , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-m68k@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 2/3] video: fbdev: atari: Convert to standard round_up() helper Date: Tue, 15 Feb 2022 12:21:25 +0100 Message-Id: <20220215112126.2633383-3-geert@linux-m68k.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220215112126.2633383-1-geert@linux-m68k.org> References: <20220215112126.2633383-1-geert@linux-m68k.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org Remove the custom macro up(), and convert the code to use the standard round_up() helper instead. Signed-off-by: Geert Uytterhoeven --- drivers/video/fbdev/atafb.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/video/fbdev/atafb.c b/drivers/video/fbdev/atafb.c index a9f25cab4a1e6737..b9d6aaaeae43f2f1 100644 --- a/drivers/video/fbdev/atafb.c +++ b/drivers/video/fbdev/atafb.c @@ -76,8 +76,6 @@ #define SWITCH_SND7 0x80 #define SWITCH_NONE 0x00 -#define up(x, r) (((x) + (r) - 1) & ~((r)-1)) - static int default_par; /* default resolution (0=none) */ @@ -1649,12 +1647,12 @@ static int falcon_pan_display(struct fb_var_screeninfo *var, int bpp = info->var.bits_per_pixel; if (bpp == 1) - var->xoffset = up(var->xoffset, 32); + var->xoffset = round_up(var->xoffset, 32); if (bpp != 16) par->hw.falcon.xoffset = var->xoffset & 15; else { par->hw.falcon.xoffset = 0; - var->xoffset = up(var->xoffset, 2); + var->xoffset = round_up(var->xoffset, 2); } par->hw.falcon.line_offset = bpp * (info->var.xres_virtual - info->var.xres) / 16; @@ -2268,7 +2266,7 @@ static int pan_display(struct fb_var_screeninfo *var, struct fb_info *info) if (!fbhw->set_screen_base || (!ATARIHW_PRESENT(EXTD_SHIFTER) && var->xoffset)) return -EINVAL; - var->xoffset = up(var->xoffset, 16); + var->xoffset = round_up(var->xoffset, 16); par->screen_base = screen_base + (var->yoffset * info->var.xres_virtual + var->xoffset) * info->var.bits_per_pixel / 8; From patchwork Tue Feb 15 11:21:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 12746929 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 78D9DC433FE for ; Tue, 15 Feb 2022 11:21:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236600AbiBOLVr (ORCPT ); Tue, 15 Feb 2022 06:21:47 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:41302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237040AbiBOLVr (ORCPT ); Tue, 15 Feb 2022 06:21:47 -0500 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 809E3AA2E1 for ; Tue, 15 Feb 2022 03:21:36 -0800 (PST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:8c73:faf1:1d11:4a47]) by laurent.telenet-ops.be with bizsmtp id vPMZ2600A3BmCM301PMZ7K; Tue, 15 Feb 2022 12:21:33 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1nJvtk-000rqf-KT; Tue, 15 Feb 2022 12:21:32 +0100 Received: from geert by rox.of.borg with local (Exim 4.93) (envelope-from ) id 1nJvtk-00B351-6e; Tue, 15 Feb 2022 12:21:32 +0100 From: Geert Uytterhoeven To: Helge Deller Cc: Michael Schmitz , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-m68k@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 3/3] video: fbdev: atari: Remove unused atafb_setcolreg() Date: Tue, 15 Feb 2022 12:21:26 +0100 Message-Id: <20220215112126.2633383-4-geert@linux-m68k.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220215112126.2633383-1-geert@linux-m68k.org> References: <20220215112126.2633383-1-geert@linux-m68k.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org atafb_probe() overrides the atafb_ops.fb_setcolreg() method to match the actual graphics hardware. Besides, the shifts by 8 were bogus, as the individual .fb_setcolreg() implementations already take care of that. Signed-off-by: Geert Uytterhoeven --- drivers/video/fbdev/atafb.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/video/fbdev/atafb.c b/drivers/video/fbdev/atafb.c index b9d6aaaeae43f2f1..e95333e004744bf5 100644 --- a/drivers/video/fbdev/atafb.c +++ b/drivers/video/fbdev/atafb.c @@ -2404,16 +2404,6 @@ static void atafb_set_disp(struct fb_info *info) atari_stram_to_virt(info->fix.smem_start)); } -static int atafb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, - u_int transp, struct fb_info *info) -{ - red >>= 8; - green >>= 8; - blue >>= 8; - - return info->fbops->fb_setcolreg(regno, red, green, blue, transp, info); -} - static int atafb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) { @@ -2724,7 +2714,6 @@ static struct fb_ops atafb_ops = { .owner = THIS_MODULE, .fb_check_var = atafb_check_var, .fb_set_par = atafb_set_par, - .fb_setcolreg = atafb_setcolreg, .fb_blank = atafb_blank, .fb_pan_display = atafb_pan_display, .fb_fillrect = atafb_fillrect,