From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PULL] topic/core-stuff Date: Wed, 24 Sep 2014 12:24:53 +0200 Message-ID: <20140924102453.GA6184@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) by gabe.freedesktop.org (Postfix) with ESMTP id D12C46E51C for ; Wed, 24 Sep 2014 03:26:14 -0700 (PDT) Received: by mail-wi0-f180.google.com with SMTP id q5so6919868wiv.7 for ; Wed, 24 Sep 2014 03:26:14 -0700 (PDT) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Dave Airlie Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org 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 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