aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>2008-02-06 04:39:30 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 13:41:17 -0500
commitbbcfe34078f3a0e690d1b54036dc9e6006129d9f (patch)
tree3f2d762e1496742968c408284139cb8a03f0ca08
parent084ffff29844a4bce69999d67809e6c00309ba58 (diff)
ps3fb: kill PS3FB_FULL_MODE_BIT
Kill PS3FB_FULL_MODE_BIT, use PS3AV_MODE_FULL instead Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/ps3fb.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c
index 1f982bd6cc17..069a6ed6e75b 100644
--- a/drivers/video/ps3fb.c
+++ b/drivers/video/ps3fb.c
@@ -57,8 +57,6 @@
57#define GPU_ALIGN_UP(x) _ALIGN_UP((x), 64) 57#define GPU_ALIGN_UP(x) _ALIGN_UP((x), 64)
58#define GPU_MAX_LINE_LENGTH (65536 - 64) 58#define GPU_MAX_LINE_LENGTH (65536 - 64)
59 59
60#define PS3FB_FULL_MODE_BIT 0x80
61
62#define GPU_INTR_STATUS_VSYNC_0 0 /* vsync on head A */ 60#define GPU_INTR_STATUS_VSYNC_0 0 /* vsync on head A */
63#define GPU_INTR_STATUS_VSYNC_1 1 /* vsync on head B */ 61#define GPU_INTR_STATUS_VSYNC_1 1 /* vsync on head B */
64#define GPU_INTR_STATUS_FLIP_0 3 /* flip head A */ 62#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)
310 unsigned int i; 308 unsigned int i;
311 u32 x, y, f; 309 u32 x, y, f;
312 310
313 full_mode = (mode & PS3FB_FULL_MODE_BIT) ? PS3FB_RES_FULL : 0; 311 full_mode = (mode & PS3AV_MODE_FULL) ? PS3FB_RES_FULL : 0;
314 for (i = 0;; i++) { 312 for (i = 0;; i++) {
315 x = ps3fb_res[i].xres; 313 x = ps3fb_res[i].xres;
316 y = ps3fb_res[i].yres; 314 y = ps3fb_res[i].yres;
@@ -373,7 +371,7 @@ found:
373 /* Full broadcast modes have the full mode bit set */ 371 /* Full broadcast modes have the full mode bit set */
374 mode = i+1; 372 mode = i+1;
375 if (mode > PS3AV_MODE_WUXGA) 373 if (mode > PS3AV_MODE_WUXGA)
376 mode = (mode - PS3AV_MODE_WUXGA) | PS3FB_FULL_MODE_BIT; 374 mode = (mode - PS3AV_MODE_WUXGA) | PS3AV_MODE_FULL;
377 375
378 pr_debug("ps3fb_find_mode: mode %u\n", mode); 376 pr_debug("ps3fb_find_mode: mode %u\n", mode);
379 377
@@ -390,7 +388,7 @@ static const struct fb_videomode *ps3fb_default_mode(int id)
390 388
391 flags = id & ~PS3AV_MODE_MASK; 389 flags = id & ~PS3AV_MODE_MASK;
392 390
393 if (mode <= PS3AV_MODE_1080P50 && flags & PS3FB_FULL_MODE_BIT) { 391 if (mode <= PS3AV_MODE_1080P50 && flags & PS3AV_MODE_FULL) {
394 /* Full broadcast mode */ 392 /* Full broadcast mode */
395 return &ps3fb_modedb[mode + PS3AV_MODE_WUXGA - 1]; 393 return &ps3fb_modedb[mode + PS3AV_MODE_WUXGA - 1];
396 } 394 }