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

Signed-off-by: Geert 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: Benjamin Herrenschmidt <benh@kernel.crashing.org>

3 files changed, 31 insertions, 65 deletions

diff --git a/drivers/block/ps3vram.c b/drivers/block/ps3vram.c
index 83c14533aea5..2c2ea9cb207b 100644
--- a/drivers/block/ps3vram.c
+++ b/drivers/block/ps3vram.c
@@ -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) {
diff --git a/drivers/ps3/ps3av_cmd.c b/drivers/ps3/ps3av_cmd.c
index 716596e8e5b0..f555fedd5073 100644
--- a/drivers/ps3/ps3av_cmd.c
+++ b/drivers/ps3/ps3av_cmd.c
@@ -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"
 
diff --git a/drivers/video/ps3fb.c b/drivers/video/ps3fb.c
index a61c1d89bd87..13c876c6e32c 100644
--- a/drivers/video/ps3fb.c
+++ b/drivers/video/ps3fb.c
@@ -37,21 +37,11 @@
 #include <asm/ps3av.h>
 #include <asm/ps3fb.h>
 #include <asm/ps3.h>
+#include <asm/ps3gpu.h>
 
 
 #define DEVICE_NAME             "ps3fb"
 
-#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
-
 #define GPU_CMD_BUF_SIZE                        (2 * 1024 * 1024)
 #define GPU_FB_START                            (64 * 1024)
 #define GPU_IOIF                                (0x0d000000UL)
@@ -463,33 +453,27 @@ static void ps3fb_sync_image(struct device *dev, u64 frame_offset,
         src_offset += GPU_FB_START;
 
         mutex_lock(&ps3_gpu_mutex);
-        status = lv1_gpu_context_attribute(ps3fb.context_handle,
-                                           L1GPU_CONTEXT_ATTRIBUTE_FB_BLIT,
-                                           dst_offset, GPU_IOIF + src_offset,
-                                           L1GPU_FB_BLIT_WAIT_FOR_COMPLETION |
-                                           (width << 16) | height,
-                                           line_length);
+        status = lv1_gpu_fb_blit(ps3fb.context_handle, dst_offset,
+                                 GPU_IOIF + src_offset,
+                                 L1GPU_FB_BLIT_WAIT_FOR_COMPLETION |
+                                 (width << 16) | height,
+                                 line_length);
         mutex_unlock(&ps3_gpu_mutex);
 
         if (status)
-                dev_err(dev,
-                        "%s: lv1_gpu_context_attribute FB_BLIT failed: %d\n",
-                        __func__, status);
+                dev_err(dev, "%s: lv1_gpu_fb_blit failed: %d\n", __func__,
+                        status);
 #ifdef HEAD_A
-        status = lv1_gpu_context_attribute(ps3fb.context_handle,
-                                           L1GPU_CONTEXT_ATTRIBUTE_DISPLAY_FLIP,
-                                           0, frame_offset, 0, 0);
+        status = lv1_gpu_display_flip(ps3fb.context_handle, 0, frame_offset);
         if (status)
-                dev_err(dev, "%s: lv1_gpu_context_attribute FLIP failed: %d\n",
-                        __func__, status);
+                dev_err(dev, "%s: lv1_gpu_display_flip failed: %d\n", __func__,
+                        status);
 #endif
 #ifdef HEAD_B
-        status = lv1_gpu_context_attribute(ps3fb.context_handle,
-                                           L1GPU_CONTEXT_ATTRIBUTE_DISPLAY_FLIP,
-                                           1, frame_offset, 0, 0);
+        status = lv1_gpu_display_flip(ps3fb.context_handle, 1, frame_offset);
         if (status)
-                dev_err(dev, "%s: lv1_gpu_context_attribute FLIP failed: %d\n",
-                        __func__, status);
+                dev_err(dev, "%s: lv1_gpu_display_flip failed: %d\n", __func__,
+                        status);
 #endif
 }
 
@@ -1020,27 +1004,18 @@ static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev)
         init_waitqueue_head(&ps3fb.wait_vsync);
 
 #ifdef HEAD_A
-        status = lv1_gpu_context_attribute(0x0,
-                                           L1GPU_CONTEXT_ATTRIBUTE_DISPLAY_SYNC,
-                                           0, L1GPU_DISPLAY_SYNC_VSYNC, 0, 0);
+        status = lv1_gpu_display_sync(0x0, 0, L1GPU_DISPLAY_SYNC_VSYNC);
         if (status) {
-                dev_err(&dev->core,
-                        "%s: lv1_gpu_context_attribute DISPLAY_SYNC failed: "
-                        "%d\n",
+                dev_err(&dev->core, "%s: lv1_gpu_display_sync failed: %d\n",
                         __func__, status);
                 retval = -ENODEV;
                 goto err_close_device;
         }
 #endif
 #ifdef HEAD_B
-        status = lv1_gpu_context_attribute(0x0,
-                                           L1GPU_CONTEXT_ATTRIBUTE_DISPLAY_SYNC,
-                                           1, L1GPU_DISPLAY_SYNC_VSYNC, 0, 0);
-
+        status = lv1_gpu_display_sync(0x0, 1, L1GPU_DISPLAY_SYNC_VSYNC);
         if (status) {
-                dev_err(&dev->core,
-                        "%s: lv1_gpu_context_attribute DISPLAY_SYNC failed: "
-                        "%d\n",
+                dev_err(&dev->core, "%s: lv1_gpu_display_sync failed: %d\n",
                         __func__, status);
                 retval = -ENODEV;
                 goto err_close_device;
@@ -1070,7 +1045,7 @@ static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev)
                                           &lpar_reports, &lpar_reports_size);
         if (status) {
                 dev_err(&dev->core,
-                        "%s: lv1_gpu_context_attribute failed: %d\n", __func__,
+                        "%s: lv1_gpu_context_allocate failed: %d\n", __func__,
                         status);
                 goto err_gpu_memory_free;
         }
@@ -1137,13 +1112,10 @@ static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev)
                 ps3fb_videomemory.address, GPU_IOIF, xdr_lpar,
                 ps3fb_videomemory.size);
 
-        status = lv1_gpu_context_attribute(ps3fb.context_handle,
-                                           L1GPU_CONTEXT_ATTRIBUTE_FB_SETUP,
-                                           xdr_lpar, GPU_CMD_BUF_SIZE,
-                                           GPU_IOIF, 0);
+        status = lv1_gpu_fb_setup(ps3fb.context_handle, xdr_lpar,
+                                  GPU_CMD_BUF_SIZE, GPU_IOIF);
         if (status) {
-                dev_err(&dev->core,
-                        "%s: lv1_gpu_context_attribute FB_SETUP failed: %d\n",
+                dev_err(&dev->core, "%s: lv1_gpu_fb_setup failed: %d\n",
                         __func__, status);
                 retval = -ENXIO;
                 goto err_context_unmap;