From patchwork Wed Jul 15 15:44:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6799301 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8FA5C9F3E6 for ; Wed, 15 Jul 2015 15:42:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BB981205D8 for ; Wed, 15 Jul 2015 15:42:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id EBE6A20641 for ; Wed, 15 Jul 2015 15:42:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5ADBA720D2; Wed, 15 Jul 2015 08:42:16 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9138C6E48C for ; Wed, 15 Jul 2015 08:42:14 -0700 (PDT) Received: by widic2 with SMTP id ic2so6172977wid.0 for ; Wed, 15 Jul 2015 08:42:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=1HRwnoaFI9shhwR93Ivb+a9Chi1w7fDEN+JRBN2Z2gw=; b=Vhu1oYB36TJ4DZ35kpeDJSj+ugkQxSlgIbYBs9bspC5HqFrVrc3O8+u7g6vMN2BiWD PEu/PKq470zLGirvcYnGzYzXNoakDxkVEIQuYkFqojf1UcZ85yJe4Sw71XGbEPDzaobJ 0C1qp8KCOL9PslzTDsGH089CRB6v5NtjKOqyY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=1HRwnoaFI9shhwR93Ivb+a9Chi1w7fDEN+JRBN2Z2gw=; b=GckGAzhOmfbuoWh5i3Y2rAlarKzCJsB1CMtkYsPbdmy9oZNEQK7ZZ9Ov4BwJnjLn4i O1VYP0TumcOM3aSoKoZxPiVSIY/UZPR7sWPSn1c6EWMEnD03CcVA8xvYyc4hGgR3gZya JNF5+5+P+CnoN8WhQ3Ng3VvGMmykZnEhcukeys3k/jYEzZNlnDMoRLNQVMRzW83HGgVJ YnGjar2+SecSAGBMk0RM3qrc3mGP1Jr7NOHYwXMMlrFERLtah5LdGxLQ0dEHCT/4nYR+ 7mJgBpsv95K0xvsBUSFkS3k9QucS/U+5k+NwRDgrm313+HmIRwPH4Ir+4rZqDMZouXev ai1A== X-Gm-Message-State: ALoCoQm0gsCGwsPquo0vkvXzoItbdZi3nXj4slDr4soM4xVma1WnUj4ociKSmpxJPvKrdL6zkapE X-Received: by 10.180.219.41 with SMTP id pl9mr289196wic.30.1436974932940; Wed, 15 Jul 2015 08:42:12 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id jy6sm8521075wjc.4.2015.07.15.08.42.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 15 Jul 2015 08:42:12 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Wed, 15 Jul 2015 17:44:51 +0200 Message-Id: <1436975091-2397-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.4 Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/atomic-helper: Also update legacy dpms state X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Avoids legacy userspace/code getting confused when dpms doesn't reflect reality of what's going on. Signed-off-by: Daniel Vetter Reviewed-by: Daniel Stone --- drivers/gpu/drm/drm_atomic_helper.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 91ad6bd13734..2a5f2907ca3a 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -661,6 +661,11 @@ drm_atomic_helper_update_legacy_modeset_state(struct drm_device *dev, connector->encoder = connector->state->best_encoder; connector->encoder->crtc = connector->state->crtc; + + if (connector->state->crtc->state->active) + connector->dpms = DRM_MODE_DPMS_ON; + else + connector->dpms = DRM_MODE_DPMS_OFF; } /* set legacy state in the crtc structure */