| Message ID | 1405942047-26711-1-git-send-email-deathsimple@vodafone.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Jul 21, 2014 at 7:27 AM, Christian König <deathsimple@vodafone.de> wrote: > From: Christian König <christian.koenig@amd.com> > > Unused and unimplemented. Also fix specifying the > kernel flag incorrectly at one occasion. > > Signed-off-by: Christian König <christian.koenig@amd.com> Applied to my 3.17 tree. Alex > --- > drivers/gpu/drm/radeon/radeon.h | 2 +- > drivers/gpu/drm/radeon/radeon_fb.c | 3 +-- > drivers/gpu/drm/radeon/radeon_gem.c | 7 +++---- > 3 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h > index 6ce80ae..9b6fbda 100644 > --- a/drivers/gpu/drm/radeon/radeon.h > +++ b/drivers/gpu/drm/radeon/radeon.h > @@ -548,7 +548,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, > diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c > index 477ea0d..94b0f2a 100644 > --- a/drivers/gpu/drm/radeon/radeon_fb.c > +++ b/drivers/gpu/drm/radeon/radeon_fb.c > @@ -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); > diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c > index eafe316..9fb1c06 100644 > --- a/drivers/gpu/drm/radeon/radeon_gem.c > +++ b/drivers/gpu/drm/radeon/radeon_gem.c > @@ -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; > @@ -255,7 +255,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); > @@ -570,8 +570,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; > > -- > 1.9.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 6ce80ae..9b6fbda 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -548,7 +548,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, diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index 477ea0d..94b0f2a 100644 --- a/drivers/gpu/drm/radeon/radeon_fb.c +++ b/drivers/gpu/drm/radeon/radeon_fb.c @@ -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); diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c index eafe316..9fb1c06 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -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; @@ -255,7 +255,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); @@ -570,8 +570,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;