mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
ps3fb: Tear down FB setup during cleanup
During cleanup, use L1GPU_CONTEXT_ATTRIBUTE_FB_CLOSE to tear down the setup done by L1GPU_CONTEXT_ATTRIBUTE_FB_SETUP. This allows unloading and reloading of ps3fb while the sound driver keeps the GPU open. Signed-off-by: Geert Uytterhoeven <[email protected]> Cc: [email protected] Signed-off-by: Benjamin Herrenschmidt <[email protected]>
This commit is contained in:
parent
d3352c9f1e
commit
c204ff6559
2 changed files with 12 additions and 1 deletions
|
|
@ -1123,7 +1123,7 @@ static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev)
|
|||
|
||||
info = framebuffer_alloc(sizeof(struct ps3fb_par), &dev->core);
|
||||
if (!info)
|
||||
goto err_context_unmap;
|
||||
goto err_context_fb_close;
|
||||
|
||||
par = info->par;
|
||||
par->mode_id = ~ps3fb_mode; /* != ps3fb_mode, to trigger change */
|
||||
|
|
@ -1188,6 +1188,8 @@ err_fb_dealloc:
|
|||
fb_dealloc_cmap(&info->cmap);
|
||||
err_framebuffer_release:
|
||||
framebuffer_release(info);
|
||||
err_context_fb_close:
|
||||
lv1_gpu_fb_close(ps3fb.context_handle);
|
||||
err_context_unmap:
|
||||
lv1_gpu_context_iomap(ps3fb.context_handle, GPU_IOIF, xdr_lpar,
|
||||
ps3fb_videomemory.size, CBE_IOPTE_M);
|
||||
|
|
@ -1233,6 +1235,7 @@ static int ps3fb_shutdown(struct ps3_system_bus_device *dev)
|
|||
info = dev->core.driver_data = NULL;
|
||||
}
|
||||
iounmap((u8 __force __iomem *)ps3fb.dinfo);
|
||||
lv1_gpu_fb_close(ps3fb.context_handle);
|
||||
lv1_gpu_context_iomap(ps3fb.context_handle, GPU_IOIF, xdr_lpar,
|
||||
ps3fb_videomemory.size, CBE_IOPTE_M);
|
||||
lv1_gpu_context_free(ps3fb.context_handle);
|
||||
|
|
|
|||
Loading…
Reference in a new issue