Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abca9e45 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm: Pass 'flags' from the caller to .get_scanout_position() 



Preparation for moving the early vblank IRQ logic into
radeon_get_crtc_scanoutpos().

v2: Fix radeon_drv.c compile warning (Mario)

Reviewed-by: default avatar <mario.kleiner.de@gmail.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
parent c0ae24c1

drivers/gpu/drm/drm_irq.c

+1 −1
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc, 
		 * Get vertical and horizontal scanout position vpos, hpos,

		 * and bounding timestamps stime, etime, pre/post query.

		 */

		vbl_status = dev->driver->get_scanout_position(dev, crtc, &vpos,

		vbl_status = dev->driver->get_scanout_position(dev, crtc, flags, &vpos,

							       &hpos, &stime, &etime);



		/*

drivers/gpu/drm/i915/i915_irq.c

+2 −1
Original line number Diff line number Diff line
@@ -675,7 +675,8 @@ static bool intel_pipe_in_vblank_locked(struct drm_device *dev, enum pipe pipe) 
}



static int i915_get_crtc_scanoutpos(struct drm_device *dev, int pipe,

			     int *vpos, int *hpos, ktime_t *stime, ktime_t *etime)

				    unsigned int flags, int *vpos, int *hpos,

				    ktime_t *stime, ktime_t *etime)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];

drivers/gpu/drm/radeon/radeon_display.c

+4 −3
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id) 
	 * to complete in this vblank?

	 */

	if (update_pending &&

	    (DRM_SCANOUTPOS_VALID & radeon_get_crtc_scanoutpos(rdev->ddev, crtc_id,

	    (DRM_SCANOUTPOS_VALID & radeon_get_crtc_scanoutpos(rdev->ddev, crtc_id, 0,

							       &vpos, &hpos, NULL, NULL)) &&

	    ((vpos >= (99 * rdev->mode_info.crtcs[crtc_id]->base.hwmode.crtc_vdisplay)/100) ||

	     (vpos < 0 && !ASIC_IS_AVIVO(rdev)))) {
@@ -1610,6 +1610,7 @@ bool radeon_crtc_scaling_mode_fixup(struct drm_crtc *crtc, 
 *

 * \param dev Device to query.

 * \param crtc Crtc to query.

 * \param flags Flags from caller (DRM_CALLED_FROM_VBLIRQ or 0).

 * \param *vpos Location where vertical scanout position should be stored.

 * \param *hpos Location where horizontal scanout position should go.

 * \param *stime Target location for timestamp taken immediately before
@@ -1631,8 +1632,8 @@ bool radeon_crtc_scaling_mode_fixup(struct drm_crtc *crtc, 
 * unknown small number of scanlines wrt. real scanout position.

 *

 */

int radeon_get_crtc_scanoutpos(struct drm_device *dev, int crtc, int *vpos, int *hpos,

			       ktime_t *stime, ktime_t *etime)

int radeon_get_crtc_scanoutpos(struct drm_device *dev, int crtc, unsigned int flags,

			       int *vpos, int *hpos, ktime_t *stime, ktime_t *etime)

{

	u32 stat_crtc = 0, vbl = 0, position = 0;

	int vbl_start, vbl_end, vtotal, ret = 0;

drivers/gpu/drm/radeon/radeon_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ int radeon_gem_object_open(struct drm_gem_object *obj, 
void radeon_gem_object_close(struct drm_gem_object *obj,

				struct drm_file *file_priv);

extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, int crtc,

				      unsigned int flags,

				      int *vpos, int *hpos, ktime_t *stime,

				      ktime_t *etime);

extern const struct drm_ioctl_desc radeon_ioctls_kms[];

drivers/gpu/drm/radeon/radeon_mode.h

+1 −0
Original line number Diff line number Diff line
@@ -800,6 +800,7 @@ extern int radeon_crtc_cursor_move(struct drm_crtc *crtc, 
				   int x, int y);



extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, int crtc,

				      unsigned int flags,

				      int *vpos, int *hpos, ktime_t *stime,

				      ktime_t *etime);