projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4fa62c8 c5ab3bc)
Merge branch 'topic/drm-vblank-rework' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 21 May 2014 09:45:40 +0000 (11:45 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 21 May 2014 09:45:40 +0000 (11:45 +0200)
commitd40d91876a58979374e39722399ee93e870a44c9
tree0f88607146771ae496439a5089d7f1d4aea6594dtree | snapshot (tar.gz zip)
parent4fa62c890cea83f28c30e1d5dc8fc86f61210280commit | diff
parentc5ab3bc07e252a32b170ab4797142ef117c367a0commit | 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>
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