Commit 4a580877 authored by Luben Tuikov's avatar Luben Tuikov Committed by Alex Deucher
Browse files

drm/amdgpu: Get DRM dev from adev by inline-f 



Add a static inline adev_to_drm() to obtain
the DRM device pointer from an amdgpu_device pointer.

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 1348969a

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

+5 −0
Original line number Diff line number Diff line
@@ -991,6 +991,11 @@ static inline struct amdgpu_device *drm_to_adev(struct drm_device *ddev) 
	return ddev->dev_private;

}



static inline struct drm_device *adev_to_drm(struct amdgpu_device *adev)

{

	return adev->ddev;

}



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_acpi.c

+5 −5
Original line number Diff line number Diff line
@@ -463,11 +463,11 @@ static int amdgpu_atif_handler(struct amdgpu_device *adev, 


		if (req.pending & ATIF_DGPU_DISPLAY_EVENT) {

			if (adev->flags & AMD_IS_PX) {

				pm_runtime_get_sync(adev->ddev->dev);

				pm_runtime_get_sync(adev_to_drm(adev)->dev);

				/* Just fire off a uevent and let userspace tell us what to do */

				drm_helper_hpd_irq_event(adev->ddev);

				pm_runtime_mark_last_busy(adev->ddev->dev);

				pm_runtime_put_autosuspend(adev->ddev->dev);

				drm_helper_hpd_irq_event(adev_to_drm(adev));

				pm_runtime_mark_last_busy(adev_to_drm(adev)->dev);

				pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

			}

		}

		/* TODO: check other events */
@@ -817,7 +817,7 @@ int amdgpu_acpi_init(struct amdgpu_device *adev) 
			struct drm_encoder *tmp;



			/* Find the encoder controlling the brightness */

			list_for_each_entry(tmp, &adev->ddev->mode_config.encoder_list,

			list_for_each_entry(tmp, &adev_to_drm(adev)->mode_config.encoder_list,

					    head) {

				struct amdgpu_encoder *enc = to_amdgpu_encoder(tmp);

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

+3 −3
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev) 
			.gpuvm_size = min(adev->vm_manager.max_pfn

					  << AMDGPU_GPU_PAGE_SHIFT,

					  AMDGPU_GMC_HOLE_START),

			.drm_render_minor = adev->ddev->render->index,

			.drm_render_minor = adev_to_drm(adev)->render->index,

			.sdma_doorbell_idx = adev->doorbell_index.sdma_engine,



		};
@@ -160,7 +160,7 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev) 
					adev->doorbell_index.last_non_cp;

		}



		kgd2kfd_device_init(adev->kfd.dev, adev->ddev, &gpu_resources);

		kgd2kfd_device_init(adev->kfd.dev, adev_to_drm(adev), &gpu_resources);

	}

}
@@ -479,7 +479,7 @@ int amdgpu_amdkfd_get_dmabuf_info(struct kgd_dev *kgd, int dma_buf_fd, 
		goto out_put;



	obj = dma_buf->priv;

	if (obj->dev->driver != adev->ddev->driver)

	if (obj->dev->driver != adev_to_drm(adev)->driver)

		/* Can't handle buffers from different drivers */

		goto out_put;

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

+3 −3
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ void amdgpu_atombios_i2c_init(struct amdgpu_device *adev) 


			if (i2c.valid) {

				sprintf(stmp, "0x%x", i2c.i2c_id);

				adev->i2c_bus[i] = amdgpu_i2c_create(adev->ddev, &i2c, stmp);

				adev->i2c_bus[i] = amdgpu_i2c_create(adev_to_drm(adev), &i2c, stmp);

			}

			gpio = (ATOM_GPIO_I2C_ASSIGMENT *)

				((u8 *)gpio + sizeof(ATOM_GPIO_I2C_ASSIGMENT));
@@ -541,7 +541,7 @@ bool amdgpu_atombios_get_connector_info_from_object_table(struct amdgpu_device * 
		}

	}



	amdgpu_link_encoder_connector(adev->ddev);

	amdgpu_link_encoder_connector(adev_to_drm(adev));



	return true;

}
@@ -1995,7 +1995,7 @@ int amdgpu_atombios_init(struct amdgpu_device *adev) 
		return -ENOMEM;



	adev->mode_info.atom_card_info = atom_card_info;

	atom_card_info->dev = adev->ddev;

	atom_card_info->dev = adev_to_drm(adev);

	atom_card_info->reg_read = cail_reg_read;

	atom_card_info->reg_write = cail_reg_write;

	/* needed for iio ops */

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

+1 −1
Original line number Diff line number Diff line
@@ -1521,7 +1521,7 @@ amdgpu_connector_add(struct amdgpu_device *adev, 
		      struct amdgpu_hpd *hpd,

		      struct amdgpu_router *router)

{

	struct drm_device *dev = adev->ddev;

	struct drm_device *dev = adev_to_drm(adev);

	struct drm_connector *connector;

	struct drm_connector_list_iter iter;

	struct amdgpu_connector *amdgpu_connector;