Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 73 insertions, 30 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index d1e595d91723..aa1ca2dea42f 100644
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -32,21 +32,18 @@
 
 int radeon_gem_object_init(struct drm_gem_object *obj)
 {
-        /* we do nothings here */
+        BUG();
+
         return 0;
 }
 
 void radeon_gem_object_free(struct drm_gem_object *gobj)
 {
-        struct radeon_bo *robj = gobj->driver_private;
+        struct radeon_bo *robj = gem_to_radeon_bo(gobj);
 
-        gobj->driver_private = NULL;
         if (robj) {
                 radeon_bo_unref(&robj);
         }
-
-        drm_gem_object_release(gobj);
-        kfree(gobj);
 }
 
 int radeon_gem_object_create(struct radeon_device *rdev, int size,
@@ -54,36 +51,34 @@ int radeon_gem_object_create(struct radeon_device *rdev, int size,
                                 bool discardable, bool kernel,
                                 struct drm_gem_object **obj)
 {
-        struct drm_gem_object *gobj;
         struct radeon_bo *robj;
         int r;
 
         *obj = NULL;
-        gobj = drm_gem_object_alloc(rdev->ddev, size);
-        if (!gobj) {
-                return -ENOMEM;
-        }
         /* At least align on page size */
         if (alignment < PAGE_SIZE) {
                 alignment = PAGE_SIZE;
         }
-        r = radeon_bo_create(rdev, gobj, size, kernel, initial_domain, &robj);
+        r = radeon_bo_create(rdev, size, alignment, kernel, initial_domain, &robj);
         if (r) {
                 if (r != -ERESTARTSYS)
                         DRM_ERROR("Failed to allocate GEM object (%d, %d, %u, %d)\n",
                                   size, initial_domain, alignment, r);
-                drm_gem_object_unreference_unlocked(gobj);
                 return r;
         }
-        gobj->driver_private = robj;
-        *obj = gobj;
+        *obj = &robj->gem_base;
+
+        mutex_lock(&rdev->gem.mutex);
+        list_add_tail(&robj->list, &rdev->gem.objects);
+        mutex_unlock(&rdev->gem.mutex);
+
         return 0;
 }
 
 int radeon_gem_object_pin(struct drm_gem_object *obj, uint32_t pin_domain,
                           uint64_t *gpu_addr)
 {
-        struct radeon_bo *robj = obj->driver_private;
+        struct radeon_bo *robj = gem_to_radeon_bo(obj);
         int r;
 
         r = radeon_bo_reserve(robj, false);
@@ -96,7 +91,7 @@ int radeon_gem_object_pin(struct drm_gem_object *obj, uint32_t pin_domain,
 
 void radeon_gem_object_unpin(struct drm_gem_object *obj)
 {
-        struct radeon_bo *robj = obj->driver_private;
+        struct radeon_bo *robj = gem_to_radeon_bo(obj);
         int r;
 
         r = radeon_bo_reserve(robj, false);
@@ -114,7 +109,7 @@ int radeon_gem_set_domain(struct drm_gem_object *gobj,
         int r;
 
         /* FIXME: reeimplement */
-        robj = gobj->driver_private;
+        robj = gem_to_radeon_bo(gobj);
         /* work out where to validate the buffer to */
         domain = wdomain;
         if (!domain) {
@@ -156,9 +151,12 @@ int radeon_gem_info_ioctl(struct drm_device *dev, void *data,
 {
         struct radeon_device *rdev = dev->dev_private;
         struct drm_radeon_gem_info *args = data;
+        struct ttm_mem_type_manager *man;
+
+        man = &rdev->mman.bdev.man[TTM_PL_VRAM];
 
         args->vram_size = rdev->mc.real_vram_size;
-        args->vram_visible = rdev->mc.real_vram_size;
+        args->vram_visible = (u64)man->size << PAGE_SHIFT;
         if (rdev->stollen_vga_memory)
                 args->vram_visible -= radeon_bo_size(rdev->stollen_vga_memory);
         args->vram_visible -= radeon_fbdev_total_size(rdev);
@@ -228,7 +226,7 @@ int radeon_gem_set_domain_ioctl(struct drm_device *dev, void *data,
         if (gobj == NULL) {
                 return -ENOENT;
         }
-        robj = gobj->driver_private;
+        robj = gem_to_radeon_bo(gobj);
 
         r = radeon_gem_set_domain(gobj, args->read_domains, args->write_domain);
 
@@ -236,23 +234,31 @@ int radeon_gem_set_domain_ioctl(struct drm_device *dev, void *data,
         return r;
 }
 
-int radeon_gem_mmap_ioctl(struct drm_device *dev, void *data,
-                          struct drm_file *filp)
+int radeon_mode_dumb_mmap(struct drm_file *filp,
+                          struct drm_device *dev,
+                          uint32_t handle, uint64_t *offset_p)
 {
-        struct drm_radeon_gem_mmap *args = data;
         struct drm_gem_object *gobj;
         struct radeon_bo *robj;
 
-        gobj = drm_gem_object_lookup(dev, filp, args->handle);
+        gobj = drm_gem_object_lookup(dev, filp, handle);
         if (gobj == NULL) {
                 return -ENOENT;
         }
-        robj = gobj->driver_private;
-        args->addr_ptr = radeon_bo_mmap_offset(robj);
+        robj = gem_to_radeon_bo(gobj);
+        *offset_p = radeon_bo_mmap_offset(robj);
         drm_gem_object_unreference_unlocked(gobj);
         return 0;
 }
 
+int radeon_gem_mmap_ioctl(struct drm_device *dev, void *data,
+                          struct drm_file *filp)
+{
+        struct drm_radeon_gem_mmap *args = data;
+
+        return radeon_mode_dumb_mmap(filp, dev, args->handle, &args->addr_ptr);
+}
+
 int radeon_gem_busy_ioctl(struct drm_device *dev, void *data,
                           struct drm_file *filp)
 {
@@ -266,7 +272,7 @@ int radeon_gem_busy_ioctl(struct drm_device *dev, void *data,
         if (gobj == NULL) {
                 return -ENOENT;
         }
-        robj = gobj->driver_private;
+        robj = gem_to_radeon_bo(gobj);
         r = radeon_bo_wait(robj, &cur_placement, true);
         switch (cur_placement) {
         case TTM_PL_VRAM:
@@ -296,7 +302,7 @@ int radeon_gem_wait_idle_ioctl(struct drm_device *dev, void *data,
         if (gobj == NULL) {
                 return -ENOENT;
         }
-        robj = gobj->driver_private;
+        robj = gem_to_radeon_bo(gobj);
         r = radeon_bo_wait(robj, NULL, false);
         /* callback hw specific functions if any */
         if (robj->rdev->asic->ioctl_wait_idle)
@@ -317,7 +323,7 @@ int radeon_gem_set_tiling_ioctl(struct drm_device *dev, void *data,
         gobj = drm_gem_object_lookup(dev, filp, args->handle);
         if (gobj == NULL)
                 return -ENOENT;
-        robj = gobj->driver_private;
+        robj = gem_to_radeon_bo(gobj);
         r = radeon_bo_set_tiling_flags(robj, args->tiling_flags, args->pitch);
         drm_gem_object_unreference_unlocked(gobj);
         return r;
@@ -335,7 +341,7 @@ int radeon_gem_get_tiling_ioctl(struct drm_device *dev, void *data,
         gobj = drm_gem_object_lookup(dev, filp, args->handle);
         if (gobj == NULL)
                 return -ENOENT;
-        rbo = gobj->driver_private;
+        rbo = gem_to_radeon_bo(gobj);
         r = radeon_bo_reserve(rbo, false);
         if (unlikely(r != 0))
                 goto out;
@@ -345,3 +351,40 @@ out:
         drm_gem_object_unreference_unlocked(gobj);
         return r;
 }
+
+int radeon_mode_dumb_create(struct drm_file *file_priv,
+                            struct drm_device *dev,
+                            struct drm_mode_create_dumb *args)
+{
+        struct radeon_device *rdev = dev->dev_private;
+        struct drm_gem_object *gobj;
+        uint32_t handle;
+        int r;
+
+        args->pitch = radeon_align_pitch(rdev, args->width, args->bpp, 0) * ((args->bpp + 1) / 8);
+        args->size = args->pitch * args->height;
+        args->size = ALIGN(args->size, PAGE_SIZE);
+
+        r = radeon_gem_object_create(rdev, args->size, 0,
+                                     RADEON_GEM_DOMAIN_VRAM,
+                                     false, ttm_bo_type_device,
+                                     &gobj);
+        if (r)
+                return -ENOMEM;
+
+        r = drm_gem_handle_create(file_priv, gobj, &handle);
+        /* drop reference from allocate - handle holds it now */
+        drm_gem_object_unreference_unlocked(gobj);
+        if (r) {
+                return r;
+        }
+        args->handle = handle;
+        return 0;
+}
+
+int radeon_mode_dumb_destroy(struct drm_file *file_priv,
+                             struct drm_device *dev,
+                             uint32_t handle)
+{
+        return drm_gem_handle_delete(file_priv, handle);
+}