From 96f9d8df1381ad3a51f78b1804454f870f999618 Mon Sep 17 00:00:00 2001
From: Russell King <rmk_cubox@arm.linux.org.uk>
Date: Thu, 13 Jun 2013 14:40:54 +0100
Subject: Remove drm_armada_bo_phys() and its associated ioctl

drm_armada_bo_phys() is no longer necessary with dmabuf support, so
drop it from the library.  Also get rid of the bo "phys" member.

Signed-off-by: Russell King <rmk@arm.linux.org.uk>
---
 armada_bufmgr.c | 15 ---------------
 armada_bufmgr.h |  2 --
 armada_ioctl.h  | 10 +---------
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/armada_bufmgr.c b/armada_bufmgr.c
index 6b9e667..8122269 100644
--- a/armada_bufmgr.c
+++ b/armada_bufmgr.c
@@ -282,7 +282,6 @@ struct drm_armada_bo *drm_armada_bo_create_phys(struct drm_armada_bufmgr *mgr,
         bo->bo.ref = 1;
         bo->bo.handle = arg.handle;
         bo->bo.size = size;
-        bo->bo.phys = phys;
         bo->bo.type = DRM_ARMADA_BO_LINEAR;
         bo->alloc_size = size;
         bo->ref = 1;
@@ -511,20 +510,6 @@ int drm_armada_bo_map(struct drm_armada_bo *dbo)
     return 0;
 }
 
-uint32_t drm_armada_bo_phys(struct drm_armada_bo *dbo)
-{
-    struct armada_bo *bo = to_armada_bo(dbo);
-    struct drm_armada_gem_prop arg;
-    int ret, fd = bo->mgr->fd;
-
-    memset(&arg, 0, sizeof(arg));
-    arg.handle = bo->bo.handle;
-
-    ret = drmIoctl(fd, DRM_IOCTL_ARMADA_GEM_PROP, &arg);
-
-    return ret ? -1 : (uint32_t)arg.phys;
-}
-
 int drm_armada_bo_subdata(struct drm_armada_bo *dbo, unsigned long offset,
     unsigned long size, const void *data)
 {
diff --git a/armada_bufmgr.h b/armada_bufmgr.h
index f84785f..f7e0cb6 100644
--- a/armada_bufmgr.h
+++ b/armada_bufmgr.h
@@ -14,7 +14,6 @@ struct drm_armada_bo {
 	uint32_t handle;
 	uint32_t size;
 	uint32_t pitch;
-	uint32_t phys;
 	void *ptr;
 	enum drm_armada_bo_type type;
 };
@@ -40,7 +39,6 @@ int drm_armada_bo_flink(struct drm_armada_bo *bo, uint32_t *name);
 int drm_armada_bo_to_fd(struct drm_armada_bo *bo, int *fd);
 
 int drm_armada_bo_map(struct drm_armada_bo *bo);
-uint32_t drm_armada_bo_phys(struct drm_armada_bo *bo);
 void drm_armada_bo_get(struct drm_armada_bo *bo);
 void drm_armada_bo_put(struct drm_armada_bo *bo);
 int drm_armada_bo_subdata(struct drm_armada_bo *bo, unsigned long offset,
diff --git a/armada_ioctl.h b/armada_ioctl.h
index 2bb3146..b031975 100644
--- a/armada_ioctl.h
+++ b/armada_ioctl.h
@@ -13,10 +13,9 @@
 #define DRM_ARMADA_GEM_CREATE_PHYS	0x01
 #define DRM_ARMADA_GEM_MMAP		0x02
 #define DRM_ARMADA_GEM_PWRITE		0x03
-#define DRM_ARMADA_GEM_PROP		0x04
 #define DRM_ARMADA_GEM_CACHE		0x05
 #define DRM_ARMADA_OVERLAY_PUT_IMAGE	0x06
-#define DRM_ARMADA_OVERLAY_ATTRS		0x07
+#define DRM_ARMADA_OVERLAY_ATTRS	0x07
 
 #define ARMADA_IOCTL(dir,name,str) \
 	DRM_##dir(DRM_COMMAND_BASE + DRM_ARMADA_##name, struct drm_armada_##str)
@@ -55,13 +54,6 @@ struct drm_armada_gem_pwrite {
 #define DRM_IOCTL_ARMADA_GEM_PWRITE \
 	ARMADA_IOCTL(IOW, GEM_PWRITE, gem_pwrite)
 
-struct drm_armada_gem_prop {
-	uint64_t phys;
-	uint32_t handle;
-};
-#define DRM_IOCTL_ARMADA_GEM_PROP \
-	ARMADA_IOCTL(IOWR, GEM_PROP, gem_prop)
-
 struct drm_armada_gem_cache {
 	uint64_t ptr;
 	uint32_t handle;
-- 
cgit