From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45109C433E1 for ; Fri, 10 Jul 2020 23:11:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 24AD92077D for ; Fri, 10 Jul 2020 23:11:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=marek-ca.20150623.gappssmtp.com header.i=@marek-ca.20150623.gappssmtp.com header.b="xga4wvwb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726707AbgGJXL4 (ORCPT ); Fri, 10 Jul 2020 19:11:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726519AbgGJXL4 (ORCPT ); Fri, 10 Jul 2020 19:11:56 -0400 Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 988FBC08C5DD for ; Fri, 10 Jul 2020 16:11:55 -0700 (PDT) Received: by mail-qt1-x841.google.com with SMTP id w27so5765102qtb.7 for ; Fri, 10 Jul 2020 16:11:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marek-ca.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=54ZF/DC2XdS/e/GhSUjcB8qoFITR5sUGRvRbus64HRQ=; b=xga4wvwbBEC04/iZpEdO+nhnKTnoWlbbOevlszj0kqf16I1GjGr2sWmPrl1s1Ac8/T xM9JsU8YxXMfBlBfQ1zelM4fXOPxVB7GA2UJmQDJq3w4iKA4J2pKNLyKeqHSJw60q3+5 fj+WGPSBLucdRgsJmDXtQuij5Y/RI7THik614lchFwEy3G5tAHFMXaRm8cEA6R6qFMsh 18GHMINFtD+gVYbEE7G68OfsmO0mmB6KO9PgQhua53yFHm8B2LCo6u3nyIXIwifazrn7 +/xvSRKtruklY3AJhwmfVjeyra2puvk+nh63Dzt1kXBlrLfxVje+VVjUv0nlpETSXQ50 HSEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=54ZF/DC2XdS/e/GhSUjcB8qoFITR5sUGRvRbus64HRQ=; b=JKrdBP2yVvTUS8YNjd2pB2UsoOoynnnH0LlZsvuAOa1bEQBLH1Nzuw0CbKi68Qed+P OEHv0H28R0VSi0S4ei+U09fMzujllPeGjxIjqzJDrPAzGZLXb6b0Yi1p4z35DkdYS4in ZGA73l+n+u3SNY9OYAHkiF4AZUr+7wij3o0+MYkCc/bzX67BZjnVpL1uU5meIZRK1KZ7 XgcAmxVrXuYm60KWn+BuxS/Xo9REvoDgSdPSLMd04I8Djzo6eDXVs/Ck050MOGtsVGcQ 0HJkHH1ck0PM4PcoB6oKkvNIiatdTQ+3oZnI9oXRiNCt/aAYrxjVKfB4yC82MO1M0Wns ff9w== X-Gm-Message-State: AOAM532IOeCzcRgalsuEvBLD7c0jEkFVPCaGUYFXaQ/rUFr/rvTbFKzm GdfuFT/8dmUQNFknUPUHjdHaDlv+loA= X-Google-Smtp-Source: ABdhPJyN68zcsLWPlfYAlpLa0B3HI+vp8uJq0nlRnX2FePWUTrlODNZIEv3VOJ1fuHsSCLi9SZGELQ== X-Received: by 2002:ac8:674c:: with SMTP id n12mr67421310qtp.312.1594422714572; Fri, 10 Jul 2020 16:11:54 -0700 (PDT) Received: from [192.168.0.189] ([147.253.86.153]) by smtp.gmail.com with ESMTPSA id k14sm10155785qtb.38.2020.07.10.16.11.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 10 Jul 2020 16:11:54 -0700 (PDT) Subject: Re: [PATCH v2] drm/msm: handle for EPROBE_DEFER for of_icc_get To: Rob Clark Cc: freedreno , Sean Paul , David Airlie , Daniel Vetter , Jordan Crouse , Bjorn Andersson , Brian Masney , Fabio Estevam , "open list:DRM DRIVER FOR MSM ADRENO GPU" , "open list:DRM DRIVER FOR MSM ADRENO GPU" , open list References: <20200709143404.11876-1-jonathan@marek.ca> From: Jonathan Marek Message-ID: <3729cda9-2d02-c213-c31a-d3e1316798f8@marek.ca> Date: Fri, 10 Jul 2020 19:10:38 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 7/9/20 11:15 AM, Rob Clark wrote: > On Thu, Jul 9, 2020 at 7:35 AM Jonathan Marek wrote: >> >> Check for errors instead of silently not using icc if the msm driver >> probes before the interconnect driver. >> >> Allow ENODATA for ocmem path, as it is optional and this error >> is returned when "gfx-mem" path is provided but not "ocmem". >> >> Remove the WARN_ON in msm_gpu_cleanup because INIT_LIST_HEAD won't have >> been called on the list yet when going through the defer error path. >> >> Changes in v2: >> * Changed to not only check for EPROBE_DEFER >> >> Signed-off-by: Jonathan Marek >> --- >> drivers/gpu/drm/msm/adreno/adreno_gpu.c | 17 ++++++++++++++--- >> drivers/gpu/drm/msm/msm_gpu.c | 2 -- >> 2 files changed, 14 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c >> index 89673c7ed473..0f5217202eb5 100644 >> --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c >> +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c >> @@ -940,12 +940,20 @@ static int adreno_get_pwrlevels(struct device *dev, >> */ >> gpu->icc_path = of_icc_get(dev, NULL); >> } >> - if (IS_ERR(gpu->icc_path)) >> + if (IS_ERR(gpu->icc_path)) { >> + ret = PTR_ERR(gpu->icc_path); >> gpu->icc_path = NULL; >> + return ret; >> + } >> >> gpu->ocmem_icc_path = of_icc_get(dev, "ocmem"); >> - if (IS_ERR(gpu->ocmem_icc_path)) >> + if (IS_ERR(gpu->ocmem_icc_path)) { >> + ret = PTR_ERR(gpu->ocmem_icc_path); >> gpu->ocmem_icc_path = NULL; >> + /* allow -ENODATA, ocmem icc is optional */ >> + if (ret != -ENODATA) >> + return ret; >> + } >> >> return 0; >> } >> @@ -996,6 +1004,7 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, >> struct adreno_platform_config *config = pdev->dev.platform_data; >> struct msm_gpu_config adreno_gpu_config = { 0 }; >> struct msm_gpu *gpu = &adreno_gpu->base; >> + int ret; >> >> adreno_gpu->funcs = funcs; >> adreno_gpu->info = adreno_info(config->rev); >> @@ -1007,7 +1016,9 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, >> >> adreno_gpu_config.nr_rings = nr_rings; >> >> - adreno_get_pwrlevels(&pdev->dev, gpu); >> + ret = adreno_get_pwrlevels(&pdev->dev, gpu); >> + if (ret) >> + return ret; >> >> pm_runtime_set_autosuspend_delay(&pdev->dev, >> adreno_gpu->info->inactive_period); >> diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c >> index a22d30622306..ccf9a0dd9706 100644 >> --- a/drivers/gpu/drm/msm/msm_gpu.c >> +++ b/drivers/gpu/drm/msm/msm_gpu.c >> @@ -959,8 +959,6 @@ void msm_gpu_cleanup(struct msm_gpu *gpu) >> >> DBG("%s", gpu->name); >> >> - WARN_ON(!list_empty(&gpu->active_list)); >> - > > hmm, not a huge fan of removing the WARN_ON().. can we just init the > list head earlier? > There doesn't seem to be a nice way of doing that. Would it be reasonable to instead detect that msm_gpu_init wasn't called (checking if gpu->dev is NULL?), and just skip the msm_gpu_cleanup() call in adreno_gpu_cleanup() in that case? > BR, > -R > >> for (i = 0; i < ARRAY_SIZE(gpu->rb); i++) { >> msm_ringbuffer_destroy(gpu->rb[i]); >> gpu->rb[i] = NULL; >> -- >> 2.26.1 >>