From patchwork Wed Jun 5 15:02:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 10977171 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 C70AA13AD for ; Wed, 5 Jun 2019 15:02:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B88DD289A1 for ; Wed, 5 Jun 2019 15:02:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC891289F7; Wed, 5 Jun 2019 15:02:41 +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.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED 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 1343D289A1 for ; Wed, 5 Jun 2019 15:02:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9921789C83; Wed, 5 Jun 2019 15:02:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8EC9689C83 for ; Wed, 5 Jun 2019 15:02:38 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id r18so10825716wrm.10 for ; Wed, 05 Jun 2019 08:02:38 -0700 (PDT) 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:mime-version :content-transfer-encoding; bh=N6a/FkfxXhOreQfJRYjMNcTKcCaCdcUNkyh7nQmvAxo=; b=cnhZ05SF0Ax9/gs+oUma24NfxbMZF88Hhq8zyuHIbb3fVOkFvP5Wrppn2mDslGPryW meyD0QrIb9zrZ4007X6IwkL1vzVb+di2j26zRYAkEeKfhIVAknwSefrZS2Ew2UCs8Ylg RptRabEyK0u1VxeYPX/0UWTVtQhZwkaNQz1OoXK5rDEs2iMURtwbe/DPq/CBdSXYwDQB oqFyK3bdo0cT1g04HI0+U2f/Npk5MAphZA0DKrNy+Hj+xsKkZQp/+ZFw7+Lr3RIWFCex QY1S8DR3vdo1lh3RfG9Frd1qrkJjWv4XUN8iM+luOyxOo/8Imoj53AV8nuCoEVmBKJXa 9org== X-Gm-Message-State: APjAAAWyottoOIMNbC3EwSj6tnnqR+UBNhFoVt9VaIqbCdD+G/lFogh5 xchiVX2JOpyVaFucA4kVHMXBfw== X-Google-Smtp-Source: APXvYqzpivxtbUb0B7v6zlx/ySMgwFto9UtFrNAdrIenPrqyJui8YaGU9jpSJLvRjUkAWUdDjz8JUw== X-Received: by 2002:adf:dcd1:: with SMTP id x17mr26074169wrm.98.1559746957134; Wed, 05 Jun 2019 08:02:37 -0700 (PDT) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id e7sm3897403wmd.0.2019.06.05.08.02.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Jun 2019 08:02:35 -0700 (PDT) From: Neil Armstrong To: robh@kernel.org, tomeu.vizoso@collabora.com Subject: [PATCH v2] drm/panfrost: make devfreq optional again Date: Wed, 5 Jun 2019 17:02:33 +0200 Message-Id: <20190605150233.32722-1-narmstrong@baylibre.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=N6a/FkfxXhOreQfJRYjMNcTKcCaCdcUNkyh7nQmvAxo=; b=nldZwfo8Gpf6s/aquD/M19FkkNSWDMyNJTAhOrXp9irA+hClfpHywxMuMMjSc8Xfq7 ZG6EDFY1MD4zYQFaWn43mrsV4vG8B5QdmqFv+2UCn0iycC+1XwuofALnjxt+x1tm4YZp rgw1F0nw5lNYv3yp08nej0aC2c3Ic9ChT2teg/z/Ug/aG9zMYQ3luyO3Cm1Sib6RzyPb 39UnADgXCBtDdb2wsfCINm8XA4rjkg5AC7XKyO2nsisfGHnPwD4rhG7GHULAJv4cSIB4 ti5ltaKqL2vA84zmrPFvXvl796GeDdVzapF7jV/aUkJlOqEcxgUjXH45oKIBTe6Ytod/ 8TfA== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peron.clem@gmail.com, ezequiel@collabora.com, dri-devel@lists.freedesktop.org, Neil Armstrong Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Devfreq runtime usage was made mandatory, thus making panfrost fail to probe on Amlogic S912 SoCs missing the "operating-points-v2" property. Make it optional again, leaving PM_DEVFREQ selected by default. Fixes: f3617b449d ("drm/panfrost: Select devfreq") Signed-off-by: Neil Armstrong Reviewed-by: Ezequiel Garcia --- Changes since v1: - fixed else/if logic in panfrost_devfreq_init drivers/gpu/drm/panfrost/panfrost_devfreq.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c index 29fcffdf2d57..db798532b0b6 100644 --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c @@ -140,7 +140,9 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) return 0; ret = dev_pm_opp_of_add_table(&pfdev->pdev->dev); - if (ret) + if (ret == -ENODEV) /* Optional, continue without devfreq */ + return 0; + else if (ret) return ret; panfrost_devfreq_reset(pfdev); @@ -170,6 +172,9 @@ void panfrost_devfreq_resume(struct panfrost_device *pfdev) { int i; + if (!pfdev->devfreq.devfreq) + return; + panfrost_devfreq_reset(pfdev); for (i = 0; i < NUM_JOB_SLOTS; i++) pfdev->devfreq.slot[i].busy = false; @@ -179,6 +184,9 @@ void panfrost_devfreq_resume(struct panfrost_device *pfdev) void panfrost_devfreq_suspend(struct panfrost_device *pfdev) { + if (!pfdev->devfreq.devfreq) + return; + devfreq_suspend_device(pfdev->devfreq.devfreq); } @@ -188,6 +196,9 @@ static void panfrost_devfreq_update_utilization(struct panfrost_device *pfdev, i ktime_t now; ktime_t last; + if (!pfdev->devfreq.devfreq) + return; + now = ktime_get(); last = pfdev->devfreq.slot[slot].time_last_update;