From: Daniel Vetter Date: Wed, 9 Apr 2014 12:33:47 +0000 (+0200) Subject: Merge remote-tracking branch 'airlied/drm-next' into HEAD X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8cbf3202098f191f8b0a0606b2df0af047f21fe5;p=linux-beck.git Merge remote-tracking branch 'airlied/drm-next' into HEAD Backmerge drm-next after the big s/crtc->fb/crtc->primary->fb/ cocinelle patch to avoid endless amounts of conflict hilarity in my -next queue for 3.16. Signed-off-by: Daniel Vetter --- 8cbf3202098f191f8b0a0606b2df0af047f21fe5 diff --cc drivers/gpu/drm/i915/i915_cmd_parser.c index be09e7cd5afb,4cf6d020d513..29184d6c0027 --- a/drivers/gpu/drm/i915/i915_cmd_parser.c +++ b/drivers/gpu/drm/i915/i915_cmd_parser.c @@@ -906,10 -402,10 +906,10 @@@ int i915_parse_cmds(struct intel_ring_b length = ((*cmd & desc->length.mask) + LENGTH_BIAS); if ((batch_end - cmd) < length) { - DRM_DEBUG_DRIVER("CMD: Command length exceeds batch length: 0x%08X length=%d batchlen=%td\n", + DRM_DEBUG_DRIVER("CMD: Command length exceeds batch length: 0x%08X length=%u batchlen=%td\n", *cmd, length, - batch_end - cmd); + (unsigned long)(batch_end - cmd)); ret = -EINVAL; break; } diff --cc drivers/gpu/drm/i915/i915_drv.c index a01faea0401c,82f4d1f47d3b..5d8250f7145d --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@@ -924,13 -945,17 +982,17 @@@ static int intel_runtime_resume(struct static const struct dev_pm_ops i915_pm_ops = { .suspend = i915_pm_suspend, + .suspend_late = i915_pm_suspend_late, + .resume_early = i915_pm_resume_early, .resume = i915_pm_resume, .freeze = i915_pm_freeze, + .thaw_early = i915_pm_thaw_early, .thaw = i915_pm_thaw, .poweroff = i915_pm_poweroff, + .restore_early = i915_pm_resume_early, .restore = i915_pm_resume, - .runtime_suspend = i915_runtime_suspend, - .runtime_resume = i915_runtime_resume, + .runtime_suspend = intel_runtime_suspend, + .runtime_resume = intel_runtime_resume, }; static const struct vm_operations_struct i915_gem_vm_ops = {