From patchwork Thu Sep 6 20:08: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: 1417931 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 31C413FC71 for ; Thu, 6 Sep 2012 21:18:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2F080A0D8F for ; Thu, 6 Sep 2012 14:18:53 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id D8BADA0D53 for ; Thu, 6 Sep 2012 14:16:03 -0700 (PDT) Received: by mail-wi0-f171.google.com with SMTP id hq4so5486228wib.12 for ; Thu, 06 Sep 2012 14:16:02 -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=RsNkyqSb4bUAfnw0FHId1dKWHlP9+zQEiR07XezpKlg=; b=AC8VTXoE1W6Gt+YQKHroyKXChqSYQPTDrbNMXqvUemDHtBWE8r2cjFyg9DTdbZxmU/ jGjfEIr+7Kxcw7EiSKUKx7NQwRglYySchxh8ceDuP616EP/fUVVdCECl6xdjd8QSPOag 7mlwvCsoK14zoQyMz9Y2hVbhD/7pc8imOf0AQ= 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=RsNkyqSb4bUAfnw0FHId1dKWHlP9+zQEiR07XezpKlg=; b=ED2v5rHipbbnH0W8jjKZc2XZ/swng9JB5XJ3nzilAltmlKPiSrSQACLww7WuBxBwB2 yRvl0QyDiYf0UeuCl1k2w5slwj1yprdLNDWsYZEt7VIhqmNv+pCXjfG7ozDN0QJFuIUW l40l9yrXRTs1zRJo2XI/0tNMzA5TVzoOTvaOnGCx2YUiSOkaK/JmTAQSoSwgKRlTeDkQ iB3LC9itcXsApi8aKEU9/l1ObuBm1W1kPlkc1WEUd3bt7BQUA2hbz2RkarM/weogNv1+ 0cR2R/8VcLlhqsNxPYq0e3gOaqV+uukkTHKgQYnpkMYjWniR0q8W32bVQm84siy9jPX4 QZ+A== Received: by 10.180.82.39 with SMTP id f7mr7479447wiy.2.1346966162770; Thu, 06 Sep 2012 14:16:02 -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 h9sm6038460wiz.1.2012.09.06.14.16.01 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 06 Sep 2012 14:16:02 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 6 Sep 2012 22:08:35 +0200 Message-Id: <1346962115-7267-5-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1346962115-7267-1-git-send-email-daniel.vetter@ffwll.ch> References: <1346962115-7267-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQlLzcG4MAbMEQss2K4Ki6DP8/unvqoyRdNjYnDO7prljI42gq8a1xHVTBVfozBCYSkwxpji Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 4/4] 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 Reviewed-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_display.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 805324d..bff0936 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6806,7 +6806,13 @@ intel_modeset_update_state(struct drm_device *dev, unsigned prepare_pipes) intel_crtc = to_intel_crtc(connector->encoder->crtc); 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); intel_encoder = to_intel_encoder(connector->encoder); intel_encoder->connectors_active = true;