From: Maarten Lankhorst Date: Fri, 11 May 2018 16:08:10 +0000 (+0200) Subject: Merge remote-tracking branch 'drm/drm-next' into drm-misc-next X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=94cc2fde365fb4484080ea6675bb1e0c933f8002;p=linux.git Merge remote-tracking branch 'drm/drm-next' into drm-misc-next drm-misc-next is still based on v4.16-rc7, and was getting a bit stale. Signed-off-by: Maarten Lankhorst --- 94cc2fde365fb4484080ea6675bb1e0c933f8002 diff --cc drivers/gpu/drm/i915/Kconfig.debug index 8c7972df9f0fc,80efee1ff7f38..9de8b1c51a5cc --- a/drivers/gpu/drm/i915/Kconfig.debug +++ b/drivers/gpu/drm/i915/Kconfig.debug @@@ -25,7 -25,8 +25,8 @@@ config DRM_I915_DEBU select X86_MSR # used by igt/pm_rpm select DRM_VGEM # used by igt/prime_vgem (dmabuf interop checks) select DRM_DEBUG_MM if DRM=y + select STACKDEPOT if DRM=y # for DRM_DEBUG_MM - select DRM_DEBUG_MM_SELFTEST + select DRM_DEBUG_SELFTEST select SW_SYNC # signaling validation framework (igt/syncobj*) select DRM_I915_SW_FENCE_DEBUG_OBJECTS select DRM_I915_SELFTEST diff --cc drivers/gpu/drm/i915/intel_sprite.c index 344228b640b97,aa1dfaa692b9d..970015dcc6f1b --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@@ -939,7 -946,12 +940,8 @@@ intel_check_sprite_plane(struct intel_p int max_scale, min_scale; bool can_scale; int ret; + uint32_t pixel_format = 0; - *src = drm_plane_state_src(&state->base); - *dst = drm_plane_state_dest(&state->base); - if (!fb) { state->base.visible = false; return 0;