summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2011-10-17 13:26:01 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2011-10-17 14:24:32 +0200
commit26dcc838d877d1cbcac920bccc6d65af926bcb32 (patch)
tree40de740cf235337e9f2fad69090a85c1079ffead
parentdea0a2daebe19864af79cd22418b88dd1c8e6ce0 (diff)
intel: kill dri1 stuff
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--src/intel_driver.c9
-rw-r--r--src/intel_driver.h3
2 files changed, 0 insertions, 12 deletions
diff --git a/src/intel_driver.c b/src/intel_driver.c
index 10ead32..6a296dc 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -60,15 +60,6 @@ intel_driver_init(VADriverContextP ctx)
intel->fd = dri_state->fd;
intel->dri2Enabled = (dri_state->driConnectedFlag == VA_DRI2);
- if (!intel->dri2Enabled) {
- drm_sarea_t *pSAREA;
-
- pSAREA = (drm_sarea_t *)dri_state->pSAREA;
- intel->hHWContext = dri_state->hwContext;
- intel->driHwLock = (drmLock *)(&pSAREA->lock);
- intel->pPrivSarea = (void *)pSAREA + sizeof(drm_sarea_t);
- }
-
intel->locked = 0;
pthread_mutex_init(&intel->ctxmutex, NULL);
diff --git a/src/intel_driver.h b/src/intel_driver.h
index ac84735..de4c01f 100644
--- a/src/intel_driver.h
+++ b/src/intel_driver.h
@@ -95,9 +95,6 @@ struct intel_driver_data
int device_id;
int dri2Enabled;
- drm_context_t hHWContext;
- drm_i915_sarea_t *pPrivSarea;
- drmLock *driHwLock;
sigset_t sa_mask;
pthread_mutex_t ctxmutex;