summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-12-17 00:48:26 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2011-01-08 19:46:36 +0000
commita851879695c48e88d421b053a78f867d9902273f (patch)
tree657fdcfdb2e1fd96b996bd08f8a7079f177f6910
parentf8a5d7737e014e99943b947d088a4f9f1b465d46 (diff)
Remove bitrotted, but fortunately unused, I830CrtcPrivate
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/intel.h18
-rw-r--r--src/intel_driver.c24
2 files changed, 0 insertions, 42 deletions
diff --git a/src/intel.h b/src/intel.h
index b6e8bde5..fc0b6d58 100644
--- a/src/intel.h
+++ b/src/intel.h
@@ -239,22 +239,6 @@ typedef struct _I830OutputRec I830OutputRec, *I830OutputPtr;
#define PITCH_NONE 0
-typedef struct _I830CrtcPrivateRec {
- int pipe;
- int plane;
-
- Bool enabled;
-
- int dpms_mode;
-
- int x, y;
-
- /* Lookup table values to be set when the CRTC is enabled */
- uint8_t lut_r[256], lut_g[256], lut_b[256];
-} I830CrtcPrivateRec, *I830CrtcPrivatePtr;
-
-#define I830CrtcPrivate(c) ((I830CrtcPrivatePtr) (c)->driver_private)
-
/** enumeration of 3d consumers so some can maintain invariant state. */
enum last_3d {
LAST_3D_OTHER,
@@ -510,8 +494,6 @@ extern void I830InitVideo(ScreenPtr pScreen);
extern xf86CrtcPtr intel_covering_crtc(ScrnInfoPtr scrn, BoxPtr box,
xf86CrtcPtr desired, BoxPtr crtc_box_ret);
-extern xf86CrtcPtr intel_pipe_to_crtc(ScrnInfoPtr scrn, int pipe);
-
Bool I830DRI2ScreenInit(ScreenPtr pScreen);
void I830DRI2CloseScreen(ScreenPtr pScreen);
void I830DRI2FrameEventHandler(unsigned int frame, unsigned int tv_sec,
diff --git a/src/intel_driver.c b/src/intel_driver.c
index 803cf61d..2cd5f1fa 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -166,14 +166,6 @@ I830LoadPalette(ScrnInfoPtr scrn, int numColors, int *indices,
for (p = 0; p < xf86_config->num_crtc; p++) {
xf86CrtcPtr crtc = xf86_config->crtc[p];
- I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
-
- /* Initialize to the old lookup table values. */
- for (i = 0; i < 256; i++) {
- lut_r[i] = intel_crtc->lut_r[i] << 8;
- lut_g[i] = intel_crtc->lut_g[i] << 8;
- lut_b[i] = intel_crtc->lut_b[i] << 8;
- }
switch (scrn->depth) {
case 15:
@@ -1277,22 +1269,6 @@ static Bool I830PMEvent(int scrnIndex, pmEvent event, Bool undo)
return TRUE;
}
-xf86CrtcPtr intel_pipe_to_crtc(ScrnInfoPtr scrn, int pipe)
-{
- xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
- int c;
-
- for (c = 0; c < config->num_crtc; c++) {
- xf86CrtcPtr crtc = config->crtc[c];
- I830CrtcPrivatePtr intel_crtc = crtc->driver_private;
-
- if (intel_crtc->pipe == pipe)
- return crtc;
- }
-
- return NULL;
-}
-
void intel_init_scrn(ScrnInfoPtr scrn)
{
scrn->PreInit = I830PreInit;