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

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

drm: Pass the display mode to drm_calc_vbltimestamp_from_scanoutpos() 



Rather than using crtc->hwmode, just pass the relevant mode to
drm_calc_vbltimestamp_from_scanoutpos(). This removes the last hwmode
usage from core drm.

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

drivers/gpu/drm/drm_irq.c

+3 −3
Original line number Diff line number Diff line
@@ -522,6 +522,7 @@ EXPORT_SYMBOL(drm_calc_timestamping_constants); 
 *         0 = Default.

 *         DRM_CALLED_FROM_VBLIRQ = If function is called from vbl irq handler.

 * @refcrtc: drm_crtc* of crtc which defines scanout timing.

 * @mode: mode which defines the scanout timings

 *

 * Returns negative value on error, failure or if not supported in current

 * video mode:
@@ -541,11 +542,11 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc, 
					  int *max_error,

					  struct timeval *vblank_time,

					  unsigned flags,

					  struct drm_crtc *refcrtc)

					  const struct drm_crtc *refcrtc,

					  const struct drm_display_mode *mode)

{

	ktime_t stime, etime, mono_time_offset;

	struct timeval tv_etime;

	struct drm_display_mode *mode;

	int vbl_status, vtotal, vdisplay;

	int vpos, hpos, i;

	s64 framedur_ns, linedur_ns, pixeldur_ns, delta_ns, duration_ns;
@@ -562,7 +563,6 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, int crtc, 
		return -EIO;

	}



	mode = &refcrtc->hwmode;

	vtotal = mode->crtc_vtotal;

	vdisplay = mode->crtc_vdisplay;

drivers/gpu/drm/i915/i915_irq.c

+2 −1
Original line number Diff line number Diff line
@@ -809,7 +809,8 @@ static int i915_get_vblank_timestamp(struct drm_device *dev, int pipe, 
	/* Helper routine in DRM core does all the work: */

	return drm_calc_vbltimestamp_from_scanoutpos(dev, pipe, max_error,

						     vblank_time, flags,

						     crtc);

						     crtc,

						     &to_intel_crtc(crtc)->config.adjusted_mode);

}



static bool intel_hpd_irq_event(struct drm_device *dev,

drivers/gpu/drm/radeon/radeon_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -712,7 +712,7 @@ int radeon_get_vblank_timestamp_kms(struct drm_device *dev, int crtc, 
	/* Helper routine in DRM core does all the work: */

	return drm_calc_vbltimestamp_from_scanoutpos(dev, crtc, max_error,

						     vblank_time, flags,

						     drmcrtc);

						     drmcrtc, &drmcrtc->hwmode);

}



#define KMS_INVALID_IOCTL(name)						\

include/drm/drmP.h

+2 −1
Original line number Diff line number Diff line
@@ -1401,7 +1401,8 @@ extern int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, 
						 int crtc, int *max_error,

						 struct timeval *vblank_time,

						 unsigned flags,

						 struct drm_crtc *refcrtc);

						 const struct drm_crtc *refcrtc,

						 const struct drm_display_mode *mode);

extern void drm_calc_timestamping_constants(struct drm_crtc *crtc,

					    const struct drm_display_mode *mode);