From: Matt Roper Date: Thu, 29 May 2014 15:06:53 +0000 (-0700) Subject: drm/i915: don't force full modeset if primary plane is disabled (v2) X-Git-Tag: omap-for-v3.17/fixes-against-rc2~125^2~63^2~76 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b150f08e5013297729627a222e410284832effe;p=pandora-kernel.git drm/i915: don't force full modeset if primary plane is disabled (v2) In a future patch, we'll allow the primary plane to be disabled by userspace via the universal plane API. If a modeset is requested while the primary plane is disabled, crtc->primary->fb will be NULL which generally triggers a full modeset (except in fastboot situations). If we detect that the crtc is active, but there's no primary plane fb, we should still allow a simple plane update rather than a full modeset if the mode isn't actually changing (after re-enabling the primary plane of course). v2: - Enable plane after set_base to avoid enabling the plane if set_base fails, and to make flip+enable atomic (suggested by Ville) - Drop BUG to WARN if we somehow enter the 'fb_changed' modeset case with the crtc disabled (suggested by Ville) Reviewed-by: Chon Ming Lee Signed-off-by: Matt Roper Signed-off-by: Daniel Vetter --- Reading git-diff-tree failed