aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_runtime_pm.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2016-10-28 03:14:08 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-10-28 03:14:08 -0400
commit96583ddbec291929880edefa2141c06c63e16aa5 (patch)
tree6ae6bd3aec381d7461a687e3314bdf949798c554 /drivers/gpu/drm/i915/intel_runtime_pm.c
parent1353ec3833360ffab479d17781493ead1d38a006 (diff)
parentfb422950c6cd726fd36eb72a7cf84583440a18a2 (diff)
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge latest drm-next to pull in the s/fence/dma_fence/ rework, needed before we merge more i915 fencing patches. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_runtime_pm.c')
0 files changed, 0 insertions, 0 deletions