[PULL] topic/core-stuff

[Daniel Vetter]

On Wed, Sep 24, 2014 at 12:24:53PM +0200, Daniel Vetter wrote:
> Hi Dave,
> 
> Just noticed that you've picked up the header rework stuff already, so
> I've rebased that out again. Otherwise just two stragglers from the vblank
> rework and the universal cursor planes locking fix. Plus sprinkling
> container_of all over fbdev emulation from Fabian.
> 
> Aside: I only have just 1 fix for drm-next atm for i915 and not terribly
> serious. So will probably only send you a pull for it when the merge
> window opens or something more serious shows up.
> 
> Cheers, Daniel
> 
> 
> The following changes since commit d743ecf360637d489a3ba81a268f574359149601:
> 
>   drm/doc: Fixup drm_irq kerneldoc includes. (2014-09-24 11:43:47 +1000)
> 
> are available in the git repository at:
> 
>   git://anongit.freedesktop.org/drm-intel tags/topic/core-stuff-2014-09-24
> 
> for you to fetch changes up to ee0d68ab5f0997a500fdf90924a58e787b216292:
> 
>   drm/udl: use container_of to resolve udl_fbdev from drm_fb_helper (2014-09-24 12:09:28 +0200)
> 
> ----------------------------------------------------------------
> Daniel Vetter (2):
>       drm: Fixup locking for universal cursor planes

Ok, this one here is bust since it introduces an inversion between the
modeset locks and fpriv->fbs_lock. Oh well. I'll try to patch this up
asap.
-Daniel

>       drm: Improve debug output for drm_wait_one_vblank
> 
> Fabian Frederick (9):
>       drm/cirrus: use container_of to resolve cirrus_fbdev from drm_fb_helper
>       drm/mgag200: use container_of to resolve mga_fbdev from drm_fb_helper
>       drm/radeon: use container_of to resolve radeon_fbdev from drm_fb_helper
>       drm/nouveau: use container_of to resolve nouveau_fbdev from drm_fb_helper
>       drm/nouveau: use container_of to resolve nouveau_plane from drm_plane
>       drm/qxl: use container_of to resolve qxl_fbdev from drm_fb_helper
>       drm/gma500: use container_of to resolve psb_fbdev from drm_fb_helper
>       drm/ast: use container_of to resolve ast_fbdev from drm_fb_helper
>       drm/udl: use container_of to resolve udl_fbdev from drm_fb_helper
> 
> Mario Kleiner (1):
>       drm: Don't update vblank timestamp when the counter didn't change
> 
>  drivers/gpu/drm/ast/ast_fb.c               |  3 +-
>  drivers/gpu/drm/cirrus/cirrus_fbdev.c      |  3 +-
>  drivers/gpu/drm/drm_crtc.c                 | 51 ++++++++++++++++++++----------
>  drivers/gpu/drm/drm_irq.c                  |  7 ++--
>  drivers/gpu/drm/gma500/framebuffer.c       |  3 +-
>  drivers/gpu/drm/mgag200/mgag200_fb.c       |  3 +-
>  drivers/gpu/drm/nouveau/dispnv04/overlay.c | 15 ++++++---
>  drivers/gpu/drm/nouveau/nouveau_fbcon.c    |  3 +-
>  drivers/gpu/drm/qxl/qxl_fb.c               |  3 +-
>  drivers/gpu/drm/radeon/radeon_fb.c         |  3 +-
>  drivers/gpu/drm/udl/udl_fb.c               |  3 +-
>  11 files changed, 65 insertions(+), 32 deletions(-)
> 
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch