diff options
| author | Andy Green <andy.green@linaro.org> | 2011-06-16 11:02:16 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-06-16 11:02:16 +0100 |
| commit | 1299f5d8b51c6592d0b6d3f3de79f573782bba24 (patch) | |
| tree | 0527c2da13ca0d6b976164877bfee1c2a21d26cc | |
| parent | b90bc829e935ff8847368c7d529647eb49f69082 (diff) | |
omap4 sgx fix console locking
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c b/drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c index aca3b4de874..f0e0e05ed38 100644 --- a/drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c +++ b/drivers/gpu/pvr/omaplfb/omaplfb_displayclass.c @@ -327,19 +327,20 @@ OMAP_ERROR UnBlankDisplay(OMAPLFB_DEVINFO *psDevInfo) #if defined(SUPPORT_DRI_DRM) && defined(PVR_DISPLAY_CONTROLLER_DRM_IOCTL) static OMAP_ERROR BlankDisplay(OMAPLFB_DEVINFO *psDevInfo, int blank_cmd) { + int ret = OMAP_OK; + DEBUG_PRINTK("Executing for display %u", psDevInfo->uDeviceID); - acquire_console_sem(); + console_lock(); if (fb_blank(psDevInfo->psLINFBInfo, blank_cmd)) { - release_console_sem(); WARNING_PRINTK("fb_blank %i failed", blank_cmd); - return OMAP_ERROR_GENERIC; + ret = OMAP_ERROR_GENERIC; } - release_console_sem(); + console_unlock(); - return OMAP_OK; + return ret; } #endif |