Commit a25955ba authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/radeon: also init GEM funcs in radeon_gem_prime_import_sg_table 



Otherwise we will run into a NULL ptr deref.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Bug: https://bugzilla.kernel.org/show_bug.cgi?id=212137


Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 5.11.x
parent 48123d06

drivers/gpu/drm/radeon/radeon.h

+2 −0
Original line number Diff line number Diff line
@@ -574,6 +574,8 @@ struct radeon_gem { 
	struct list_head	objects;

};



extern const struct drm_gem_object_funcs radeon_gem_object_funcs;



int radeon_gem_init(struct radeon_device *rdev);

void radeon_gem_fini(struct radeon_device *rdev);

int radeon_gem_object_create(struct radeon_device *rdev, unsigned long size,

drivers/gpu/drm/radeon/radeon_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ struct sg_table *radeon_gem_prime_get_sg_table(struct drm_gem_object *obj); 
int radeon_gem_prime_pin(struct drm_gem_object *obj);

void radeon_gem_prime_unpin(struct drm_gem_object *obj);



static const struct drm_gem_object_funcs radeon_gem_object_funcs;

const struct drm_gem_object_funcs radeon_gem_object_funcs;



static void radeon_gem_object_free(struct drm_gem_object *gobj)

{
@@ -227,7 +227,7 @@ static int radeon_gem_handle_lockup(struct radeon_device *rdev, int r) 
	return r;

}



static const struct drm_gem_object_funcs radeon_gem_object_funcs = {

const struct drm_gem_object_funcs radeon_gem_object_funcs = {

	.free = radeon_gem_object_free,

	.open = radeon_gem_object_open,

	.close = radeon_gem_object_close,

drivers/gpu/drm/radeon/radeon_prime.c

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ struct drm_gem_object *radeon_gem_prime_import_sg_table(struct drm_device *dev, 
	if (ret)

		return ERR_PTR(ret);



	bo->tbo.base.funcs = &radeon_gem_object_funcs;



	mutex_lock(&rdev->gem.mutex);

	list_add_tail(&bo->list, &rdev->gem.objects);

	mutex_unlock(&rdev->gem.mutex);