Commit 1348969a authored by Luben Tuikov's avatar Luben Tuikov Committed by Alex Deucher
Browse files

drm/amdgpu: drm_device to amdgpu_device by inline-f (v2) 



Get the amdgpu_device from the DRM device by use
of an inline function, drm_to_adev(). The inline
function resolves a pointer to struct drm_device
to a pointer to struct amdgpu_device.

v2: Use a typed visible static inline function
    instead of an invisible macro.

Signed-off-by: default avatarLuben Tuikov <luben.tuikov@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 50166d1c

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+5 −0
Original line number Diff line number Diff line
@@ -986,6 +986,11 @@ struct amdgpu_device { 
	struct ratelimit_state		throttling_logging_rs;

};



static inline struct amdgpu_device *drm_to_adev(struct drm_device *ddev)

{

	return ddev->dev_private;

}



static inline struct amdgpu_device *amdgpu_ttm_adev(struct ttm_bo_device *bdev)

{

	return container_of(bdev, struct amdgpu_device, mman.bdev);

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c

+1 −1
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ int amdgpu_amdkfd_get_dmabuf_info(struct kgd_dev *kgd, int dma_buf_fd, 
		/* Can't handle buffers from different drivers */

		goto out_put;



	adev = obj->dev->dev_private;

	adev = drm_to_adev(obj->dev);

	bo = gem_to_amdgpu_bo(obj);

	if (!(bo->preferred_domains & (AMDGPU_GEM_DOMAIN_VRAM |

				    AMDGPU_GEM_DOMAIN_GTT)))

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c

+1 −1
Original line number Diff line number Diff line
@@ -1674,7 +1674,7 @@ int amdgpu_amdkfd_gpuvm_import_dmabuf(struct kgd_dev *kgd, 
		return -EINVAL;



	obj = dma_buf->priv;

	if (obj->dev->dev_private != adev)

	if (drm_to_adev(obj->dev) != adev)

		/* Can't handle buffers from other devices */

		return -EINVAL;

drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c

+5 −5
Original line number Diff line number Diff line
@@ -1882,7 +1882,7 @@ static void cail_mc_write(struct card_info *info, uint32_t reg, uint32_t val) 
 */

static void cail_reg_write(struct card_info *info, uint32_t reg, uint32_t val)

{

	struct amdgpu_device *adev = info->dev->dev_private;

	struct amdgpu_device *adev = drm_to_adev(info->dev);



	WREG32(reg, val);

}
@@ -1898,7 +1898,7 @@ static void cail_reg_write(struct card_info *info, uint32_t reg, uint32_t val) 
 */

static uint32_t cail_reg_read(struct card_info *info, uint32_t reg)

{

	struct amdgpu_device *adev = info->dev->dev_private;

	struct amdgpu_device *adev = drm_to_adev(info->dev);

	uint32_t r;



	r = RREG32(reg);
@@ -1916,7 +1916,7 @@ static uint32_t cail_reg_read(struct card_info *info, uint32_t reg) 
 */

static void cail_ioreg_write(struct card_info *info, uint32_t reg, uint32_t val)

{

	struct amdgpu_device *adev = info->dev->dev_private;

	struct amdgpu_device *adev = drm_to_adev(info->dev);



	WREG32_IO(reg, val);

}
@@ -1932,7 +1932,7 @@ static void cail_ioreg_write(struct card_info *info, uint32_t reg, uint32_t val) 
 */

static uint32_t cail_ioreg_read(struct card_info *info, uint32_t reg)

{

	struct amdgpu_device *adev = info->dev->dev_private;

	struct amdgpu_device *adev = drm_to_adev(info->dev);

	uint32_t r;



	r = RREG32_IO(reg);
@@ -1944,7 +1944,7 @@ static ssize_t amdgpu_atombios_get_vbios_version(struct device *dev, 
						 char *buf)

{

	struct drm_device *ddev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = ddev->dev_private;

	struct amdgpu_device *adev = drm_to_adev(ddev);

	struct atom_context *ctx = adev->mode_info.atom_context;



	return snprintf(buf, PAGE_SIZE, "%s\n", ctx->vbios_version);

drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ int amdgpu_bo_create_list_entry_array(struct drm_amdgpu_bo_list_in *in, 
int amdgpu_bo_list_ioctl(struct drm_device *dev, void *data,

				struct drm_file *filp)

{

	struct amdgpu_device *adev = dev->dev_private;

	struct amdgpu_device *adev = drm_to_adev(dev);

	struct amdgpu_fpriv *fpriv = filp->driver_priv;

	union drm_amdgpu_bo_list *args = data;

	uint32_t handle = args->in.list_handle;