From: Maarten Lankhorst Date: Mon, 1 Jun 2015 10:50:05 +0000 (+0200) Subject: drm/i915: Make intel_display_suspend atomic, v2. X-Git-Tag: omap-for-v4.3/fixes-rc1~89^2~36^2~284^2~12 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06ea0b0897db906c5616f660a34b54d92f7d09cf;p=pandora-kernel.git drm/i915: Make intel_display_suspend atomic, v2. Calculate all state using a normal transition, but afterwards fudge crtc->state->active back to its old value. This should still allow state restore in setup_hw_state to work properly. Calling intel_set_mode will cause intel_display_set_init_power to be called, make sure init_power gets set again afterwards. Changes since v1: - Fix to compile with v2 of the patch that adds intel_display_suspend. - Add intel_display_set_init_power. - Set return value to int to allow error checking. Signed-off-by: Maarten Lankhorst Reviewed-by: Matt Roper Signed-off-by: Jani Nikula --- Reading git-diff-tree failed