VDR Portal

Source code

Jul 12 14:08:03 vdrclient_mediapc 2008-07-12_5
Jul 12 14:08:03 vdrclient_mediapc vdr: [8014] vsync.vbl_since.tv_usec: 7279
Jul 12 14:08:03 vdrclient_mediapc vdr: [8014] vsync.vbl_now.tv_usec: 253663
Jul 12 14:08:03 vdrclient_mediapc vdr: [8014] vsync.vbl_trim: 200
Jul 12 14:08:03 vdrclient_mediapc 2008-07-12_5
Jul 12 14:08:03 vdrclient_mediapc vdr: [8014] vsync.vbl_since.tv_usec: 12493
Jul 12 14:08:03 vdrclient_mediapc vdr: [8014] vsync.vbl_now.tv_usec: 298869
Jul 12 14:08:03 vdrclient_mediapc vdr: [8014] vsync.vbl_trim: 200
Jul 12 14:08:03 vdrclient_mediapc 2008-07-12_5
Jul 12 14:08:03 vdrclient_mediapc vdr: [8014] vsync.vbl_since.tv_usec: 6744
Jul 12 14:08:03 vdrclient_mediapc vdr: [8014] vsync.vbl_now.tv_usec: 333109
Jul 12 14:08:03 vdrclient_mediapc vdr: [8014] vsync.vbl_trim: 0
Jul 12 14:08:03 vdrclient_mediapc 2008-07-12_5
Jul 12 14:08:03 vdrclient_mediapc vdr: [8014] vsync.vbl_since.tv_usec: 4750
Jul 12 14:08:03 vdrclient_mediapc vdr: [8014] vsync.vbl_now.tv_usec: 371113
Jul 12 14:08:03 vdrclient_mediapc vdr: [8014] vsync.vbl_trim: 200

Source code

nt cXvVideoOut::PutXvImage(XvImage *xv_image,
int edge_width, int edge_height) {

#ifdef SYNC_FIELDS

static int fd;
static drm_radeon_vsync_t vsync;
int errno;

if (!fd && (fd = drmOpen("radeon", 0)) < 0) {
esyslog("drmOpen: %sn", strerror(errno));
}

if (ioctl(fd, DRM_IOCTL_RADEON_VSYNC, &vsync)) {
esyslog("DRM_IOCTL_RADEON_VSYNC: %sn", strerror(errno));
}


/*
* here we continously monitor and correct placement of xine-lib's
* xv_display_frame() call in relation to vertical blanking intervals (VBI)
* of graphics card.
*
* to achieve a maximum amount of immunity against jitter
* we always center the call to xv_display_frame() in the middle
* of 2 consecutive VBIs.
*
* there are no special hysteresis requirements:
* we even can choose another vbl_trim value each adjacent call
*
* theory of operation:
*
* - a vbl_trim value of 0 yields in a slower graphics card frame rate
*
* - thus increasing the time between 2 VBIs
*
* - as a result from xv_display_frame()-call point of view the
* time distance to the last VBI decreases
*
* - dependend on value of vsync.vbl_since.tv_usec (the elapsed
* time since last VBI) we decide whether to increase
* or to decrease graphics cards framerate.
*
* - illustration of how VBI of graphics card wander into
* the center of xines xv_display_frame() calls, if graphics card framerate
* is a little slower than xine's call to xv_display_frame()
*
* xine reference clock (calls to xv_display_frame())
* ______ ________ ________ ________
* |________| |________| |________| |_______
* ^ ^
* | |
* graphics card clock (VBLANK edges): |
* _______| _________ _________| ________
* |_________| |_________| |_________| |__
* | |
* out of center centered
* | |
* | <--- edge drifts into the middle ---> |
* | of xine reference clock phase |
*
*
*/

esyslog("vsync.vbl_since.tv_usec: %d", vsync.vbl_since.tv_usec);
esyslog("vsync.vbl_now.tv_usec: %d", vsync.vbl_now.tv_usec);
esyslog("vsync.vbl_trim: %d", vsync.vbl_trim);
/*
* RGB PAL is 50Hz and cycle duration of 20000us
* i.e. 10000us tip the balance
*/

if (vsync.vbl_since.tv_usec < 10000) {
vsync.vbl_trim = MAX_DRIFT_TRIM;
} else {
vsync.vbl_trim = 0;
}

#endif

// if (useShm)
// return XvShmPutImage(dpy, port,
// win, gc,
// xv_image,
// sxoff+edge_width, syoff+edge_height, /* sx, sy */
// swidth, sheight, /* sw, sh */
// lxoff, lyoff, /* dx, dy */
// lwidth, lheight, /* dw, dh */
// False);
// else
return XvPutImage(dpy, port,
win, gc,
xv_image,
sxoff+edge_width, syoff+edge_height, /* sx, sy */
swidth, sheight, /* sw, sh */
lxoff, lyoff, /* dx, dy */
lwidth, lheight /* dw, dh */
);
};

