[PATCH 12/14] drm/ast: Detect AST 2510 model

[Thomas Zimmermann]

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

Signed-off-by: Thomas Zimmermann <tzimmerm...@suse.de>
---
 drivers/gpu/drm/ast/ast_drv.h  |  2 +-
 drivers/gpu/drm/ast/ast_main.c | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
index ef69a1535695b..c66fe0ba208e7 100644
--- a/drivers/gpu/drm/ast/ast_drv.h
+++ b/drivers/gpu/drm/ast/ast_drv.h
@@ -78,7 +78,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 72543e97f3586..7f8fb9a613604 100644
--- a/drivers/gpu/drm/ast/ast_main.c
+++ b/drivers/gpu/drm/ast/ast_main.c
@@ -164,8 +164,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:
@@ -228,8 +235,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;
-- 
2.41.0