Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200123135943.24140-11-tzimmermann@suse.de

+22 -12
+1
drivers/gpu/drm/radeon/atombios_crtc.c
··· 2232 2232 .prepare = atombios_crtc_prepare, 2233 2233 .commit = atombios_crtc_commit, 2234 2234 .disable = atombios_crtc_disable, 2235 + .get_scanout_position = radeon_get_crtc_scanout_position, 2235 2236 }; 2236 2237 2237 2238 void radeon_atombios_init_crtc(struct drm_device *dev,
+13
drivers/gpu/drm/radeon/radeon_display.c
··· 1978 1978 1979 1979 return ret; 1980 1980 } 1981 + 1982 + bool 1983 + radeon_get_crtc_scanout_position(struct drm_crtc *crtc, 1984 + bool in_vblank_irq, int *vpos, int *hpos, 1985 + ktime_t *stime, ktime_t *etime, 1986 + const struct drm_display_mode *mode) 1987 + { 1988 + struct drm_device *dev = crtc->dev; 1989 + unsigned int pipe = crtc->index; 1990 + 1991 + return radeon_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos, 1992 + stime, etime, mode); 1993 + }
-11
drivers/gpu/drm/radeon/radeon_drv.c
··· 563 563 #endif 564 564 }; 565 565 566 - static bool 567 - radeon_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe, 568 - bool in_vblank_irq, int *vpos, int *hpos, 569 - ktime_t *stime, ktime_t *etime, 570 - const struct drm_display_mode *mode) 571 - { 572 - return radeon_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos, 573 - stime, etime, mode); 574 - } 575 - 576 566 static struct drm_driver kms_driver = { 577 567 .driver_features = 578 568 DRIVER_USE_AGP | DRIVER_GEM | DRIVER_RENDER, ··· 575 585 .enable_vblank = radeon_enable_vblank_kms, 576 586 .disable_vblank = radeon_disable_vblank_kms, 577 587 .get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos, 578 - .get_scanout_position = radeon_get_crtc_scanout_position, 579 588 .irq_preinstall = radeon_driver_irq_preinstall_kms, 580 589 .irq_postinstall = radeon_driver_irq_postinstall_kms, 581 590 .irq_uninstall = radeon_driver_irq_uninstall_kms,
+2 -1
drivers/gpu/drm/radeon/radeon_legacy_crtc.c
··· 1111 1111 .mode_set_base_atomic = radeon_crtc_set_base_atomic, 1112 1112 .prepare = radeon_crtc_prepare, 1113 1113 .commit = radeon_crtc_commit, 1114 - .disable = radeon_crtc_disable 1114 + .disable = radeon_crtc_disable, 1115 + .get_scanout_position = radeon_get_crtc_scanout_position, 1115 1116 }; 1116 1117 1117 1118
+6
drivers/gpu/drm/radeon/radeon_mode.h
··· 881 881 ktime_t *stime, ktime_t *etime, 882 882 const struct drm_display_mode *mode); 883 883 884 + extern bool 885 + radeon_get_crtc_scanout_position(struct drm_crtc *crtc, bool in_vblank_irq, 886 + int *vpos, int *hpos, 887 + ktime_t *stime, ktime_t *etime, 888 + const struct drm_display_mode *mode); 889 + 884 890 extern bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev); 885 891 extern struct edid * 886 892 radeon_bios_get_hardcoded_edid(struct radeon_device *rdev);