aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2017-05-09 10:03:26 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2017-05-10 04:21:17 -0400
commit3fcdcb270936ae69a069bab4c52ebd9fde594669 (patch)
treea827669d62e21004a280fe63050430715dc58597 /drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
parentd673c02c4bdbcbe3076a2680f9c954be26b525c8 (diff)
drm/vblank: Switch to bool in_vblank_irq in get_vblank_timestamp
It's overkill to have a flag parameter which is essentially used just as a boolean. This takes care of core + adjusting drivers. Adjusting the scanout position callback is a bit harder, since radeon also supplies it's own driver-private flags in there. v2: Fixup misplaced hunks (Neil). v3: kbuild says v1 was better ... Cc: Mario Kleiner <mario.kleiner@tuebingen.mpg.de> Cc: Eric Anholt <eric@anholt.net> Cc: Rob Clark <robdclark@gmail.com> Cc: linux-arm-msm@vger.kernel.org Cc: freedreno@lists.freedesktop.org Cc: Alex Deucher <alexander.deucher@amd.com> Cc: Christian König <christian.koenig@amd.com> Cc: Ben Skeggs <bskeggs@redhat.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Neil Armstrong <narmstrong@baylibre.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170509140329.24114-2-daniel.vetter@ffwll.ch
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index a1b97809305e..babd969a63d1 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -941,7 +941,7 @@ void amdgpu_disable_vblank_kms(struct drm_device *dev, unsigned int pipe)
941 * @crtc: crtc to get the timestamp for 941 * @crtc: crtc to get the timestamp for
942 * @max_error: max error 942 * @max_error: max error
943 * @vblank_time: time value 943 * @vblank_time: time value
944 * @flags: flags passed to the driver 944 * @in_vblank_irq: called from drm_handle_vblank()
945 * 945 *
946 * Gets the timestamp on the requested crtc based on the 946 * Gets the timestamp on the requested crtc based on the
947 * scanout position. (all asics). 947 * scanout position. (all asics).
@@ -950,7 +950,7 @@ void amdgpu_disable_vblank_kms(struct drm_device *dev, unsigned int pipe)
950bool amdgpu_get_vblank_timestamp_kms(struct drm_device *dev, unsigned int pipe, 950bool amdgpu_get_vblank_timestamp_kms(struct drm_device *dev, unsigned int pipe,
951 int *max_error, 951 int *max_error,
952 struct timeval *vblank_time, 952 struct timeval *vblank_time,
953 unsigned flags) 953 bool in_vblank_irq)
954{ 954{
955 struct drm_crtc *crtc; 955 struct drm_crtc *crtc;
956 struct amdgpu_device *adev = dev->dev_private; 956 struct amdgpu_device *adev = dev->dev_private;
@@ -971,7 +971,7 @@ bool amdgpu_get_vblank_timestamp_kms(struct drm_device *dev, unsigned int pipe,
971 971
972 /* Helper routine in DRM core does all the work: */ 972 /* Helper routine in DRM core does all the work: */
973 return drm_calc_vbltimestamp_from_scanoutpos(dev, pipe, max_error, 973 return drm_calc_vbltimestamp_from_scanoutpos(dev, pipe, max_error,
974 vblank_time, flags, 974 vblank_time, in_vblank_irq,
975 &crtc->hwmode); 975 &crtc->hwmode);
976} 976}
977 977