Source code

diff -rupN orig/linux-2.6.25/drivers/char/drm/radeon_drm.h patch/linux-2.6.25/drivers/char/drm/radeon_drm.h
--- orig/linux-2.6.25/drivers/char/drm/radeon_drm.h 2008-04-17 04:49:44.000000000 +0200
+++ patch/linux-2.6.25/drivers/char/drm/radeon_drm.h 2008-07-10 10:43:15.000000000 +0200
@@ -485,6 +485,7 @@ typedef struct {
#define DRM_RADEON_SETPARAM 0x19
#define DRM_RADEON_SURF_ALLOC 0x1a
#define DRM_RADEON_SURF_FREE 0x1b
+#define DRM_RADEON_VSYNC 0x1c

#define DRM_IOCTL_RADEON_CP_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_INIT, drm_radeon_init_t)
#define DRM_IOCTL_RADEON_CP_START DRM_IO( DRM_COMMAND_BASE + DRM_RADEON_CP_START)
@@ -513,6 +514,7 @@ typedef struct {
#define DRM_IOCTL_RADEON_SETPARAM DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SETPARAM, drm_radeon_setparam_t)
#define DRM_IOCTL_RADEON_SURF_ALLOC DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_ALLOC, drm_radeon_surface_alloc_t)
#define DRM_IOCTL_RADEON_SURF_FREE DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_FREE, drm_radeon_surface_free_t)
+#define DRM_IOCTL_RADEON_VSYNC DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_VSYNC, drm_radeon_vsync_t)

typedef struct drm_radeon_init {
enum {
@@ -735,6 +737,14 @@ typedef struct drm_radeon_surface_free {
unsigned int address;
} drm_radeon_surface_free_t;

+typedef struct drm_radeon_vsync {
+ struct timeval vbl_now; /* time when this ioctl() has been called */
+ struct timeval vbl_since; /* time since last vertical blank */
+ unsigned vbl_received; /* continously counting blanking intervals */
+ unsigned vbl_trim; /* graphics card frame rate adjust */
+} drm_radeon_vsync_t;
+
+#define MAX_DRIFT_TRIM 200
#define DRM_RADEON_VBLANK_CRTC1 1
#define DRM_RADEON_VBLANK_CRTC2 2

diff -rupN orig/linux-2.6.25/drivers/char/drm/radeon_drv.h patch/linux-2.6.25/drivers/char/drm/radeon_drv.h
--- orig/linux-2.6.25/drivers/char/drm/radeon_drv.h 2008-04-17 04:49:44.000000000 +0200
+++ patch/linux-2.6.25/drivers/char/drm/radeon_drv.h 2008-07-10 10:44:10.000000000 +0200
@@ -307,6 +307,10 @@ typedef struct drm_radeon_private {
/* starting from here on, data is preserved accross an open */
uint32_t flags; /* see radeon_chip_flags */
unsigned long fb_aper_offset;
+
+ /* field sync circuitry */
+ struct timeval vbl_last;
+ u32 trim;
} drm_radeon_private_t;

typedef struct drm_radeon_buf_priv {
diff -rupN orig/linux-2.6.25/drivers/char/drm/radeon_irq.c patch/linux-2.6.25/drivers/char/drm/radeon_irq.c
--- orig/linux-2.6.25/drivers/char/drm/radeon_irq.c 2008-04-17 04:49:44.000000000 +0200
+++ patch/linux-2.6.25/drivers/char/drm/radeon_irq.c 2008-07-10 10:47:28.000000000 +0200
@@ -62,6 +62,8 @@ static __inline__ u32 radeon_acknowledge
* tied to dma at all, this is just a hangover from dri prehistory.
*/

+#define RADEON_CRTC_H_TOTAL_DISP 0x0200
+
irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS)
{
struct drm_device *dev = (struct drm_device *) arg;
@@ -102,8 +104,24 @@ irqreturn_t radeon_driver_irq_handler(DR
(vblank_crtc & DRM_RADEON_VBLANK_CRTC2)))
atomic_inc(&dev->vbl_received);

+ do_gettimeofday(&dev_priv->vbl_last);
+
DRM_WAKEUP(&dev->vbl_queue);
drm_vbl_send_signals(dev);
+
+ /*
+ * if issued we inject a few horizontal lines
+ * with modified length to trim frame rate as needed.
+ *
+ * don't try this at home:-)
+ */
+ if (dev_priv->trim) {
+ udelay(200);
+ RADEON_WRITE(RADEON_CRTC_H_TOTAL_DISP, 0x00590068);
+ udelay(dev_priv->trim);
+ RADEON_WRITE(RADEON_CRTC_H_TOTAL_DISP, 0x0059006e);
+ }
+
}

return IRQ_HANDLED;
diff -rupN orig/linux-2.6.25/drivers/char/drm/radeon_state.c patch/linux-2.6.25/drivers/char/drm/radeon_state.c
--- orig/linux-2.6.25/drivers/char/drm/radeon_state.c 2008-04-17 04:49:44.000000000 +0200
+++ patch/linux-2.6.25/drivers/char/drm/radeon_state.c 2008-07-10 11:45:11.000000000 +0200
@@ -2099,6 +2099,42 @@ static int radeon_surface_free(struct dr
return 0;
}

+static int radeon_vsync(struct drm_device *dev, void *data, struct drm_file *file_priv)
+{
+ drm_radeon_private_t *dev_priv = dev->dev_private;
+ struct drm_radeon_vsync *t = data;
+ drm_radeon_vsync_t vsync;
+
+ printk(KERN_INFO "2008-07-12_5n" );
+
+/**
+ if (DRM_COPY_FROM_USER(&vsync, (drm_radeon_vsync_t __user *)data, sizeof(vsync))) {
+ DRM_ERROR("copy_from_usern");
+ return -EFAULT;
+ }
+*/
+ memcpy(&vsync,t,sizeof(vsync));
+
+ if (vsync.vbl_trim != ~0) {
+ if (vsync.vbl_trim > MAX_DRIFT_TRIM) {
+ printk(KERN_DEBUG "[drm] clipped radeon drift trim to max of %dn", MAX_DRIFT_TRIM);
+ vsync.vbl_trim = MAX_DRIFT_TRIM;
+ }
+ if (dev_priv->trim != vsync.vbl_trim) {
+// printk(KERN_DEBUG "[drm] changed radeon drift trim from %d -> %dn", dev_priv->trim, vsync.vbl_trim);
+ dev_priv->trim = vsync.vbl_trim;
+ }
+ }
+ do_gettimeofday(&vsync.vbl_now);
+ if (vsync.vbl_now.tv_usec < dev_priv->vbl_last.tv_usec) {
+ vsync.vbl_since.tv_sec = vsync.vbl_now.tv_sec - dev_priv->vbl_last.tv_sec - 1;
+ vsync.vbl_since.tv_usec = vsync.vbl_now.tv_usec - dev_priv->vbl_last.tv_usec + 1000000;
+ } else {
+ vsync.vbl_since.tv_sec = vsync.vbl_now.tv_sec - dev_priv->vbl_last.tv_sec;
+ vsync.vbl_since.tv_usec = vsync.vbl_now.tv_usec - dev_priv->vbl_last.tv_usec;
+ }
+ vsync.vbl_received = atomic_read(&dev->vbl_received);
+
+/**
+ if (DRM_COPY_TO_USER((drm_radeon_vsync_t __user *)data, &vsync, sizeof(vsync))) {
+ DRM_ERROR("copy_to_usern");
+ return -EFAULT;
+ } else {
+ return 0;
+ }
+*/
+ memcpy(t,&vsync,sizeof(vsync));
+
+ return 0;
+}
+
static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *file_priv)
{
drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -3186,7 +3222,8 @@ struct drm_ioctl_desc radeon_ioctls[] =
DRM_IOCTL_DEF(DRM_RADEON_IRQ_WAIT, radeon_irq_wait, DRM_AUTH),
DRM_IOCTL_DEF(DRM_RADEON_SETPARAM, radeon_cp_setparam, DRM_AUTH),
DRM_IOCTL_DEF(DRM_RADEON_SURF_ALLOC, radeon_surface_alloc, DRM_AUTH),
- DRM_IOCTL_DEF(DRM_RADEON_SURF_FREE, radeon_surface_free, DRM_AUTH)
+ DRM_IOCTL_DEF(DRM_RADEON_SURF_FREE, radeon_surface_free, DRM_AUTH),
+ DRM_IOCTL_DEF(DRM_RADEON_VSYNC, radeon_vsync, DRM_AUTH),
};

int radeon_max_ioctl = DRM_ARRAY_SIZE(radeon_ioctls);

Source code

Jul 13 12:36:40 vdrclient_mediapc [drm] changed radeon drift trim from 0 -> 200
Jul 13 12:36:40 vdrclient_mediapc [drm] changed radeon drift trim from 200 -> 0
Jul 13 12:36:41 vdrclient_mediapc [drm] changed radeon drift trim from 0 -> 200
Jul 13 12:36:41 vdrclient_mediapc [drm] changed radeon drift trim from 200 -> 0
Jul 13 12:36:42 vdrclient_mediapc [drm] changed radeon drift trim from 0 -> 200
Jul 13 12:36:42 vdrclient_mediapc [drm] changed radeon drift trim from 200 -> 0
Jul 13 12:36:47 vdrclient_mediapc [drm] changed radeon drift trim from 0 -> 200
Jul 13 12:36:47 vdrclient_mediapc [drm] changed radeon drift trim from 200 -> 0
Jul 13 12:36:50 vdrclient_mediapc [drm] changed radeon drift trim from 0 -> 200
Jul 13 12:36:50 vdrclient_mediapc [drm] changed radeon drift trim from 200 -> 0
Jul 13 12:36:51 vdrclient_mediapc [drm] changed radeon drift trim from 0 -> 200
Jul 13 12:36:51 vdrclient_mediapc [drm] changed radeon drift trim from 200 -> 0
Jul 13 12:36:53 vdrclient_mediapc [drm] changed radeon drift trim from 0 -> 200
Jul 13 12:36:53 vdrclient_mediapc [drm] changed radeon drift trim from 200 -> 0
Jul 13 12:36:55 vdrclient_mediapc [drm] changed radeon drift trim from 0 -> 200
Jul 13 12:36:55 vdrclient_mediapc [drm] changed radeon drift trim from 200 -> 0
Jul 13 12:36:56 vdrclient_mediapc [drm] changed radeon drift trim from 0 -> 200
Jul 13 12:36:56 vdrclient_mediapc [drm] changed radeon drift trim from 200 -> 0
Jul 13 12:36:57 vdrclient_mediapc [drm] changed radeon drift trim from 0 -> 200
Jul 13 12:36:57 vdrclient_mediapc [drm] changed radeon drift trim from 200 -> 0
Jul 13 12:36:58 vdrclient_mediapc [drm] changed radeon drift trim from 0 -> 200
Jul 13 12:36:58 vdrclient_mediapc [drm] changed radeon drift trim from 200 -> 0

Source code

Modeline "720x576i"   13.875 720  744  808  888  576  580  585  625 interlace composite