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

Commit eba1f35d authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm: Move timestamping constants into drm_vblank_crtc 



Collect the timestamping constants alongside the rest of the relevant
stuff under drm_vblank_crtc.

We can now get rid of the 'refcrtc' parameter to
drm_calc_vbltimestamp_from_scanoutpos().

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 94284037

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

+1 −1
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ int amdgpu_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->hwmode);

						     &drmcrtc->hwmode);

}



const struct drm_ioctl_desc amdgpu_ioctls_kms[] = {

drivers/gpu/drm/drm_irq.c

+8 −8
Original line number Diff line number Diff line
@@ -603,6 +603,7 @@ int drm_control(struct drm_device *dev, void *data, 
void drm_calc_timestamping_constants(struct drm_crtc *crtc,

				     const struct drm_display_mode *mode)

{

	struct drm_vblank_crtc *vblank = &crtc->dev->vblank[drm_crtc_index(crtc)];

	int linedur_ns = 0, pixeldur_ns = 0, framedur_ns = 0;

	int dotclock = mode->crtc_clock;
@@ -628,9 +629,9 @@ void drm_calc_timestamping_constants(struct drm_crtc *crtc, 
		DRM_ERROR("crtc %u: Can't calculate constants, dotclock = 0!\n",

			  crtc->base.id);



	crtc->pixeldur_ns = pixeldur_ns;

	crtc->linedur_ns  = linedur_ns;

	crtc->framedur_ns = framedur_ns;

	vblank->pixeldur_ns = pixeldur_ns;

	vblank->linedur_ns  = linedur_ns;

	vblank->framedur_ns = framedur_ns;



	DRM_DEBUG("crtc %u: hwmode: htotal %d, vtotal %d, vdisplay %d\n",

		  crtc->base.id, mode->crtc_htotal,
@@ -651,7 +652,6 @@ EXPORT_SYMBOL(drm_calc_timestamping_constants); 
 * @flags: Flags to pass to driver:

 *         0 = Default,

 *         DRM_CALLED_FROM_VBLIRQ = If function is called from vbl IRQ handler

 * @refcrtc: CRTC which defines scanout timing

 * @mode: mode which defines the scanout timings

 *

 * Implements calculation of exact vblank timestamps from given drm_display_mode
@@ -692,9 +692,9 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, 
					  int *max_error,

					  struct timeval *vblank_time,

					  unsigned flags,

					  const struct drm_crtc *refcrtc,

					  const struct drm_display_mode *mode)

{

	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];

	struct timeval tv_etime;

	ktime_t stime, etime;

	int vbl_status;
@@ -714,9 +714,9 @@ int drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, 
	}



	/* Durations of frames, lines, pixels in nanoseconds. */

	framedur_ns = refcrtc->framedur_ns;

	linedur_ns  = refcrtc->linedur_ns;

	pixeldur_ns = refcrtc->pixeldur_ns;

	framedur_ns = vblank->framedur_ns;

	linedur_ns  = vblank->linedur_ns;

	pixeldur_ns = vblank->pixeldur_ns;



	/* If mode timing undefined, just return as no-op:

	 * Happens during initial modesetting of a crtc.

drivers/gpu/drm/i915/i915_irq.c

+0 −1
Original line number Diff line number Diff line
@@ -810,7 +810,6 @@ 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->hwmode);

}

drivers/gpu/drm/nouveau/nouveau_display.c

+3 −2
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ nouveau_display_scanoutpos_head(struct drm_crtc *crtc, int *vpos, int *hpos, 
		.base.head = nouveau_crtc(crtc)->index,

	};

	struct nouveau_display *disp = nouveau_display(crtc->dev);

	struct drm_vblank_crtc *vblank = &crtc->dev->vblank[drm_crtc_index(crtc)];

	int ret, retry = 1;



	do {
@@ -116,7 +117,7 @@ nouveau_display_scanoutpos_head(struct drm_crtc *crtc, int *vpos, int *hpos, 
			break;

		}



		if (retry) ndelay(crtc->linedur_ns);

		if (retry) ndelay(vblank->linedur_ns);

	} while (retry--);



	*hpos = args.scan.hline;
@@ -155,7 +156,7 @@ nouveau_display_vblstamp(struct drm_device *dev, int head, int *max_error, 
	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {

		if (nouveau_crtc(crtc)->index == head) {

			return drm_calc_vbltimestamp_from_scanoutpos(dev,

					head, max_error, time, flags, crtc,

					head, max_error, time, flags,

					&crtc->hwmode);

		}

	}

drivers/gpu/drm/radeon/radeon_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -841,7 +841,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->hwmode);

						     &drmcrtc->hwmode);

}



#define KMS_INVALID_IOCTL(name)						\