From patchwork Thu Jul 26 18:49: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: 1245431 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 017CD3FC33 for ; Thu, 26 Jul 2012 20:54:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B9478A0EEB for ; Thu, 26 Jul 2012 13:54:07 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E3D49ED88 for ; Thu, 26 Jul 2012 12:57:42 -0700 (PDT) Received: by wibhm2 with SMTP id hm2so70889wib.0 for ; Thu, 26 Jul 2012 12:57:41 -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=8kPBnSj5qlAA+BhRnmeqk92+rVcLLhZe0QiaCgveVgo=; b=eAIrgpKv4Mt3rz3Ws63SmgQcDFw9Lkw7UoZzSopHo//2kleh5bGrUK+KSABhOG7Yo4 M9pDV16tLb953nl9y8bZXTa3G1DcLiNfCUYstXgjnEumPe19z710kKjyzWJRnYVE0yWc k6KnCm5hRXhZRZPac+ncDyX16FwtoeCBnXq8s= 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=8kPBnSj5qlAA+BhRnmeqk92+rVcLLhZe0QiaCgveVgo=; b=MUeE59y6GFYf6FqEyYFv6r58rQ+Hl4xpTKRNNU8n1DiicL7eJP+3ia+Elh3Y86oP9k +vhl3lxPv5O4SRqMy9HUDBuqB9arPqWvKreMQrOQECUKovjQYeiarPD5gpumtnWVBpaJ vIwIBBSM7gJv3biwK3uFgQs3dNjwoN9/hKm6vrhgYdKWtwiYYlSJPR8Tr3dyC0xRgdUk W0+v2i4e+WKSZVm/kTP6vu1Yb6a4UnV2JnfkySVGKdtFxIBhp3G0/hkcm6giNzlUeh4A vgwfhixv2ZbDhQRwAQOf2jqDWYvK6NSr1ze44B7o3FpIaPWGidPzIjns5Tnrb4UBXVWU 5RXQ== Received: by 10.180.100.133 with SMTP id ey5mr178337wib.4.1343332661879; Thu, 26 Jul 2012 12:57:41 -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.40 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 12:57:41 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 26 Jul 2012 20:49:34 +0200 Message-Id: <1343328581-2324-70-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: ALoCoQnrB+ijus4txFZgVznuoDq44S2CKBTYGPhoo6Qg28ESZPTaZYMrAv5TLpWAwZWsEpmEfDkq Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 69/76] 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're 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 --- 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 09c1a1c..8979ad7 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7112,7 +7112,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); @@ -7176,15 +7175,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);