mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 08:26:59 +00:00
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: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
4807c5a8a0
commit
ed5cb43f8f
3 changed files with 5 additions and 7 deletions
|
@ -549,7 +549,7 @@ int radeon_gem_init(struct radeon_device *rdev);
|
||||||
void radeon_gem_fini(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 radeon_gem_object_create(struct radeon_device *rdev, unsigned long size,
|
||||||
int alignment, int initial_domain,
|
int alignment, int initial_domain,
|
||||||
u32 flags, bool discardable, bool kernel,
|
u32 flags, bool kernel,
|
||||||
struct drm_gem_object **obj);
|
struct drm_gem_object **obj);
|
||||||
|
|
||||||
int radeon_mode_dumb_create(struct drm_file *file_priv,
|
int radeon_mode_dumb_create(struct drm_file *file_priv,
|
||||||
|
|
|
@ -127,8 +127,7 @@ static int radeonfb_create_pinned_object(struct radeon_fbdev *rfbdev,
|
||||||
aligned_size = ALIGN(size, PAGE_SIZE);
|
aligned_size = ALIGN(size, PAGE_SIZE);
|
||||||
ret = radeon_gem_object_create(rdev, aligned_size, 0,
|
ret = radeon_gem_object_create(rdev, aligned_size, 0,
|
||||||
RADEON_GEM_DOMAIN_VRAM,
|
RADEON_GEM_DOMAIN_VRAM,
|
||||||
0, false, true,
|
0, true, &gobj);
|
||||||
&gobj);
|
|
||||||
if (ret) {
|
if (ret) {
|
||||||
printk(KERN_ERR "failed to allocate framebuffer (%d)\n",
|
printk(KERN_ERR "failed to allocate framebuffer (%d)\n",
|
||||||
aligned_size);
|
aligned_size);
|
||||||
|
|
|
@ -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 radeon_gem_object_create(struct radeon_device *rdev, unsigned long size,
|
||||||
int alignment, int initial_domain,
|
int alignment, int initial_domain,
|
||||||
u32 flags, bool discardable, bool kernel,
|
u32 flags, bool kernel,
|
||||||
struct drm_gem_object **obj)
|
struct drm_gem_object **obj)
|
||||||
{
|
{
|
||||||
struct radeon_bo *robj;
|
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);
|
args->size = roundup(args->size, PAGE_SIZE);
|
||||||
r = radeon_gem_object_create(rdev, args->size, args->alignment,
|
r = radeon_gem_object_create(rdev, args->size, args->alignment,
|
||||||
args->initial_domain, args->flags,
|
args->initial_domain, args->flags,
|
||||||
false, false, &gobj);
|
false, &gobj);
|
||||||
if (r) {
|
if (r) {
|
||||||
up_read(&rdev->exclusive_lock);
|
up_read(&rdev->exclusive_lock);
|
||||||
r = radeon_gem_handle_lockup(rdev, r);
|
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,
|
r = radeon_gem_object_create(rdev, args->size, 0,
|
||||||
RADEON_GEM_DOMAIN_VRAM, 0,
|
RADEON_GEM_DOMAIN_VRAM, 0,
|
||||||
false, ttm_bo_type_device,
|
false, &gobj);
|
||||||
&gobj);
|
|
||||||
if (r)
|
if (r)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue