Commit ea702333 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/amdgpu: 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
amdgpu over.

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-5-tzimmermann@suse.de
parent 7fe3f0d1

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

+12 −0
Original line number Diff line number Diff line
@@ -914,3 +914,15 @@ int amdgpu_display_crtc_idx_to_irq_type(struct amdgpu_device *adev, int crtc) 
		return AMDGPU_CRTC_IRQ_NONE;

	}

}



bool amdgpu_crtc_get_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 amdgpu_display_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos,

						  stime, etime, mode);

}

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

+0 −11
Original line number Diff line number Diff line
@@ -1367,16 +1367,6 @@ int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv) 
	return 0;

}



static bool

amdgpu_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 amdgpu_display_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos,

						  stime, etime, mode);

}



static struct drm_driver kms_driver = {

	.driver_features =

	    DRIVER_USE_AGP | DRIVER_ATOMIC |
@@ -1391,7 +1381,6 @@ static struct drm_driver kms_driver = { 
	.enable_vblank = amdgpu_enable_vblank_kms,

	.disable_vblank = amdgpu_disable_vblank_kms,

	.get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos,

	.get_scanout_position = amdgpu_get_crtc_scanout_position,

	.irq_handler = amdgpu_irq_handler,

	.ioctls = amdgpu_ioctls_kms,

	.gem_free_object_unlocked = amdgpu_gem_object_free,

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

+5 −0
Original line number Diff line number Diff line
@@ -612,6 +612,11 @@ void amdgpu_panel_mode_fixup(struct drm_encoder *encoder, 
			     struct drm_display_mode *adjusted_mode);

int amdgpu_display_crtc_idx_to_irq_type(struct amdgpu_device *adev, int crtc);



bool amdgpu_crtc_get_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);



/* fbdev layer */

int amdgpu_fbdev_init(struct amdgpu_device *adev);

void amdgpu_fbdev_fini(struct amdgpu_device *adev);

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

+1 −0
Original line number Diff line number Diff line
@@ -2685,6 +2685,7 @@ static const struct drm_crtc_helper_funcs dce_v10_0_crtc_helper_funcs = { 
	.prepare = dce_v10_0_crtc_prepare,

	.commit = dce_v10_0_crtc_commit,

	.disable = dce_v10_0_crtc_disable,

	.get_scanout_position = amdgpu_crtc_get_scanout_position,

};



static int dce_v10_0_crtc_init(struct amdgpu_device *adev, int index)

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

+1 −0
Original line number Diff line number Diff line
@@ -2793,6 +2793,7 @@ static const struct drm_crtc_helper_funcs dce_v11_0_crtc_helper_funcs = { 
	.prepare = dce_v11_0_crtc_prepare,

	.commit = dce_v11_0_crtc_commit,

	.disable = dce_v11_0_crtc_disable,

	.get_scanout_position = amdgpu_crtc_get_scanout_position,

};



static int dce_v11_0_crtc_init(struct amdgpu_device *adev, int index)

CRA Git | Maintained and supported by SUSTech CRA and CCSE