[openchrome-devel] drm-openchrome: Branch 'drm-next-5.20' - 21 commits - drivers/gpu/drm include/drm/drm_pciids.h include/linux/pci_ids.h
Kevin Brace
kevinbrace at kemper.freedesktop.org
Sat Jul 2 00:42:10 UTC 2022
drivers/gpu/drm/via/via_crtc.c | 104 +++++++++++++++++++-------------------
drivers/gpu/drm/via/via_cursor.c | 60 ++++++++++-----------
drivers/gpu/drm/via/via_dac.c | 32 +++++------
drivers/gpu/drm/via/via_display.c | 2
drivers/gpu/drm/via/via_drv.c | 14 ++++-
drivers/gpu/drm/via/via_drv.h | 27 ++-------
drivers/gpu/drm/via/via_hdmi.c | 66 +-----------------------
drivers/gpu/drm/via/via_init.c | 28 +++++-----
drivers/gpu/drm/via/via_lvds.c | 66 ++++++++++++------------
drivers/gpu/drm/via/via_pll.c | 20 +++----
drivers/gpu/drm/via/via_pm.c | 12 ++--
drivers/gpu/drm/via/via_tmds.c | 32 +++++------
include/drm/drm_pciids.h | 26 ++++-----
include/linux/pci_ids.h | 30 +++++-----
14 files changed, 229 insertions(+), 290 deletions(-)
New commits:
commit 582508da93d6f100a405cac498352571b5d88a36
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 1 19:26:57 2022 -0500
drm/via: Version bumped to 3.5.3
Removed unnecessary code from integrated DVI / HDMI transmitter
support code. Changed VIA Technologies PCI device ID labels to make it
more intuitive. Brought PCI device detection table into via_drv.c.
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index bee4e6dfb0e8..1c801d525a24 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -50,10 +50,10 @@
#define DRIVER_MAJOR 3
#define DRIVER_MINOR 5
-#define DRIVER_PATCHLEVEL 2
+#define DRIVER_PATCHLEVEL 3
#define DRIVER_NAME "via"
#define DRIVER_DESC "OpenChrome DRM for VIA Technologies Chrome IGP"
-#define DRIVER_DATE "20220620"
+#define DRIVER_DATE "20220701"
#define DRIVER_AUTHOR "OpenChrome Project"
commit 12df952e58dbfd1ddfb5aa1090a02fea48e2316f
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 1 19:21:29 2022 -0500
drm/via: Stop relying on drm_pciids.h for device detection
Bring the PCI device detection table directly into via_drv.c.
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index 25d7967c938b..dcb975439daa 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -185,7 +185,19 @@ static struct drm_driver via_driver = {
};
static struct pci_device_id via_pci_table[] = {
- viadrv_PCI_IDS,
+ {0x1106, 0x3122, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {0x1106, 0x7205, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {0x1106, 0x3108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {0x1106, 0x3344, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {0x1106, 0x3118, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {0x1106, 0x3343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {0x1106, 0x3230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {0x1106, 0x3371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {0x1106, 0x1122, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {0x1106, 0x5122, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {0x1106, 0x7122, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {0, 0, 0}
};
MODULE_DEVICE_TABLE(pci, via_pci_table);
commit 4bad0e24f9a419d2cb566f3ac05ad9cfcd37d17f
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 1 18:51:41 2022 -0500
drm/via: Change VX800 chipset host bridge PCI device ID label
The new name is PCI_DEVICE_ID_VIA_VX800_HB since it is much easier to
remember.
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_init.c b/drivers/gpu/drm/via/via_init.c
index cb960d39edbf..0e478b974628 100644
--- a/drivers/gpu/drm/via/via_init.c
+++ b/drivers/gpu/drm/via/via_init.c
@@ -855,7 +855,7 @@ int via_vram_detect(struct via_drm_priv *dev_priv)
/* P4M890 / VN890 */
case PCI_DEVICE_ID_VIA_P4M890:
/* VX800 / VX820 */
- case PCI_DEVICE_ID_VIA_VT3353:
+ case PCI_DEVICE_ID_VIA_VX800_HB:
/* VX855 / VX875 */
case PCI_DEVICE_ID_VIA_VX855_HB:
ret = pci_read_config_byte(fn3, 0xA1, &size);
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index a37c790d29ad..3e6e6b19aea9 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1423,7 +1423,7 @@
#define PCI_DEVICE_ID_VIA_VT3324 0x0324
#define PCI_DEVICE_ID_VIA_VT3336 0x0336
#define PCI_DEVICE_ID_VIA_VT3351 0x0351
-#define PCI_DEVICE_ID_VIA_VT3353 0x0353
+#define PCI_DEVICE_ID_VIA_VX800_HB 0x0353
#define PCI_DEVICE_ID_VIA_VT3364 0x0364
#define PCI_DEVICE_ID_VIA_8371_0 0x0391
#define PCI_DEVICE_ID_VIA_VX855_HB 0x0409
commit b41ef25fc07e110d8d7e33d3de7d236678d37d5f
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 1 18:51:39 2022 -0500
drm/via: Change VX855 chipset host bridge PCI device ID label
The new name is PCI_DEVICE_ID_VIA_VX855_HB since it is much easier to
remember.
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_init.c b/drivers/gpu/drm/via/via_init.c
index 2089f82fb27d..cb960d39edbf 100644
--- a/drivers/gpu/drm/via/via_init.c
+++ b/drivers/gpu/drm/via/via_init.c
@@ -857,7 +857,7 @@ int via_vram_detect(struct via_drm_priv *dev_priv)
/* VX800 / VX820 */
case PCI_DEVICE_ID_VIA_VT3353:
/* VX855 / VX875 */
- case PCI_DEVICE_ID_VIA_VT3409:
+ case PCI_DEVICE_ID_VIA_VX855_HB:
ret = pci_read_config_byte(fn3, 0xA1, &size);
if (ret)
goto out_err;
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 8234a41f576d..a37c790d29ad 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1426,7 +1426,7 @@
#define PCI_DEVICE_ID_VIA_VT3353 0x0353
#define PCI_DEVICE_ID_VIA_VT3364 0x0364
#define PCI_DEVICE_ID_VIA_8371_0 0x0391
-#define PCI_DEVICE_ID_VIA_VT3409 0x0409
+#define PCI_DEVICE_ID_VIA_VX855_HB 0x0409
#define PCI_DEVICE_ID_VIA_VX900_HB 0x0410
#define PCI_DEVICE_ID_VIA_6415 0x0415
#define PCI_DEVICE_ID_VIA_8501_0 0x0501
commit da090c97ccd2c7e55504b45061de487e940bc8a9
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 1 18:51:38 2022 -0500
drm/via: Change VX900 chipset host bridge PCI device ID label
The new name is PCI_DEVICE_ID_VIA_VX900_HB since it is much easier to
remember.
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_init.c b/drivers/gpu/drm/via/via_init.c
index a72069d5ae66..2089f82fb27d 100644
--- a/drivers/gpu/drm/via/via_init.c
+++ b/drivers/gpu/drm/via/via_init.c
@@ -869,7 +869,7 @@ int via_vram_detect(struct via_drm_priv *dev_priv)
break;
/* VX900 */
- case PCI_DEVICE_ID_VIA_VT3410:
+ case PCI_DEVICE_ID_VIA_VX900_HB:
ret = pci_read_config_byte(fn3, 0xA1, &size);
if (ret)
goto out_err;
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index bab87ce7aef2..8234a41f576d 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1427,7 +1427,7 @@
#define PCI_DEVICE_ID_VIA_VT3364 0x0364
#define PCI_DEVICE_ID_VIA_8371_0 0x0391
#define PCI_DEVICE_ID_VIA_VT3409 0x0409
-#define PCI_DEVICE_ID_VIA_VT3410 0x0410
+#define PCI_DEVICE_ID_VIA_VX900_HB 0x0410
#define PCI_DEVICE_ID_VIA_6415 0x0415
#define PCI_DEVICE_ID_VIA_8501_0 0x0501
#define PCI_DEVICE_ID_VIA_82C561 0x0561
commit 0591d767d2e2700117d2414fd95d525137b97c4b
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 1 18:50:43 2022 -0500
drm/via: Change CLE266 chipset graphics PCI device ID label
The new name is PCI_DEVICE_ID_VIA_CLE266_GFX since it is much easier to
remember.
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index 6e9b1b4a8a75..6203c2d53231 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -288,7 +288,7 @@ static int via_gamma_set(struct drm_crtc *crtc,
/* Old platforms LUT are 6 bits in size.
* Newer it is 8 bits. */
switch (pdev->device) {
- case PCI_DEVICE_ID_VIA_CLE266:
+ case PCI_DEVICE_ID_VIA_CLE266_GFX:
case PCI_DEVICE_ID_VIA_KM400_GFX:
case PCI_DEVICE_ID_VIA_K8M800_GFX:
case PCI_DEVICE_ID_VIA_PM800_GFX:
@@ -401,7 +401,7 @@ static int via_iga1_display_fifo_regs(struct drm_device *dev,
DRM_DEBUG_KMS("Entered %s.\n", __func__);
switch (pdev->device) {
- case PCI_DEVICE_ID_VIA_CLE266:
+ case PCI_DEVICE_ID_VIA_CLE266_GFX:
if (dev_priv->revision == CLE266_REVISION_AX) {
if (mode->hdisplay > 1024) {
/* SR17[6:0] */
@@ -726,7 +726,7 @@ static int via_iga1_display_fifo_regs(struct drm_device *dev,
goto exit;
}
- if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266) ||
+ if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266_GFX) ||
(pdev->device == PCI_DEVICE_ID_VIA_KM400_GFX) ||
(pdev->device == PCI_DEVICE_ID_VIA_K8M800_GFX) ||
(pdev->device == PCI_DEVICE_ID_VIA_PM800_GFX) ||
@@ -738,7 +738,7 @@ static int via_iga1_display_fifo_regs(struct drm_device *dev,
svga_wseq_mask(VGABASE, 0x18, 0x00, BIT(6));
}
- if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266) ||
+ if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266_GFX) ||
(pdev->device == PCI_DEVICE_ID_VIA_KM400_GFX)) {
if (enable_extended_display_fifo) {
reg_value = VIA_READ(0x0298);
@@ -803,7 +803,7 @@ static int via_iga2_display_fifo_regs(struct drm_device *dev,
DRM_DEBUG_KMS("Entered %s.\n", __func__);
switch (pdev->device) {
- case PCI_DEVICE_ID_VIA_CLE266:
+ case PCI_DEVICE_ID_VIA_CLE266_GFX:
if (dev_priv->revision == CLE266_REVISION_AX) {
if (((dev_priv->vram_type <= VIA_MEM_DDR_200) &&
(fb->format->depth > 16) &&
@@ -1056,7 +1056,7 @@ static int via_iga2_display_fifo_regs(struct drm_device *dev,
goto exit;
}
- if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266) ||
+ if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266_GFX) ||
(pdev->device == PCI_DEVICE_ID_VIA_KM400_GFX)) {
if (enable_extended_display_fifo) {
/* Enable IGA2 extended display FIFO. */
@@ -1067,7 +1067,7 @@ static int via_iga2_display_fifo_regs(struct drm_device *dev,
}
}
- if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266) ||
+ if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266_GFX) ||
(pdev->device == PCI_DEVICE_ID_VIA_KM400_GFX)) {
/* Set IGA2 Display FIFO Depth Select */
reg_value = IGA2_FIFO_DEPTH_SELECT_FORMULA(fifo_max_depth);
@@ -2065,7 +2065,7 @@ static void via_crtc_param_init(struct via_drm_priv *dev_priv,
iga->timings.hsync_start.count = ARRAY_SIZE(iga2_hor_sync_start);
iga->timings.hsync_start.regs = iga2_hor_sync_start;
- if (pdev->device == PCI_DEVICE_ID_VIA_CLE266
+ if (pdev->device == PCI_DEVICE_ID_VIA_CLE266_GFX
|| pdev->device == PCI_DEVICE_ID_VIA_KM400_GFX)
iga->timings.hsync_start.count--;
@@ -2091,7 +2091,7 @@ static void via_crtc_param_init(struct via_drm_priv *dev_priv,
iga->timings.vsync_end.regs = iga2_ver_sync_end;
/* Secondary FIFO setup */
- if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266) ||
+ if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266_GFX) ||
(pdev->device == PCI_DEVICE_ID_VIA_KM400_GFX)) {
iga->fifo_depth.count =
ARRAY_SIZE(iga2_cle266_fifo_depth_select);
@@ -2162,7 +2162,7 @@ static void via_crtc_param_init(struct via_drm_priv *dev_priv,
iga->timings.vsync_end.regs = iga1_ver_sync_end;
/* Primary FIFO setup */
- if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266) ||
+ if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266_GFX) ||
(pdev->device == PCI_DEVICE_ID_VIA_KM400_GFX)) {
iga->fifo_depth.count = ARRAY_SIZE(iga1_cle266_fifo_depth_select);
iga->fifo_depth.regs = iga1_cle266_fifo_depth_select;
diff --git a/drivers/gpu/drm/via/via_dac.c b/drivers/gpu/drm/via/via_dac.c
index 16081e098fd5..0e133c6f6551 100644
--- a/drivers/gpu/drm/via/via_dac.c
+++ b/drivers/gpu/drm/via/via_dac.c
@@ -297,7 +297,7 @@ static enum drm_mode_status via_dac_mode_valid(
min_clock = 25000;
switch (pdev->device) {
/* CLE266 Chipset */
- case PCI_DEVICE_ID_VIA_CLE266:
+ case PCI_DEVICE_ID_VIA_CLE266_GFX:
/* KM400(A) / KN400(A) / P4M800 Chipset */
case PCI_DEVICE_ID_VIA_KM400_GFX:
max_clock = 250000;
diff --git a/drivers/gpu/drm/via/via_init.c b/drivers/gpu/drm/via/via_init.c
index ce3e788cf830..a72069d5ae66 100644
--- a/drivers/gpu/drm/via/via_init.c
+++ b/drivers/gpu/drm/via/via_init.c
@@ -757,7 +757,7 @@ int via_vram_detect(struct via_drm_priv *dev_priv)
goto out_err;
}
- if (!fn3 && pdev->device != PCI_DEVICE_ID_VIA_CLE266
+ if (!fn3 && pdev->device != PCI_DEVICE_ID_VIA_CLE266_GFX
&& pdev->device != PCI_DEVICE_ID_VIA_KM400_GFX) {
ret = -EINVAL;
DRM_ERROR("No function 3 on host bridge...\n");
@@ -1126,7 +1126,7 @@ void chip_revision_info(struct via_drm_priv *dev_priv)
switch (pdev->device) {
/* CLE266 Chipset */
- case PCI_DEVICE_ID_VIA_CLE266:
+ case PCI_DEVICE_ID_VIA_CLE266_GFX:
/* CR4F only defined in CLE266.CX chipset. */
tmp = vga_rcrt(VGABASE, 0x4F);
vga_wcrt(VGABASE, 0x4F, 0x55);
diff --git a/drivers/gpu/drm/via/via_lvds.c b/drivers/gpu/drm/via/via_lvds.c
index 52798058b5e9..acf54da4dca5 100644
--- a/drivers/gpu/drm/via/via_lvds.c
+++ b/drivers/gpu/drm/via/via_lvds.c
@@ -418,7 +418,7 @@ static void via_lvds_power(struct via_drm_priv *dev_priv,
DRM_DEBUG_KMS("Entered %s.\n", __func__);
switch (device) {
- case PCI_DEVICE_ID_VIA_CLE266:
+ case PCI_DEVICE_ID_VIA_CLE266_GFX:
via_lvds_cle266_soft_power_seq(dev_priv, power_state);
break;
case PCI_DEVICE_ID_VIA_KM400_GFX:
@@ -903,7 +903,7 @@ via_lvds_detect(struct drm_connector *connector, bool force)
i2c_bus_bit = i2c_bus_bit << 1;
}
- if (pdev->device == PCI_DEVICE_ID_VIA_CLE266) {
+ if (pdev->device == PCI_DEVICE_ID_VIA_CLE266_GFX) {
mask = BIT(3);
} else {
mask = BIT(1);
@@ -1149,7 +1149,7 @@ void via_lvds_probe(struct drm_device *dev)
/* Detect the presence of FPs. */
switch (chipset) {
- case PCI_DEVICE_ID_VIA_CLE266:
+ case PCI_DEVICE_ID_VIA_CLE266_GFX:
if ((sr12 & BIT(4)) || (cr3b & BIT(3))) {
dev_priv->int_fp1_presence = true;
dev_priv->int_fp1_di_port = VIA_DI_PORT_DIP0;
diff --git a/drivers/gpu/drm/via/via_pll.c b/drivers/gpu/drm/via/via_pll.c
index 5b40f02ac886..3adf54e1c7bd 100644
--- a/drivers/gpu/drm/via/via_pll.c
+++ b/drivers/gpu/drm/via/via_pll.c
@@ -73,7 +73,7 @@ u32 via_get_clk_value(struct drm_device *dev, u32 freq)
{ 0, 0, 0, 0, 0 } };
int count;
- if ((pdev->device != PCI_DEVICE_ID_VIA_CLE266) &&
+ if ((pdev->device != PCI_DEVICE_ID_VIA_CLE266_GFX) &&
(pdev->device != PCI_DEVICE_ID_VIA_KM400_GFX)) {
/* DN[6:0] */
for (pll_n = 2; pll_n < 6; pll_n++) {
@@ -156,7 +156,7 @@ u32 via_get_clk_value(struct drm_device *dev, u32 freq)
}
switch (pdev->device) {
- case PCI_DEVICE_ID_VIA_CLE266:
+ case PCI_DEVICE_ID_VIA_CLE266_GFX:
case PCI_DEVICE_ID_VIA_KM400_GFX:
/* Clock Synthesizer Value 0[7:6]: DR[1:0]
* Clock Synthesizer Value 0[5:0]: DN[5:0] */
@@ -212,7 +212,7 @@ void via_set_vclock(struct drm_crtc *crtc, u32 clk)
svga_wcrt_mask(VGABASE, 0x17, 0x00, BIT(7));
/* set clk */
- if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266) ||
+ if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266_GFX) ||
(pdev->device == PCI_DEVICE_ID_VIA_KM400_GFX)) {
vga_wseq(VGABASE, 0x46, (clk & 0xFF00) >> 8); /* rshift + divisor */
vga_wseq(VGABASE, 0x47, (clk & 0x00FF)); /* multiplier */
@@ -239,7 +239,7 @@ void via_set_vclock(struct drm_crtc *crtc, u32 clk)
svga_wcrt_mask(VGABASE, 0x6A, 0x00, BIT(6));
/* set clk */
- if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266) ||
+ if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266_GFX) ||
(pdev->device == PCI_DEVICE_ID_VIA_KM400_GFX)) {
vga_wseq(VGABASE, 0x44, (clk & 0xFF00) >> 8);
vga_wseq(VGABASE, 0x45, (clk & 0x00FF));
diff --git a/drivers/gpu/drm/via/via_tmds.c b/drivers/gpu/drm/via/via_tmds.c
index 5c9f2f1ac209..df9552c362a8 100644
--- a/drivers/gpu/drm/via/via_tmds.c
+++ b/drivers/gpu/drm/via/via_tmds.c
@@ -632,7 +632,7 @@ void via_ext_dvi_probe(struct drm_device *dev)
if (dev_priv->ext_tmds_presence) {
switch (chipset) {
- case PCI_DEVICE_ID_VIA_CLE266:
+ case PCI_DEVICE_ID_VIA_CLE266_GFX:
/* 3C5.12[4] - FPD17 pin strapping
* 0: TMDS transmitter (DVI) /
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 927794e41cfa..bab87ce7aef2 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1462,7 +1462,7 @@
#define PCI_DEVICE_ID_VIA_XM266 0x3116
#define PCI_DEVICE_ID_VIA_PM800_GFX 0x3118
#define PCI_DEVICE_ID_VIA_612X 0x3119
-#define PCI_DEVICE_ID_VIA_CLE266 0x3122
+#define PCI_DEVICE_ID_VIA_CLE266_GFX 0x3122
#define PCI_DEVICE_ID_VIA_862X_0 0x3123
#define PCI_DEVICE_ID_VIA_8753_0 0x3128
#define PCI_DEVICE_ID_VIA_8233A 0x3147
commit 1a75a1be6d6666afc049b530d0dccd74c19129b1
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 1 18:50:42 2022 -0500
drm/via: Change KM400 chipset graphics PCI device ID label
The new name is PCI_DEVICE_ID_VIA_KM400_GFX since it is much easier to
remember.
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index 2ab9df4216a4..6e9b1b4a8a75 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -289,7 +289,7 @@ static int via_gamma_set(struct drm_crtc *crtc,
* Newer it is 8 bits. */
switch (pdev->device) {
case PCI_DEVICE_ID_VIA_CLE266:
- case PCI_DEVICE_ID_VIA_KM400:
+ case PCI_DEVICE_ID_VIA_KM400_GFX:
case PCI_DEVICE_ID_VIA_K8M800_GFX:
case PCI_DEVICE_ID_VIA_PM800_GFX:
break;
@@ -522,7 +522,7 @@ static int via_iga1_display_fifo_regs(struct drm_device *dev,
}
break;
- case PCI_DEVICE_ID_VIA_KM400:
+ case PCI_DEVICE_ID_VIA_KM400_GFX:
if ((mode->hdisplay >= 1600) &&
(dev_priv->vram_type <= VIA_MEM_DDR_200)) {
/* SR17[6:0] */
@@ -727,7 +727,7 @@ static int via_iga1_display_fifo_regs(struct drm_device *dev,
}
if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266) ||
- (pdev->device == PCI_DEVICE_ID_VIA_KM400) ||
+ (pdev->device == PCI_DEVICE_ID_VIA_KM400_GFX) ||
(pdev->device == PCI_DEVICE_ID_VIA_K8M800_GFX) ||
(pdev->device == PCI_DEVICE_ID_VIA_PM800_GFX) ||
(pdev->device == PCI_DEVICE_ID_VIA_P4M800_PRO_GFX) ||
@@ -739,7 +739,7 @@ static int via_iga1_display_fifo_regs(struct drm_device *dev,
}
if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266) ||
- (pdev->device == PCI_DEVICE_ID_VIA_KM400)) {
+ (pdev->device == PCI_DEVICE_ID_VIA_KM400_GFX)) {
if (enable_extended_display_fifo) {
reg_value = VIA_READ(0x0298);
VIA_WRITE(0x0298, reg_value | 0x20000000);
@@ -849,7 +849,7 @@ static int via_iga2_display_fifo_regs(struct drm_device *dev,
}
break;
- case PCI_DEVICE_ID_VIA_KM400:
+ case PCI_DEVICE_ID_VIA_KM400_GFX:
if (mode->hdisplay >= 1600) {
/* CR68[7:4] */
fifo_max_depth = 120;
@@ -1057,7 +1057,7 @@ static int via_iga2_display_fifo_regs(struct drm_device *dev,
}
if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266) ||
- (pdev->device == PCI_DEVICE_ID_VIA_KM400)) {
+ (pdev->device == PCI_DEVICE_ID_VIA_KM400_GFX)) {
if (enable_extended_display_fifo) {
/* Enable IGA2 extended display FIFO. */
svga_wcrt_mask(VGABASE, 0x6a, BIT(5), BIT(5));
@@ -1068,7 +1068,7 @@ static int via_iga2_display_fifo_regs(struct drm_device *dev,
}
if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266) ||
- (pdev->device == PCI_DEVICE_ID_VIA_KM400)) {
+ (pdev->device == PCI_DEVICE_ID_VIA_KM400_GFX)) {
/* Set IGA2 Display FIFO Depth Select */
reg_value = IGA2_FIFO_DEPTH_SELECT_FORMULA(fifo_max_depth);
load_value_to_registers(VGABASE, &iga->fifo_depth, reg_value);
@@ -2066,7 +2066,7 @@ static void via_crtc_param_init(struct via_drm_priv *dev_priv,
iga->timings.hsync_start.count = ARRAY_SIZE(iga2_hor_sync_start);
iga->timings.hsync_start.regs = iga2_hor_sync_start;
if (pdev->device == PCI_DEVICE_ID_VIA_CLE266
- || pdev->device == PCI_DEVICE_ID_VIA_KM400)
+ || pdev->device == PCI_DEVICE_ID_VIA_KM400_GFX)
iga->timings.hsync_start.count--;
iga->timings.hsync_end.count = ARRAY_SIZE(iga2_hor_sync_end);
@@ -2092,7 +2092,7 @@ static void via_crtc_param_init(struct via_drm_priv *dev_priv,
/* Secondary FIFO setup */
if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266) ||
- (pdev->device == PCI_DEVICE_ID_VIA_KM400)) {
+ (pdev->device == PCI_DEVICE_ID_VIA_KM400_GFX)) {
iga->fifo_depth.count =
ARRAY_SIZE(iga2_cle266_fifo_depth_select);
iga->fifo_depth.regs = iga2_cle266_fifo_depth_select;
@@ -2163,7 +2163,7 @@ static void via_crtc_param_init(struct via_drm_priv *dev_priv,
/* Primary FIFO setup */
if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266) ||
- (pdev->device == PCI_DEVICE_ID_VIA_KM400)) {
+ (pdev->device == PCI_DEVICE_ID_VIA_KM400_GFX)) {
iga->fifo_depth.count = ARRAY_SIZE(iga1_cle266_fifo_depth_select);
iga->fifo_depth.regs = iga1_cle266_fifo_depth_select;
diff --git a/drivers/gpu/drm/via/via_dac.c b/drivers/gpu/drm/via/via_dac.c
index 52feafb940d2..16081e098fd5 100644
--- a/drivers/gpu/drm/via/via_dac.c
+++ b/drivers/gpu/drm/via/via_dac.c
@@ -299,7 +299,7 @@ static enum drm_mode_status via_dac_mode_valid(
/* CLE266 Chipset */
case PCI_DEVICE_ID_VIA_CLE266:
/* KM400(A) / KN400(A) / P4M800 Chipset */
- case PCI_DEVICE_ID_VIA_KM400:
+ case PCI_DEVICE_ID_VIA_KM400_GFX:
max_clock = 250000;
break;
/* K8M800(A) / K8N800(A) Chipset */
diff --git a/drivers/gpu/drm/via/via_init.c b/drivers/gpu/drm/via/via_init.c
index bc39eb57ab87..ce3e788cf830 100644
--- a/drivers/gpu/drm/via/via_init.c
+++ b/drivers/gpu/drm/via/via_init.c
@@ -758,7 +758,7 @@ int via_vram_detect(struct via_drm_priv *dev_priv)
}
if (!fn3 && pdev->device != PCI_DEVICE_ID_VIA_CLE266
- && pdev->device != PCI_DEVICE_ID_VIA_KM400) {
+ && pdev->device != PCI_DEVICE_ID_VIA_KM400_GFX) {
ret = -EINVAL;
DRM_ERROR("No function 3 on host bridge...\n");
goto out_err;
diff --git a/drivers/gpu/drm/via/via_lvds.c b/drivers/gpu/drm/via/via_lvds.c
index 8490f9375122..52798058b5e9 100644
--- a/drivers/gpu/drm/via/via_lvds.c
+++ b/drivers/gpu/drm/via/via_lvds.c
@@ -421,7 +421,7 @@ static void via_lvds_power(struct via_drm_priv *dev_priv,
case PCI_DEVICE_ID_VIA_CLE266:
via_lvds_cle266_soft_power_seq(dev_priv, power_state);
break;
- case PCI_DEVICE_ID_VIA_KM400:
+ case PCI_DEVICE_ID_VIA_KM400_GFX:
case PCI_DEVICE_ID_VIA_P4M800_PRO_GFX:
case PCI_DEVICE_ID_VIA_PM800_GFX:
case PCI_DEVICE_ID_VIA_K8M800_GFX:
@@ -1161,7 +1161,7 @@ void via_lvds_probe(struct drm_device *dev)
dev_priv->int_fp2_presence = false;
dev_priv->int_fp2_di_port = VIA_DI_PORT_NONE;
break;
- case PCI_DEVICE_ID_VIA_KM400:
+ case PCI_DEVICE_ID_VIA_KM400_GFX:
case PCI_DEVICE_ID_VIA_P4M800_PRO_GFX:
case PCI_DEVICE_ID_VIA_PM800_GFX:
case PCI_DEVICE_ID_VIA_K8M800_GFX:
diff --git a/drivers/gpu/drm/via/via_pll.c b/drivers/gpu/drm/via/via_pll.c
index 513d0c2f3daf..5b40f02ac886 100644
--- a/drivers/gpu/drm/via/via_pll.c
+++ b/drivers/gpu/drm/via/via_pll.c
@@ -74,7 +74,7 @@ u32 via_get_clk_value(struct drm_device *dev, u32 freq)
int count;
if ((pdev->device != PCI_DEVICE_ID_VIA_CLE266) &&
- (pdev->device != PCI_DEVICE_ID_VIA_KM400)) {
+ (pdev->device != PCI_DEVICE_ID_VIA_KM400_GFX)) {
/* DN[6:0] */
for (pll_n = 2; pll_n < 6; pll_n++) {
/* DR[2:0] */
@@ -157,7 +157,7 @@ u32 via_get_clk_value(struct drm_device *dev, u32 freq)
switch (pdev->device) {
case PCI_DEVICE_ID_VIA_CLE266:
- case PCI_DEVICE_ID_VIA_KM400:
+ case PCI_DEVICE_ID_VIA_KM400_GFX:
/* Clock Synthesizer Value 0[7:6]: DR[1:0]
* Clock Synthesizer Value 0[5:0]: DN[5:0] */
pll_mrn = ((best_pll_r & 0x3) << 14 |
@@ -213,7 +213,7 @@ void via_set_vclock(struct drm_crtc *crtc, u32 clk)
/* set clk */
if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266) ||
- (pdev->device == PCI_DEVICE_ID_VIA_KM400)) {
+ (pdev->device == PCI_DEVICE_ID_VIA_KM400_GFX)) {
vga_wseq(VGABASE, 0x46, (clk & 0xFF00) >> 8); /* rshift + divisor */
vga_wseq(VGABASE, 0x47, (clk & 0x00FF)); /* multiplier */
} else {
@@ -240,7 +240,7 @@ void via_set_vclock(struct drm_crtc *crtc, u32 clk)
/* set clk */
if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266) ||
- (pdev->device == PCI_DEVICE_ID_VIA_KM400)) {
+ (pdev->device == PCI_DEVICE_ID_VIA_KM400_GFX)) {
vga_wseq(VGABASE, 0x44, (clk & 0xFF00) >> 8);
vga_wseq(VGABASE, 0x45, (clk & 0x00FF));
} else {
diff --git a/drivers/gpu/drm/via/via_tmds.c b/drivers/gpu/drm/via/via_tmds.c
index b3350df67b4d..5c9f2f1ac209 100644
--- a/drivers/gpu/drm/via/via_tmds.c
+++ b/drivers/gpu/drm/via/via_tmds.c
@@ -651,7 +651,7 @@ void via_ext_dvi_probe(struct drm_device *dev)
}
break;
- case PCI_DEVICE_ID_VIA_KM400:
+ case PCI_DEVICE_ID_VIA_KM400_GFX:
case PCI_DEVICE_ID_VIA_K8M800_GFX:
case PCI_DEVICE_ID_VIA_P4M800_PRO_GFX:
case PCI_DEVICE_ID_VIA_PM800_GFX:
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 75399821e7fa..927794e41cfa 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1489,8 +1489,8 @@
#define PCI_DEVICE_ID_VIA_8237S 0x3372
#define PCI_DEVICE_ID_VIA_CHROME9_HCM 0x5122
#define PCI_DEVICE_ID_VIA_SATA_EIDE 0x5324
-#define PCI_DEVICE_ID_VIA_KM400 0x7205
#define PCI_DEVICE_ID_VIA_CHROME9_HD 0x7122
+#define PCI_DEVICE_ID_VIA_KM400_GFX 0x7205
#define PCI_DEVICE_ID_VIA_8231 0x8231
#define PCI_DEVICE_ID_VIA_8231_4 0x8235
#define PCI_DEVICE_ID_VIA_8365_1 0x8305
commit 53e484dea1207e86e74bafe9f78d663267ae8e32
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 1 18:50:40 2022 -0500
drm/via: Change K8M800 chipset graphics PCI device ID label
The new name is PCI_DEVICE_ID_VIA_K8M800_GFX since it is much easier
to remember.
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index 914f76fdd2ea..2ab9df4216a4 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -290,7 +290,7 @@ static int via_gamma_set(struct drm_crtc *crtc,
switch (pdev->device) {
case PCI_DEVICE_ID_VIA_CLE266:
case PCI_DEVICE_ID_VIA_KM400:
- case PCI_DEVICE_ID_VIA_K8M800:
+ case PCI_DEVICE_ID_VIA_K8M800_GFX:
case PCI_DEVICE_ID_VIA_PM800_GFX:
break;
@@ -565,7 +565,7 @@ static int via_iga1_display_fifo_regs(struct drm_device *dev,
}
break;
- case PCI_DEVICE_ID_VIA_K8M800:
+ case PCI_DEVICE_ID_VIA_K8M800_GFX:
/* SR17[7:0] */
fifo_max_depth = 384;
@@ -728,7 +728,7 @@ static int via_iga1_display_fifo_regs(struct drm_device *dev,
if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266) ||
(pdev->device == PCI_DEVICE_ID_VIA_KM400) ||
- (pdev->device == PCI_DEVICE_ID_VIA_K8M800) ||
+ (pdev->device == PCI_DEVICE_ID_VIA_K8M800_GFX) ||
(pdev->device == PCI_DEVICE_ID_VIA_PM800_GFX) ||
(pdev->device == PCI_DEVICE_ID_VIA_P4M800_PRO_GFX) ||
(pdev->device == PCI_DEVICE_ID_VIA_UNICHROME_PRO_II)) {
@@ -895,7 +895,7 @@ static int via_iga2_display_fifo_regs(struct drm_device *dev,
}
break;
- case PCI_DEVICE_ID_VIA_K8M800:
+ case PCI_DEVICE_ID_VIA_K8M800_GFX:
/* CR95[7], CR94[7], CR68[7:4] */
fifo_max_depth = 376;
diff --git a/drivers/gpu/drm/via/via_dac.c b/drivers/gpu/drm/via/via_dac.c
index 44ed9c44eb78..52feafb940d2 100644
--- a/drivers/gpu/drm/via/via_dac.c
+++ b/drivers/gpu/drm/via/via_dac.c
@@ -303,7 +303,7 @@ static enum drm_mode_status via_dac_mode_valid(
max_clock = 250000;
break;
/* K8M800(A) / K8N800(A) Chipset */
- case PCI_DEVICE_ID_VIA_K8M800:
+ case PCI_DEVICE_ID_VIA_K8M800_GFX:
/* P4M800 Pro / P4M800CE / VN800 / CN700 / CN333 / CN400 Chipset */
case PCI_DEVICE_ID_VIA_P4M800_PRO_GFX:
max_clock = 300000;
diff --git a/drivers/gpu/drm/via/via_lvds.c b/drivers/gpu/drm/via/via_lvds.c
index 4c6cfd88a5d2..8490f9375122 100644
--- a/drivers/gpu/drm/via/via_lvds.c
+++ b/drivers/gpu/drm/via/via_lvds.c
@@ -424,7 +424,7 @@ static void via_lvds_power(struct via_drm_priv *dev_priv,
case PCI_DEVICE_ID_VIA_KM400:
case PCI_DEVICE_ID_VIA_P4M800_PRO_GFX:
case PCI_DEVICE_ID_VIA_PM800_GFX:
- case PCI_DEVICE_ID_VIA_K8M800:
+ case PCI_DEVICE_ID_VIA_K8M800_GFX:
case PCI_DEVICE_ID_VIA_P4M890_GFX:
case PCI_DEVICE_ID_VIA_CHROME9:
case PCI_DEVICE_ID_VIA_CHROME9_HC:
@@ -1164,7 +1164,7 @@ void via_lvds_probe(struct drm_device *dev)
case PCI_DEVICE_ID_VIA_KM400:
case PCI_DEVICE_ID_VIA_P4M800_PRO_GFX:
case PCI_DEVICE_ID_VIA_PM800_GFX:
- case PCI_DEVICE_ID_VIA_K8M800:
+ case PCI_DEVICE_ID_VIA_K8M800_GFX:
/* 3C5.13[3] - DVP0D8 pin strapping
* 0: AGP pins are used for AGP
* 1: AGP pins are used by FPDP
diff --git a/drivers/gpu/drm/via/via_tmds.c b/drivers/gpu/drm/via/via_tmds.c
index 876623e20f5a..b3350df67b4d 100644
--- a/drivers/gpu/drm/via/via_tmds.c
+++ b/drivers/gpu/drm/via/via_tmds.c
@@ -652,7 +652,7 @@ void via_ext_dvi_probe(struct drm_device *dev)
break;
case PCI_DEVICE_ID_VIA_KM400:
- case PCI_DEVICE_ID_VIA_K8M800:
+ case PCI_DEVICE_ID_VIA_K8M800_GFX:
case PCI_DEVICE_ID_VIA_P4M800_PRO_GFX:
case PCI_DEVICE_ID_VIA_PM800_GFX:
/* 3C5.12[6] - DVP0D6 pin strapping
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index cbd48e3b19d4..75399821e7fa 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1456,7 +1456,7 @@
#define PCI_DEVICE_ID_VIA_8653_0 0x3101
#define PCI_DEVICE_ID_VIA_8622 0x3102
#define PCI_DEVICE_ID_VIA_8235_USB_2 0x3104
-#define PCI_DEVICE_ID_VIA_K8M800 0x3108
+#define PCI_DEVICE_ID_VIA_K8M800_GFX 0x3108
#define PCI_DEVICE_ID_VIA_8233C_0 0x3109
#define PCI_DEVICE_ID_VIA_8361 0x3112
#define PCI_DEVICE_ID_VIA_XM266 0x3116
commit 8beac7de628d8c60296752033ac423a7c6859bce
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 1 18:50:39 2022 -0500
drm/via: Change P4M800 Pro chipset graphics PCI device ID label
The new name is PCI_DEVICE_ID_VIA_P4M800_PRO_GFX since it is much easier
to remember.
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index 90cfa2b319e0..914f76fdd2ea 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -605,7 +605,7 @@ static int via_iga1_display_fifo_regs(struct drm_device *dev,
}
break;
- case PCI_DEVICE_ID_VIA_CN700:
+ case PCI_DEVICE_ID_VIA_P4M800_PRO_GFX:
/* SR17[7:0] */
fifo_max_depth = CN700_IGA1_FIFO_MAX_DEPTH;
@@ -730,7 +730,7 @@ static int via_iga1_display_fifo_regs(struct drm_device *dev,
(pdev->device == PCI_DEVICE_ID_VIA_KM400) ||
(pdev->device == PCI_DEVICE_ID_VIA_K8M800) ||
(pdev->device == PCI_DEVICE_ID_VIA_PM800_GFX) ||
- (pdev->device == PCI_DEVICE_ID_VIA_CN700) ||
+ (pdev->device == PCI_DEVICE_ID_VIA_P4M800_PRO_GFX) ||
(pdev->device == PCI_DEVICE_ID_VIA_UNICHROME_PRO_II)) {
/* Force PREQ to be always higher than TREQ. */
svga_wseq_mask(VGABASE, 0x18, BIT(6), BIT(6));
@@ -935,7 +935,7 @@ static int via_iga2_display_fifo_regs(struct drm_device *dev,
}
break;
- case PCI_DEVICE_ID_VIA_CN700:
+ case PCI_DEVICE_ID_VIA_P4M800_PRO_GFX:
/* CR95[7], CR94[7], CR68[7:4] */
fifo_max_depth = CN700_IGA2_FIFO_MAX_DEPTH;
diff --git a/drivers/gpu/drm/via/via_dac.c b/drivers/gpu/drm/via/via_dac.c
index 58624ba21986..44ed9c44eb78 100644
--- a/drivers/gpu/drm/via/via_dac.c
+++ b/drivers/gpu/drm/via/via_dac.c
@@ -305,7 +305,7 @@ static enum drm_mode_status via_dac_mode_valid(
/* K8M800(A) / K8N800(A) Chipset */
case PCI_DEVICE_ID_VIA_K8M800:
/* P4M800 Pro / P4M800CE / VN800 / CN700 / CN333 / CN400 Chipset */
- case PCI_DEVICE_ID_VIA_CN700:
+ case PCI_DEVICE_ID_VIA_P4M800_PRO_GFX:
max_clock = 300000;
break;
/* PM800 / PN800 / PM880 / PN880 Chipset */
diff --git a/drivers/gpu/drm/via/via_lvds.c b/drivers/gpu/drm/via/via_lvds.c
index 9c901536f423..4c6cfd88a5d2 100644
--- a/drivers/gpu/drm/via/via_lvds.c
+++ b/drivers/gpu/drm/via/via_lvds.c
@@ -422,7 +422,7 @@ static void via_lvds_power(struct via_drm_priv *dev_priv,
via_lvds_cle266_soft_power_seq(dev_priv, power_state);
break;
case PCI_DEVICE_ID_VIA_KM400:
- case PCI_DEVICE_ID_VIA_CN700:
+ case PCI_DEVICE_ID_VIA_P4M800_PRO_GFX:
case PCI_DEVICE_ID_VIA_PM800_GFX:
case PCI_DEVICE_ID_VIA_K8M800:
case PCI_DEVICE_ID_VIA_P4M890_GFX:
@@ -1162,7 +1162,7 @@ void via_lvds_probe(struct drm_device *dev)
dev_priv->int_fp2_di_port = VIA_DI_PORT_NONE;
break;
case PCI_DEVICE_ID_VIA_KM400:
- case PCI_DEVICE_ID_VIA_CN700:
+ case PCI_DEVICE_ID_VIA_P4M800_PRO_GFX:
case PCI_DEVICE_ID_VIA_PM800_GFX:
case PCI_DEVICE_ID_VIA_K8M800:
/* 3C5.13[3] - DVP0D8 pin strapping
diff --git a/drivers/gpu/drm/via/via_tmds.c b/drivers/gpu/drm/via/via_tmds.c
index d61ba7d8a3ef..876623e20f5a 100644
--- a/drivers/gpu/drm/via/via_tmds.c
+++ b/drivers/gpu/drm/via/via_tmds.c
@@ -653,7 +653,7 @@ void via_ext_dvi_probe(struct drm_device *dev)
break;
case PCI_DEVICE_ID_VIA_KM400:
case PCI_DEVICE_ID_VIA_K8M800:
- case PCI_DEVICE_ID_VIA_CN700:
+ case PCI_DEVICE_ID_VIA_P4M800_PRO_GFX:
case PCI_DEVICE_ID_VIA_PM800_GFX:
/* 3C5.12[6] - DVP0D6 pin strapping
* 0: Disable DVP0 (Digital Video Port 0) for
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index edadff7fa323..cbd48e3b19d4 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1484,7 +1484,7 @@
#define PCI_DEVICE_ID_VIA_8261 0x3402
#define PCI_DEVICE_ID_VIA_8237A 0x3337
#define PCI_DEVICE_ID_VIA_P4M890_GFX 0x3343
-#define PCI_DEVICE_ID_VIA_CN700 0x3344
+#define PCI_DEVICE_ID_VIA_P4M800_PRO_GFX 0x3344
#define PCI_DEVICE_ID_VIA_CHROME9_HC 0x3371
#define PCI_DEVICE_ID_VIA_8237S 0x3372
#define PCI_DEVICE_ID_VIA_CHROME9_HCM 0x5122
commit b163ff710c514326607b476a1b5b3aa8f495d19d
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 1 18:50:37 2022 -0500
drm/via: Change PM800 chipset graphics PCI device ID label
The new name is PCI_DEVICE_ID_VIA_PM800_GFX since it is much easier to
remember.
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index b7bf57f5fbd9..90cfa2b319e0 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -291,7 +291,7 @@ static int via_gamma_set(struct drm_crtc *crtc,
case PCI_DEVICE_ID_VIA_CLE266:
case PCI_DEVICE_ID_VIA_KM400:
case PCI_DEVICE_ID_VIA_K8M800:
- case PCI_DEVICE_ID_VIA_PM800:
+ case PCI_DEVICE_ID_VIA_PM800_GFX:
break;
default:
@@ -585,7 +585,7 @@ static int via_iga1_display_fifo_regs(struct drm_device *dev,
}
break;
- case PCI_DEVICE_ID_VIA_PM800:
+ case PCI_DEVICE_ID_VIA_PM800_GFX:
/* SR17[7:0] */
fifo_max_depth = 192;
@@ -729,7 +729,7 @@ static int via_iga1_display_fifo_regs(struct drm_device *dev,
if ((pdev->device == PCI_DEVICE_ID_VIA_CLE266) ||
(pdev->device == PCI_DEVICE_ID_VIA_KM400) ||
(pdev->device == PCI_DEVICE_ID_VIA_K8M800) ||
- (pdev->device == PCI_DEVICE_ID_VIA_PM800) ||
+ (pdev->device == PCI_DEVICE_ID_VIA_PM800_GFX) ||
(pdev->device == PCI_DEVICE_ID_VIA_CN700) ||
(pdev->device == PCI_DEVICE_ID_VIA_UNICHROME_PRO_II)) {
/* Force PREQ to be always higher than TREQ. */
@@ -915,7 +915,7 @@ static int via_iga2_display_fifo_regs(struct drm_device *dev,
}
break;
- case PCI_DEVICE_ID_VIA_PM800:
+ case PCI_DEVICE_ID_VIA_PM800_GFX:
/* CR95[7], CR94[7], CR68[7:4] */
fifo_max_depth = 96;
diff --git a/drivers/gpu/drm/via/via_dac.c b/drivers/gpu/drm/via/via_dac.c
index b6165aaa2bbc..58624ba21986 100644
--- a/drivers/gpu/drm/via/via_dac.c
+++ b/drivers/gpu/drm/via/via_dac.c
@@ -309,7 +309,7 @@ static enum drm_mode_status via_dac_mode_valid(
max_clock = 300000;
break;
/* PM800 / PN800 / PM880 / PN880 Chipset */
- case PCI_DEVICE_ID_VIA_PM800:
+ case PCI_DEVICE_ID_VIA_PM800_GFX:
/* P4M890 / P4N890 Chipset */
case PCI_DEVICE_ID_VIA_P4M890_GFX:
/* K8M890 / K8N890 Chipset */
diff --git a/drivers/gpu/drm/via/via_lvds.c b/drivers/gpu/drm/via/via_lvds.c
index d94f91181cc6..9c901536f423 100644
--- a/drivers/gpu/drm/via/via_lvds.c
+++ b/drivers/gpu/drm/via/via_lvds.c
@@ -423,7 +423,7 @@ static void via_lvds_power(struct via_drm_priv *dev_priv,
break;
case PCI_DEVICE_ID_VIA_KM400:
case PCI_DEVICE_ID_VIA_CN700:
- case PCI_DEVICE_ID_VIA_PM800:
+ case PCI_DEVICE_ID_VIA_PM800_GFX:
case PCI_DEVICE_ID_VIA_K8M800:
case PCI_DEVICE_ID_VIA_P4M890_GFX:
case PCI_DEVICE_ID_VIA_CHROME9:
@@ -1163,7 +1163,7 @@ void via_lvds_probe(struct drm_device *dev)
break;
case PCI_DEVICE_ID_VIA_KM400:
case PCI_DEVICE_ID_VIA_CN700:
- case PCI_DEVICE_ID_VIA_PM800:
+ case PCI_DEVICE_ID_VIA_PM800_GFX:
case PCI_DEVICE_ID_VIA_K8M800:
/* 3C5.13[3] - DVP0D8 pin strapping
* 0: AGP pins are used for AGP
diff --git a/drivers/gpu/drm/via/via_tmds.c b/drivers/gpu/drm/via/via_tmds.c
index acea4c74d30c..d61ba7d8a3ef 100644
--- a/drivers/gpu/drm/via/via_tmds.c
+++ b/drivers/gpu/drm/via/via_tmds.c
@@ -654,7 +654,7 @@ void via_ext_dvi_probe(struct drm_device *dev)
case PCI_DEVICE_ID_VIA_KM400:
case PCI_DEVICE_ID_VIA_K8M800:
case PCI_DEVICE_ID_VIA_CN700:
- case PCI_DEVICE_ID_VIA_PM800:
+ case PCI_DEVICE_ID_VIA_PM800_GFX:
/* 3C5.12[6] - DVP0D6 pin strapping
* 0: Disable DVP0 (Digital Video Port 0) for
* DVI or TV out use
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 2e728d08434f..edadff7fa323 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1460,7 +1460,7 @@
#define PCI_DEVICE_ID_VIA_8233C_0 0x3109
#define PCI_DEVICE_ID_VIA_8361 0x3112
#define PCI_DEVICE_ID_VIA_XM266 0x3116
-#define PCI_DEVICE_ID_VIA_PM800 0x3118
+#define PCI_DEVICE_ID_VIA_PM800_GFX 0x3118
#define PCI_DEVICE_ID_VIA_612X 0x3119
#define PCI_DEVICE_ID_VIA_CLE266 0x3122
#define PCI_DEVICE_ID_VIA_862X_0 0x3123
commit 903be52573349bd04c98cf2b74b4dd0d4c89362c
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 1 18:50:36 2022 -0500
drm/via: Change P4M890 chipset graphics PCI device ID label
The new name is PCI_DEVICE_ID_VIA_P4M890_GFX since it is much easier
to remember.
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index db865022e6b7..b7bf57f5fbd9 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -648,7 +648,7 @@ static int via_iga1_display_fifo_regs(struct drm_device *dev,
display_queue_expire_num = K8M890_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
break;
/* P4M890 */
- case PCI_DEVICE_ID_VIA_VT3343:
+ case PCI_DEVICE_ID_VIA_P4M890_GFX:
/* SR17[7:0] */
fifo_max_depth = P4M890_IGA1_FIFO_MAX_DEPTH;
@@ -978,7 +978,7 @@ static int via_iga2_display_fifo_regs(struct drm_device *dev,
display_queue_expire_num = K8M890_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
break;
/* P4M890 */
- case PCI_DEVICE_ID_VIA_VT3343:
+ case PCI_DEVICE_ID_VIA_P4M890_GFX:
/* CR95[7], CR94[7], CR68[7:4] */
fifo_max_depth = P4M890_IGA2_FIFO_MAX_DEPTH;
diff --git a/drivers/gpu/drm/via/via_cursor.c b/drivers/gpu/drm/via/via_cursor.c
index 9418ad76f0ee..391ea5810708 100644
--- a/drivers/gpu/drm/via/via_cursor.c
+++ b/drivers/gpu/drm/via/via_cursor.c
@@ -60,7 +60,7 @@ static void via_hide_cursor(struct drm_crtc *crtc)
switch (pdev->device) {
case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
- case PCI_DEVICE_ID_VIA_VT3343:
+ case PCI_DEVICE_ID_VIA_P4M890_GFX:
case PCI_DEVICE_ID_VIA_CHROME9_HC:
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
@@ -91,7 +91,7 @@ static void via_show_cursor(struct drm_crtc *crtc)
switch (pdev->device) {
case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
- case PCI_DEVICE_ID_VIA_VT3343:
+ case PCI_DEVICE_ID_VIA_P4M890_GFX:
case PCI_DEVICE_ID_VIA_CHROME9_HC:
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
@@ -128,7 +128,7 @@ static void via_show_cursor(struct drm_crtc *crtc)
switch (pdev->device) {
case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
- case PCI_DEVICE_ID_VIA_VT3343:
+ case PCI_DEVICE_ID_VIA_P4M890_GFX:
case PCI_DEVICE_ID_VIA_CHROME9_HC:
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
@@ -168,7 +168,7 @@ static void via_cursor_address(struct drm_crtc *crtc,
switch (pdev->device) {
case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
- case PCI_DEVICE_ID_VIA_VT3343:
+ case PCI_DEVICE_ID_VIA_P4M890_GFX:
case PCI_DEVICE_ID_VIA_CHROME9_HC:
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
@@ -219,7 +219,7 @@ static void via_set_hi_location(struct drm_crtc *crtc, int crtc_x, int crtc_y)
switch (pdev->device) {
case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
- case PCI_DEVICE_ID_VIA_VT3343:
+ case PCI_DEVICE_ID_VIA_P4M890_GFX:
case PCI_DEVICE_ID_VIA_CHROME9_HC:
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
diff --git a/drivers/gpu/drm/via/via_dac.c b/drivers/gpu/drm/via/via_dac.c
index 35ced404142e..b6165aaa2bbc 100644
--- a/drivers/gpu/drm/via/via_dac.c
+++ b/drivers/gpu/drm/via/via_dac.c
@@ -311,7 +311,7 @@ static enum drm_mode_status via_dac_mode_valid(
/* PM800 / PN800 / PM880 / PN880 Chipset */
case PCI_DEVICE_ID_VIA_PM800:
/* P4M890 / P4N890 Chipset */
- case PCI_DEVICE_ID_VIA_VT3343:
+ case PCI_DEVICE_ID_VIA_P4M890_GFX:
/* K8M890 / K8N890 Chipset */
case PCI_DEVICE_ID_VIA_CHROME9:
/* P4M900 / VN896 / CN896 Chipset */
diff --git a/drivers/gpu/drm/via/via_lvds.c b/drivers/gpu/drm/via/via_lvds.c
index 4ed8adea0484..d94f91181cc6 100644
--- a/drivers/gpu/drm/via/via_lvds.c
+++ b/drivers/gpu/drm/via/via_lvds.c
@@ -425,7 +425,7 @@ static void via_lvds_power(struct via_drm_priv *dev_priv,
case PCI_DEVICE_ID_VIA_CN700:
case PCI_DEVICE_ID_VIA_PM800:
case PCI_DEVICE_ID_VIA_K8M800:
- case PCI_DEVICE_ID_VIA_VT3343:
+ case PCI_DEVICE_ID_VIA_P4M890_GFX:
case PCI_DEVICE_ID_VIA_CHROME9:
case PCI_DEVICE_ID_VIA_CHROME9_HC:
via_lvds_primary_hard_power_seq(dev_priv, power_state);
@@ -1181,7 +1181,7 @@ void via_lvds_probe(struct drm_device *dev)
dev_priv->int_fp2_presence = false;
dev_priv->int_fp2_di_port = VIA_DI_PORT_NONE;
break;
- case PCI_DEVICE_ID_VIA_VT3343:
+ case PCI_DEVICE_ID_VIA_P4M890_GFX:
case PCI_DEVICE_ID_VIA_CHROME9:
case PCI_DEVICE_ID_VIA_CHROME9_HC:
if (cr3b & BIT(1)) {
diff --git a/drivers/gpu/drm/via/via_tmds.c b/drivers/gpu/drm/via/via_tmds.c
index bce16466eef2..acea4c74d30c 100644
--- a/drivers/gpu/drm/via/via_tmds.c
+++ b/drivers/gpu/drm/via/via_tmds.c
@@ -670,7 +670,7 @@ void via_ext_dvi_probe(struct drm_device *dev)
}
break;
- case PCI_DEVICE_ID_VIA_VT3343:
+ case PCI_DEVICE_ID_VIA_P4M890_GFX:
case PCI_DEVICE_ID_VIA_CHROME9:
case PCI_DEVICE_ID_VIA_CHROME9_HC:
/* Assume DVP2 as DVP0. Hence, VIA_DI_PORT_DVP0
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 1a8a4a0e938d..2e728d08434f 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1483,7 +1483,7 @@
#define PCI_DEVICE_ID_VIA_8251 0x3287
#define PCI_DEVICE_ID_VIA_8261 0x3402
#define PCI_DEVICE_ID_VIA_8237A 0x3337
-#define PCI_DEVICE_ID_VIA_VT3343 0x3343
+#define PCI_DEVICE_ID_VIA_P4M890_GFX 0x3343
#define PCI_DEVICE_ID_VIA_CN700 0x3344
#define PCI_DEVICE_ID_VIA_CHROME9_HC 0x3371
#define PCI_DEVICE_ID_VIA_8237S 0x3372
commit 4d1b97c94d4b24c9e95d2bf6ed87b67e5083a293
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 1 18:50:34 2022 -0500
drm/via: Change K8M890 chipset graphics PCI device ID label
The new name is PCI_DEVICE_ID_VIA_CHROME9 since it is much easier to
remember.
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index 7cc246799465..db865022e6b7 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -634,7 +634,7 @@ static int via_iga1_display_fifo_regs(struct drm_device *dev,
break;
/* K8M890 */
- case PCI_DEVICE_ID_VIA_K8M890:
+ case PCI_DEVICE_ID_VIA_CHROME9:
/* SR17[7:0] */
fifo_max_depth = K8M890_IGA1_FIFO_MAX_DEPTH;
@@ -964,7 +964,7 @@ static int via_iga2_display_fifo_regs(struct drm_device *dev,
break;
/* K8M890 */
- case PCI_DEVICE_ID_VIA_K8M890:
+ case PCI_DEVICE_ID_VIA_CHROME9:
/* CR95[7], CR94[7], CR68[7:4] */
fifo_max_depth = K8M890_IGA2_FIFO_MAX_DEPTH;
diff --git a/drivers/gpu/drm/via/via_dac.c b/drivers/gpu/drm/via/via_dac.c
index 8b3b4599b580..35ced404142e 100644
--- a/drivers/gpu/drm/via/via_dac.c
+++ b/drivers/gpu/drm/via/via_dac.c
@@ -313,7 +313,7 @@ static enum drm_mode_status via_dac_mode_valid(
/* P4M890 / P4N890 Chipset */
case PCI_DEVICE_ID_VIA_VT3343:
/* K8M890 / K8N890 Chipset */
- case PCI_DEVICE_ID_VIA_K8M890:
+ case PCI_DEVICE_ID_VIA_CHROME9:
/* P4M900 / VN896 / CN896 Chipset */
case PCI_DEVICE_ID_VIA_CHROME9_HC:
/* CX700(M/M2) / VX700(M/M2) Chipset */
diff --git a/drivers/gpu/drm/via/via_lvds.c b/drivers/gpu/drm/via/via_lvds.c
index e1010017c7c0..4ed8adea0484 100644
--- a/drivers/gpu/drm/via/via_lvds.c
+++ b/drivers/gpu/drm/via/via_lvds.c
@@ -426,7 +426,7 @@ static void via_lvds_power(struct via_drm_priv *dev_priv,
case PCI_DEVICE_ID_VIA_PM800:
case PCI_DEVICE_ID_VIA_K8M800:
case PCI_DEVICE_ID_VIA_VT3343:
- case PCI_DEVICE_ID_VIA_K8M890:
+ case PCI_DEVICE_ID_VIA_CHROME9:
case PCI_DEVICE_ID_VIA_CHROME9_HC:
via_lvds_primary_hard_power_seq(dev_priv, power_state);
break;
@@ -1182,7 +1182,7 @@ void via_lvds_probe(struct drm_device *dev)
dev_priv->int_fp2_di_port = VIA_DI_PORT_NONE;
break;
case PCI_DEVICE_ID_VIA_VT3343:
- case PCI_DEVICE_ID_VIA_K8M890:
+ case PCI_DEVICE_ID_VIA_CHROME9:
case PCI_DEVICE_ID_VIA_CHROME9_HC:
if (cr3b & BIT(1)) {
/* 3C5.12[4] - DVP0D4 pin strapping
diff --git a/drivers/gpu/drm/via/via_tmds.c b/drivers/gpu/drm/via/via_tmds.c
index 4668db1aba3d..bce16466eef2 100644
--- a/drivers/gpu/drm/via/via_tmds.c
+++ b/drivers/gpu/drm/via/via_tmds.c
@@ -671,7 +671,7 @@ void via_ext_dvi_probe(struct drm_device *dev)
break;
case PCI_DEVICE_ID_VIA_VT3343:
- case PCI_DEVICE_ID_VIA_K8M890:
+ case PCI_DEVICE_ID_VIA_CHROME9:
case PCI_DEVICE_ID_VIA_CHROME9_HC:
/* Assume DVP2 as DVP0. Hence, VIA_DI_PORT_DVP0
* is used. */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 562ccf61ace7..1a8a4a0e938d 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1479,7 +1479,7 @@
#define PCI_DEVICE_ID_VIA_8783_0 0x3208
#define PCI_DEVICE_ID_VIA_CN750 0x3225
#define PCI_DEVICE_ID_VIA_8237 0x3227
-#define PCI_DEVICE_ID_VIA_K8M890 0x3230
+#define PCI_DEVICE_ID_VIA_CHROME9 0x3230
#define PCI_DEVICE_ID_VIA_8251 0x3287
#define PCI_DEVICE_ID_VIA_8261 0x3402
#define PCI_DEVICE_ID_VIA_8237A 0x3337
commit c920e8feeb7a38bb25fbf375976986da52417812
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 1 17:37:47 2022 -0500
drm/via: Change P4M900 chipset graphics PCI device ID label
The new name is PCI_DEVICE_ID_VIA_CHROME9_HC since it is much easier
to remember.
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index 12103f9f5156..7cc246799465 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -662,7 +662,7 @@ static int via_iga1_display_fifo_regs(struct drm_device *dev,
display_queue_expire_num = P4M890_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
break;
/* P4M900 */
- case PCI_DEVICE_ID_VIA_P4M900:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC:
/* SR17[7:0] */
fifo_max_depth = P4M900_IGA1_FIFO_MAX_DEPTH;
@@ -992,7 +992,7 @@ static int via_iga2_display_fifo_regs(struct drm_device *dev,
display_queue_expire_num = P4M890_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
break;
/* P4M900 */
- case PCI_DEVICE_ID_VIA_P4M900:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC:
/* CR95[7], CR94[7], CR68[7:4] */
fifo_max_depth = P4M900_IGA2_FIFO_MAX_DEPTH;
diff --git a/drivers/gpu/drm/via/via_cursor.c b/drivers/gpu/drm/via/via_cursor.c
index 6d5a4af26361..9418ad76f0ee 100644
--- a/drivers/gpu/drm/via/via_cursor.c
+++ b/drivers/gpu/drm/via/via_cursor.c
@@ -61,7 +61,7 @@ static void via_hide_cursor(struct drm_crtc *crtc)
switch (pdev->device) {
case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
case PCI_DEVICE_ID_VIA_VT3343:
- case PCI_DEVICE_ID_VIA_P4M900:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC:
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
@@ -92,7 +92,7 @@ static void via_show_cursor(struct drm_crtc *crtc)
switch (pdev->device) {
case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
case PCI_DEVICE_ID_VIA_VT3343:
- case PCI_DEVICE_ID_VIA_P4M900:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC:
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
@@ -129,7 +129,7 @@ static void via_show_cursor(struct drm_crtc *crtc)
switch (pdev->device) {
case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
case PCI_DEVICE_ID_VIA_VT3343:
- case PCI_DEVICE_ID_VIA_P4M900:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC:
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
@@ -169,7 +169,7 @@ static void via_cursor_address(struct drm_crtc *crtc,
switch (pdev->device) {
case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
case PCI_DEVICE_ID_VIA_VT3343:
- case PCI_DEVICE_ID_VIA_P4M900:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC:
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
@@ -220,7 +220,7 @@ static void via_set_hi_location(struct drm_crtc *crtc, int crtc_x, int crtc_y)
switch (pdev->device) {
case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
case PCI_DEVICE_ID_VIA_VT3343:
- case PCI_DEVICE_ID_VIA_P4M900:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC:
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
diff --git a/drivers/gpu/drm/via/via_dac.c b/drivers/gpu/drm/via/via_dac.c
index ad169868d45b..8b3b4599b580 100644
--- a/drivers/gpu/drm/via/via_dac.c
+++ b/drivers/gpu/drm/via/via_dac.c
@@ -315,7 +315,7 @@ static enum drm_mode_status via_dac_mode_valid(
/* K8M890 / K8N890 Chipset */
case PCI_DEVICE_ID_VIA_K8M890:
/* P4M900 / VN896 / CN896 Chipset */
- case PCI_DEVICE_ID_VIA_P4M900:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC:
/* CX700(M/M2) / VX700(M/M2) Chipset */
case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
/* VX800 / VX820 Chipset */
diff --git a/drivers/gpu/drm/via/via_lvds.c b/drivers/gpu/drm/via/via_lvds.c
index 35ef6168c7aa..e1010017c7c0 100644
--- a/drivers/gpu/drm/via/via_lvds.c
+++ b/drivers/gpu/drm/via/via_lvds.c
@@ -427,7 +427,7 @@ static void via_lvds_power(struct via_drm_priv *dev_priv,
case PCI_DEVICE_ID_VIA_K8M800:
case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_K8M890:
- case PCI_DEVICE_ID_VIA_P4M900:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC:
via_lvds_primary_hard_power_seq(dev_priv, power_state);
break;
case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
@@ -781,7 +781,7 @@ via_lvds_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,
/* Temporary implementation.*/
switch (chipset) {
- case PCI_DEVICE_ID_VIA_P4M900:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC:
via_fpdp_low_set_adjustment(VGABASE, 0x08);
break;
default:
@@ -1183,7 +1183,7 @@ void via_lvds_probe(struct drm_device *dev)
break;
case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_K8M890:
- case PCI_DEVICE_ID_VIA_P4M900:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC:
if (cr3b & BIT(1)) {
/* 3C5.12[4] - DVP0D4 pin strapping
* 0: 12-bit FPDP (Flat Panel
diff --git a/drivers/gpu/drm/via/via_tmds.c b/drivers/gpu/drm/via/via_tmds.c
index 9d98f038aab7..4668db1aba3d 100644
--- a/drivers/gpu/drm/via/via_tmds.c
+++ b/drivers/gpu/drm/via/via_tmds.c
@@ -672,7 +672,7 @@ void via_ext_dvi_probe(struct drm_device *dev)
break;
case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_K8M890:
- case PCI_DEVICE_ID_VIA_P4M900:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC:
/* Assume DVP2 as DVP0. Hence, VIA_DI_PORT_DVP0
* is used. */
/* 3C5.12[6] - DVP2D6 pin strapping
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 7ead8fa1054a..562ccf61ace7 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1485,7 +1485,7 @@
#define PCI_DEVICE_ID_VIA_8237A 0x3337
#define PCI_DEVICE_ID_VIA_VT3343 0x3343
#define PCI_DEVICE_ID_VIA_CN700 0x3344
-#define PCI_DEVICE_ID_VIA_P4M900 0x3371
+#define PCI_DEVICE_ID_VIA_CHROME9_HC 0x3371
#define PCI_DEVICE_ID_VIA_8237S 0x3372
#define PCI_DEVICE_ID_VIA_CHROME9_HCM 0x5122
#define PCI_DEVICE_ID_VIA_SATA_EIDE 0x5324
commit 9e56b20f85b1fb6787ddc4683599d69bef6c972d
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 1 17:19:06 2022 -0500
drm/via: Change CX700 chipset graphics PCI device ID label
The new name is PCI_DEVICE_ID_VIA_UNICHROME_PRO_II since it is much
easier to remember.
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index f55ba259e32f..12103f9f5156 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -619,7 +619,7 @@ static int via_iga1_display_fifo_regs(struct drm_device *dev,
display_queue_expire_num = CN700_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
break;
/* CX700 */
- case PCI_DEVICE_ID_VIA_VT3157:
+ case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
/* SR17[7:0] */
fifo_max_depth = CX700_IGA1_FIFO_MAX_DEPTH;
@@ -731,7 +731,7 @@ static int via_iga1_display_fifo_regs(struct drm_device *dev,
(pdev->device == PCI_DEVICE_ID_VIA_K8M800) ||
(pdev->device == PCI_DEVICE_ID_VIA_PM800) ||
(pdev->device == PCI_DEVICE_ID_VIA_CN700) ||
- (pdev->device == PCI_DEVICE_ID_VIA_VT3157)) {
+ (pdev->device == PCI_DEVICE_ID_VIA_UNICHROME_PRO_II)) {
/* Force PREQ to be always higher than TREQ. */
svga_wseq_mask(VGABASE, 0x18, BIT(6), BIT(6));
} else {
@@ -949,7 +949,7 @@ static int via_iga2_display_fifo_regs(struct drm_device *dev,
display_queue_expire_num = CN700_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
break;
/* CX700 */
- case PCI_DEVICE_ID_VIA_VT3157:
+ case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
/* CR95[7], CR94[7], CR68[7:4] */
fifo_max_depth = CX700_IGA2_FIFO_MAX_DEPTH;
diff --git a/drivers/gpu/drm/via/via_cursor.c b/drivers/gpu/drm/via/via_cursor.c
index dc0d32a857bb..6d5a4af26361 100644
--- a/drivers/gpu/drm/via/via_cursor.c
+++ b/drivers/gpu/drm/via/via_cursor.c
@@ -59,7 +59,7 @@ static void via_hide_cursor(struct drm_crtc *crtc)
uint32_t temp;
switch (pdev->device) {
- case PCI_DEVICE_ID_VIA_VT3157:
+ case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_P4M900:
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
@@ -90,7 +90,7 @@ static void via_show_cursor(struct drm_crtc *crtc)
struct via_drm_priv *dev_priv = to_via_drm_priv(dev);
switch (pdev->device) {
- case PCI_DEVICE_ID_VIA_VT3157:
+ case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_P4M900:
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
@@ -127,7 +127,7 @@ static void via_show_cursor(struct drm_crtc *crtc)
}
switch (pdev->device) {
- case PCI_DEVICE_ID_VIA_VT3157:
+ case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_P4M900:
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
@@ -167,7 +167,7 @@ static void via_cursor_address(struct drm_crtc *crtc,
struct via_drm_priv *dev_priv = to_via_drm_priv(dev);
switch (pdev->device) {
- case PCI_DEVICE_ID_VIA_VT3157:
+ case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_P4M900:
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
@@ -218,7 +218,7 @@ static void via_set_hi_location(struct drm_crtc *crtc, int crtc_x, int crtc_y)
}
switch (pdev->device) {
- case PCI_DEVICE_ID_VIA_VT3157:
+ case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_P4M900:
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
diff --git a/drivers/gpu/drm/via/via_dac.c b/drivers/gpu/drm/via/via_dac.c
index 68a889c3b58f..ad169868d45b 100644
--- a/drivers/gpu/drm/via/via_dac.c
+++ b/drivers/gpu/drm/via/via_dac.c
@@ -317,7 +317,7 @@ static enum drm_mode_status via_dac_mode_valid(
/* P4M900 / VN896 / CN896 Chipset */
case PCI_DEVICE_ID_VIA_P4M900:
/* CX700(M/M2) / VX700(M/M2) Chipset */
- case PCI_DEVICE_ID_VIA_VT3157:
+ case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
/* VX800 / VX820 Chipset */
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
/* VX855 / VX875 Chipset */
@@ -424,7 +424,7 @@ void via_dac_probe(struct drm_device *dev)
DRM_DEBUG_KMS("Entered %s.\n", __func__);
switch (chipset) {
- case PCI_DEVICE_ID_VIA_VT3157:
+ case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
diff --git a/drivers/gpu/drm/via/via_init.c b/drivers/gpu/drm/via/via_init.c
index 2d30751bce88..bc39eb57ab87 100644
--- a/drivers/gpu/drm/via/via_init.c
+++ b/drivers/gpu/drm/via/via_init.c
@@ -982,7 +982,7 @@ static void via_quirks_init(struct via_drm_priv *dev_priv)
* setting to handle DVI. As a result, the code needs to know
* this in order to support DVI properly.
*/
- if ((pdev->device == PCI_DEVICE_ID_VIA_VT3157) &&
+ if ((pdev->device == PCI_DEVICE_ID_VIA_UNICHROME_PRO_II) &&
(pdev->subsystem_vendor == 0x1509) &&
(pdev->subsystem_device == 0x2d30)) {
dev_priv->is_via_nanobook = true;
@@ -1140,7 +1140,7 @@ void chip_revision_info(struct via_drm_priv *dev_priv)
vga_wcrt(VGABASE, 0x4F, tmp);
break;
/* CX700 / VX700 Chipset */
- case PCI_DEVICE_ID_VIA_VT3157:
+ case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
tmp = vga_rseq(VGABASE, 0x43);
if (tmp & 0x02) {
dev_priv->revision = CX700_REVISION_700M2;
diff --git a/drivers/gpu/drm/via/via_lvds.c b/drivers/gpu/drm/via/via_lvds.c
index babce1a01424..35ef6168c7aa 100644
--- a/drivers/gpu/drm/via/via_lvds.c
+++ b/drivers/gpu/drm/via/via_lvds.c
@@ -430,7 +430,7 @@ static void via_lvds_power(struct via_drm_priv *dev_priv,
case PCI_DEVICE_ID_VIA_P4M900:
via_lvds_primary_hard_power_seq(dev_priv, power_state);
break;
- case PCI_DEVICE_ID_VIA_VT3157:
+ case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
if (di_port & VIA_DI_PORT_LVDS1) {
via_lvds_primary_soft_power_seq(dev_priv, power_state);
@@ -789,7 +789,7 @@ via_lvds_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,
}
switch (chipset) {
- case PCI_DEVICE_ID_VIA_VT3157:
+ case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
@@ -1207,7 +1207,7 @@ void via_lvds_probe(struct drm_device *dev)
dev_priv->int_fp2_presence = false;
dev_priv->int_fp2_di_port = VIA_DI_PORT_NONE;
break;
- case PCI_DEVICE_ID_VIA_VT3157:
+ case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
diff --git a/drivers/gpu/drm/via/via_tmds.c b/drivers/gpu/drm/via/via_tmds.c
index cbd8b762070a..9d98f038aab7 100644
--- a/drivers/gpu/drm/via/via_tmds.c
+++ b/drivers/gpu/drm/via/via_tmds.c
@@ -371,7 +371,7 @@ static enum drm_mode_status via_tmds_mode_valid(
min_clock = 25000;
switch (pdev->device) {
/* CX700(M/M2) / VX700(M/M2) Chipset */
- case PCI_DEVICE_ID_VIA_VT3157:
+ case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
/* VX800 / VX820 Chipset */
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
max_clock = 165000;
@@ -461,7 +461,7 @@ void via_tmds_probe(struct drm_device *dev)
/* Detect the presence of integrated TMDS transmitter. */
switch (chipset) {
- case PCI_DEVICE_ID_VIA_VT3157:
+ case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
sr5a = vga_rseq(VGABASE, 0x5a);
@@ -688,7 +688,7 @@ void via_ext_dvi_probe(struct drm_device *dev)
}
break;
- case PCI_DEVICE_ID_VIA_VT3157:
+ case PCI_DEVICE_ID_VIA_UNICHROME_PRO_II:
case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index cd6077fedff0..7ead8fa1054a 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1469,7 +1469,7 @@
#define PCI_DEVICE_ID_VIA_8703_51_0 0x3148
#define PCI_DEVICE_ID_VIA_8237_SATA 0x3149
#define PCI_DEVICE_ID_VIA_XN266 0x3156
-#define PCI_DEVICE_ID_VIA_VT3157 0x3157
+#define PCI_DEVICE_ID_VIA_UNICHROME_PRO_II 0x3157
#define PCI_DEVICE_ID_VIA_6410 0x3164
#define PCI_DEVICE_ID_VIA_8754C_0 0x3168
#define PCI_DEVICE_ID_VIA_8235 0x3177
commit 7fd0061e883f7dfd5347117fa4e1656927a511fd
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 1 17:07:57 2022 -0500
drm/via: Change VX800 chipset graphics PCI device ID label
The new name is PCI_DEVICE_ID_VIA_CHROME9_HC3 since it is much easier to
remember.
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index d0d92e69ccf5..f55ba259e32f 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -676,7 +676,7 @@ static int via_iga1_display_fifo_regs(struct drm_device *dev,
display_queue_expire_num = P4M900_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
break;
/* VX800 */
- case PCI_DEVICE_ID_VIA_VT1122:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC3:
/* SR17[7:0] */
fifo_max_depth = VX800_IGA1_FIFO_MAX_DEPTH;
@@ -1006,7 +1006,7 @@ static int via_iga2_display_fifo_regs(struct drm_device *dev,
display_queue_expire_num = P4M900_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
break;
/* VX800 */
- case PCI_DEVICE_ID_VIA_VT1122:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC3:
/* CR95[7], CR94[7], CR68[7:4] */
fifo_max_depth = VX800_IGA2_FIFO_MAX_DEPTH;
diff --git a/drivers/gpu/drm/via/via_cursor.c b/drivers/gpu/drm/via/via_cursor.c
index d38212a5940b..dc0d32a857bb 100644
--- a/drivers/gpu/drm/via/via_cursor.c
+++ b/drivers/gpu/drm/via/via_cursor.c
@@ -62,7 +62,7 @@ static void via_hide_cursor(struct drm_crtc *crtc)
case PCI_DEVICE_ID_VIA_VT3157:
case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_P4M900:
- case PCI_DEVICE_ID_VIA_VT1122:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
if (iga->index) {
@@ -93,7 +93,7 @@ static void via_show_cursor(struct drm_crtc *crtc)
case PCI_DEVICE_ID_VIA_VT3157:
case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_P4M900:
- case PCI_DEVICE_ID_VIA_VT1122:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
/*
@@ -130,7 +130,7 @@ static void via_show_cursor(struct drm_crtc *crtc)
case PCI_DEVICE_ID_VIA_VT3157:
case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_P4M900:
- case PCI_DEVICE_ID_VIA_VT1122:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
/*
@@ -170,7 +170,7 @@ static void via_cursor_address(struct drm_crtc *crtc,
case PCI_DEVICE_ID_VIA_VT3157:
case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_P4M900:
- case PCI_DEVICE_ID_VIA_VT1122:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
/*
@@ -221,7 +221,7 @@ static void via_set_hi_location(struct drm_crtc *crtc, int crtc_x, int crtc_y)
case PCI_DEVICE_ID_VIA_VT3157:
case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_P4M900:
- case PCI_DEVICE_ID_VIA_VT1122:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
if (iga->index) {
diff --git a/drivers/gpu/drm/via/via_dac.c b/drivers/gpu/drm/via/via_dac.c
index e956ade0b5b8..68a889c3b58f 100644
--- a/drivers/gpu/drm/via/via_dac.c
+++ b/drivers/gpu/drm/via/via_dac.c
@@ -319,7 +319,7 @@ static enum drm_mode_status via_dac_mode_valid(
/* CX700(M/M2) / VX700(M/M2) Chipset */
case PCI_DEVICE_ID_VIA_VT3157:
/* VX800 / VX820 Chipset */
- case PCI_DEVICE_ID_VIA_VT1122:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC3:
/* VX855 / VX875 Chipset */
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
/* VX900(H) Chipset */
@@ -425,7 +425,7 @@ void via_dac_probe(struct drm_device *dev)
switch (chipset) {
case PCI_DEVICE_ID_VIA_VT3157:
- case PCI_DEVICE_ID_VIA_VT1122:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
sr5a = vga_rseq(VGABASE, 0x5a);
diff --git a/drivers/gpu/drm/via/via_init.c b/drivers/gpu/drm/via/via_init.c
index dd290c161968..2d30751bce88 100644
--- a/drivers/gpu/drm/via/via_init.c
+++ b/drivers/gpu/drm/via/via_init.c
@@ -995,7 +995,7 @@ static void via_quirks_init(struct via_drm_priv *dev_priv)
* due to its flat panel connected to DVP1 (Digital
* Video Port 1) rather than its LVDS channel.
*/
- if ((pdev->device == PCI_DEVICE_ID_VIA_VT1122) &&
+ if ((pdev->device == PCI_DEVICE_ID_VIA_CHROME9_HC3) &&
(pdev->subsystem_vendor == 0x152d) &&
(pdev->subsystem_device == 0x0771)) {
dev_priv->is_quanta_il1 = true;
@@ -1009,7 +1009,7 @@ static void via_quirks_init(struct via_drm_priv *dev_priv)
* flag register is needed for properly controlling its
* FP.
*/
- if ((pdev->device == PCI_DEVICE_ID_VIA_VT1122) &&
+ if ((pdev->device == PCI_DEVICE_ID_VIA_CHROME9_HC3) &&
(pdev->subsystem_vendor == 0x144d) &&
(pdev->subsystem_device == 0xc04e)) {
dev_priv->is_samsung_nc20 = true;
@@ -1152,7 +1152,7 @@ void chip_revision_info(struct via_drm_priv *dev_priv)
break;
/* VX800 / VX820 Chipset */
- case PCI_DEVICE_ID_VIA_VT1122:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC3:
break;
/* VX855 / VX875 Chipset */
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
diff --git a/drivers/gpu/drm/via/via_lvds.c b/drivers/gpu/drm/via/via_lvds.c
index 4702a45564ae..babce1a01424 100644
--- a/drivers/gpu/drm/via/via_lvds.c
+++ b/drivers/gpu/drm/via/via_lvds.c
@@ -103,7 +103,7 @@ static void via_init_td_timing_regs(struct drm_device *dev)
/* Note: VT3353 have two hardware power sequences
* other chips only have one hardware power sequence */
- if (pdev->device == PCI_DEVICE_ID_VIA_VT1122) {
+ if (pdev->device == PCI_DEVICE_ID_VIA_CHROME9_HC3) {
/* set CRD4[0] to "1" to select 2nd LCD power sequence. */
svga_wcrt_mask(VGABASE, 0xD4, BIT(0), BIT(0));
/* Fill secondary power sequence */
@@ -431,7 +431,7 @@ static void via_lvds_power(struct via_drm_priv *dev_priv,
via_lvds_primary_hard_power_seq(dev_priv, power_state);
break;
case PCI_DEVICE_ID_VIA_VT3157:
- case PCI_DEVICE_ID_VIA_VT1122:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC3:
if (di_port & VIA_DI_PORT_LVDS1) {
via_lvds_primary_soft_power_seq(dev_priv, power_state);
via_lvds1_set_power(VGABASE, power_state);
@@ -790,7 +790,7 @@ via_lvds_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,
switch (chipset) {
case PCI_DEVICE_ID_VIA_VT3157:
- case PCI_DEVICE_ID_VIA_VT1122:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
/* OPENLDI Mode */
@@ -1208,7 +1208,7 @@ void via_lvds_probe(struct drm_device *dev)
dev_priv->int_fp2_di_port = VIA_DI_PORT_NONE;
break;
case PCI_DEVICE_ID_VIA_VT3157:
- case PCI_DEVICE_ID_VIA_VT1122:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
/* Save SR5A. */
diff --git a/drivers/gpu/drm/via/via_pm.c b/drivers/gpu/drm/via/via_pm.c
index acf2e5fca261..5fad01447eed 100644
--- a/drivers/gpu/drm/via/via_pm.c
+++ b/drivers/gpu/drm/via/via_pm.c
@@ -49,7 +49,7 @@ int via_dev_pm_ops_suspend(struct device *dev)
* are only available on VX800, VX855, and VX900 chipsets. This bug
* was observed on VIA Embedded EPIA-M830 mainboard.
*/
- if ((pdev->device == PCI_DEVICE_ID_VIA_VT1122) ||
+ if ((pdev->device == PCI_DEVICE_ID_VIA_CHROME9_HC3) ||
(pdev->device == PCI_DEVICE_ID_VIA_CHROME9_HCM) ||
(pdev->device == PCI_DEVICE_ID_VIA_CHROME9_HD)) {
dev_priv->saved_sr14 = vga_rseq(VGABASE, 0x14);
@@ -143,7 +143,7 @@ int via_dev_pm_ops_resume(struct device *dev)
* are only available on VX800, VX855, and VX900 chipsets. This bug
* was observed on VIA Embedded EPIA-M830 mainboard.
*/
- if ((pdev->device == PCI_DEVICE_ID_VIA_VT1122) ||
+ if ((pdev->device == PCI_DEVICE_ID_VIA_CHROME9_HC3) ||
(pdev->device == PCI_DEVICE_ID_VIA_CHROME9_HCM) ||
(pdev->device == PCI_DEVICE_ID_VIA_CHROME9_HD)) {
vga_wseq(VGABASE, 0x14, dev_priv->saved_sr14);
diff --git a/drivers/gpu/drm/via/via_tmds.c b/drivers/gpu/drm/via/via_tmds.c
index 8de3b440f99a..cbd8b762070a 100644
--- a/drivers/gpu/drm/via/via_tmds.c
+++ b/drivers/gpu/drm/via/via_tmds.c
@@ -373,7 +373,7 @@ static enum drm_mode_status via_tmds_mode_valid(
/* CX700(M/M2) / VX700(M/M2) Chipset */
case PCI_DEVICE_ID_VIA_VT3157:
/* VX800 / VX820 Chipset */
- case PCI_DEVICE_ID_VIA_VT1122:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC3:
max_clock = 165000;
break;
/* Illegal condition (should never get here) */
@@ -462,7 +462,7 @@ void via_tmds_probe(struct drm_device *dev)
/* Detect the presence of integrated TMDS transmitter. */
switch (chipset) {
case PCI_DEVICE_ID_VIA_VT3157:
- case PCI_DEVICE_ID_VIA_VT1122:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC3:
sr5a = vga_rseq(VGABASE, 0x5a);
/* Setting SR5A[0] to 1.
@@ -689,7 +689,7 @@ void via_ext_dvi_probe(struct drm_device *dev)
break;
case PCI_DEVICE_ID_VIA_VT3157:
- case PCI_DEVICE_ID_VIA_VT1122:
+ case PCI_DEVICE_ID_VIA_CHROME9_HC3:
case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
dev_priv->ext_tmds_di_port = VIA_DI_PORT_DVP1;
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 38bab3794d23..cd6077fedff0 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1441,7 +1441,7 @@
#define PCI_DEVICE_ID_VIA_8605_0 0x0605
#define PCI_DEVICE_ID_VIA_82C686 0x0686
#define PCI_DEVICE_ID_VIA_82C691_0 0x0691
-#define PCI_DEVICE_ID_VIA_VT1122 0x1122
+#define PCI_DEVICE_ID_VIA_CHROME9_HC3 0x1122
#define PCI_DEVICE_ID_VIA_82C576_1 0x1571
#define PCI_DEVICE_ID_VIA_82C586_2 0x3038
#define PCI_DEVICE_ID_VIA_82C586_3 0x3040
commit cdd11cd28c4a8eb81fbdd1a7f6b8d972d7a54733
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 1 16:53:12 2022 -0500
drm/via: Change VX855 chipset graphics PCI device ID label
The new name is PCI_DEVICE_ID_VIA_CHROME9_HCM since it is much easier to
remember.
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index e2d1172e36e1..d0d92e69ccf5 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -690,7 +690,7 @@ static int via_iga1_display_fifo_regs(struct drm_device *dev,
display_queue_expire_num = VX800_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
break;
/* VX855 */
- case PCI_DEVICE_ID_VIA_VX875:
+ case PCI_DEVICE_ID_VIA_CHROME9_HCM:
/* SR17[7:0] */
fifo_max_depth = VX855_IGA1_FIFO_MAX_DEPTH;
@@ -1020,7 +1020,7 @@ static int via_iga2_display_fifo_regs(struct drm_device *dev,
display_queue_expire_num = VX800_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
break;
/* VX855 */
- case PCI_DEVICE_ID_VIA_VX875:
+ case PCI_DEVICE_ID_VIA_CHROME9_HCM:
/* CR95[7], CR94[7], CR68[7:4] */
fifo_max_depth = VX855_IGA2_FIFO_MAX_DEPTH;
diff --git a/drivers/gpu/drm/via/via_cursor.c b/drivers/gpu/drm/via/via_cursor.c
index 4bab6dbb611c..d38212a5940b 100644
--- a/drivers/gpu/drm/via/via_cursor.c
+++ b/drivers/gpu/drm/via/via_cursor.c
@@ -63,7 +63,7 @@ static void via_hide_cursor(struct drm_crtc *crtc)
case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_P4M900:
case PCI_DEVICE_ID_VIA_VT1122:
- case PCI_DEVICE_ID_VIA_VX875:
+ case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
if (iga->index) {
temp = VIA_READ(HI_CONTROL);
@@ -94,7 +94,7 @@ static void via_show_cursor(struct drm_crtc *crtc)
case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_P4M900:
case PCI_DEVICE_ID_VIA_VT1122:
- case PCI_DEVICE_ID_VIA_VX875:
+ case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
/*
* Program Hardware Icon (HI) FIFO, foreground color,
@@ -131,7 +131,7 @@ static void via_show_cursor(struct drm_crtc *crtc)
case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_P4M900:
case PCI_DEVICE_ID_VIA_VT1122:
- case PCI_DEVICE_ID_VIA_VX875:
+ case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
/*
* Turn on Hardware Icon (HI).
@@ -171,7 +171,7 @@ static void via_cursor_address(struct drm_crtc *crtc,
case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_P4M900:
case PCI_DEVICE_ID_VIA_VT1122:
- case PCI_DEVICE_ID_VIA_VX875:
+ case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
/*
* Program Hardware Icon (HI) offset.
@@ -222,7 +222,7 @@ static void via_set_hi_location(struct drm_crtc *crtc, int crtc_x, int crtc_y)
case PCI_DEVICE_ID_VIA_VT3343:
case PCI_DEVICE_ID_VIA_P4M900:
case PCI_DEVICE_ID_VIA_VT1122:
- case PCI_DEVICE_ID_VIA_VX875:
+ case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
if (iga->index) {
VIA_WRITE(HI_POSSTART,
diff --git a/drivers/gpu/drm/via/via_dac.c b/drivers/gpu/drm/via/via_dac.c
index 9c6d4b4963fb..e956ade0b5b8 100644
--- a/drivers/gpu/drm/via/via_dac.c
+++ b/drivers/gpu/drm/via/via_dac.c
@@ -321,7 +321,7 @@ static enum drm_mode_status via_dac_mode_valid(
/* VX800 / VX820 Chipset */
case PCI_DEVICE_ID_VIA_VT1122:
/* VX855 / VX875 Chipset */
- case PCI_DEVICE_ID_VIA_VX875:
+ case PCI_DEVICE_ID_VIA_CHROME9_HCM:
/* VX900(H) Chipset */
case PCI_DEVICE_ID_VIA_CHROME9_HD:
max_clock = 350000;
@@ -426,7 +426,7 @@ void via_dac_probe(struct drm_device *dev)
switch (chipset) {
case PCI_DEVICE_ID_VIA_VT3157:
case PCI_DEVICE_ID_VIA_VT1122:
- case PCI_DEVICE_ID_VIA_VX875:
+ case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
sr5a = vga_rseq(VGABASE, 0x5a);
DRM_DEBUG_KMS("SR5A: 0x%02x\n", sr5a);
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index b55fa5d78016..bee4e6dfb0e8 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -320,7 +320,7 @@ via_unlock_crtc(void __iomem *regs, int pci_id)
u8 mask = BIT(0);
svga_wcrt_mask(regs, 0x11, 0, BIT(7));
- if ((pci_id == PCI_DEVICE_ID_VIA_VX875) ||
+ if ((pci_id == PCI_DEVICE_ID_VIA_CHROME9_HCM) ||
(pci_id == PCI_DEVICE_ID_VIA_CHROME9_HD))
mask = BIT(4);
svga_wcrt_mask(regs, 0x47, 0, mask);
diff --git a/drivers/gpu/drm/via/via_init.c b/drivers/gpu/drm/via/via_init.c
index c7e1ac421b96..dd290c161968 100644
--- a/drivers/gpu/drm/via/via_init.c
+++ b/drivers/gpu/drm/via/via_init.c
@@ -1155,7 +1155,7 @@ void chip_revision_info(struct via_drm_priv *dev_priv)
case PCI_DEVICE_ID_VIA_VT1122:
break;
/* VX855 / VX875 Chipset */
- case PCI_DEVICE_ID_VIA_VX875:
+ case PCI_DEVICE_ID_VIA_CHROME9_HCM:
/* VX900 Chipset */
case PCI_DEVICE_ID_VIA_CHROME9_HD:
dev_priv->revision = vga_rseq(VGABASE, 0x3B);
diff --git a/drivers/gpu/drm/via/via_lvds.c b/drivers/gpu/drm/via/via_lvds.c
index 344505247afd..4702a45564ae 100644
--- a/drivers/gpu/drm/via/via_lvds.c
+++ b/drivers/gpu/drm/via/via_lvds.c
@@ -443,7 +443,7 @@ static void via_lvds_power(struct via_drm_priv *dev_priv,
}
break;
- case PCI_DEVICE_ID_VIA_VX875:
+ case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
via_lvds_primary_hard_power_seq(dev_priv, power_state);
via_lvds1_set_power(VGABASE, power_state);
@@ -791,7 +791,7 @@ via_lvds_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,
switch (chipset) {
case PCI_DEVICE_ID_VIA_VT3157:
case PCI_DEVICE_ID_VIA_VT1122:
- case PCI_DEVICE_ID_VIA_VX875:
+ case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
/* OPENLDI Mode */
via_lvds_format(dev_priv, enc->di_port, 0x01);
@@ -1209,7 +1209,7 @@ void via_lvds_probe(struct drm_device *dev)
break;
case PCI_DEVICE_ID_VIA_VT3157:
case PCI_DEVICE_ID_VIA_VT1122:
- case PCI_DEVICE_ID_VIA_VX875:
+ case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
/* Save SR5A. */
sr5a = vga_rseq(VGABASE, 0x5a);
diff --git a/drivers/gpu/drm/via/via_pll.c b/drivers/gpu/drm/via/via_pll.c
index 4dc770af98cd..513d0c2f3daf 100644
--- a/drivers/gpu/drm/via/via_pll.c
+++ b/drivers/gpu/drm/via/via_pll.c
@@ -165,7 +165,7 @@ u32 via_get_clk_value(struct drm_device *dev, u32 freq)
/* Clock Synthesizer Value 1[6:0]: DM[6:0] */
pll_mrn |= (best_pll_m & 0x7F);
break;
- case PCI_DEVICE_ID_VIA_VX875:
+ case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
/* Clock Synthesizer Value 0 : DM[7:0] */
pll_mrn = (best_pll_m & 0xFF) << 16;
diff --git a/drivers/gpu/drm/via/via_pm.c b/drivers/gpu/drm/via/via_pm.c
index dbf1d0e42d1c..acf2e5fca261 100644
--- a/drivers/gpu/drm/via/via_pm.c
+++ b/drivers/gpu/drm/via/via_pm.c
@@ -50,7 +50,7 @@ int via_dev_pm_ops_suspend(struct device *dev)
* was observed on VIA Embedded EPIA-M830 mainboard.
*/
if ((pdev->device == PCI_DEVICE_ID_VIA_VT1122) ||
- (pdev->device == PCI_DEVICE_ID_VIA_VX875) ||
+ (pdev->device == PCI_DEVICE_ID_VIA_CHROME9_HCM) ||
(pdev->device == PCI_DEVICE_ID_VIA_CHROME9_HD)) {
dev_priv->saved_sr14 = vga_rseq(VGABASE, 0x14);
@@ -144,7 +144,7 @@ int via_dev_pm_ops_resume(struct device *dev)
* was observed on VIA Embedded EPIA-M830 mainboard.
*/
if ((pdev->device == PCI_DEVICE_ID_VIA_VT1122) ||
- (pdev->device == PCI_DEVICE_ID_VIA_VX875) ||
+ (pdev->device == PCI_DEVICE_ID_VIA_CHROME9_HCM) ||
(pdev->device == PCI_DEVICE_ID_VIA_CHROME9_HD)) {
vga_wseq(VGABASE, 0x14, dev_priv->saved_sr14);
diff --git a/drivers/gpu/drm/via/via_tmds.c b/drivers/gpu/drm/via/via_tmds.c
index d8e0c40d9885..8de3b440f99a 100644
--- a/drivers/gpu/drm/via/via_tmds.c
+++ b/drivers/gpu/drm/via/via_tmds.c
@@ -690,7 +690,7 @@ void via_ext_dvi_probe(struct drm_device *dev)
break;
case PCI_DEVICE_ID_VIA_VT3157:
case PCI_DEVICE_ID_VIA_VT1122:
- case PCI_DEVICE_ID_VIA_VX875:
+ case PCI_DEVICE_ID_VIA_CHROME9_HCM:
case PCI_DEVICE_ID_VIA_CHROME9_HD:
dev_priv->ext_tmds_di_port = VIA_DI_PORT_DVP1;
break;
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index e407df5d1355..38bab3794d23 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1487,7 +1487,7 @@
#define PCI_DEVICE_ID_VIA_CN700 0x3344
#define PCI_DEVICE_ID_VIA_P4M900 0x3371
#define PCI_DEVICE_ID_VIA_8237S 0x3372
-#define PCI_DEVICE_ID_VIA_VX875 0x5122
+#define PCI_DEVICE_ID_VIA_CHROME9_HCM 0x5122
#define PCI_DEVICE_ID_VIA_SATA_EIDE 0x5324
#define PCI_DEVICE_ID_VIA_KM400 0x7205
#define PCI_DEVICE_ID_VIA_CHROME9_HD 0x7122
commit 3630c72c6a83d5d52ade15beb1f4f8a0968776db
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 1 16:41:00 2022 -0500
drm/via: Change VX900 chipset graphics PCI device ID label
The new name is PCI_DEVICE_ID_VIA_CHROME9_HD since it is much easier to
remember.
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index afd42bd99f25..e2d1172e36e1 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -704,7 +704,7 @@ static int via_iga1_display_fifo_regs(struct drm_device *dev,
display_queue_expire_num = VX855_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;
break;
/* VX900 */
- case PCI_DEVICE_ID_VIA_VX900_VGA:
+ case PCI_DEVICE_ID_VIA_CHROME9_HD:
/* SR17[7:0] */
fifo_max_depth = VX900_IGA1_FIFO_MAX_DEPTH;
@@ -1034,7 +1034,7 @@ static int via_iga2_display_fifo_regs(struct drm_device *dev,
display_queue_expire_num = VX855_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;
break;
/* VX900 */
- case PCI_DEVICE_ID_VIA_VX900_VGA:
+ case PCI_DEVICE_ID_VIA_CHROME9_HD:
/* CR95[7], CR94[7], CR68[7:4] */
fifo_max_depth = VX900_IGA2_FIFO_MAX_DEPTH;
@@ -1184,7 +1184,7 @@ void via_load_crtc_timing(struct via_crtc *iga, struct drm_display_mode *mode)
u32 reg_value = 0;
if (!iga->index) {
- if (pdev->device == PCI_DEVICE_ID_VIA_VX900_VGA) {
+ if (pdev->device == PCI_DEVICE_ID_VIA_CHROME9_HD) {
/* Disable IGA1 shadow timing */
svga_wcrt_mask(VGABASE, 0x45, 0x00, BIT(0));
@@ -1288,7 +1288,7 @@ void via_set_scale_path(struct drm_crtc *crtc, u32 scale_type)
reg_cr_fd &= ~BIT(7);
/* only IGA1 up scaling need to clear this bit CRFD.5. */
- if (pdev->device == PCI_DEVICE_ID_VIA_VX900_VGA) {
+ if (pdev->device == PCI_DEVICE_ID_VIA_CHROME9_HD) {
if (!iga->index
&& ((VIA_HOR_EXPAND & scale_type)
|| (VIA_VER_EXPAND & scale_type)))
@@ -2052,12 +2052,12 @@ static void via_crtc_param_init(struct via_drm_priv *dev_priv,
iga->timings.hdisplay.count = ARRAY_SIZE(iga2_hor_addr);
iga->timings.hdisplay.regs = iga2_hor_addr;
- if (pdev->device != PCI_DEVICE_ID_VIA_VX900_VGA)
+ if (pdev->device != PCI_DEVICE_ID_VIA_CHROME9_HD)
iga->timings.hdisplay.count--;
iga->timings.hblank_start.count = ARRAY_SIZE(iga2_hor_blank_start);
iga->timings.hblank_start.regs = iga2_hor_blank_start;
- if (pdev->device != PCI_DEVICE_ID_VIA_VX900_VGA)
+ if (pdev->device != PCI_DEVICE_ID_VIA_CHROME9_HD)
iga->timings.hblank_start.count--;
iga->timings.hblank_end.count = ARRAY_SIZE(iga2_hor_blank_end);
@@ -2126,12 +2126,12 @@ static void via_crtc_param_init(struct via_drm_priv *dev_priv,
iga->timings.hdisplay.count = ARRAY_SIZE(iga1_hor_addr);
iga->timings.hdisplay.regs = iga1_hor_addr;
- if (pdev->device != PCI_DEVICE_ID_VIA_VX900_VGA)
+ if (pdev->device != PCI_DEVICE_ID_VIA_CHROME9_HD)
iga->timings.hdisplay.count--;
iga->timings.hblank_start.count = ARRAY_SIZE(iga1_hor_blank_start);
iga->timings.hblank_start.regs = iga1_hor_blank_start;
- if (pdev->device != PCI_DEVICE_ID_VIA_VX900_VGA)
+ if (pdev->device != PCI_DEVICE_ID_VIA_CHROME9_HD)
iga->timings.hblank_start.count--;
iga->timings.hblank_end.count = ARRAY_SIZE(iga1_hor_blank_end);
diff --git a/drivers/gpu/drm/via/via_cursor.c b/drivers/gpu/drm/via/via_cursor.c
index 9a6bce1cf922..4bab6dbb611c 100644
--- a/drivers/gpu/drm/via/via_cursor.c
+++ b/drivers/gpu/drm/via/via_cursor.c
@@ -64,7 +64,7 @@ static void via_hide_cursor(struct drm_crtc *crtc)
case PCI_DEVICE_ID_VIA_P4M900:
case PCI_DEVICE_ID_VIA_VT1122:
case PCI_DEVICE_ID_VIA_VX875:
- case PCI_DEVICE_ID_VIA_VX900_VGA:
+ case PCI_DEVICE_ID_VIA_CHROME9_HD:
if (iga->index) {
temp = VIA_READ(HI_CONTROL);
VIA_WRITE(HI_CONTROL, temp & 0xFFFFFFFA);
@@ -95,7 +95,7 @@ static void via_show_cursor(struct drm_crtc *crtc)
case PCI_DEVICE_ID_VIA_P4M900:
case PCI_DEVICE_ID_VIA_VT1122:
case PCI_DEVICE_ID_VIA_VX875:
- case PCI_DEVICE_ID_VIA_VX900_VGA:
+ case PCI_DEVICE_ID_VIA_CHROME9_HD:
/*
* Program Hardware Icon (HI) FIFO, foreground color,
* and background color.
@@ -132,7 +132,7 @@ static void via_show_cursor(struct drm_crtc *crtc)
case PCI_DEVICE_ID_VIA_P4M900:
case PCI_DEVICE_ID_VIA_VT1122:
case PCI_DEVICE_ID_VIA_VX875:
- case PCI_DEVICE_ID_VIA_VX900_VGA:
+ case PCI_DEVICE_ID_VIA_CHROME9_HD:
/*
* Turn on Hardware Icon (HI).
*/
@@ -172,7 +172,7 @@ static void via_cursor_address(struct drm_crtc *crtc,
case PCI_DEVICE_ID_VIA_P4M900:
case PCI_DEVICE_ID_VIA_VT1122:
case PCI_DEVICE_ID_VIA_VX875:
- case PCI_DEVICE_ID_VIA_VX900_VGA:
+ case PCI_DEVICE_ID_VIA_CHROME9_HD:
/*
* Program Hardware Icon (HI) offset.
*/
@@ -223,7 +223,7 @@ static void via_set_hi_location(struct drm_crtc *crtc, int crtc_x, int crtc_y)
case PCI_DEVICE_ID_VIA_P4M900:
case PCI_DEVICE_ID_VIA_VT1122:
case PCI_DEVICE_ID_VIA_VX875:
- case PCI_DEVICE_ID_VIA_VX900_VGA:
+ case PCI_DEVICE_ID_VIA_CHROME9_HD:
if (iga->index) {
VIA_WRITE(HI_POSSTART,
(((location_x & 0x07ff) << 16) |
diff --git a/drivers/gpu/drm/via/via_dac.c b/drivers/gpu/drm/via/via_dac.c
index 4921c93d1089..9c6d4b4963fb 100644
--- a/drivers/gpu/drm/via/via_dac.c
+++ b/drivers/gpu/drm/via/via_dac.c
@@ -323,7 +323,7 @@ static enum drm_mode_status via_dac_mode_valid(
/* VX855 / VX875 Chipset */
case PCI_DEVICE_ID_VIA_VX875:
/* VX900(H) Chipset */
- case PCI_DEVICE_ID_VIA_VX900_VGA:
+ case PCI_DEVICE_ID_VIA_CHROME9_HD:
max_clock = 350000;
break;
/* Illegal condition (should never get here) */
@@ -427,7 +427,7 @@ void via_dac_probe(struct drm_device *dev)
case PCI_DEVICE_ID_VIA_VT3157:
case PCI_DEVICE_ID_VIA_VT1122:
case PCI_DEVICE_ID_VIA_VX875:
- case PCI_DEVICE_ID_VIA_VX900_VGA:
+ case PCI_DEVICE_ID_VIA_CHROME9_HD:
sr5a = vga_rseq(VGABASE, 0x5a);
DRM_DEBUG_KMS("SR5A: 0x%02x\n", sr5a);
diff --git a/drivers/gpu/drm/via/via_display.c b/drivers/gpu/drm/via/via_display.c
index 2f82764038c0..76bcfa470657 100644
--- a/drivers/gpu/drm/via/via_display.c
+++ b/drivers/gpu/drm/via/via_display.c
@@ -99,7 +99,7 @@ int via_modeset_init(struct drm_device *dev)
via_lvds_init(dev);
switch (pdev->device) {
- case PCI_DEVICE_ID_VIA_VX900_VGA:
+ case PCI_DEVICE_ID_VIA_CHROME9_HD:
via_hdmi_init(dev, VIA_DI_PORT_NONE);
break;
default:
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 8f087f75a147..b55fa5d78016 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -321,7 +321,7 @@ via_unlock_crtc(void __iomem *regs, int pci_id)
svga_wcrt_mask(regs, 0x11, 0, BIT(7));
if ((pci_id == PCI_DEVICE_ID_VIA_VX875) ||
- (pci_id == PCI_DEVICE_ID_VIA_VX900_VGA))
+ (pci_id == PCI_DEVICE_ID_VIA_CHROME9_HD))
mask = BIT(4);
svga_wcrt_mask(regs, 0x47, 0, mask);
}
diff --git a/drivers/gpu/drm/via/via_init.c b/drivers/gpu/drm/via/via_init.c
index a46b9fb79884..c7e1ac421b96 100644
--- a/drivers/gpu/drm/via/via_init.c
+++ b/drivers/gpu/drm/via/via_init.c
@@ -764,7 +764,7 @@ int via_vram_detect(struct via_drm_priv *dev_priv)
goto out_err;
}
- if (pdev->device == PCI_DEVICE_ID_VIA_VX900_VGA) {
+ if (pdev->device == PCI_DEVICE_ID_VIA_CHROME9_HD) {
dev_priv->vram_start = pci_resource_start(pdev, 2);
} else {
dev_priv->vram_start = pci_resource_start(pdev, 0);
@@ -1157,7 +1157,7 @@ void chip_revision_info(struct via_drm_priv *dev_priv)
/* VX855 / VX875 Chipset */
case PCI_DEVICE_ID_VIA_VX875:
/* VX900 Chipset */
- case PCI_DEVICE_ID_VIA_VX900_VGA:
+ case PCI_DEVICE_ID_VIA_CHROME9_HD:
dev_priv->revision = vga_rseq(VGABASE, 0x3B);
break;
default:
diff --git a/drivers/gpu/drm/via/via_lvds.c b/drivers/gpu/drm/via/via_lvds.c
index 63445e044ebd..344505247afd 100644
--- a/drivers/gpu/drm/via/via_lvds.c
+++ b/drivers/gpu/drm/via/via_lvds.c
@@ -444,7 +444,7 @@ static void via_lvds_power(struct via_drm_priv *dev_priv,
break;
case PCI_DEVICE_ID_VIA_VX875:
- case PCI_DEVICE_ID_VIA_VX900_VGA:
+ case PCI_DEVICE_ID_VIA_CHROME9_HD:
via_lvds_primary_hard_power_seq(dev_priv, power_state);
via_lvds1_set_power(VGABASE, power_state);
break;
@@ -792,7 +792,7 @@ via_lvds_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,
case PCI_DEVICE_ID_VIA_VT3157:
case PCI_DEVICE_ID_VIA_VT1122:
case PCI_DEVICE_ID_VIA_VX875:
- case PCI_DEVICE_ID_VIA_VX900_VGA:
+ case PCI_DEVICE_ID_VIA_CHROME9_HD:
/* OPENLDI Mode */
via_lvds_format(dev_priv, enc->di_port, 0x01);
@@ -1093,7 +1093,7 @@ static int via_lvds_mode_valid(struct drm_connector *connector,
return MODE_PANEL;
/* Don't support mode larger than physical size */
- if (pdev->device != PCI_DEVICE_ID_VIA_VX900_VGA) {
+ if (pdev->device != PCI_DEVICE_ID_VIA_CHROME9_HD) {
if (mode->hdisplay > native_mode->hdisplay)
return MODE_PANEL;
if (mode->vdisplay > native_mode->vdisplay)
@@ -1210,7 +1210,7 @@ void via_lvds_probe(struct drm_device *dev)
case PCI_DEVICE_ID_VIA_VT3157:
case PCI_DEVICE_ID_VIA_VT1122:
case PCI_DEVICE_ID_VIA_VX875:
- case PCI_DEVICE_ID_VIA_VX900_VGA:
+ case PCI_DEVICE_ID_VIA_CHROME9_HD:
/* Save SR5A. */
sr5a = vga_rseq(VGABASE, 0x5a);
diff --git a/drivers/gpu/drm/via/via_pll.c b/drivers/gpu/drm/via/via_pll.c
index ec61d044504d..4dc770af98cd 100644
--- a/drivers/gpu/drm/via/via_pll.c
+++ b/drivers/gpu/drm/via/via_pll.c
@@ -166,7 +166,7 @@ u32 via_get_clk_value(struct drm_device *dev, u32 freq)
pll_mrn |= (best_pll_m & 0x7F);
break;
case PCI_DEVICE_ID_VIA_VX875:
- case PCI_DEVICE_ID_VIA_VX900_VGA:
+ case PCI_DEVICE_ID_VIA_CHROME9_HD:
/* Clock Synthesizer Value 0 : DM[7:0] */
pll_mrn = (best_pll_m & 0xFF) << 16;
/* Clock Synthesizer Value 1[1:0] : DM[9:8]
diff --git a/drivers/gpu/drm/via/via_pm.c b/drivers/gpu/drm/via/via_pm.c
index 9b80886ab06a..dbf1d0e42d1c 100644
--- a/drivers/gpu/drm/via/via_pm.c
+++ b/drivers/gpu/drm/via/via_pm.c
@@ -51,7 +51,7 @@ int via_dev_pm_ops_suspend(struct device *dev)
*/
if ((pdev->device == PCI_DEVICE_ID_VIA_VT1122) ||
(pdev->device == PCI_DEVICE_ID_VIA_VX875) ||
- (pdev->device == PCI_DEVICE_ID_VIA_VX900_VGA)) {
+ (pdev->device == PCI_DEVICE_ID_VIA_CHROME9_HD)) {
dev_priv->saved_sr14 = vga_rseq(VGABASE, 0x14);
dev_priv->saved_sr66 = vga_rseq(VGABASE, 0x66);
@@ -145,7 +145,7 @@ int via_dev_pm_ops_resume(struct device *dev)
*/
if ((pdev->device == PCI_DEVICE_ID_VIA_VT1122) ||
(pdev->device == PCI_DEVICE_ID_VIA_VX875) ||
- (pdev->device == PCI_DEVICE_ID_VIA_VX900_VGA)) {
+ (pdev->device == PCI_DEVICE_ID_VIA_CHROME9_HD)) {
vga_wseq(VGABASE, 0x14, dev_priv->saved_sr14);
vga_wseq(VGABASE, 0x66, dev_priv->saved_sr66);
diff --git a/drivers/gpu/drm/via/via_tmds.c b/drivers/gpu/drm/via/via_tmds.c
index 5404fc7f8b64..d8e0c40d9885 100644
--- a/drivers/gpu/drm/via/via_tmds.c
+++ b/drivers/gpu/drm/via/via_tmds.c
@@ -691,7 +691,7 @@ void via_ext_dvi_probe(struct drm_device *dev)
case PCI_DEVICE_ID_VIA_VT3157:
case PCI_DEVICE_ID_VIA_VT1122:
case PCI_DEVICE_ID_VIA_VX875:
- case PCI_DEVICE_ID_VIA_VX900_VGA:
+ case PCI_DEVICE_ID_VIA_CHROME9_HD:
dev_priv->ext_tmds_di_port = VIA_DI_PORT_DVP1;
break;
default:
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index e3845578e53e..e407df5d1355 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1490,7 +1490,7 @@
#define PCI_DEVICE_ID_VIA_VX875 0x5122
#define PCI_DEVICE_ID_VIA_SATA_EIDE 0x5324
#define PCI_DEVICE_ID_VIA_KM400 0x7205
-#define PCI_DEVICE_ID_VIA_VX900_VGA 0x7122
+#define PCI_DEVICE_ID_VIA_CHROME9_HD 0x7122
#define PCI_DEVICE_ID_VIA_8231 0x8231
#define PCI_DEVICE_ID_VIA_8231_4 0x8235
#define PCI_DEVICE_ID_VIA_8365_1 0x8305
commit 5fb350fbdd2cefc5fdbd3f4a211092d8e987a80b
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 1 16:28:41 2022 -0500
drm/via: Discontinue the unused via_state{}
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 2611ac619ff2..8f087f75a147 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -174,11 +174,6 @@ struct via_encoder {
struct via_connector cons[];
};
-struct via_state {
- struct vga_regset crt_regs[256];
- struct vga_regset seq_regs[256];
-};
-
struct via_bo {
struct ttm_buffer_object ttm_bo;
struct ttm_bo_kmap_obj kmap;
@@ -205,8 +200,6 @@ struct via_drm_priv {
resource_size_t mmio_size;
void __iomem *mmio;
- struct via_state pm_cache;
-
bool spread_spectrum;
/*
commit 9bf3ae93df4da2081b993f6cc021d8f129bceb8e
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 1 16:28:40 2022 -0500
drm/via: Discontinue the use of via_engine enum
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 09bb88062861..2611ac619ff2 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -186,14 +186,6 @@ struct via_bo {
struct ttm_place placements[VIA_TTM_PL_NUM];
};
-enum via_engine {
- VIA_ENG_H1 = 0,
- VIA_ENG_H2,
- VIA_ENG_H5S1,
- VIA_ENG_H5S2VP1,
- VIA_ENG_H6S2
-};
-
struct via_drm_priv {
struct drm_device dev;
diff --git a/include/drm/drm_pciids.h b/include/drm/drm_pciids.h
index 639f1a9277da..a4567d2918a9 100644
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
@@ -769,19 +769,19 @@
{0, 0, 0}
#define viadrv_PCI_IDS \
- {0x1106, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_ENG_H1}, \
- {0x1106, 0x3118, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_ENG_H2}, \
- {0x1106, 0x3122, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_ENG_H1}, \
- {0x1106, 0x7205, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_ENG_H1}, \
- {0x1106, 0x3108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_ENG_H1}, \
- {0x1106, 0x3344, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_ENG_H2}, \
- {0x1106, 0x3343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_ENG_H1}, \
- {0x1106, 0x3230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_ENG_H5S1}, \
- {0x1106, 0x3371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_ENG_H5S1}, \
- {0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_ENG_H2}, \
- {0x1106, 0x1122, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_ENG_H6S2}, \
- {0x1106, 0x5122, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_ENG_H6S2}, \
- {0x1106, 0x7122, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_ENG_H5S2VP1}, \
+ {0x1106, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+ {0x1106, 0x3118, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+ {0x1106, 0x3122, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+ {0x1106, 0x7205, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+ {0x1106, 0x3108, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+ {0x1106, 0x3344, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+ {0x1106, 0x3343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+ {0x1106, 0x3230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+ {0x1106, 0x3371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+ {0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+ {0x1106, 0x1122, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+ {0x1106, 0x5122, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
+ {0x1106, 0x7122, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
{0, 0, 0}
#define i810_PCI_IDS \
commit 9a7a353514d1b5cee61f63461ee6aee42bbdc328
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 1 16:28:36 2022 -0500
drm/via: Stop using typedef to define via_lvds_info{}
Suggested-by: Jani Nikula <jani.nikula at intel.com>
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 330ab8905417..09bb88062861 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -141,10 +141,10 @@
#define VIA_TMDS_SII164 BIT(1)
-typedef struct _via_lvds_info {
+struct via_lvds_info {
u32 x;
u32 y;
-} via_lvds_info;
+};
struct via_crtc {
struct drm_crtc base;
diff --git a/drivers/gpu/drm/via/via_lvds.c b/drivers/gpu/drm/via/via_lvds.c
index 44f80cc0d6ef..63445e044ebd 100644
--- a/drivers/gpu/drm/via/via_lvds.c
+++ b/drivers/gpu/drm/via/via_lvds.c
@@ -44,7 +44,7 @@
#define TD3 25
/* Non-I2C bus FP native screen resolution information table.*/
-static via_lvds_info via_lvds_info_table[] = {
+static struct via_lvds_info via_lvds_info_table[] = {
{ 640, 480},
{ 800, 600},
{1024, 768},
commit a88db8d7abc50b5598549c953f83f8919499da25
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date: Fri Jul 1 16:18:53 2022 -0500
drm/via: Remove HDMI code not related to VX900 chipset
Only VX900 chipset supports an integrated DVI / HDMI transmitter, so
code related to other devices should not be there in the first place.
Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_hdmi.c b/drivers/gpu/drm/via/via_hdmi.c
index 9412054a24df..566d4536ebd4 100644
--- a/drivers/gpu/drm/via/via_hdmi.c
+++ b/drivers/gpu/drm/via/via_hdmi.c
@@ -250,7 +250,6 @@ static void via_hdmi_enc_mode_set(struct drm_encoder *encoder,
struct via_crtc *iga = container_of(encoder->crtc, struct via_crtc, base);
struct drm_connector *connector = NULL, *con;
struct drm_device *dev = encoder->dev;
- struct pci_dev *pdev = to_pci_dev(dev->dev);
struct via_drm_priv *dev_priv = to_via_drm_priv(dev);
list_for_each_entry(con, &dev->mode_config.connector_list, head) {
@@ -287,24 +286,8 @@ static void via_hdmi_enc_mode_set(struct drm_encoder *encoder,
/* FIXME VIA where do you get this value from ??? */
u32 v_sync_adjust = 0;
- switch (pdev->device) {
- case PCI_DEVICE_ID_VIA_VX875:
- svga_wcrt_mask(VGABASE, 0xFB,
- v_sync_adjust & 0xFF, 0xFF);
- svga_wcrt_mask(VGABASE, 0xFC,
- (v_sync_adjust & 0x700) >> 8, 0x07);
- break;
-
- case PCI_DEVICE_ID_VIA_VX900_VGA:
- svga_wcrt_mask(VGABASE, 0xAB, v_sync_adjust & 0xFF, 0xFF);
- svga_wcrt_mask(VGABASE, 0xAC, (v_sync_adjust & 0x700) >> 8, 0x07);
- break;
-
- default:
- svga_wcrt_mask(VGABASE, 0xFB, v_sync_adjust & 0xFF, 0xFF);
- svga_wcrt_mask(VGABASE, 0xFC, (v_sync_adjust & 0x700) >> 8, 0x07);
- break;
- }
+ svga_wcrt_mask(VGABASE, 0xAB, v_sync_adjust & 0xFF, 0xFF);
+ svga_wcrt_mask(VGABASE, 0xAC, (v_sync_adjust & 0x700) >> 8, 0x07);
}
} else { /* non-interlace, clear interlace setting. */
if (iga->index) {
@@ -357,30 +340,6 @@ static void via_hdmi_enc_mode_set(struct drm_encoder *encoder,
VIA_WRITE(DP_EPHY_PLL_REG, 0xDEC29E6F);
}
}
-
- /* Patch for clock skew */
- if (enc->di_port == VIA_DI_PORT_DVP1) {
- switch (pdev->device) {
- case PCI_DEVICE_ID_VIA_VT3157: /* CX700 */
- svga_wcrt_mask(VGABASE, 0x65, 0x0B, 0x0F);
- svga_wcrt_mask(VGABASE, 0x9B, 0x00, 0x0F);
- break;
-
- case PCI_DEVICE_ID_VIA_VT1122: /* VX800 */
- case PCI_DEVICE_ID_VIA_VX875: /* VX855 */
- svga_wcrt_mask(VGABASE, 0x65, 0x0B, 0x0F);
- svga_wcrt_mask(VGABASE, 0x9B, 0x0F, 0x0F);
- break;
-
- case PCI_DEVICE_ID_VIA_VX900_VGA: /* VX900 */
- svga_wcrt_mask(VGABASE, 0x65, 0x09, 0x0F);
- svga_wcrt_mask(VGABASE, 0x9B, 0x09, 0x0F);
- break;
-
- default:
- break;
- }
- }
}
static const struct drm_encoder_helper_funcs via_hdmi_enc_helper_funcs = {
@@ -654,7 +613,6 @@ static const struct drm_connector_helper_funcs via_hdmi_connector_helper_funcs =
void via_hdmi_init(struct drm_device *dev, u32 di_port)
{
- struct pci_dev *pdev = to_pci_dev(dev->dev);
struct via_connector *dvi, *hdmi;
struct via_encoder *enc;
@@ -683,17 +641,9 @@ void via_hdmi_init(struct drm_device *dev, u32 di_port)
hdmi->base.polled = DRM_CONNECTOR_POLL_HPD;
hdmi->base.doublescan_allowed = false;
+ hdmi->base.interlace_allowed = true;
INIT_LIST_HEAD(&hdmi->props);
- switch (pdev->device) {
- case PCI_DEVICE_ID_VIA_VT3157:
- case PCI_DEVICE_ID_VIA_VT1122:
- hdmi->base.interlace_allowed = false;
- break;
- default:
- hdmi->base.interlace_allowed = true;
- break;
- }
drm_connector_attach_encoder(&hdmi->base, &enc->base);
/* Setup the DVI connector */
@@ -704,16 +654,8 @@ void via_hdmi_init(struct drm_device *dev, u32 di_port)
dvi->base.polled = DRM_CONNECTOR_POLL_HPD;
dvi->base.doublescan_allowed = false;
+ dvi->base.interlace_allowed = true;
INIT_LIST_HEAD(&dvi->props);
- switch (pdev->device) {
- case PCI_DEVICE_ID_VIA_VT3157:
- case PCI_DEVICE_ID_VIA_VT3353:
- dvi->base.interlace_allowed = false;
- break;
- default:
- dvi->base.interlace_allowed = true;
- break;
- }
drm_connector_attach_encoder(&dvi->base, &enc->base);
}
More information about the openchrome-devel
mailing list