From 69029e212a98590480e88b9b058c4dcea19f76c4 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Wed, 6 Feb 2008 01:39:31 -0800 Subject: [PATCH] --- yaml --- r: 83574 b: refs/heads/master c: d9a4ba6a28f6cdd291ce2ee85bc91a85ff2c4a38 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/ps3fb.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 4f90734e8ce8..630f891afacb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bbcfe34078f3a0e690d1b54036dc9e6006129d9f +refs/heads/master: d9a4ba6a28f6cdd291ce2ee85bc91a85ff2c4a38 diff --git a/trunk/drivers/video/ps3fb.c b/trunk/drivers/video/ps3fb.c index 069a6ed6e75b..229727a5bc75 100644 --- a/trunk/drivers/video/ps3fb.c +++ b/trunk/drivers/video/ps3fb.c @@ -287,15 +287,8 @@ static const struct fb_videomode ps3fb_modedb[] = { #define HEAD_A #define HEAD_B -#define X_OFF(i) (ps3fb_res[i].xoff) /* left/right margin (pixel) */ -#define Y_OFF(i) (ps3fb_res[i].yoff) /* top/bottom margin (pixel) */ -#define WIDTH(i) (ps3fb_res[i].xres) /* width of FB */ -#define HEIGHT(i) (ps3fb_res[i].yres) /* height of FB */ #define BPP 4 /* number of bytes per pixel */ -/* Start of the virtual frame buffer (relative to fullscreen ) */ -#define VP_OFF(i) ((WIDTH(i) * Y_OFF(i) + X_OFF(i)) * BPP) - static int ps3fb_mode; module_param(ps3fb_mode, int, 0); @@ -611,7 +604,10 @@ static int ps3fb_set_par(struct fb_info *info) par->width = info->var.xres; par->height = info->var.yres; - offset = VP_OFF(i); + + /* Start of the virtual frame buffer (relative to fullscreen) */ + offset = ps3fb_res[i].yoff * ddr_line_length + ps3fb_res[i].xoff * BPP; + par->fb_offset = GPU_ALIGN_UP(offset); par->full_offset = par->fb_offset - offset; par->pan_offset = info->var.yoffset * xdr_line_length +