[git pull] drm fixes

[Michel Dänzer]

On Don, 2011-03-24 at 21:06 +1000, Dave Airlie wrote: 
> 2011/3/23 Michel Dänzer <michel at daenzer.net>:
> > On Mit, 2011-03-23 at 06:40 -0500, Ilija Hadzic wrote:
> >> On Wed, 23 Mar 2011, Dave Airlie wrote:
> >>
> >> > 2011/3/23 Michel Dänzer <michel at daenzer.net>:
> >> >> On Mit, 2011-03-23 at 18:16 +1000, Dave Airlie wrote:
> >> >>> 2011/3/23 Michel Dänzer <michel at daenzer.net>:
> >> >>>> On Mit, 2011-03-23 at 04:18 +0000, Dave Airlie wrote:
> >> >>>>>
> >> >>>>> One radeon, 2 core fixes, and an interface update to allow for > 2 crtcs
> >> >>>>> in vblank.
> >> >>>>
> >> >>>> [...]
> >> >>>>
> >> >>>>> Ilija Hadzic (1):
> >> >>>>>       drm/kernel: vblank wait on crtc > 1
> >> >>>>
> >> >>>> This patch was still being debated yesterday, are you deliberately
> >> >>>> pushing it regardless? Once it hits mainline, it'll be pretty much set
> >> >>>> in stone.
> >> >>>
> >> >>> From what I can see it was the userspace patches being debated, this
> >> >>> one seemed fine and the interface looked okay to me.
> >> >>
> >> >> The author ignored my suggestions to make the patch smaller and simpler,
> >> >> more maintainable and more future-proof all at once.
> >> >
> >> > It was already small and I'm not sure merging the flags made it more
> >> > maintainable. Its always
> >> > being a slightly painful ioctl, and hopefully any future changes add a
> >> > new ioctl esp if we want 64-bit values.
> >> >
> >> > The only comment I really thought was necessary was changing the CAP
> >> > name, but since that isn't
> >> > part of the ABI (just the number) we can quickly fix it with a follow-up.
> >> >
> >> > Dave.
> >>
> >> All of the issues debated yesterday, except one, boil down to renaming a
> >> handful on #defines without changing the values nor interface nor behavior
> >> of the kernel.
> >
> > No, one central point is not to leave two holes between
> > _DRM_VBLANK_FLAGS_MASK, _DRM_VBLANK_HIGH_CRTC_MASK and
> > _DRM_VBLANK_TYPES_MASK .
> 
> Okay I've pushed this to my tree before this discussion got on my
> radar and I'm just catching up now.
> 
> I'll push the following patch to Linus to keep the biggest gap in the
> 32-bit word for future use, then we can fixup the userspace patches.

As we discussed on IRC, I'd personally go further, but this is
definitely an improvement and fixes the worst problems. Thanks Dave.

Reviewed-by: Michel Dänzer <michel at daenzer.net>


-- 
Earthling Michel Dänzer           |                http://www.vmware.com
Libre software enthusiast         |          Debian, X and DRI developer