1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
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
|
