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

drm/amdgpu: Convert to CRTC VBLANK callbacks 



VBLANK callbacks in struct drm_driver are deprecated in favor of
their equivalents in struct drm_crtc_funcs. Convert amdgpu over.

v2:
	* don't wrap existing functions; change signature instead

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-6-tzimmermann@suse.de
parent ea702333

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

+3 −3
Original line number Diff line number Diff line
@@ -1194,9 +1194,9 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev, 
int amdgpu_device_ip_suspend(struct amdgpu_device *adev);

int amdgpu_device_suspend(struct drm_device *dev, bool fbcon);

int amdgpu_device_resume(struct drm_device *dev, bool fbcon);

u32 amdgpu_get_vblank_counter_kms(struct drm_device *dev, unsigned int pipe);

int amdgpu_enable_vblank_kms(struct drm_device *dev, unsigned int pipe);

void amdgpu_disable_vblank_kms(struct drm_device *dev, unsigned int pipe);

u32 amdgpu_get_vblank_counter_kms(struct drm_crtc *crtc);

int amdgpu_enable_vblank_kms(struct drm_crtc *crtc);

void amdgpu_disable_vblank_kms(struct drm_crtc *crtc);

long amdgpu_kms_compat_ioctl(struct file *filp, unsigned int cmd,

			     unsigned long arg);

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

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static void amdgpu_display_flip_work_func(struct work_struct *__work) 
	     & (DRM_SCANOUTPOS_VALID | DRM_SCANOUTPOS_IN_VBLANK)) ==

	    (DRM_SCANOUTPOS_VALID | DRM_SCANOUTPOS_IN_VBLANK) &&

	    (int)(work->target_vblank -

		  amdgpu_get_vblank_counter_kms(adev->ddev, amdgpu_crtc->crtc_id)) > 0) {

		  amdgpu_get_vblank_counter_kms(crtc)) > 0) {

		schedule_delayed_work(&work->flip_work, usecs_to_jiffies(1000));

		return;

	}
@@ -219,7 +219,7 @@ int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc, 
	if (!adev->enable_virtual_display)

		work->base = amdgpu_bo_gpu_offset(new_abo);

	work->target_vblank = target - (uint32_t)drm_crtc_vblank_count(crtc) +

		amdgpu_get_vblank_counter_kms(dev, work->crtc_id);

		amdgpu_get_vblank_counter_kms(crtc);



	/* we borrow the event spin lock for protecting flip_wrok */

	spin_lock_irqsave(&crtc->dev->event_lock, flags);

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

+0 −4
Original line number Diff line number Diff line
@@ -1377,10 +1377,6 @@ static struct drm_driver kms_driver = { 
	.postclose = amdgpu_driver_postclose_kms,

	.lastclose = amdgpu_driver_lastclose_kms,

	.unload = amdgpu_driver_unload_kms,

	.get_vblank_counter = amdgpu_get_vblank_counter_kms,

	.enable_vblank = amdgpu_enable_vblank_kms,

	.disable_vblank = amdgpu_disable_vblank_kms,

	.get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos,

	.irq_handler = amdgpu_irq_handler,

	.ioctls = amdgpu_ioctls_kms,

	.gem_free_object_unlocked = amdgpu_gem_object_free,

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

+12 −9
Original line number Diff line number Diff line
@@ -1110,14 +1110,15 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev, 
/**

 * amdgpu_get_vblank_counter_kms - get frame count

 *

 * @dev: drm dev pointer

 * @pipe: crtc to get the frame count from

 * @crtc: crtc to get the frame count from

 *

 * Gets the frame count on the requested crtc (all asics).

 * Returns frame count on success, -EINVAL on failure.

 */

u32 amdgpu_get_vblank_counter_kms(struct drm_device *dev, unsigned int pipe)

u32 amdgpu_get_vblank_counter_kms(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	unsigned int pipe = crtc->index;

	struct amdgpu_device *adev = dev->dev_private;

	int vpos, hpos, stat;

	u32 count;
@@ -1177,14 +1178,15 @@ u32 amdgpu_get_vblank_counter_kms(struct drm_device *dev, unsigned int pipe) 
/**

 * amdgpu_enable_vblank_kms - enable vblank interrupt

 *

 * @dev: drm dev pointer

 * @pipe: crtc to enable vblank interrupt for

 * @crtc: crtc to enable vblank interrupt for

 *

 * Enable the interrupt on the requested crtc (all asics).

 * Returns 0 on success, -EINVAL on failure.

 */

int amdgpu_enable_vblank_kms(struct drm_device *dev, unsigned int pipe)

int amdgpu_enable_vblank_kms(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	unsigned int pipe = crtc->index;

	struct amdgpu_device *adev = dev->dev_private;

	int idx = amdgpu_display_crtc_idx_to_irq_type(adev, pipe);
@@ -1194,13 +1196,14 @@ int amdgpu_enable_vblank_kms(struct drm_device *dev, unsigned int pipe) 
/**

 * amdgpu_disable_vblank_kms - disable vblank interrupt

 *

 * @dev: drm dev pointer

 * @pipe: crtc to disable vblank interrupt for

 * @crtc: crtc to disable vblank interrupt for

 *

 * Disable the interrupt on the requested crtc (all asics).

 */

void amdgpu_disable_vblank_kms(struct drm_device *dev, unsigned int pipe)

void amdgpu_disable_vblank_kms(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	unsigned int pipe = crtc->index;

	struct amdgpu_device *adev = dev->dev_private;

	int idx = amdgpu_display_crtc_idx_to_irq_type(adev, pipe);

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

+4 −0
Original line number Diff line number Diff line
@@ -2494,6 +2494,10 @@ static const struct drm_crtc_funcs dce_v10_0_crtc_funcs = { 
	.set_config = amdgpu_display_crtc_set_config,

	.destroy = dce_v10_0_crtc_destroy,

	.page_flip_target = amdgpu_display_crtc_page_flip_target,

	.get_vblank_counter = amdgpu_get_vblank_counter_kms,

	.enable_vblank = amdgpu_enable_vblank_kms,

	.disable_vblank = amdgpu_disable_vblank_kms,

	.get_vblank_timestamp = drm_crtc_vblank_helper_get_vblank_timestamp,

};



static void dce_v10_0_crtc_dpms(struct drm_crtc *crtc, int mode)

CRA Git | Maintained and supported by SUSTech CRA and CCSE