Commit fb1b5e1d authored by Wu Hoi Pok's avatar Wu Hoi Pok Committed by Alex Deucher
Browse files

drm/radeon: change rdev->ddev to rdev_to_drm(rdev) 



This patch changes the way "drm_device" is accessed. It uses "rdev_to_drm(rdev)"
instead of accessing the struct member directly.

Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Tested-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarWu Hoi Pok <wuhoipok@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a6e23bec

drivers/gpu/drm/radeon/atombios_encoders.c

+1 −1
Original line number Diff line number Diff line
@@ -2179,7 +2179,7 @@ int radeon_atom_pick_dig_encoder(struct drm_encoder *encoder, int fe_idx) 
void

radeon_atom_encoder_init(struct radeon_device *rdev)

{

	struct drm_device *dev = rdev->ddev;

	struct drm_device *dev = rdev_to_drm(rdev);

	struct drm_encoder *encoder;



	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {

drivers/gpu/drm/radeon/cik.c

+7 −7
Original line number Diff line number Diff line
@@ -7585,7 +7585,7 @@ int cik_irq_process(struct radeon_device *rdev) 
					DRM_DEBUG("IH: IH event w/o asserted irq bit?\n");



				if (rdev->irq.crtc_vblank_int[0]) {

					drm_handle_vblank(rdev->ddev, 0);

					drm_handle_vblank(rdev_to_drm(rdev), 0);

					rdev->pm.vblank_sync = true;

					wake_up(&rdev->irq.vblank_queue);

				}
@@ -7615,7 +7615,7 @@ int cik_irq_process(struct radeon_device *rdev) 
					DRM_DEBUG("IH: IH event w/o asserted irq bit?\n");



				if (rdev->irq.crtc_vblank_int[1]) {

					drm_handle_vblank(rdev->ddev, 1);

					drm_handle_vblank(rdev_to_drm(rdev), 1);

					rdev->pm.vblank_sync = true;

					wake_up(&rdev->irq.vblank_queue);

				}
@@ -7645,7 +7645,7 @@ int cik_irq_process(struct radeon_device *rdev) 
					DRM_DEBUG("IH: IH event w/o asserted irq bit?\n");



				if (rdev->irq.crtc_vblank_int[2]) {

					drm_handle_vblank(rdev->ddev, 2);

					drm_handle_vblank(rdev_to_drm(rdev), 2);

					rdev->pm.vblank_sync = true;

					wake_up(&rdev->irq.vblank_queue);

				}
@@ -7675,7 +7675,7 @@ int cik_irq_process(struct radeon_device *rdev) 
					DRM_DEBUG("IH: IH event w/o asserted irq bit?\n");



				if (rdev->irq.crtc_vblank_int[3]) {

					drm_handle_vblank(rdev->ddev, 3);

					drm_handle_vblank(rdev_to_drm(rdev), 3);

					rdev->pm.vblank_sync = true;

					wake_up(&rdev->irq.vblank_queue);

				}
@@ -7705,7 +7705,7 @@ int cik_irq_process(struct radeon_device *rdev) 
					DRM_DEBUG("IH: IH event w/o asserted irq bit?\n");



				if (rdev->irq.crtc_vblank_int[4]) {

					drm_handle_vblank(rdev->ddev, 4);

					drm_handle_vblank(rdev_to_drm(rdev), 4);

					rdev->pm.vblank_sync = true;

					wake_up(&rdev->irq.vblank_queue);

				}
@@ -7735,7 +7735,7 @@ int cik_irq_process(struct radeon_device *rdev) 
					DRM_DEBUG("IH: IH event w/o asserted irq bit?\n");



				if (rdev->irq.crtc_vblank_int[5]) {

					drm_handle_vblank(rdev->ddev, 5);

					drm_handle_vblank(rdev_to_drm(rdev), 5);

					rdev->pm.vblank_sync = true;

					wake_up(&rdev->irq.vblank_queue);

				}
@@ -8581,7 +8581,7 @@ int cik_init(struct radeon_device *rdev) 
	/* Initialize surface registers */

	radeon_surface_init(rdev);

	/* Initialize clocks */

	radeon_get_clock_info(rdev->ddev);

	radeon_get_clock_info(rdev_to_drm(rdev));



	/* Fence driver */

	radeon_fence_driver_init(rdev);

drivers/gpu/drm/radeon/dce6_afmt.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ struct r600_audio_pin *dce6_audio_get_pin(struct radeon_device *rdev) 
			pin = &rdev->audio.pin[i];

			pin_count = 0;



			list_for_each_entry(encoder, &rdev->ddev->mode_config.encoder_list, head) {

			list_for_each_entry(encoder, &rdev_to_drm(rdev)->mode_config.encoder_list, head) {

				if (radeon_encoder_is_digital(encoder)) {

					radeon_encoder = to_radeon_encoder(encoder);

					dig = radeon_encoder->enc_priv;

drivers/gpu/drm/radeon/evergreen.c

+6 −6
Original line number Diff line number Diff line
@@ -1673,7 +1673,7 @@ void evergreen_pm_misc(struct radeon_device *rdev) 
 */

void evergreen_pm_prepare(struct radeon_device *rdev)

{

	struct drm_device *ddev = rdev->ddev;

	struct drm_device *ddev = rdev_to_drm(rdev);

	struct drm_crtc *crtc;

	struct radeon_crtc *radeon_crtc;

	u32 tmp;
@@ -1698,7 +1698,7 @@ void evergreen_pm_prepare(struct radeon_device *rdev) 
 */

void evergreen_pm_finish(struct radeon_device *rdev)

{

	struct drm_device *ddev = rdev->ddev;

	struct drm_device *ddev = rdev_to_drm(rdev);

	struct drm_crtc *crtc;

	struct radeon_crtc *radeon_crtc;

	u32 tmp;
@@ -1763,7 +1763,7 @@ void evergreen_hpd_set_polarity(struct radeon_device *rdev, 
 */

void evergreen_hpd_init(struct radeon_device *rdev)

{

	struct drm_device *dev = rdev->ddev;

	struct drm_device *dev = rdev_to_drm(rdev);

	struct drm_connector *connector;

	unsigned enabled = 0;

	u32 tmp = DC_HPDx_CONNECTION_TIMER(0x9c4) |
@@ -1804,7 +1804,7 @@ void evergreen_hpd_init(struct radeon_device *rdev) 
 */

void evergreen_hpd_fini(struct radeon_device *rdev)

{

	struct drm_device *dev = rdev->ddev;

	struct drm_device *dev = rdev_to_drm(rdev);

	struct drm_connector *connector;

	unsigned disabled = 0;
@@ -4753,7 +4753,7 @@ int evergreen_irq_process(struct radeon_device *rdev) 
				event_name = "vblank";



				if (rdev->irq.crtc_vblank_int[crtc_idx]) {

					drm_handle_vblank(rdev->ddev, crtc_idx);

					drm_handle_vblank(rdev_to_drm(rdev), crtc_idx);

					rdev->pm.vblank_sync = true;

					wake_up(&rdev->irq.vblank_queue);

				}
@@ -5211,7 +5211,7 @@ int evergreen_init(struct radeon_device *rdev) 
	/* Initialize surface registers */

	radeon_surface_init(rdev);

	/* Initialize clocks */

	radeon_get_clock_info(rdev->ddev);

	radeon_get_clock_info(rdev_to_drm(rdev));

	/* Fence driver */

	radeon_fence_driver_init(rdev);

	/* initialize AGP */

drivers/gpu/drm/radeon/ni.c

+1 −1
Original line number Diff line number Diff line
@@ -2360,7 +2360,7 @@ int cayman_init(struct radeon_device *rdev) 
	/* Initialize surface registers */

	radeon_surface_init(rdev);

	/* Initialize clocks */

	radeon_get_clock_info(rdev->ddev);

	radeon_get_clock_info(rdev_to_drm(rdev));

	/* Fence driver */

	radeon_fence_driver_init(rdev);

	/* initialize memory controller */