From: Marek Olšák Date: Wed, 27 May 2015 12:30:38 +0000 (+0200) Subject: drm/amdgpu: rename GEM_OP_SET_INITIAL_DOMAIN -> GEM_OP_SET_PLACEMENT X-Git-Tag: microblaze-4.7-rc1~1800^2~25^2~13 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=d8f65a2376268dfb2963152754d41208dc43d906;p=linux-2.6-microblaze.git drm/amdgpu: rename GEM_OP_SET_INITIAL_DOMAIN -> GEM_OP_SET_PLACEMENT Signed-off-by: Marek Olšák Reviewed-by: Christian König Reviewed-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c index c90b74da0027..ad5b9c676fd8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c @@ -638,7 +638,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, r = -EFAULT; break; } - case AMDGPU_GEM_OP_SET_INITIAL_DOMAIN: + case AMDGPU_GEM_OP_SET_PLACEMENT: if (amdgpu_ttm_tt_has_userptr(robj->tbo.ttm)) { r = -EPERM; break; diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h index 64a07ac3b4b9..cd54891b1d5c 100644 --- a/include/uapi/drm/amdgpu_drm.h +++ b/include/uapi/drm/amdgpu_drm.h @@ -284,8 +284,8 @@ struct drm_amdgpu_gem_op { uint64_t value; /* input or return value */ }; -#define AMDGPU_GEM_OP_GET_GEM_CREATE_INFO 0 -#define AMDGPU_GEM_OP_SET_INITIAL_DOMAIN 1 +#define AMDGPU_GEM_OP_GET_GEM_CREATE_INFO 0 +#define AMDGPU_GEM_OP_SET_PLACEMENT 1 #define AMDGPU_VA_OP_MAP 1 #define AMDGPU_VA_OP_UNMAP 2