From patchwork Thu Sep 6 20:08:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1417921 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id D40E4DFFCF for ; Thu, 6 Sep 2012 21:18:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C5A95A0D88 for ; Thu, 6 Sep 2012 14:18:13 -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 633CF9E829 for ; Thu, 6 Sep 2012 14:16:02 -0700 (PDT) Received: by weyr3 with SMTP id r3so1373069wey.36 for ; Thu, 06 Sep 2012 14:16:01 -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=xk9Dk9qCaB/SJiP0+ekc1Zu+kEMk2IHt1b/9mN5fy5Y=; b=Dx3FqZDmV9w0zVVczeS71mYPJmrf9pbfx7aZM1cHL/MmdXzEQsAxrF9182wrX4tw+J hWan4CIH+t3sNuZCRnyhjW4KwOceq5/ioFPXcS1aPTIDeed5pyXRY9UMQZwHwKrE9x99 3Mm7vpXlwGKt6H4c/R5iUd2VR3bopLiLvFBaY= 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=xk9Dk9qCaB/SJiP0+ekc1Zu+kEMk2IHt1b/9mN5fy5Y=; b=BS53/554i7/wwUzbdCBjRvAu76omLs1RkXCbsmbRHIJsb4qq6rFF8Mnb7xRLG7cGp1 KoOF8OL9JrQ1zGRu4h9ODGKN+3/BU74Q7pUsj2NwECB/G8cINgDbwdvmlZRHCi7EFL6a xIzk+9FcNNayXpIcfPYWIWFubPJxpU6EeIc1Vh/oDh7gSYT1N20vdHdJdHqQEgr4Dc6j IPExX/xRPv4ZJPLimT4ppFHzI3jfgUU92pANN5xfZdTozRI7asKEMWR0cbgtLsF/434Q zhsy0Kgfbkm11UvViChxCW/INSpCilXEuGLIXJOELAp4mEm0M6piCQYPjSWPMlhO6Mrl S3sQ== Received: by 10.180.85.167 with SMTP id i7mr7457322wiz.8.1346966161458; Thu, 06 Sep 2012 14:16:01 -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.00 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 06 Sep 2012 14:16:00 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 6 Sep 2012 22:08:34 +0200 Message-Id: <1346962115-7267-4-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: ALoCoQmNVWdbl4gs8y7jhpCQbS38wypQgn7uTV8x5YQ6R4E6t1d+qrCQ5eeIx1/Vt9EQQif1B7Mm Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 3/4] drm/i915: don't call dpms funcs after 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 ... because our current set_mode implementation doesn't bother to adjust for the dpms state, we just forcefully update it. So stop pretending that we're better than we are and rip out this extranous call. Note that this totally confuses userspace, because the exposed connector property isn't actually updated ... Signed-off-by: Daniel Vetter Reviewed-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_display.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 0973797..805324d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7236,7 +7236,6 @@ static int intel_crtc_set_config(struct drm_mode_set *set) struct drm_mode_set save_set; struct intel_set_config *config; int ret; - int i; BUG_ON(!set); BUG_ON(!set->crtc); @@ -7300,15 +7299,6 @@ static int intel_crtc_set_config(struct drm_mode_set *set) ret = -EINVAL; goto fail; } - - if (set->crtc->enabled) { - DRM_DEBUG_KMS("Setting connector DPMS state to on\n"); - for (i = 0; i < set->num_connectors; i++) { - DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS on\n", set->connectors[i]->base.id, - drm_get_connector_name(set->connectors[i])); - set->connectors[i]->funcs->dpms(set->connectors[i], DRM_MODE_DPMS_ON); - } - } } else if (config->fb_changed) { ret = intel_pipe_set_base(set->crtc, set->x, set->y, set->fb);