drm/ast: Detect AST 2510 model

Detect the 6th-generation AST 2510. Allows to simplify the code
for widescreen support.

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

diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
index 876ebbd3b60e02c8a9d8baaede9005555f2aaa31..3f6e0c984523a58b36790f7fa6893942b16fbf5a 100644 (file)
--- a/drivers/gpu/drm/ast/ast_drv.h
+++ b/drivers/gpu/drm/ast/ast_drv.h
@@ -75,7 +75,7 @@ enum ast_chip {
        AST1250 = __AST_CHIP(5, 2), // unused
        /* 6th gen */
        AST2500 = __AST_CHIP(6, 0),
-       AST2510 = __AST_CHIP(6, 1), // unused
+       AST2510 = __AST_CHIP(6, 1),
        AST2520 = __AST_CHIP(6, 2), // unused
        /* 7th gen */
        AST2600 = __AST_CHIP(7, 0),

diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
index cbfe93c7929d4d676316495b5ab4a205bff6f7fa..f2f8a054c52cfbc800382c2eca6bfa581560066d 100644 (file)
--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c
@@ -163,8 +163,15 @@ static int ast_detect_chip(struct drm_device *dev, bool need_post, u32 scu_rev)
                ast->chip = AST2600;
                drm_info(dev, "AST 2600 detected\n");
        } else if (pdev->revision >= 0x40) {
-               ast->chip = AST2500;
-               drm_info(dev, "AST 2500 detected\n");
+               switch (scu_rev & 0x300) {
+               case 0x0100:
+                       ast->chip = AST2510;
+                       drm_info(dev, "AST 2510 detected\n");
+                       break;
+               default:
+                       ast->chip = AST2500;
+                       drm_info(dev, "AST 2500 detected\n");
+               }
        } else if (pdev->revision >= 0x30) {
                switch (scu_rev & 0x300) {
                case 0x0100:
@@ -227,8 +234,7 @@ static int ast_detect_chip(struct drm_device *dev, bool need_post, u32 scu_rev)
                                ast->support_wide_screen = true;
                        if (ast->chip == AST1400)
                                ast->support_wide_screen = true;
-                       if (ast->chip == AST2500 &&
-                           scu_rev == 0x100)           /* ast2510 */
+                       if (ast->chip == AST2510)
                                ast->support_wide_screen = true;
                        if (IS_AST_GEN7(ast))
                                ast->support_wide_screen = true;