drm/ast: Align naming in widescreen detection code to manual

Rename variables and register constants to align with the programming
manual. Add new constants where necessary.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250131092257.115596-3-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c
index cddd69972e89d1c3cea0ed83031af2553d7e7645..6fbf62a99c48da49000a42edddc9f21c15bd7802 100644 (file)
--- a/drivers/gpu/drm/ast/ast_drv.c
+++ b/drivers/gpu/drm/ast/ast_drv.c
@@ -170,7 +170,7 @@ static int ast_detect_chip(struct pci_dev *pdev,
 
                        /* Patch AST2500/AST2510 */
                        if ((pdev->revision & 0xf0) == 0x40) {
-                               if (!(vgacrd0 & AST_VRAM_INIT_STATUS_MASK))
+                               if (!(vgacrd0 & AST_IO_VGACRD0_VRAM_INIT_STATUS_MASK))
                                        ast_patch_ahb_2500(regs);
                        }
 

diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
index ba69280b33e783db8205036ac88cf06e541c258c..2a813f0128eb8a25c13414eeedb8dee68915135d 100644 (file)
--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c
@@ -38,7 +38,7 @@
 
 static void ast_detect_widescreen(struct ast_device *ast)
 {
-       u8 jreg;
+       u8 vgacrd0;
 
        /* Check if we support wide screen */
        switch (AST_GEN(ast)) {
@@ -46,10 +46,10 @@ static void ast_detect_widescreen(struct ast_device *ast)
                ast->support_wide_screen = false;
                break;
        default:
-               jreg = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
-               if (!(jreg & 0x80))
+               vgacrd0 = ast_get_index_reg(ast, AST_IO_VGACRI, 0xd0);
+               if (!(vgacrd0 & AST_IO_VGACRD0_VRAM_INIT_BY_BMC))
                        ast->support_wide_screen = true;
-               else if (jreg & 0x01)
+               else if (vgacrd0 & AST_IO_VGACRD0_IKVM_WIDESCREEN)
                        ast->support_wide_screen = true;
                else {
                        ast->support_wide_screen = false;

diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c
index 0daa8e52a092a6103c0b251e5845551509f51478..91e85e457bdf34e5f29dd52fc8a3f856a29966e1 100644 (file)
--- a/drivers/gpu/drm/ast/ast_post.c
+++ b/drivers/gpu/drm/ast/ast_post.c
@@ -2062,7 +2062,7 @@ void ast_post_chip_2500(struct ast_device *ast)
        u8 reg;
 
        reg = ast_get_index_reg_mask(ast, AST_IO_VGACRI, 0xd0, 0xff);
-       if ((reg & AST_VRAM_INIT_STATUS_MASK) == 0) {/* vga only */
+       if ((reg & AST_IO_VGACRD0_VRAM_INIT_STATUS_MASK) == 0) {/* vga only */
                /* Clear bus lock condition */
                ast_patch_ahb_2500(ast->regs);
 

diff --git a/drivers/gpu/drm/ast/ast_reg.h b/drivers/gpu/drm/ast/ast_reg.h
index 0745d58e5b4507abb55846b6d91ad2e8188f22cc..b4ff38949a565f38d21cb4e8759c254416aa5fa2 100644 (file)
--- a/drivers/gpu/drm/ast/ast_reg.h
+++ b/drivers/gpu/drm/ast/ast_reg.h
@@ -38,6 +38,12 @@
 #define AST_IO_VGACRCB_HWC_16BPP       BIT(0) /* set: ARGB4444, cleared: 2bpp palette */
 #define AST_IO_VGACRCB_HWC_ENABLED     BIT(1)
 
+/* mirrors SCU100[7:0] */
+#define AST_IO_VGACRD0_VRAM_INIT_STATUS_MASK   GENMASK(7, 6)
+#define AST_IO_VGACRD0_VRAM_INIT_BY_BMC                BIT(7)
+#define AST_IO_VGACRD0_VRAM_INIT_READY         BIT(6)
+#define AST_IO_VGACRD0_IKVM_WIDESCREEN         BIT(0)
+
 #define AST_IO_VGACRD1_MCU_FW_EXECUTING                BIT(5)
 /* Display Transmitter Type */
 #define AST_IO_VGACRD1_TX_TYPE_MASK            GENMASK(3, 1)
@@ -61,11 +67,6 @@
 #define AST_IO_VGAIR1_R                        (0x5A)
 #define AST_IO_VGAIR1_VREFRESH         BIT(3)
 
-
-#define AST_VRAM_INIT_STATUS_MASK      GENMASK(7, 6)
-//#define AST_VRAM_INIT_BY_BMC         BIT(7)
-//#define AST_VRAM_INIT_READY          BIT(6)
-
 /*
  * AST DisplayPort
  */