diff options
| author | Erik Gilling <konkers@android.com> | 2011-05-26 13:37:39 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 11:42:29 -0700 |
| commit | 4bb4e6fd2d5d444c1f6360d026898d3ccb9525dd (patch) | |
| tree | 94b5383813c1920a3120fa9ed56889eeb513bf7c /drivers/gpu | |
| parent | 99dab7325c9085b69def1f50952d7ae5bb727935 (diff) | |
| download | kernel_samsung_tuna-4bb4e6fd2d5d444c1f6360d026898d3ccb9525dd.zip kernel_samsung_tuna-4bb4e6fd2d5d444c1f6360d026898d3ccb9525dd.tar.gz kernel_samsung_tuna-4bb4e6fd2d5d444c1f6360d026898d3ccb9525dd.tar.bz2 | |
gpu: pvr: 2.6.39 fixups
Change-Id: Iadfac0328655f72064af5b0267b64e8066afb9cc
Signed-off-by: Erik Gilling <konkers@android.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c | 8 | ||||
| -rw-r--r-- | drivers/gpu/pvr/omaplfb/omaplfb_linux.c | 16 | ||||
| -rw-r--r-- | drivers/gpu/pvr/pvr_debug.c | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c b/drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c index 65f6a1e..4483e51 100644 --- a/drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c +++ b/drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c @@ -831,7 +831,7 @@ static OMAPLFB_ERROR OMAPLFBInitFBDev(OMAPLFB_DEVINFO *psDevInfo) unsigned long ulLCM; unsigned uiFBDevID = psDevInfo->uiFBDevID; - acquire_console_sem(); + console_lock(); psLINFBInfo = registered_fb[uiFBDevID]; if (psLINFBInfo == NULL) @@ -976,7 +976,7 @@ static OMAPLFB_ERROR OMAPLFBInitFBDev(OMAPLFB_DEVINFO *psDevInfo) ErrorModPut: module_put(psLINFBOwner); ErrorRelSem: - release_console_sem(); + console_unlock(); return eError; } @@ -986,7 +986,7 @@ static void OMAPLFBDeInitFBDev(OMAPLFB_DEVINFO *psDevInfo) struct fb_info *psLINFBInfo = psDevInfo->psLINFBInfo; struct module *psLINFBOwner; - acquire_console_sem(); + console_lock(); psLINFBOwner = psLINFBInfo->fbops->owner; @@ -997,7 +997,7 @@ static void OMAPLFBDeInitFBDev(OMAPLFB_DEVINFO *psDevInfo) module_put(psLINFBOwner); - release_console_sem(); + console_unlock(); } static OMAPLFB_DEVINFO *OMAPLFBInitDev(unsigned uiFBDevID) diff --git a/drivers/gpu/pvr/omaplfb/omaplfb_linux.c b/drivers/gpu/pvr/omaplfb/omaplfb_linux.c index 7e247f5..8aae8f5 100644 --- a/drivers/gpu/pvr/omaplfb/omaplfb_linux.c +++ b/drivers/gpu/pvr/omaplfb/omaplfb_linux.c @@ -214,7 +214,7 @@ static void WorkQueueHandler(struct work_struct *psWork) OMAPLFB_ERROR OMAPLFBCreateSwapQueue(OMAPLFB_SWAPCHAIN *psSwapChain) { - psSwapChain->psWorkQueue = __create_workqueue(DEVNAME, 1, 1, 1); + psSwapChain->psWorkQueue = alloc_ordered_workqueue(DEVNAME, WQ_NON_REENTRANT | WQ_FREEZABLE | WQ_HIGHPRI); if (psSwapChain->psWorkQueue == NULL) { printk(KERN_ERR DRIVER_PREFIX ": %s: Device %u: create_singlethreaded_workqueue failed\n", __FUNCTION__, psSwapChain->uiFBDevID); @@ -241,7 +241,7 @@ void OMAPLFBFlip(OMAPLFB_DEVINFO *psDevInfo, OMAPLFB_BUFFER *psBuffer) int res; unsigned long ulYResVirtual; - acquire_console_sem(); + console_lock(); sFBVar = psDevInfo->psLINFBInfo->var; @@ -277,7 +277,7 @@ void OMAPLFBFlip(OMAPLFB_DEVINFO *psDevInfo, OMAPLFB_BUFFER *psBuffer) } } #endif - release_console_sem(); + console_unlock(); } #if !defined(PVR_OMAPLFB_DRM_FB) || defined(DEBUG) @@ -555,7 +555,7 @@ OMAPLFB_BOOL OMAPLFBSetUpdateMode(OMAPLFB_DEVINFO *psDevInfo, OMAPLFB_UPDATE_MOD res = psDSSDrv->set_update_mode(psDSSDev, eDSSMode); if (res != 0) { - DEBUG_PRINTK((KERN_WARNING DRIVER_PREFIX ": %s: Device %u: set_update_mode (%s) failed (%d)\n", __FUNCTION__, psDevInfo->uiFBDevID, OMAPLFBDSSUpdateModeToString(eDSSMode), res)); + DEBUG_PRINTK((KERN_WARNING DRIVER_PREFIX ": %s: Device %u: set_update_mode (%s) failed (%d)\n", __FUNCTION__, psDevInfo->uiFBDevID, ""/*OMAPLFBDSSUpdateModeToString(eDSSMode)*/, res)); } return (res == 0); @@ -691,9 +691,9 @@ OMAPLFB_ERROR OMAPLFBUnblankDisplay(OMAPLFB_DEVINFO *psDevInfo) { int res; - acquire_console_sem(); + console_lock(); res = fb_blank(psDevInfo->psLINFBInfo, 0); - release_console_sem(); + console_unlock(); if (res != 0 && res != -EINVAL) { printk(KERN_ERR DRIVER_PREFIX @@ -708,9 +708,9 @@ OMAPLFB_ERROR OMAPLFBUnblankDisplay(OMAPLFB_DEVINFO *psDevInfo) static void OMAPLFBBlankDisplay(OMAPLFB_DEVINFO *psDevInfo) { - acquire_console_sem(); + console_lock(); fb_blank(psDevInfo->psLINFBInfo, 1); - release_console_sem(); + console_unlock(); } static void OMAPLFBEarlySuspendHandler(struct early_suspend *h) diff --git a/drivers/gpu/pvr/pvr_debug.c b/drivers/gpu/pvr/pvr_debug.c index c114e5f..44c7be7 100644 --- a/drivers/gpu/pvr/pvr_debug.c +++ b/drivers/gpu/pvr/pvr_debug.c @@ -76,7 +76,7 @@ static IMG_CHAR gszBufferIRQ[PVR_MAX_MSG_LEN + 1]; static PVRSRV_LINUX_MUTEX gsDebugMutexNonIRQ; -static spinlock_t gsDebugLockIRQ = SPIN_LOCK_UNLOCKED; +static DEFINE_SPINLOCK(gsDebugLockIRQ); #if !defined (USE_SPIN_LOCK) #define USE_SPIN_LOCK (in_interrupt() || !preemptible()) |