Re: drm: Branch 'vblank-rework'

2008-01-24 Thread Jesse Barnes
On Wednesday, January 23, 2008 8:28 am Jesse Barnes wrote: On Wednesday, January 23, 2008 4:29 am Michel Dänzer wrote: On Tue, 2008-01-22 at 15:17 -0800, Jesse Barnes wrote: @@ -378,6 +380,15 @@ u32 i915_get_vblank_counter(struct drm_device *dev, int plane) count = (high1 8) |

Re: drm: Branch 'vblank-rework'

2008-01-23 Thread Michel Dänzer
On Tue, 2008-01-22 at 15:17 -0800, Jesse Barnes wrote: @@ -378,6 +380,15 @@ u32 i915_get_vblank_counter(struct drm_device *dev, int plane) count = (high1 8) | low; + /* + * If we're in the middle of the vblank period, the + * above regs won't have been updated

Re: drm: Branch 'vblank-rework'

2008-01-23 Thread Jesse Barnes
On Wednesday, January 23, 2008 4:29 am Michel Dänzer wrote: On Tue, 2008-01-22 at 15:17 -0800, Jesse Barnes wrote: @@ -378,6 +380,15 @@ u32 i915_get_vblank_counter(struct drm_device *dev, int plane) count = (high1 8) | low; + /* +* If we're in the middle of the vblank

Re: drm: Branch 'vblank-rework' - 2 commits

2007-06-27 Thread Michel Dänzer
On Mon, 2007-06-25 at 20:19 -0700, Jesse Barnes wrote: On Monday, June 25, 2007 12:44:16 pm Jesse Barnes wrote: IIRC my test app hung indefinitely. Main loop was something like: while (i++) { /* Wait for vsync */ if (waitforsync)

Re: drm: Branch 'vblank-rework' - 2 commits

