From 8f5040e421ca4bbd8cd5216dec509da188eb74bc Mon Sep 17 00:00:00 2001 From: Marta Lofstedt Date: Mon, 5 Dec 2016 14:04:08 +0200 Subject: [PATCH] drm: allow changing DPMS mode The drm_atomic_helper_connector_dpms will set the connector back the old DPMS state before returning. This makes it impossible to change DPMS state of the connector. Fixes: 0853695c3ba46f97dfc0b5885f7b7e640ca212dd v2: edit of commit message Cc: Chris Wilson Cc: Daniel Vetter Cc: Eric Engestrom Cc: Sean Paul Cc: dri-devel@lists.freedesktop.org Cc: Signed-off-by: Marta Lofstedt Signed-off-by: Daniel Vetter Link: http://patchwork.freedesktop.org/patch/msgid/20161205120408.13056-1-marta.lofstedt@intel.com --- drivers/gpu/drm/drm_atomic_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 494680c9056e..6a5acb91fa7f 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -2885,8 +2885,8 @@ int drm_atomic_helper_connector_dpms(struct drm_connector *connector, fail: if (ret == -EDEADLK) goto backoff; - - connector->dpms = old_mode; + if (ret != 0) + connector->dpms = old_mode; drm_atomic_state_put(state); return ret; -- 2.45.2