On Fri, 3 May 2013 19:44:07 +0200
Egbert Eich <eich at suse.de> wrote:
> From: Imre Deak <imre.deak at intel.com>
>
> Currently the driver's assumed behavior for a modeset with an attached
> FB is that the corresponding connector will be switched to DPMS ON mode
> if it happened to be in DPMS OFF (or another power save mode). This
> wasn't enforced though if only the FB changed, everything else (format,
> connector etc.) remaining the same. In this case we only set the new FB
> base and left the connector in the old power save mode.
>
> Fix this by forcing a full modeset whenever there is an attached FB and
> any affected connector is in a power save mode.
>
> V_2: Run the test for encoders in power save mode outside the the
> test for fb change: user space may have just disabled the encoders
> but left everything else in place. Make sure the connector list is
> not empty before running this test.
>
> Signed-off-by: Imre Deak <imre.deak at intel.com>
> Signed-off-by: Egbert Eich <eich at suse.de>
> ---
> drivers/gpu/drm/i915/intel_display.c | 24 ++++++++++++++++++++++--
> 1 file changed, 22 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 2939524..992d469 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -8380,6 +8380,21 @@ static void intel_set_config_restore_state(struct drm_device *dev,
> }
> }
>
> +static bool
> +connector_off(struct drm_crtc *crtc, struct drm_connector *connectors,
> + int num_connectors)
> +{
> + int i;
> +
> + for (i = 0; i < num_connectors; i++)
> + if (connectors[i].encoder &&
> + connectors[i].encoder->crtc == crtc &&
> + connectors[i].dpms != DRM_MODE_DPMS_ON)
> + return true;
> +
> + return false;
> +}
> +
> static void
> intel_set_config_compute_mode_changes(struct drm_mode_set *set,
> struct intel_set_config *config)
> @@ -8387,7 +8402,11 @@ intel_set_config_compute_mode_changes(struct drm_mode_set *set,
>
> /* We should be able to check here if the fb has the same properties
> * and then just flip_or_move it */
> - if (set->crtc->fb != set->fb) {
> + if (set->connectors != NULL &&
> + connector_off(set->crtc, *set->connectors,
> + set->num_connectors)) {
> + config->mode_changed = true;
> + } else if (set->crtc->fb != set->fb) {
> /* If we have no fb then treat it as a full mode set */
> if (set->crtc->fb == NULL) {
> DRM_DEBUG_KMS("crtc has no fb, full mode set\n");
> @@ -8397,8 +8416,9 @@ intel_set_config_compute_mode_changes(struct drm_mode_set *set,
> } else if (set->fb->pixel_format !=
> set->crtc->fb->pixel_format) {
> config->mode_changed = true;
> - } else
> + } else {
> config->fb_changed = true;
> + }
> }
>
> if (set->fb && (set->x != set->crtc->x || set->y != set->crtc->y))
Acked-by: Jesse Barnes <jbarnes at virtuousgeek.org>
--
Jesse Barnes, Intel Open Source Technology Center
