From patchwork Thu Apr 24 13:50:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 4051461 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B1A85BFF02 for ; Thu, 24 Apr 2014 13:51:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DC768201BA for ; Thu, 24 Apr 2014 13:51:26 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 01CC92018E for ; Thu, 24 Apr 2014 13:51:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 806496EC72; Thu, 24 Apr 2014 06:51:25 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yh0-f48.google.com (mail-yh0-f48.google.com [209.85.213.48]) by gabe.freedesktop.org (Postfix) with ESMTP id 8DEEB6EC72 for ; Thu, 24 Apr 2014 06:51:24 -0700 (PDT) Received: by mail-yh0-f48.google.com with SMTP id z6so2218244yhz.21 for ; Thu, 24 Apr 2014 06:51:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=t9UikcoHQCwBsnUW57g0VGOMIwYpGOdJFeW9fNjC4iA=; b=SLtIRWBMc6N2cTq+CR+3siYZ9X8exMAtqcI4vtJjzh5su+1LuBtRdqSbwtbX3BFscF Loi4HGodHOrOQ3VRMfoR/7EvLL0jPzadoyMWhTly8vPmM9B7dRcau1y/VJpnDRj/AN/O Z4EFJ9w9J7Iw2Q9nPwavl6nKUICk6f+Z467iUnLyAIu+rvXUzMrPuQrAt6gknxEYvHwk TL2yJLAp38UHpJDhoULc90SdG446xxN35oKv+nOLbpy9kbGCWTX8XEDvWGBrCa6KoX/x /gDs52BKjdWZdvg+aXH8ngm5jJEyneN/iCVm2vudN+btuoJMeiKlr0Fz6Ai+8TaFx/Nm riPA== X-Received: by 10.236.134.140 with SMTP id s12mr2613870yhi.138.1398347483544; Thu, 24 Apr 2014 06:51:23 -0700 (PDT) Received: from localhost.localdomain ([177.156.79.173]) by mx.google.com with ESMTPSA id f62sm7667471yhq.6.2014.04.24.06.51.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Apr 2014 06:51:22 -0700 (PDT) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Thu, 24 Apr 2014 10:50:56 -0300 Message-Id: <1398347456-2523-1-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <20140423095242.GG18465@intel.com> References: <20140423095242.GG18465@intel.com> Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 4/4] drm/i915: remove useless runtime PM get calls X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 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=-4.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 From: Paulo Zanoni We already call intel_dp_power_get, which will get a power domain, and every power domain should get a runtime PM reference, which will wake up the machine. v2: - Also touch intel_crt_detect() (Ville). Signed-off-by: Paulo Zanoni Reviewed-by: Ville Syrjälä --- drivers/gpu/drm/i915/intel_crt.c | 4 ---- drivers/gpu/drm/i915/intel_dp.c | 5 ----- 2 files changed, 9 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index aa5a3dc..4c673d0 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c @@ -646,8 +646,6 @@ intel_crt_detect(struct drm_connector *connector, bool force) enum drm_connector_status status; struct intel_load_detect_pipe tmp; - intel_runtime_pm_get(dev_priv); - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] force=%d\n", connector->base.id, drm_get_connector_name(connector), force); @@ -699,8 +697,6 @@ intel_crt_detect(struct drm_connector *connector, bool force) out: intel_display_power_put(dev_priv, power_domain); - intel_runtime_pm_put(dev_priv); - return status; } diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 66d202c..104998e 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -3155,8 +3155,6 @@ intel_dp_detect(struct drm_connector *connector, bool force) enum intel_display_power_domain power_domain; struct edid *edid = NULL; - intel_runtime_pm_get(dev_priv); - power_domain = intel_display_port_power_domain(intel_encoder); intel_display_power_get(dev_priv, power_domain); @@ -3191,9 +3189,6 @@ intel_dp_detect(struct drm_connector *connector, bool force) out: intel_display_power_put(dev_priv, power_domain); - - intel_runtime_pm_put(dev_priv); - return status; }