viafb: Determine type of 2D engine and store it in chip_info

This will help us for the upcoming support for 2D acceleration using
the M1 engine.

[jc: fixed merge conflicts]
Signed-off-by: Harald Welte <HaraldWelte@viatech.com>

diff --git a/drivers/video/via/chip.h b/drivers/video/via/chip.h
index 8c06bd3c0b4da124d20e02db56e28d8fd7d93d68..d9b6e06e07004a5c5697302547d381bf976c097d 100644 (file)
--- a/drivers/video/via/chip.h
+++ b/drivers/video/via/chip.h
@@ -121,9 +121,17 @@ struct lvds_chip_information {
        int i2c_port;
 };
 
+/* The type of 2D engine */
+enum via_2d_engine {
+       VIA_2D_ENG_H2,
+       VIA_2D_ENG_H5,
+       VIA_2D_ENG_M1,
+};
+
 struct chip_information {
        int gfx_chip_name;
        int gfx_chip_revision;
+       enum via_2d_engine twod_engine;
        struct tmds_chip_information tmds_chip_info;
        struct lvds_chip_information lvds_chip_info;
        struct lvds_chip_information lvds_chip_info2;

diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c
index c94bcce71eaf8acc8606c9eedeec24d0e9cb8ea4..ae664fbd7e80b037ef51f0c59fcd0879a5b4ab41 100644 (file)
--- a/drivers/video/via/hw.c
+++ b/drivers/video/via/hw.c
@@ -2016,6 +2016,21 @@ static void init_gfx_chip_info(struct pci_dev *pdev,
                                CX700_REVISION_700;
                }
        }
+
+       /* Determine which 2D engine we have */
+       switch (viaparinfo->chip_info->gfx_chip_name) {
+       case UNICHROME_VX800:
+       case UNICHROME_VX855:
+               viaparinfo->chip_info->twod_engine = VIA_2D_ENG_M1;
+               break;
+       case UNICHROME_K8M890:
+       case UNICHROME_P4M900:
+               viaparinfo->chip_info->twod_engine = VIA_2D_ENG_H5;
+               break;
+       default:
+               viaparinfo->chip_info->twod_engine = VIA_2D_ENG_H2;
+               break;
+       }
 }
 
 static void init_tmds_chip_info(void)