git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Daniel Vetter <daniel.vetter@ffwll.ch>
	Wed, 21 May 2014 09:45:40 +0000 (11:45 +0200)
committer	Daniel Vetter <daniel.vetter@ffwll.ch>
	Wed, 21 May 2014 09:45:40 +0000 (11:45 +0200)
commit	0dbfb2d5f9c9db1c0b0758b0661eef41460329bb
tree	0f88607146771ae496439a5089d7f1d4aea6594d	tree \| snapshot
parent	e85a01e0895114a57669ce8f154a4984bf43f8ad	commit \| diff
parent	ec1020eaf59107abef4f43cfbc31e9f2e3630219	commit \| diff

Merge branch 'topic/drm-vblank-rework' into drm-intel-next-queued

Pull in the drm vblank rework from Ville and me. drm core parts acked
by Dave Airlie

Conflicts:
drivers/gpu/drm/i915/intel_display.c

Just a bit of fun around the placement of drm_vblank_on. This merge
resolution has been tested in drm-intel-nightly for a while already.

Acked-by: Dave Airlie <airlied@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Linux Kernel Source Tree.

RSS Atom

drivers/gpu/drm/i915/i915_irq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_pm.c	diff1 \|	diff2 \|	blob \| history