ps3fb: Tear down FB setup during cleanup (c204ff65) · Commits · 戴 / test

arch/powerpc/include/asm/ps3gpu.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@
		#define L1GPU_CONTEXT_ATTRIBUTE_FB_SETUP 0x600
		#define L1GPU_CONTEXT_ATTRIBUTE_FB_BLIT 0x601
		#define L1GPU_CONTEXT_ATTRIBUTE_FB_BLIT_SYNC 0x602
		#define L1GPU_CONTEXT_ATTRIBUTE_FB_CLOSE 0x603

		#define L1GPU_FB_BLIT_WAIT_FOR_COMPLETION (1ULL << 32)

		@@ -75,4 +76,11 @@ static inline int lv1_gpu_fb_blit(u64 context_handle, u64 ddr_offset,
		pitch);
		}

		static inline int lv1_gpu_fb_close(u64 context_handle)
		{
		return lv1_gpu_context_attribute(context_handle,
		L1GPU_CONTEXT_ATTRIBUTE_FB_CLOSE, 0,
		0, 0, 0);
		}

		#endif /* _ASM_POWERPC_PS3GPU_H */

+4 −1

Original line number	Diff line number	Diff line
		@@ -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);