src/via_display.c | 12 ++++++------ src/via_driver.c | 10 +++++----- src/via_exa.c | 2 +- src/via_ums.c | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-)
New commits: commit 3d8aa5d0be2be6e874a11e898cfc0abdf32307dc Author: Kevin Brace <kevinbr...@gmx.com> Date: Wed Feb 10 23:04:10 2016 -0800 VIA_K8M890 label case statement position adjustment It is really a cosmetic change, but theoretically can cause problems. Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/src/via_display.c b/src/via_display.c index 0eb8b68..7e58ae5 100644 --- a/src/via_display.c +++ b/src/via_display.c @@ -313,8 +313,8 @@ ViaFirstCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode) } switch (pVia->ChipId) { - case VIA_K8M890: case VIA_CX700: + case VIA_K8M890: case VIA_P4M900: case VIA_VX800: case VIA_VX855: @@ -418,8 +418,8 @@ ViaFirstCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode) /* FIXME: check if this is really necessary here */ switch (pVia->ChipId) { - case VIA_K8M890: case VIA_CX700: + case VIA_K8M890: case VIA_P4M900: case VIA_VX800: case VIA_VX855: @@ -455,8 +455,8 @@ ViaFirstCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode) ViaSeqMask(hwp, 0x1D, temp >> 9, 0x03); switch (pVia->ChipId) { - case VIA_K8M890: case VIA_CX700: + case VIA_K8M890: case VIA_P4M900: case VIA_VX800: case VIA_VX855: @@ -583,8 +583,8 @@ ViaSecondCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode) } switch (pVia->ChipId) { - case VIA_K8M890: case VIA_CX700: + case VIA_K8M890: case VIA_P4M900: case VIA_VX800: case VIA_VX855: @@ -669,8 +669,8 @@ ViaSecondCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode) ViaCrtcMask(hwp, 0x5F, temp, 0x1F); switch (pVia->ChipId) { - case VIA_K8M890: case VIA_CX700: + case VIA_K8M890: case VIA_P4M900: case VIA_VX800: case VIA_VX855: @@ -1804,8 +1804,8 @@ UMSCrtcInit(ScrnInfoPtr pScrn) break; case VIA_CX700: - case VIA_K8M890: case VIA_P4M890: + case VIA_K8M890: case VIA_P4M900: max_pitch = 8192/(pScrn->bitsPerPixel >> 3)-1; max_height = max_pitch; diff --git a/src/via_driver.c b/src/via_driver.c index 490ae9a..efe73a5 100644 --- a/src/via_driver.c +++ b/src/via_driver.c @@ -133,8 +133,8 @@ static SymTabRec VIAChipsets[] = { {VIA_PM800, "PM800 / PN800 / PM880 / CN400"}, {VIA_P4M800PRO, "P4M800 Pro / VN800 / CN700"}, {VIA_CX700, "CX700 / VX700"}, - {VIA_K8M890, "K8M890 / K8N890"}, {VIA_P4M890, "P4M890 / CN800"}, + {VIA_K8M890, "K8M890 / K8N890"}, {VIA_P4M900, "P4M900 / VN896 / CN896"}, {VIA_VX800, "VX800 / VX820"}, {VIA_VX855, "VX855 / VX875"}, @@ -150,8 +150,8 @@ static PciChipsets VIAPciChipsets[] = { {VIA_PM800, PCI_CHIP_VT3259, VIA_RES_SHARED}, {VIA_P4M800PRO, PCI_CHIP_VT3314, VIA_RES_SHARED}, {VIA_CX700, PCI_CHIP_VT3324, VIA_RES_SHARED}, - {VIA_K8M890, PCI_CHIP_VT3336, VIA_RES_SHARED}, {VIA_P4M890, PCI_CHIP_VT3327, VIA_RES_SHARED}, + {VIA_K8M890, PCI_CHIP_VT3336, VIA_RES_SHARED}, {VIA_P4M900, PCI_CHIP_VT3364, VIA_RES_SHARED}, {VIA_VX800, PCI_CHIP_VT3353, VIA_RES_SHARED}, {VIA_VX855, PCI_CHIP_VT3409, VIA_RES_SHARED}, @@ -716,13 +716,13 @@ VIASetupDefaultOptions(ScrnInfoPtr pScrn) pVia->swov.maxWInterp = 1920; pVia->swov.maxHInterp = 1080; break; - case VIA_K8M890: + case VIA_P4M890: pVia->VideoEngine = VIDEO_ENGINE_CME; - pVia->agpEnable = FALSE; pVia->dmaXV = FALSE; break; - case VIA_P4M890: + case VIA_K8M890: pVia->VideoEngine = VIDEO_ENGINE_CME; + pVia->agpEnable = FALSE; pVia->dmaXV = FALSE; break; case VIA_P4M900: diff --git a/src/via_exa.c b/src/via_exa.c index 3ee4921..0e464ea 100644 --- a/src/via_exa.c +++ b/src/via_exa.c @@ -105,8 +105,8 @@ viaFlushPCI(ViaCommandBuffer *cb) (loop++ < MAXLOOP)) ; break; - case VIA_K8M890: case VIA_P4M890: + case VIA_K8M890: case VIA_P4M900: while ((VIAGETREG(VIA_REG_STATUS) & (VIA_CMD_RGTR_BUSY | VIA_2D_ENG_BUSY)) && diff --git a/src/via_ums.c b/src/via_ums.c index 4724819..dfb6511 100644 --- a/src/via_ums.c +++ b/src/via_ums.c @@ -38,8 +38,8 @@ ViaMMIODisable(ScrnInfoPtr pScrn) vgaHWPtr hwp = VGAHWPTR(pScrn); switch (pVia->Chipset) { - case VIA_K8M890: case VIA_CX700: + case VIA_K8M890: case VIA_P4M900: case VIA_VX800: case VIA_VX855: @@ -95,8 +95,8 @@ ViaMMIOEnable(ScrnInfoPtr pScrn) vgaHWPtr hwp = VGAHWPTR(pScrn); switch (pVia->Chipset) { - case VIA_K8M890: case VIA_CX700: + case VIA_K8M890: case VIA_P4M900: case VIA_VX800: case VIA_VX855: @@ -735,8 +735,8 @@ UMSPreInit(ScrnInfoPtr pScrn) #endif pScrn->videoRam = (1 << ((videoRam & 0x70) >> 4)) << 10; break; - case VIA_K8M890: case VIA_P4M890: + case VIA_K8M890: case VIA_P4M900: case VIA_CX700: case VIA_VX800: _______________________________________________ Openchrome-devel mailing list Openchrome-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/openchrome-devel