platform/x86: amd-pmc: Move to later in the suspend process

[linux.git] / drivers / gpu / drm / lima / lima_gem.c

diff --git a/drivers/gpu/drm/lima/lima_gem.c b/drivers/gpu/drm/lima/lima_gem.c
index 640acc060467c647c53c5f53535b3a6bf1284455..f9a9198ef19833861ed9bce00048026c603a47b2 100644 (file)
--- a/drivers/gpu/drm/lima/lima_gem.c
+++ b/drivers/gpu/drm/lima/lima_gem.c
@@ -127,7 +127,7 @@ int lima_gem_create_handle(struct drm_device *dev, struct drm_file *file,
                if (err)
                        goto out;
        } else {
                if (err)
                        goto out;
        } else {

-               struct sg_table *sgt = drm_gem_shmem_get_pages_sgt(obj);
+               struct sg_table *sgt = drm_gem_shmem_get_pages_sgt(shmem);

 
                if (IS_ERR(sgt)) {
                        err = PTR_ERR(sgt);
 
                if (IS_ERR(sgt)) {
                        err = PTR_ERR(sgt);


@@ -151,7 +151,7 @@ static void lima_gem_free_object(struct drm_gem_object *obj)
        if (!list_empty(&bo->va))
                dev_err(obj->dev->dev, "lima gem free bo still has va\n");
 
        if (!list_empty(&bo->va))
                dev_err(obj->dev->dev, "lima gem free bo still has va\n");
 

-       drm_gem_shmem_free_object(obj);
+       drm_gem_shmem_free(&bo->base);

 }
 
 static int lima_gem_object_open(struct drm_gem_object *obj, struct drm_file *file)
 }
 
 static int lima_gem_object_open(struct drm_gem_object *obj, struct drm_file *file)


@@ -179,7 +179,7 @@ static int lima_gem_pin(struct drm_gem_object *obj)
        if (bo->heap_size)
                return -EINVAL;
 
        if (bo->heap_size)
                return -EINVAL;
 

-       return drm_gem_shmem_pin(obj);
+       return drm_gem_shmem_pin(&bo->base);

 }
 
 static int lima_gem_vmap(struct drm_gem_object *obj, struct dma_buf_map *map)
 }
 
 static int lima_gem_vmap(struct drm_gem_object *obj, struct dma_buf_map *map)


@@ -189,7 +189,7 @@ static int lima_gem_vmap(struct drm_gem_object *obj, struct dma_buf_map *map)
        if (bo->heap_size)
                return -EINVAL;
 
        if (bo->heap_size)
                return -EINVAL;
 

-       return drm_gem_shmem_vmap(obj, map);
+       return drm_gem_shmem_vmap(&bo->base, map);

 }
 
 static int lima_gem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)
 }
 
 static int lima_gem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)


@@ -199,19 +199,19 @@ static int lima_gem_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)
        if (bo->heap_size)
                return -EINVAL;
 
        if (bo->heap_size)
                return -EINVAL;
 

-       return drm_gem_shmem_mmap(obj, vma);
+       return drm_gem_shmem_mmap(&bo->base, vma);

 }
 
 static const struct drm_gem_object_funcs lima_gem_funcs = {
        .free = lima_gem_free_object,
        .open = lima_gem_object_open,
        .close = lima_gem_object_close,
 }
 
 static const struct drm_gem_object_funcs lima_gem_funcs = {
        .free = lima_gem_free_object,
        .open = lima_gem_object_open,
        .close = lima_gem_object_close,

-       .print_info = drm_gem_shmem_print_info,
+       .print_info = drm_gem_shmem_object_print_info,

        .pin = lima_gem_pin,
        .pin = lima_gem_pin,

-       .unpin = drm_gem_shmem_unpin,
-       .get_sg_table = drm_gem_shmem_get_sg_table,
+       .unpin = drm_gem_shmem_object_unpin,
+       .get_sg_table = drm_gem_shmem_object_get_sg_table,

        .vmap = lima_gem_vmap,
        .vmap = lima_gem_vmap,

-       .vunmap = drm_gem_shmem_vunmap,
+       .vunmap = drm_gem_shmem_object_vunmap,

        .mmap = lima_gem_mmap,
 };
 
        .mmap = lima_gem_mmap,
 };
 


@@ -221,7 +221,7 @@ struct drm_gem_object *lima_gem_create_object(struct drm_device *dev, size_t siz
 
        bo = kzalloc(sizeof(*bo), GFP_KERNEL);
        if (!bo)
 
        bo = kzalloc(sizeof(*bo), GFP_KERNEL);
        if (!bo)

-               return NULL;
+               return ERR_PTR(-ENOMEM);

 
        mutex_init(&bo->lock);
        INIT_LIST_HEAD(&bo->va);
 
        mutex_init(&bo->lock);
        INIT_LIST_HEAD(&bo->va);