From patchwork Tue Apr 17 10:02:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10344653 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BC0D160365 for ; Tue, 17 Apr 2018 10:02:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9931028604 for ; Tue, 17 Apr 2018 10:02:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8CB89286FB; Tue, 17 Apr 2018 10:02:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C4E3328604 for ; Tue, 17 Apr 2018 10:02:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D0D9F6E116; Tue, 17 Apr 2018 10:02:34 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1B5796E116 for ; Tue, 17 Apr 2018 10:02:33 +0000 (UTC) Received: by mail-wr0-x244.google.com with SMTP id v24so16732332wra.8 for ; Tue, 17 Apr 2018 03:02:33 -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; bh=MlPJOQsWpxwfP4ZChaND7orB6hJ29rPF65bWVMZ2Ry4=; b=ZV2GG/bpLOi2Y7Xm/mTaWOb4HpyL3yuiEzUPZHM9ACvTfS8M7sii+lBzGHOZL7NAFm WEUcG13JDrpLGbrKy+HmQrbV0Ia3vq7UOlJ56j+9aSRzXDT6jdFI3phHHxEnnJ08onko IAhNCjWeH3GJHTWUouAazvyhsVfqGdsNUxVvc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=MlPJOQsWpxwfP4ZChaND7orB6hJ29rPF65bWVMZ2Ry4=; b=PR8fs0cWnvYLX326h9UCR9MfIzY8OsB4LZLBuBTv0mwYgAIfvkmJkSTLssbem1Ug70 58/35pbBeO1KxAIxaKMoMgh1KMS/YVVxTjVErpZfLHv8B5+IMa6pn6ORafx/h1u3OeTO q/4nwdMI7LMZksgzDRLrrE1dbWQRjVV1tJJwd+Xb5uvtILy/dHucmcYJow38f3OCZGlc MuW2mMV76KsW7jUikZt0cdIArSbImVeFCfqQ6RKAhHZRWYpnTpMAJPtIozevZ3fRBS5V UMpIbGSLOrNbT/kgGaf9kFHwckFefci3Bp5/J8bBeU/OdhQJ+YBcMEl/mspmqIbffUfR Uvow== X-Gm-Message-State: ALQs6tAk1MiUBHyfsBEW9Lum2qq5vG+nN7xruNqubftM+DXRiVKtskcp pnd1xtFPTURpLR/9Kczb15DIB2S4 X-Google-Smtp-Source: AIpwx48cLQTgJudD+JLC5K1DzjNWfeaNY2AgCQKxnfFFyIsd2YCU/qo4lSD5nCiTUpznvQlq2t6AUw== X-Received: by 10.80.205.69 with SMTP id d5mr2242500edj.118.1523959351389; Tue, 17 Apr 2018 03:02:31 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:5635:0:39d2:f87e:2033:9f6]) by smtp.gmail.com with ESMTPSA id o61sm8125839edb.88.2018.04.17.03.02.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 03:02:30 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Tue, 17 Apr 2018 12:02:25 +0200 Message-Id: <20180417100225.12286-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.16.2 Subject: [Intel-gfx] [PATCH] drm/i915: Remove skl dc6 enable/disable functions X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Daniel Vetter , Rodrigo Vivi MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP One is outright unused, other can be made static. Drive-by cleanup while accidentally reading dc code. Cc: Imre Deak Acked-by: Imre Deak Cc: Rodrigo Vivi Cc. Dhinakaran Pandiyan Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_drv.h | 2 -- drivers/gpu/drm/i915/intel_runtime_pm.c | 14 +------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 5bd2263407b2..8b20824e806e 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1580,8 +1580,6 @@ void bxt_enable_dc9(struct drm_i915_private *dev_priv); void bxt_disable_dc9(struct drm_i915_private *dev_priv); void gen9_enable_dc5(struct drm_i915_private *dev_priv); unsigned int skl_cdclk_get_vco(unsigned int freq); -void skl_enable_dc6(struct drm_i915_private *dev_priv); -void skl_disable_dc6(struct drm_i915_private *dev_priv); void intel_dp_get_m_n(struct intel_crtc *crtc, struct intel_crtc_state *pipe_config); void intel_dp_set_m_n(struct intel_crtc *crtc, enum link_m_n_set m_n); diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c index 92199f2f3401..1fb8b6080dfe 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c @@ -635,7 +635,7 @@ static void assert_can_enable_dc6(struct drm_i915_private *dev_priv) assert_csr_loaded(dev_priv); } -void skl_enable_dc6(struct drm_i915_private *dev_priv) +static void skl_enable_dc6(struct drm_i915_private *dev_priv) { assert_can_enable_dc6(dev_priv); @@ -645,18 +645,6 @@ void skl_enable_dc6(struct drm_i915_private *dev_priv) } -void skl_disable_dc6(struct drm_i915_private *dev_priv) -{ - DRM_DEBUG_KMS("Disabling DC6\n"); - - /* Wa Display #1183: skl,kbl,cfl */ - if (IS_GEN9_BC(dev_priv)) - I915_WRITE(GEN8_CHICKEN_DCPR_1, I915_READ(GEN8_CHICKEN_DCPR_1) | - SKL_SELECT_ALTERNATE_DC_EXIT); - - gen9_set_dc_state(dev_priv, DC_STATE_DISABLE); -} - static void hsw_power_well_sync_hw(struct drm_i915_private *dev_priv, struct i915_power_well *power_well) {