Commit 27b4118d authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/radeon: Convert to struct drm_crtc_helper_funcs.get_scanout_position() 



The callback struct drm_driver.get_scanout_position() is deprecated in
favor of struct drm_crtc_helper_funcs.get_scanout_position(). Convert
radeon over.

v4:
	* 80-character line fixes

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200123135943.24140-11-tzimmermann@suse.de
parent 91640a71

drivers/gpu/drm/radeon/atombios_crtc.c

+1 −0
Original line number Diff line number Diff line
@@ -2232,6 +2232,7 @@ static const struct drm_crtc_helper_funcs atombios_helper_funcs = { 
	.prepare = atombios_crtc_prepare,

	.commit = atombios_crtc_commit,

	.disable = atombios_crtc_disable,

	.get_scanout_position = radeon_get_crtc_scanout_position,

};



void radeon_atombios_init_crtc(struct drm_device *dev,

drivers/gpu/drm/radeon/radeon_display.c

+13 −0
Original line number Diff line number Diff line
@@ -1978,3 +1978,16 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe, 


	return ret;

}



bool

radeon_get_crtc_scanout_position(struct drm_crtc *crtc,

				 bool in_vblank_irq, int *vpos, int *hpos,

				 ktime_t *stime, ktime_t *etime,

				 const struct drm_display_mode *mode)

{

	struct drm_device *dev = crtc->dev;

	unsigned int pipe = crtc->index;



	return radeon_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos,

					  stime, etime, mode);

}

drivers/gpu/drm/radeon/radeon_drv.c

+0 −11
Original line number Diff line number Diff line
@@ -563,16 +563,6 @@ static const struct file_operations radeon_driver_kms_fops = { 
#endif

};



static bool

radeon_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe,

				 bool in_vblank_irq, int *vpos, int *hpos,

				 ktime_t *stime, ktime_t *etime,

				 const struct drm_display_mode *mode)

{

	return radeon_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos,

					  stime, etime, mode);

}



static struct drm_driver kms_driver = {

	.driver_features =

	    DRIVER_USE_AGP | DRIVER_GEM | DRIVER_RENDER,
@@ -585,7 +575,6 @@ static struct drm_driver kms_driver = { 
	.enable_vblank = radeon_enable_vblank_kms,

	.disable_vblank = radeon_disable_vblank_kms,

	.get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos,

	.get_scanout_position = radeon_get_crtc_scanout_position,

	.irq_preinstall = radeon_driver_irq_preinstall_kms,

	.irq_postinstall = radeon_driver_irq_postinstall_kms,

	.irq_uninstall = radeon_driver_irq_uninstall_kms,

drivers/gpu/drm/radeon/radeon_legacy_crtc.c

+2 −1
Original line number Diff line number Diff line
@@ -1111,7 +1111,8 @@ static const struct drm_crtc_helper_funcs legacy_helper_funcs = { 
	.mode_set_base_atomic = radeon_crtc_set_base_atomic,

	.prepare = radeon_crtc_prepare,

	.commit = radeon_crtc_commit,

	.disable = radeon_crtc_disable

	.disable = radeon_crtc_disable,

	.get_scanout_position = radeon_get_crtc_scanout_position,

};

drivers/gpu/drm/radeon/radeon_mode.h

+6 −0
Original line number Diff line number Diff line
@@ -881,6 +881,12 @@ extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe, 
				      ktime_t *stime, ktime_t *etime,

				      const struct drm_display_mode *mode);



extern bool

radeon_get_crtc_scanout_position(struct drm_crtc *crtc, bool in_vblank_irq,

				 int *vpos, int *hpos,

				 ktime_t *stime, ktime_t *etime,

				 const struct drm_display_mode *mode);



extern bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev);

extern struct edid *

radeon_bios_get_hardcoded_edid(struct radeon_device *rdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE