ps3fb: kill PS3FB_FULL_MODE_BIT

[linux-2.6-omap-h63xx.git] / drivers / video / ps3fb.c

diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c
index b3128903d67328fdcb5747de418e59b177fe2dc0..069a6ed6e75be0351c80bd5f2d94cc1612fd5277 100644 (file)
--- a/drivers/video/ps3fb.c
+++ b/drivers/video/ps3fb.c
@@ -57,8 +57,6 @@
 #define GPU_ALIGN_UP(x)                                _ALIGN_UP((x), 64)
 #define GPU_MAX_LINE_LENGTH                    (65536 - 64)
 
-#define PS3FB_FULL_MODE_BIT                    0x80
-
 #define GPU_INTR_STATUS_VSYNC_0                        0       /* vsync on head A */
 #define GPU_INTR_STATUS_VSYNC_1                        1       /* vsync on head B */
 #define GPU_INTR_STATUS_FLIP_0                 3       /* flip head A */
@@ -310,7 +308,7 @@ static int ps3fb_get_res_table(u32 xres, u32 yres, int mode)
        unsigned int i;
        u32 x, y, f;
 
-       full_mode = (mode & PS3FB_FULL_MODE_BIT) ? PS3FB_RES_FULL : 0;
+       full_mode = (mode & PS3AV_MODE_FULL) ? PS3FB_RES_FULL : 0;
        for (i = 0;; i++) {
                x = ps3fb_res[i].xres;
                y = ps3fb_res[i].yres;
@@ -338,7 +336,7 @@ static int ps3fb_get_res_table(u32 xres, u32 yres, int mode)
 static unsigned int ps3fb_find_mode(const struct fb_var_screeninfo *var,
                                    u32 *ddr_line_length, u32 *xdr_line_length)
 {
-       unsigned int i, mode;
+       unsigned int i, fi, mode;
 
        for (i = 0; i < ARRAY_SIZE(ps3fb_modedb); i++)
                if (var->xres == ps3fb_modedb[i].xres &&
@@ -359,7 +357,8 @@ static unsigned int ps3fb_find_mode(const struct fb_var_screeninfo *var,
 
 found:
        /* Cropped broadcast modes use the full line length */
-       *ddr_line_length = ps3fb_modedb[i < 10 ? i + 13 : i].xres * BPP;
+       fi = i < PS3AV_MODE_1080P50 ? i + PS3AV_MODE_WUXGA : i;
+       *ddr_line_length = ps3fb_modedb[fi].xres * BPP;
 
        if (ps3_compare_firmware_version(1, 9, 0) >= 0) {
                *xdr_line_length = GPU_ALIGN_UP(max(var->xres,
@@ -370,7 +369,9 @@ found:
                *xdr_line_length = *ddr_line_length;
 
        /* Full broadcast modes have the full mode bit set */
-       mode = i > 12 ? (i - 12) | PS3FB_FULL_MODE_BIT : i + 1;
+       mode = i+1;
+       if (mode > PS3AV_MODE_WUXGA)
+               mode = (mode - PS3AV_MODE_WUXGA) | PS3AV_MODE_FULL;
 
        pr_debug("ps3fb_find_mode: mode %u\n", mode);
 
@@ -382,14 +383,14 @@ static const struct fb_videomode *ps3fb_default_mode(int id)
        u32 mode = id & PS3AV_MODE_MASK;
        u32 flags;
 
-       if (mode < 1 || mode > 13)
+       if (mode < PS3AV_MODE_480I || mode > PS3AV_MODE_WUXGA)
                return NULL;
 
        flags = id & ~PS3AV_MODE_MASK;
 
-       if (mode <= 10 && flags & PS3FB_FULL_MODE_BIT) {
+       if (mode <= PS3AV_MODE_1080P50 && flags & PS3AV_MODE_FULL) {
                /* Full broadcast mode */
-               return &ps3fb_modedb[mode + 12];
+               return &ps3fb_modedb[mode + PS3AV_MODE_WUXGA - 1];
        }
 
        return &ps3fb_modedb[mode - 1];
@@ -443,8 +444,6 @@ static int ps3fb_sync(struct fb_info *info, u32 frame)
        u32 ddr_line_length, xdr_line_length;
        u64 ddr_base, xdr_base;
 
-       acquire_console_sem();
-
        if (frame > par->num_frames - 1) {
                dev_dbg(info->device, "%s: invalid frame number (%u)\n",
                        __func__, frame);
@@ -464,7 +463,6 @@ static int ps3fb_sync(struct fb_info *info, u32 frame)
                         xdr_line_length);
 
 out:
-       release_console_sem();
        return error;
 }
 
@@ -479,7 +477,10 @@ static int ps3fb_release(struct fb_info *info, int user)
        if (atomic_dec_and_test(&ps3fb.f_count)) {
                if (atomic_read(&ps3fb.ext_flip)) {
                        atomic_set(&ps3fb.ext_flip, 0);
-                       ps3fb_sync(info, 0);    /* single buffer */
+                       if (!try_acquire_console_sem()) {
+                               ps3fb_sync(info, 0);    /* single buffer */
+                               release_console_sem();
+                       }
                }
        }
        return 0;
@@ -865,7 +866,9 @@ static int ps3fb_ioctl(struct fb_info *info, unsigned int cmd,
                        break;
 
                dev_dbg(info->device, "PS3FB_IOCTL_FSEL:%d\n", val);
+               acquire_console_sem();
                retval = ps3fb_sync(info, val);
+               release_console_sem();
                break;
 
        default:
@@ -885,7 +888,9 @@ static int ps3fbd(void *arg)
                set_current_state(TASK_INTERRUPTIBLE);
                if (ps3fb.is_kicked) {
                        ps3fb.is_kicked = 0;
+                       acquire_console_sem();
                        ps3fb_sync(info, 0);    /* single buffer */
+                       release_console_sem();
                }
                schedule();
        }
@@ -1076,7 +1081,7 @@ static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev)
 
        if (!ps3fb_mode)
                ps3fb_mode = ps3av_get_mode();
-       dev_dbg(&dev->core, "ps3av_mode:%d\n", ps3fb_mode);
+       dev_dbg(&dev->core, "ps3fb_mode: %d\n", ps3fb_mode);
 
        if (ps3fb_mode > 0 &&
            !ps3av_video_mode2res(ps3fb_mode, &xres, &yres)) {
@@ -1234,12 +1239,6 @@ static int ps3fb_shutdown(struct ps3_system_bus_device *dev)
        ps3fb_flip_ctl(0, &ps3fb);      /* flip off */
        ps3fb.dinfo->irq.mask = 0;
 
-       if (info) {
-               unregister_framebuffer(info);
-               fb_dealloc_cmap(&info->cmap);
-               framebuffer_release(info);
-       }
-
        ps3av_register_flip_ctl(NULL, NULL);
        if (ps3fb.task) {
                struct task_struct *task = ps3fb.task;
@@ -1250,6 +1249,12 @@ static int ps3fb_shutdown(struct ps3_system_bus_device *dev)
                free_irq(ps3fb.irq_no, &dev->core);
                ps3_irq_plug_destroy(ps3fb.irq_no);
        }
+       if (info) {
+               unregister_framebuffer(info);
+               fb_dealloc_cmap(&info->cmap);
+               framebuffer_release(info);
+               info = dev->core.driver_data = NULL;
+       }
        iounmap((u8 __iomem *)ps3fb.dinfo);
 
        status = lv1_gpu_context_free(ps3fb.context_handle);