Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3352c9f authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Benjamin Herrenschmidt
Browse files

ps3fb/vram: Extract common GPU stuff into <asm/ps3gpu.h> 



Signed-off-by: default avatarGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Cc: linux-fbdev-devel@lists.sourceforge.net
Cc: Jim Paris <jim@jtan.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 56ac72db

arch/powerpc/include/asm/ps3.h

+0 −3
Original line number Diff line number Diff line
@@ -520,7 +520,4 @@ void ps3_sync_irq(int node); 
u32 ps3_get_hw_thread_id(int cpu);

u64 ps3_get_spe_id(void *arg);



/* mutex synchronizing GPU accesses and video mode changes */

extern struct mutex ps3_gpu_mutex;



#endif

arch/powerpc/include/asm/ps3gpu.h

0 → 100644
+78 −0
Original line number Diff line number Diff line 
/*

 *  PS3 GPU declarations.

 *

 *  Copyright 2009 Sony Corporation

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by

 *  the Free Software Foundation; version 2 of the License.

 *

 *  This program is distributed in the hope that it will be useful,

 *  but WITHOUT ANY WARRANTY; without even the implied warranty of

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *  GNU General Public License for more details.

 *

 *  You should have received a copy of the GNU General Public License

 *  along with this program.

 *  If not, see <http://www.gnu.org/licenses/>.

 */



#ifndef _ASM_POWERPC_PS3GPU_H

#define _ASM_POWERPC_PS3GPU_H



#include <linux/mutex.h>



#include <asm/lv1call.h>





#define L1GPU_CONTEXT_ATTRIBUTE_DISPLAY_SYNC	0x101

#define L1GPU_CONTEXT_ATTRIBUTE_DISPLAY_FLIP	0x102



#define L1GPU_CONTEXT_ATTRIBUTE_FB_SETUP	0x600

#define L1GPU_CONTEXT_ATTRIBUTE_FB_BLIT		0x601

#define L1GPU_CONTEXT_ATTRIBUTE_FB_BLIT_SYNC	0x602



#define L1GPU_FB_BLIT_WAIT_FOR_COMPLETION	(1ULL << 32)



#define L1GPU_DISPLAY_SYNC_HSYNC		1

#define L1GPU_DISPLAY_SYNC_VSYNC		2





/* mutex synchronizing GPU accesses and video mode changes */

extern struct mutex ps3_gpu_mutex;





static inline int lv1_gpu_display_sync(u64 context_handle, u64 head,

				       u64 ddr_offset)

{

	return lv1_gpu_context_attribute(context_handle,

					 L1GPU_CONTEXT_ATTRIBUTE_DISPLAY_SYNC,

					 head, ddr_offset, 0, 0);

}



static inline int lv1_gpu_display_flip(u64 context_handle, u64 head,

				       u64 ddr_offset)

{

	return lv1_gpu_context_attribute(context_handle,

					 L1GPU_CONTEXT_ATTRIBUTE_DISPLAY_FLIP,

					 head, ddr_offset, 0, 0);

}



static inline int lv1_gpu_fb_setup(u64 context_handle, u64 xdr_lpar,

				   u64 xdr_size, u64 ioif_offset)

{

	return lv1_gpu_context_attribute(context_handle,

					 L1GPU_CONTEXT_ATTRIBUTE_FB_SETUP,

					 xdr_lpar, xdr_size, ioif_offset, 0);

}



static inline int lv1_gpu_fb_blit(u64 context_handle, u64 ddr_offset,

				  u64 ioif_offset, u64 sync_width, u64 pitch)

{

	return lv1_gpu_context_attribute(context_handle,

					 L1GPU_CONTEXT_ATTRIBUTE_FB_BLIT,

					 ddr_offset, ioif_offset, sync_width,

					 pitch);

}



#endif /* _ASM_POWERPC_PS3GPU_H */

arch/powerpc/platforms/ps3/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <asm/udbg.h>

#include <asm/prom.h>

#include <asm/lv1call.h>

#include <asm/ps3gpu.h>



#include "platform.h"

drivers/block/ps3vram.c

+7 −14
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <asm/iommu.h>

#include <asm/lv1call.h>

#include <asm/ps3.h>

#include <asm/ps3gpu.h>





#define DEVICE_NAME		"ps3vram"
@@ -46,8 +47,6 @@ 
#define NV_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN	0x0000030c

#define NV_MEMORY_TO_MEMORY_FORMAT_NOTIFY	0x00000104



#define L1GPU_CONTEXT_ATTRIBUTE_FB_BLIT 0x601



#define CACHE_PAGE_PRESENT 1

#define CACHE_PAGE_DIRTY   2
@@ -184,13 +183,10 @@ static void ps3vram_rewind_ring(struct ps3_system_bus_device *dev) 
	priv->ctrl[CTRL_PUT] = FIFO_BASE + FIFO_OFFSET;



	/* asking the HV for a blit will kick the FIFO */

	status = lv1_gpu_context_attribute(priv->context_handle,

					   L1GPU_CONTEXT_ATTRIBUTE_FB_BLIT, 0,

					   0, 0, 0);

	status = lv1_gpu_fb_blit(priv->context_handle, 0, 0, 0, 0);

	if (status)

		dev_err(&dev->core,

			"%s: lv1_gpu_context_attribute failed %d\n", __func__,

			status);

		dev_err(&dev->core, "%s: lv1_gpu_fb_blit failed %d\n",

			__func__, status);



	priv->fifo_ptr = priv->fifo_base;

}
@@ -206,13 +202,10 @@ static void ps3vram_fire_ring(struct ps3_system_bus_device *dev) 
			       (priv->fifo_ptr - priv->fifo_base) * sizeof(u32);



	/* asking the HV for a blit will kick the FIFO */

	status = lv1_gpu_context_attribute(priv->context_handle,

					   L1GPU_CONTEXT_ATTRIBUTE_FB_BLIT, 0,

					   0, 0, 0);

	status = lv1_gpu_fb_blit(priv->context_handle, 0, 0, 0, 0);

	if (status)

		dev_err(&dev->core,

			"%s: lv1_gpu_context_attribute failed %d\n", __func__,

			status);

		dev_err(&dev->core, "%s: lv1_gpu_fb_blit failed %d\n",

			__func__, status);



	if ((priv->fifo_ptr - priv->fifo_base) * sizeof(u32) >

	    FIFO_SIZE - 1024) {

drivers/ps3/ps3av_cmd.c

+2 −1
Original line number Diff line number Diff line
@@ -21,9 +21,10 @@ 
#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/delay.h>



#include <asm/ps3av.h>

#include <asm/ps3fb.h>

#include <asm/ps3.h>

#include <asm/ps3gpu.h>



#include "vuart.h"