2007-06-27 Thread Jesse Barnes
On Wednesday, June 27, 2007 2:55:39 am Michel Dänzer wrote: Ok, I retested without the if (!IS_965) ... code in place, which was working for you. On my box, I get a hard hang when I run the attached test program, or any other gl program. I tried the clutter examples (clutter also uses the

Re: drm: Branch 'vblank-rework' - 2 commits

2007-06-27 Thread Michel Dänzer
On Wed, 2007-06-27 at 08:14 -0700, Jesse Barnes wrote: On Wednesday, June 27, 2007 2:55:39 am Michel Dänzer wrote: Ok, I retested without the if (!IS_965) ... code in place, which was working for you. On my box, I get a hard hang when I run the attached test program, or any other gl

Re: drm: Branch 'vblank-rework' - 2 commits

2007-06-25 Thread Michel Dänzer
On Fri, 2007-06-22 at 11:13 -0700, Jesse Barnes wrote: New commits: diff-tree 7f2a1cf2753c0c97b1290469a15322f7549f78ae (from parents) Merge: d2d53024fb4003a6b86a3ea1ea33c76ac20bebc9 97dcd7fd25c18d5148619254229f8d94efb55b44 Author: Jesse Barnes [EMAIL PROTECTED] Date: Fri Jun 22

Re: drm: Branch 'vblank-rework' - 2 commits

2007-06-25 Thread Jesse Barnes
On Monday, June 25, 2007 4:00:01 am Michel Dänzer wrote: On Fri, 2007-06-22 at 11:13 -0700, Jesse Barnes wrote: New commits: diff-tree 7f2a1cf2753c0c97b1290469a15322f7549f78ae (from parents) Merge: d2d53024fb4003a6b86a3ea1ea33c76ac20bebc9 97dcd7fd25c18d5148619254229f8d94efb55b44 Author:

Re: drm: Branch 'vblank-rework' - 2 commits

2007-06-25 Thread Michel Dänzer
On Mon, 2007-06-25 at 08:43 -0700, Jesse Barnes wrote: On Monday, June 25, 2007 4:00:01 am Michel Dänzer wrote: On Fri, 2007-06-22 at 11:13 -0700, Jesse Barnes wrote: diff-tree 97dcd7fd25c18d5148619254229f8d94efb55b44 (from 2d24455ed8b12df6d06d135cb70f02473d11f4b0) Author: Jesse Barnes

Re: drm: Branch 'vblank-rework' - 2 commits

2007-06-25 Thread Jesse Barnes
On Monday, June 25, 2007 11:46:59 Michel Dänzer wrote: On Mon, 2007-06-25 at 08:43 -0700, Jesse Barnes wrote: On Monday, June 25, 2007 4:00:01 am Michel Dänzer wrote: On Fri, 2007-06-22 at 11:13 -0700, Jesse Barnes wrote: diff-tree 97dcd7fd25c18d5148619254229f8d94efb55b44 (from

Re: drm: Branch 'vblank-rework' - 2 commits

2007-06-25 Thread Jesse Barnes
On Monday, June 25, 2007 12:44:16 Jesse Barnes wrote: On Monday, June 25, 2007 11:46:59 Michel Dänzer wrote: On Mon, 2007-06-25 at 08:43 -0700, Jesse Barnes wrote: On Monday, June 25, 2007 4:00:01 am Michel Dänzer wrote: On Fri, 2007-06-22 at 11:13 -0700, Jesse Barnes wrote:

Re: drm: Branch 'vblank-rework' - 2 commits

2007-06-25 Thread Jesse Barnes
On Monday, June 25, 2007 12:44:16 pm Jesse Barnes wrote: On Monday, June 25, 2007 11:46:59 Michel Dänzer wrote: On Mon, 2007-06-25 at 08:43 -0700, Jesse Barnes wrote: On Monday, June 25, 2007 4:00:01 am Michel Dänzer wrote: On Fri, 2007-06-22 at 11:13 -0700, Jesse Barnes wrote:

Re: drm: Branch 'vblank-rework'

2007-06-15 Thread Michel Dänzer
On Thu, 2007-06-14 at 11:37 -0700, Jesse Barnes wrote: Ok, I updated the branch with most of your suggestions. I think the ioctl still needs work (just made it a u64 for now), Yeah, that (first member 32 bit, second 64 bit) is exactly the same as radeon setparam so not 32/64 safe (64 bit

Re: drm: Branch 'vblank-rework'

2007-06-15 Thread Jesse Barnes
On Friday, June 15, 2007 4:15:57 Michel Dänzer wrote: On Thu, 2007-06-14 at 11:37 -0700, Jesse Barnes wrote: Ok, I updated the branch with most of your suggestions. I think the ioctl still needs work (just made it a u64 for now), Yeah, that (first member 32 bit, second 64 bit) is exactly

Re: drm: Branch 'vblank-rework'

2007-06-15 Thread Michel Dänzer
On Fri, 2007-06-15 at 09:27 -0700, Jesse Barnes wrote: On Friday, June 15, 2007 4:15:57 Michel Dänzer wrote: On Thu, 2007-06-14 at 11:37 -0700, Jesse Barnes wrote: Ok, I updated the branch with most of your suggestions. I think the ioctl still needs work (just made it a u64 for now),

Re: drm: Branch 'vblank-rework'

2007-06-14 Thread Michel Dänzer
On Wed, 2007-06-13 at 14:26 -0700, Jesse Barnes wrote: On Wednesday, June 13, 2007 12:24:05 Michel Dänzer wrote: On Tue, 2007-06-12 at 13:37 -0700, Jesse Barnes wrote: +typedef struct drm_modeset_ctl { + drm_modeset_ctl_cmd_t cmd; + unsigned long arg; +} drm_modeset_ctl_t;

Re: drm: Branch 'vblank-rework'

2007-06-14 Thread Jesse Barnes
On Thursday, June 14, 2007 12:40:46 Michel Dänzer wrote: On Wed, 2007-06-13 at 14:26 -0700, Jesse Barnes wrote: On Wednesday, June 13, 2007 12:24:05 Michel Dänzer wrote: On Tue, 2007-06-12 at 13:37 -0700, Jesse Barnes wrote: +typedef struct drm_modeset_ctl { +

Re: drm: Branch 'vblank-rework'

2007-06-14 Thread Jesse Barnes
Ok, I updated the branch with most of your suggestions. I think the ioctl still needs work (just made it a u64 for now), since at the very least we'll need to add the new one Keith suggested to handle CRTC reconfiguration. Please take a look and I'll test some more. I also added some

Re: drm: Branch 'vblank-rework'

2007-06-13 Thread Michel Dänzer
On Tue, 2007-06-12 at 13:37 -0700, Jesse Barnes wrote: diff --git a/linux-core/drm_irq.c b/linux-core/drm_irq.c index f229f77..8125b75 100644 --- a/linux-core/drm_irq.c +++ b/linux-core/drm_irq.c @@ -77,6 +77,70 @@ int drm_irq_by_busid(struct inode *inode return 0; } +int

Re: drm: Branch 'vblank-rework'

2007-06-13 Thread Jesse Barnes
On Wednesday, June 13, 2007 12:24:05 Michel Dänzer wrote: On Tue, 2007-06-12 at 13:37 -0700, Jesse Barnes wrote: diff --git a/linux-core/drm_irq.c b/linux-core/drm_irq.c index f229f77..8125b75 100644 --- a/linux-core/drm_irq.c +++ b/linux-core/drm_irq.c @@ -77,6 +77,70 @@ int

Re: drm: Branch 'vblank-rework'

2007-06-13 Thread Jesse Barnes
+ if (temp VSYNC_PIPEA_FLAG) + atomic_add(i915_get_vblank_counter(dev, 0), +dev-vblank_count[0]); + if (temp VSYNC_PIPEB_FLAG) + atomic_add(i915_get_vblank_counter(dev, 1), +dev-vblank_count[1]); I think atomic_add is