diff options
Diffstat (limited to 'main/xf86-video-chips/xorg-1.17-fix.patch')
| -rw-r--r-- | main/xf86-video-chips/xorg-1.17-fix.patch | 136 |
1 files changed, 136 insertions, 0 deletions
diff --git a/main/xf86-video-chips/xorg-1.17-fix.patch b/main/xf86-video-chips/xorg-1.17-fix.patch new file mode 100644 index 0000000000..c796a80aaa --- /dev/null +++ b/main/xf86-video-chips/xorg-1.17-fix.patch @@ -0,0 +1,136 @@ +From 151a1ec855a9ada44907cb6bef06a71e9080504b Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:54:34 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/ct_driver.c b/src/ct_driver.c +index 6f3a5d4..effbc60 100644 +--- a/src/ct_driver.c ++++ b/src/ct_driver.c +@@ -96,9 +96,6 @@ + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + /* All drivers using the mi banking wrapper need this */ + #ifdef HAVE_ISA + #include "mibank.h" +@@ -4145,7 +4142,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL) + pBankInfo = NULL; + return FALSE; + } +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* Initialise cursor functions */ +@@ -4296,7 +4292,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL) + } + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + #ifdef ENABLE_SILKEN_MOUSE + xf86SetSilkenMouse(pScreen); +-- +cgit v0.9.0.2-2-gbebe +From bb03c06322f875e905dec956e06a99b9674e57aa Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Wed, 21 May 2014 09:38:35 -0400 +Subject: ddc: Use own thunk function instead of vgaHWddc1SetSpeedWeak + +I plan to remove the Weak functions from future servers. + +Signed-off-by: Adam Jackson <ajax@redhat.com> + +diff --git a/src/ct_ddc.c b/src/ct_ddc.c +index 5e2346a..677d840 100644 +--- a/src/ct_ddc.c ++++ b/src/ct_ddc.c +@@ -33,6 +33,12 @@ chips_ddc1Read(ScrnInfoPtr pScrn) + return (tmp & ddc_mask); + } + ++static void ++chips_ddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed) ++{ ++ vgaHWddc1SetSpeed(pScrn, speed); ++} ++ + void + chips_ddc1(ScrnInfoPtr pScrn) + { +@@ -93,7 +99,7 @@ chips_ddc1(ScrnInfoPtr pScrn) + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "DDC1 found\n"); + else return; + +- xf86PrintEDID(xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), vgaHWddc1SetSpeedWeak(), ++ xf86PrintEDID(xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), chips_ddc1SetSpeed, + chips_ddc1Read)); + + /* restore */ +-- +cgit v0.10.2 +From 9187d76bd4f8d500fc3403b6d4a7bef55508bf2b Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Fri, 17 Oct 2014 09:49:26 -0400 +Subject: Update for xserver 1.17 + +Signed-off-by: Adam Jackson <ajax@redhat.com> + +diff --git a/src/ct_driver.c b/src/ct_driver.c +index effbc60..378a23c 100644 +--- a/src/ct_driver.c ++++ b/src/ct_driver.c +@@ -2098,13 +2098,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) + pScrn->progClock = TRUE; + cPtr->ClockType = HiQV_STYLE | TYPE_PROGRAMMABLE; + +- if (cPtr->pEnt->device->textClockFreq > 0) { +- SaveClk->Clock = cPtr->pEnt->device->textClockFreq; +- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, +- "Using textclock freq: %7.3f.\n", +- SaveClk->Clock/1000.0); +- } else +- SaveClk->Clock = 0; ++ SaveClk->Clock = 0; + + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Using programmable clocks\n"); + +@@ -2807,13 +2801,7 @@ chipsPreInitWingine(ScrnInfoPtr pScrn, int flags) + + if (cPtr->ClockType & TYPE_PROGRAMMABLE) { + pScrn->numClocks = NoClocks; +- if(cPtr->pEnt->device->textClockFreq > 0) { +- SaveClk->Clock = cPtr->pEnt->device->textClockFreq; +- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, +- "Using textclock freq: %7.3f.\n", +- SaveClk->Clock/1000.0); +- } else +- SaveClk->Clock = CRT_TEXT_CLK_FREQ; ++ SaveClk->Clock = CRT_TEXT_CLK_FREQ; + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Using programmable clocks\n"); + } else { /* TYPE_PROGRAMMABLE */ + SaveClk->Clock = chipsGetHWClock(pScrn); +@@ -3500,14 +3488,8 @@ chipsPreInit655xx(ScrnInfoPtr pScrn, int flags) + + if (cPtr->ClockType & TYPE_PROGRAMMABLE) { + pScrn->numClocks = NoClocks; +- if (cPtr->pEnt->device->textClockFreq > 0) { +- SaveClk->Clock = cPtr->pEnt->device->textClockFreq; +- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, +- "Using textclock freq: %7.3f.\n", +- SaveClk->Clock/1000.0); +- } else +- SaveClk->Clock = ((cPtr->PanelType & ChipsLCDProbed) ? +- LCD_TEXT_CLK_FREQ : CRT_TEXT_CLK_FREQ); ++ SaveClk->Clock = ((cPtr->PanelType & ChipsLCDProbed) ? ++ LCD_TEXT_CLK_FREQ : CRT_TEXT_CLK_FREQ); + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Using programmable clocks\n"); + } else { /* TYPE_PROGRAMMABLE */ + SaveClk->Clock = chipsGetHWClock(pScrn); +-- +cgit v0.10.2 |