From patchwork Thu Nov 22 01:52:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Marek X-Patchwork-Id: 10693369 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8255A16B1 for ; Thu, 22 Nov 2018 01:55:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5CC332BB18 for ; Thu, 22 Nov 2018 01:55:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A9F12BBB3; Thu, 22 Nov 2018 01:55:27 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6FEB2BB18 for ; Thu, 22 Nov 2018 01:55:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391618AbeKVMc2 (ORCPT ); Thu, 22 Nov 2018 07:32:28 -0500 Received: from mail-qt1-f193.google.com ([209.85.160.193]:36070 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391617AbeKVMc2 (ORCPT ); Thu, 22 Nov 2018 07:32:28 -0500 Received: by mail-qt1-f193.google.com with SMTP id t13so5971665qtn.3 for ; Wed, 21 Nov 2018 17:55:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marek-ca.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=otHAAoJeXEc/P3G/AXr3bWGwZWsjr5VuAddyjFBEbz8=; b=KKpAV1GkmetbHGiwp0OzSUYh514ZNd0QG51SBJeqpdjuN+AVbP4lr9c0JXDIR3+eB9 Ozl52zGTJQkbq2U+LLgDf2b7yKlLKwyBIdgvxrqMbGF+prUdBo/3pQTV618912x1IUFk yfu4nYjw6KLPSA6pQFtPzIA+hHr/L5b4EEwXnAowHTBdtj92+3WSblBq4wHt1+sEAiNf qF53EUQeTst6VBmvzPHKIgVg33mTScCY+pOizB9yQAQSWEcE2PU322ixjTZ8XjP0QtSW fUdCcaB6VSvgs6x5UgrP/Lo+iXQZKuR7bXL0GBLcG9ppUO3WTYGMQIEJwJE9xdmJwT1u twiw== 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=otHAAoJeXEc/P3G/AXr3bWGwZWsjr5VuAddyjFBEbz8=; b=AZ63/SXhRBnFi3OBijf2DOG48xX2EYUiN4Ot5Bz/JsPHARyewqI9A6iJ9OtEXum4kd XmQ4HF5YP4eA6On0c5xr2q+BDEP8oYSi40tYIuRpKAijCPzUa5cFJent7skJ/akwhuN5 wB2eJi8L+hPOQGyawK6x16wS5TrkLDdMugnUpn4WjkjOUn/zfbCrtUerfJRzo8Bwen13 kLk4snaYp8RnMl5srrIV0JbsZ8+pwAKEulzhz+ftXQvgVJUeL/8xjG/rR4NjWxaDi7g5 k1Oibc1zje7qHdoeqDspmq/9NEl7rmFX7ZhgQHgkTHIpVujxmdL5aAGF7y8XnjtdBU8i mVDA== X-Gm-Message-State: AA+aEWbUWX9x825EXHAAQkp2HqrshBFABk6WEVOmUJHUftw5oXN8ojdO Ljf27NFjRJKF2maNquv9gOp1Qw== X-Google-Smtp-Source: AJdET5e8mp0HmzxFBoyL6cqoVVRAnKcEk7lUgE+171rY4RXN7cqIMBsVrwGHuXGl6xOVCuhQcA03YA== X-Received: by 2002:ac8:1a38:: with SMTP id v53mr8008865qtj.362.1542851724451; Wed, 21 Nov 2018 17:55:24 -0800 (PST) Received: from localhost.localdomain (modemcable014.247-57-74.mc.videotron.ca. [74.57.247.14]) by smtp.gmail.com with ESMTPSA id q15sm25297721qkl.81.2018.11.21.17.55.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Nov 2018 17:55:23 -0800 (PST) From: Jonathan Marek To: freedreno@lists.freedesktop.org Cc: Chris.Healy@zii.aero, festevam@gmail.com, Rob Clark , David Airlie , Sean Paul , Rajesh Yadav , Steve Kowalik , linux-arm-msm@vger.kernel.org (open list:DRM DRIVER FOR MSM ADRENO GPU), dri-devel@lists.freedesktop.org (open list:DRM DRIVER FOR MSM ADRENO GPU), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 1/9] drm/msm/mdp4: only use lut_clk on mdp4.2+ Date: Wed, 21 Nov 2018 20:52:27 -0500 Message-Id: <20181122015237.14534-1-jonathan@marek.ca> X-Mailer: git-send-email 2.17.1 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jonathan Marek --- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c index ae25d763cd8c..8f765f284d11 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c @@ -206,7 +206,8 @@ int mdp4_disable(struct mdp4_kms *mdp4_kms) clk_disable_unprepare(mdp4_kms->clk); if (mdp4_kms->pclk) clk_disable_unprepare(mdp4_kms->pclk); - clk_disable_unprepare(mdp4_kms->lut_clk); + if (mdp4_kms->lut_clk) + clk_disable_unprepare(mdp4_kms->lut_clk); if (mdp4_kms->axi_clk) clk_disable_unprepare(mdp4_kms->axi_clk); @@ -220,7 +221,8 @@ int mdp4_enable(struct mdp4_kms *mdp4_kms) clk_prepare_enable(mdp4_kms->clk); if (mdp4_kms->pclk) clk_prepare_enable(mdp4_kms->pclk); - clk_prepare_enable(mdp4_kms->lut_clk); + if (mdp4_kms->lut_clk) + clk_prepare_enable(mdp4_kms->lut_clk); if (mdp4_kms->axi_clk) clk_prepare_enable(mdp4_kms->axi_clk); @@ -472,12 +474,13 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) if (IS_ERR(mdp4_kms->pclk)) mdp4_kms->pclk = NULL; - // XXX if (rev >= MDP_REV_42) { ??? - mdp4_kms->lut_clk = devm_clk_get(&pdev->dev, "lut_clk"); - if (IS_ERR(mdp4_kms->lut_clk)) { - dev_err(dev->dev, "failed to get lut_clk\n"); - ret = PTR_ERR(mdp4_kms->lut_clk); - goto fail; + if (mdp4_kms->rev >= 2) { + mdp4_kms->lut_clk = devm_clk_get(&pdev->dev, "lut_clk"); + if (IS_ERR(mdp4_kms->lut_clk)) { + dev_err(dev->dev, "failed to get lut_clk\n"); + ret = PTR_ERR(mdp4_kms->lut_clk); + goto fail; + } } mdp4_kms->axi_clk = devm_clk_get(&pdev->dev, "bus_clk"); @@ -488,7 +491,8 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) } clk_set_rate(mdp4_kms->clk, config->max_clk); - clk_set_rate(mdp4_kms->lut_clk, config->max_clk); + if (mdp4_kms->lut_clk) + clk_set_rate(mdp4_kms->lut_clk, config->max_clk); pm_runtime_enable(dev->dev); mdp4_kms->rpm_enabled = true;