Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/radeon: remove discardable flag from radeon_gem_object_create 



Unused and unimplemented. Also fix specifying the
kernel flag incorrectly at one occasion.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4807c5a8

drivers/gpu/drm/radeon/radeon.h

+1 −1
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ 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,

				int alignment, int initial_domain,

				u32 flags, bool discardable, bool kernel,

				u32 flags, bool kernel,

				struct drm_gem_object **obj);



int radeon_mode_dumb_create(struct drm_file *file_priv,

drivers/gpu/drm/radeon/radeon_fb.c

+1 −2
Original line number Diff line number Diff line
@@ -127,8 +127,7 @@ static int radeonfb_create_pinned_object(struct radeon_fbdev *rfbdev, 
	aligned_size = ALIGN(size, PAGE_SIZE);

	ret = radeon_gem_object_create(rdev, aligned_size, 0,

				       RADEON_GEM_DOMAIN_VRAM,

				       0, false, true,

				       &gobj);

				       0, true, &gobj);

	if (ret) {

		printk(KERN_ERR "failed to allocate framebuffer (%d)\n",

		       aligned_size);

drivers/gpu/drm/radeon/radeon_gem.c

+3 −4
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ void radeon_gem_object_free(struct drm_gem_object *gobj) 


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

				int alignment, int initial_domain,

				u32 flags, bool discardable, bool kernel,

				u32 flags, bool kernel,

				struct drm_gem_object **obj)

{

	struct radeon_bo *robj;
@@ -253,7 +253,7 @@ int radeon_gem_create_ioctl(struct drm_device *dev, void *data, 
	args->size = roundup(args->size, PAGE_SIZE);

	r = radeon_gem_object_create(rdev, args->size, args->alignment,

				     args->initial_domain, args->flags,

				     false, false, &gobj);

				     false, &gobj);

	if (r) {

		up_read(&rdev->exclusive_lock);

		r = radeon_gem_handle_lockup(rdev, r);
@@ -568,8 +568,7 @@ int radeon_mode_dumb_create(struct drm_file *file_priv, 


	r = radeon_gem_object_create(rdev, args->size, 0,

				     RADEON_GEM_DOMAIN_VRAM, 0,

				     false, ttm_bo_type_device,

				     &gobj);

				     false, &gobj);

	if (r)

		return -ENOMEM;