Skip to content

Commit

Permalink
[POWERPC] PS3: Frame buffer system-bus rework
Browse files Browse the repository at this point in the history
Convert the ps3fb device from a platform device to a PS3 system bus device.
Fix the remove and shutdown methods to support kexec and to make ps3fb a
loadable module.

Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Geert Uytterhoeven authored and Paul Mackerras committed Jun 28, 2007
1 parent 13a5e30 commit 9e6b99b
Show file tree
Hide file tree
Showing 4 changed files with 134 additions and 181 deletions.
9 changes: 5 additions & 4 deletions arch/powerpc/platforms/ps3/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ static void ps3_panic(char *str)
while(1);
}

#ifdef CONFIG_FB_PS3
#if defined(CONFIG_FB_PS3) || defined(CONFIG_FB_PS3_MODULE)
static void prealloc(struct ps3_prealloc *p)
{
if (!p->size)
Expand All @@ -125,10 +125,11 @@ static void prealloc(struct ps3_prealloc *p)
}

struct ps3_prealloc ps3fb_videomemory = {
.name = "ps3fb videomemory",
.size = CONFIG_FB_PS3_DEFAULT_SIZE_M*1024*1024,
.align = 1024*1024 /* the GPU requires 1 MiB alignment */
.name = "ps3fb videomemory",
.size = CONFIG_FB_PS3_DEFAULT_SIZE_M*1024*1024,
.align = 1024*1024 /* the GPU requires 1 MiB alignment */
};
EXPORT_SYMBOL_GPL(ps3fb_videomemory);
#define prealloc_ps3fb_videomemory() prealloc(&ps3fb_videomemory)

static int __init early_parse_ps3fb(char *p)
Expand Down
4 changes: 2 additions & 2 deletions drivers/video/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1790,8 +1790,8 @@ config FB_IBM_GXT4500
adaptor, found on some IBM System P (pSeries) machines.

config FB_PS3
bool "PS3 GPU framebuffer driver"
depends on (FB = y) && PS3_PS3AV
tristate "PS3 GPU framebuffer driver"
depends on FB && PS3_PS3AV
select FB_SYS_FILLRECT
select FB_SYS_COPYAREA
select FB_SYS_IMAGEBLIT
Expand Down
Loading

0 comments on commit 9e6b99b

Please sign in to comment.