WebSVN – Kolibri OS – Diff – /drivers/video/drm/drm_irq.c

 //#include
 #include
 /* Access macro for slots in vblank timestamp ringbuffer. */
-#define vblanktimestamp(dev, crtc, count) ( \
-	(dev)->_vblank_time[(crtc) * DRM_VBLANKTIME_RBSIZE + \
+#define vblanktimestamp(dev, crtc, count) \
-	((count) % DRM_VBLANKTIME_RBSIZE)])
+	((dev)->vblank[crtc].time[(count) % DRM_VBLANKTIME_RBSIZE])
 /* Retry timestamp calculation up to 3 times to satisfy
     if (dev->irq_enabled) {
             mutex_unlock(&dev->struct_mutex);
             return -EBUSY;
     }
-    dev->irq_enabled = 1;
+	dev->irq_enabled = true;
     mutex_unlock(&dev->struct_mutex);
         return div_u64(dividend, d);
+}
-/**
- * drm_calc_timestamping_constants - Calculate and
- * store various constants which are later needed by
- * vblank and swap-completion timestamping, e.g, by
- * drm_calc_vbltimestamp_from_scanoutpos().
- * They are derived from crtc's true scanout timing,
- * so they take things like panel scaling or other
+/**
- * adjustments into account.
+ * drm_calc_timestamping_constants - Calculate vblank timestamp constants
+ *
  * @crtc drm_crtc whose timestamp constants should be updated.
+ * @mode display mode containing the scanout timings
+ *
+ * Calculate and store various constants which are later
+ * needed by vblank and swap-completion timestamping, e.g,
+ * by drm_calc_vbltimestamp_from_scanoutpos(). They are
- * @crtc drm_crtc whose timestamp constants should be updated.
+ * derived from crtc's true scanout timing, so they take
- *
+ * things like panel scaling or other adjustments into account.
+ */
- */
+void drm_calc_timestamping_constants(struct drm_crtc *crtc,
-void drm_calc_timestamping_constants(struct drm_crtc *crtc)
+				     const struct drm_display_mode *mode)
 {
+	int linedur_ns = 0, pixeldur_ns = 0, framedur_ns = 0;
-	s64 linedur_ns = 0, pixeldur_ns = 0, framedur_ns = 0;
+	int dotclock = mode->crtc_clock;
-	u64 dotclock;
+	/* Valid dotclock? */
+	if (dotclock > 0) {
-	/* Dot clock in Hz: */
+		int frame_size = mode->crtc_htotal * mode->crtc_vtotal;
-	dotclock = (u64) crtc->hwmode.clock * 1000;
+		/*
+		 * Convert scanline length in pixels and video
-	/* Fields of interlaced scanout modes are only halve a frame duration.
+		 * dot clock to line duration, frame duration
+		 * and pixel duration in nanoseconds:
-	 * Double the dotclock to get halve the frame-/line-/pixelduration.
-	 */
-	if (crtc->hwmode.flags & DRM_MODE_FLAG_INTERLACE)
+	 */
-		dotclock *= 2;
+		pixeldur_ns = 1000000 / dotclock;
-	/* Valid dotclock? */
-	if (dotclock > 0) {
+		linedur_ns  = div_u64((u64) mode->crtc_htotal * 1000000, dotclock);
-		int frame_size;
-		/* Convert scanline length in pixels and video dot clock to
-		 * line duration, frame duration and pixel duration in
-		 * nanoseconds:
+		framedur_ns = div_u64((u64) frame_size * 1000000, dotclock);
-		 */
-		pixeldur_ns = (s64) div64_u64(1000000000, dotclock);
-		linedur_ns  = (s64) div64_u64(((u64) crtc->hwmode.crtc_htotal *
-					      1000000000), dotclock);
+		/*
-		frame_size = crtc->hwmode.crtc_htotal *
+		 * Fields of interlaced scanout modes are only half a frame duration.
-				crtc->hwmode.crtc_vtotal;
+		 */
-		framedur_ns = (s64) div64_u64((u64) frame_size * 1000000000,
+		if (mode->flags & DRM_MODE_FLAG_INTERLACE)
-					      dotclock);
+			framedur_ns /= 2;
 	} else
 		DRM_ERROR("crtc %d: 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;
 	DRM_DEBUG("crtc %d: hwmode: htotal %d, vtotal %d, vdisplay %d\n",
-		  crtc->base.id, crtc->hwmode.crtc_htotal,
+		  crtc->base.id, mode->crtc_htotal,
-		  crtc->hwmode.crtc_vtotal, crtc->hwmode.crtc_vdisplay);
+		  mode->crtc_vtotal, mode->crtc_vdisplay);
  * @vblank_time: Pointer to struct timeval which should receive the timestamp.
  * @flags: Flags to pass to driver:
  *         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:
+ *
  * -EINVAL   - Invalid crtc.
  */
 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 vbl_status;
 	int vpos, hpos, i;
-	s64 framedur_ns, linedur_ns, pixeldur_ns, delta_ns, duration_ns;
+	int framedur_ns, linedur_ns, pixeldur_ns, delta_ns, duration_ns;
 	bool invbl;
 	if (crtc < 0 || crtc >= dev->num_crtcs) {
 		DRM_ERROR("Invalid crtc %d\n", crtc);
 	if (!dev->driver->get_scanout_position) {
 		DRM_ERROR("Called from driver w/o get_scanout_position()!?\n");
 		return -EIO;
+	}
-	mode = &refcrtc->hwmode;
-	vtotal = mode->crtc_vtotal;
-	vdisplay = mode->crtc_vdisplay;
 	/* Durations of frames, lines, pixels in nanoseconds. */
 	framedur_ns = refcrtc->framedur_ns;
 	linedur_ns  = refcrtc->linedur_ns;
 	pixeldur_ns = refcrtc->pixeldur_ns;
 	/* If mode timing undefined, just return as no-op:
 	 * Happens during initial modesetting of a crtc.
 	 */
-	if (vtotal <= 0 || vdisplay <= 0 || framedur_ns == 0) {
+	if (framedur_ns == 0) {
 		DRM_DEBUG("crtc %d: Noop due to uninitialized mode.\n", crtc);
 		return -EAGAIN;
      * were enabled/disabled around or between these calls, we just
      * have the kernel take a reference on the CRTC (just once though
      * to avoid corrupting the count if multiple, mismatch calls occur),
      * so that interrupts remain enabled in the interim.
      */
-    if (!dev->vblank_inmodeset[crtc]) {
+	if (!dev->vblank[crtc].inmodeset) {
-        dev->vblank_inmodeset[crtc] = 0x1;
+		dev->vblank[crtc].inmodeset = 0x1;
         if (drm_vblank_get(dev, crtc) == 0)
-            dev->vblank_inmodeset[crtc] |= 0x2;
+			dev->vblank[crtc].inmodeset |= 0x2;
+    }
 #endif
+}
 EXPORT_SYMBOL(drm_vblank_pre_modeset);
 	/* vblank is not initialized (IRQ not installed ?), or has been freed */
 	if (!dev->num_crtcs)
 		return;
-    if (dev->vblank_inmodeset[crtc]) {
+	if (dev->vblank[crtc].inmodeset) {
         spin_lock_irqsave(&dev->vbl_lock, irqflags);
-        dev->vblank_disable_allowed = 1;
+		dev->vblank_disable_allowed = true;
         spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
-        if (dev->vblank_inmodeset[crtc] & 0x2)
+		if (dev->vblank[crtc].inmodeset & 0x2)
             drm_vblank_put(dev, crtc);
-        dev->vblank_inmodeset[crtc] = 0;
+		dev->vblank[crtc].inmodeset = 0;

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/drm_irq.c – Rev 4539 → 4560