diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-10-17 13:32:31 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-10-17 14:22:06 +0200 |
| commit | dea0a2daebe19864af79cd22418b88dd1c8e6ce0 (patch) | |
| tree | ac5c80bddabbf83483714110309298a41d60356e | |
| parent | fd964e45d683c82ab7cd4ebb9fa60a6e82976ccf (diff) | |
intel: kill lock/unlock_hardware
Like totally unused.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | src/intel_driver.c | 39 | ||||
| -rw-r--r-- | src/intel_driver.h | 5 |
2 files changed, 3 insertions, 41 deletions
diff --git a/src/intel_driver.c b/src/intel_driver.c index 5fd22c9..10ead32 100644 --- a/src/intel_driver.c +++ b/src/intel_driver.c @@ -94,42 +94,3 @@ intel_driver_terminate(VADriverContextP ctx) return True; } - -void -intel_lock_hardware(VADriverContextP ctx) -{ - struct intel_driver_data *intel = intel_driver_data(ctx); - char __ret = 0; - - PPTHREAD_MUTEX_LOCK(); - - assert(!intel->locked); - - if (!intel->dri2Enabled) { - DRM_CAS(intel->driHwLock, - intel->hHWContext, - (DRM_LOCK_HELD|intel->hHWContext), - __ret); - - if (__ret) { - drmGetLock(intel->fd, intel->hHWContext, 0); - } - } - - intel->locked = 1; -} - -void -intel_unlock_hardware(VADriverContextP ctx) -{ - struct intel_driver_data *intel = intel_driver_data(ctx); - - if (!intel->dri2Enabled) { - DRM_UNLOCK(intel->fd, - intel->driHwLock, - intel->hHWContext); - } - - intel->locked = 0; - PPTHREAD_MUTEX_UNLOCK(); -} diff --git a/src/intel_driver.h b/src/intel_driver.h index e31360d..ac84735 100644 --- a/src/intel_driver.h +++ b/src/intel_driver.h @@ -41,6 +41,7 @@ #define BR13_8888 (0x3 << 24) #define CMD_PIPE_CONTROL (CMD_3D | (3 << 27) | (2 << 24) | (0 << 16)) +#define CMD_PIPE_CONTROL_CS_STALL (1 << 20) #define CMD_PIPE_CONTROL_NOWRITE (0 << 14) #define CMD_PIPE_CONTROL_WRITE_QWORD (1 << 14) #define CMD_PIPE_CONTROL_WRITE_DEPTH (2 << 14) @@ -104,6 +105,8 @@ struct intel_driver_data dri_bufmgr *bufmgr; + drm_intel_bo *wa_scratch_bo; + unsigned int has_exec2 : 1; /* Flag: has execbuffer2? */ unsigned int has_bsd : 1; /* Flag: has bitstream decoder for H.264? */ unsigned int has_blt : 1; /* Flag: has BLT unit? */ @@ -111,8 +114,6 @@ struct intel_driver_data Bool intel_driver_init(VADriverContextP ctx); Bool intel_driver_terminate(VADriverContextP ctx); -void intel_lock_hardware(VADriverContextP ctx); -void intel_unlock_hardware(VADriverContextP ctx); static INLINE struct intel_driver_data * intel_driver_data(VADriverContextP ctx) |