Commit 246cb7e4 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/amdgpu: Introduce GEM object functions 



GEM object functions deprecate several similar callback interfaces in
struct drm_driver. This patch replaces the per-driver callbacks with
per-instance callbacks in amdgpu. The only exception is gem_prime_mmap,
which is non-trivial to convert.

v3:
	* remove amdgpu_object.c from patch (Christian)
v2:
	* move object-function instance to amdgpu_gem.c (Christian)
	* set callbacks in amdgpu_gem_object_create() (Christian)

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200923102159.24084-2-tzimmermann@suse.de
parent a0d078d0

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+0 −6
Original line number Diff line number Diff line
@@ -1497,19 +1497,13 @@ static struct drm_driver kms_driver = { 
	.lastclose = amdgpu_driver_lastclose_kms,

	.irq_handler = amdgpu_irq_handler,

	.ioctls = amdgpu_ioctls_kms,

	.gem_free_object_unlocked = amdgpu_gem_object_free,

	.gem_open_object = amdgpu_gem_object_open,

	.gem_close_object = amdgpu_gem_object_close,

	.dumb_create = amdgpu_mode_dumb_create,

	.dumb_map_offset = amdgpu_mode_dumb_mmap,

	.fops = &amdgpu_driver_kms_fops,



	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,

	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,

	.gem_prime_export = amdgpu_gem_prime_export,

	.gem_prime_import = amdgpu_gem_prime_import,

	.gem_prime_vmap = amdgpu_gem_prime_vmap,

	.gem_prime_vunmap = amdgpu_gem_prime_vunmap,

	.gem_prime_mmap = amdgpu_gem_prime_mmap,



	.name = DRIVER_NAME,

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c

+18 −5
Original line number Diff line number Diff line
@@ -36,9 +36,12 @@ 


#include "amdgpu.h"

#include "amdgpu_display.h"

#include "amdgpu_dma_buf.h"

#include "amdgpu_xgmi.h"



void amdgpu_gem_object_free(struct drm_gem_object *gobj)

static const struct drm_gem_object_funcs amdgpu_gem_object_funcs;



static void amdgpu_gem_object_free(struct drm_gem_object *gobj)

{

	struct amdgpu_bo *robj = gem_to_amdgpu_bo(gobj);
@@ -87,6 +90,7 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size, 
		return r;

	}

	*obj = &bo->tbo.base;

	(*obj)->funcs = &amdgpu_gem_object_funcs;



	return 0;

}
@@ -119,7 +123,7 @@ void amdgpu_gem_force_release(struct amdgpu_device *adev) 
 * Call from drm_gem_handle_create which appear in both new and open ioctl

 * case.

 */

int amdgpu_gem_object_open(struct drm_gem_object *obj,

static int amdgpu_gem_object_open(struct drm_gem_object *obj,

				  struct drm_file *file_priv)

{

	struct amdgpu_bo *abo = gem_to_amdgpu_bo(obj);
@@ -152,7 +156,7 @@ int amdgpu_gem_object_open(struct drm_gem_object *obj, 
	return 0;

}



void amdgpu_gem_object_close(struct drm_gem_object *obj,

static void amdgpu_gem_object_close(struct drm_gem_object *obj,

				    struct drm_file *file_priv)

{

	struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);
@@ -211,6 +215,15 @@ void amdgpu_gem_object_close(struct drm_gem_object *obj, 
	ttm_eu_backoff_reservation(&ticket, &list);

}



static const struct drm_gem_object_funcs amdgpu_gem_object_funcs = {

	.free = amdgpu_gem_object_free,

	.open = amdgpu_gem_object_open,

	.close = amdgpu_gem_object_close,

	.export = amdgpu_gem_prime_export,

	.vmap = amdgpu_gem_prime_vmap,

	.vunmap = amdgpu_gem_prime_vunmap,

};



/*

 * GEM ioctls.

 */

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h

+0 −5
Original line number Diff line number Diff line
@@ -33,11 +33,6 @@ 
#define AMDGPU_GEM_DOMAIN_MAX		0x3

#define gem_to_amdgpu_bo(gobj) container_of((gobj), struct amdgpu_bo, tbo.base)



void amdgpu_gem_object_free(struct drm_gem_object *obj);

int amdgpu_gem_object_open(struct drm_gem_object *obj,

				struct drm_file *file_priv);

void amdgpu_gem_object_close(struct drm_gem_object *obj,

				struct drm_file *file_priv);

unsigned long amdgpu_gem_timeout(uint64_t timeout_ns);



/*