From patchwork Thu Jul 26 18:49:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1245441 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 8ED5F3FC33 for ; Thu, 26 Jul 2012 20:54:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 566E7A0EEC for ; Thu, 26 Jul 2012 13:54:48 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 6BFA99EEC2 for ; Thu, 26 Jul 2012 12:57:43 -0700 (PDT) Received: by mail-we0-f177.google.com with SMTP id r3so1738770wey.36 for ; Thu, 26 Jul 2012 12:57:43 -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:x-mailer:in-reply-to:references; bh=TPV+TnblifEDLstTjLoY34ZEO9wtkQ7GyqYZm8/Ekuk=; b=I8tYjD1FvzPQWNUx0OcnPq3DK0U3BT29X4x6vqaL1KFyiVqwsr3zZKgGdkRCjzM+UT q902BHi1Blk704X3qYEpVf29gBNgogId8k/IPTG3ywDFY6IyLllMGAu2wowiMmbdU8mo /0VDLxN8W7HaYyeOLBpPxrfrJfhSej09ef5f4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=TPV+TnblifEDLstTjLoY34ZEO9wtkQ7GyqYZm8/Ekuk=; b=gw7xria0hFLoLLH1FbA1UhlZwbfQCzBGK3ta/Vv2S+Pxmhho2/G521Lxe1vLlFdARw aNPvCJEO2acmnRiQX0TgtZnYoc7EYQwZPHa5Xn0Hz9ucKfw+jBcymbtkNBipOdyPWDvq P8+nRmKq5bQqHtiY0X2gEXrXrRb9CTHIcyQGUdA9UhyIVa7tJy9hUbBXj6pHc3Ttpnh7 pch0EFgoSTE2rXG/mSiWGbvB8eJvojZFSAciVIHK5sZz/LbVkfo1F20AfWM2FpidHj5F HyjZ20iI4Wow9BYTEZoywf73RNFTx+2NsIhqj8sTKZ5FQcLMfHYMyUW4OTN8Ux7Vnl/2 Ho0g== Received: by 10.216.213.37 with SMTP id z37mr15795080weo.132.1343332663177; Thu, 26 Jul 2012 12:57:43 -0700 (PDT) Received: from wespe.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id fr4sm391403wib.8.2012.07.26.12.57.41 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 12:57:42 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 26 Jul 2012 20:49:35 +0200 Message-Id: <1343328581-2324-71-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343328581-2324-1-git-send-email-daniel.vetter@ffwll.ch> References: <1343328581-2324-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQnjIvRWr42WA7e+uDQWjYqMfYr/IUCElJOHb2teiKfytv9FWdApvcPm9+PxeKxH4y/8w0CN Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 70/76] drm/i915: update dpms property in set_mode X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Hopefully this makes userspace slightly less confused about us frobbing the dpms state behind its back. Yeah, it would be better to be more careful with not changing the dpms state, but that is quite more invasive. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_display.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8979ad7..9de4dc1 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6827,8 +6827,15 @@ bool intel_set_mode(struct drm_crtc *crtc, intel_crtc = to_intel_crtc(connector->encoder->crtc); - if (prepare_pipes & (1 << intel_crtc->pipe)) + if (prepare_pipes & (1 << intel_crtc->pipe)) { + struct drm_property *dpms_property = + dev->mode_config.dpms_property; + connector->dpms = DRM_MODE_DPMS_ON; + drm_connector_property_set_value(connector, + dpms_property, + DRM_MODE_DPMS_ON); + } to_intel_encoder(connector->encoder)->connectors_active = true; }