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.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,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 1F13BC433DF for ; Wed, 15 Jul 2020 18:37:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 04E332064B for ; Wed, 15 Jul 2020 18:37:56 +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="X41U7h2b" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726971AbgGOShy (ORCPT ); Wed, 15 Jul 2020 14:37:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726670AbgGOShy (ORCPT ); Wed, 15 Jul 2020 14:37:54 -0400 Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19D5CC08C5CE for ; Wed, 15 Jul 2020 11:37:54 -0700 (PDT) Received: by mail-qt1-x844.google.com with SMTP id o38so2534419qtf.6 for ; Wed, 15 Jul 2020 11:37:54 -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=wu5L69ovDWpf3LlRTghHvSZ9xDVM0oBpBNBxh9J31aU=; b=X41U7h2bTsN1nK0Puc/tLb924o67b+2UV9G0xJtvqBnjtGU2GJVoLTPmPc2FM+tUrb Yqa/M22owsTFVTn8qQuvMAhKKdbOchqlqkKcL3i9UZ7cUvoSJemVue+leOt2xxf4Udl8 0QdSDzjGO8hph3oKTCCMmWEFoJT7nzr3yBVxVmuVLny7X4bnY73FE7kXEKyzlggqVxvG ilX0nPTbXIaLsc5zdeyl8IwR+yURCMy/1WPaHPWiskOYpN8t4ShR35rLkwoy8ME/5pnH P+ys0a1HCyZMA23ZGY+NOI1MtM773J6j+OiXsBamFl5mwJG04FdBbpXcVaX0EsJ17Cia EHIQ== 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=wu5L69ovDWpf3LlRTghHvSZ9xDVM0oBpBNBxh9J31aU=; b=DLlgBnBp0DClAfkdIWdQ8jWdgqQg6GfUMm2SCvJxxEJs4xeKqW55KVsBleS8O3lwXp y4zvnk9Q58O2Ftrab8dLhbwEsL+Y3oWxj/yLIWAurpa7aSr+kWxu4fzGZYsJNTh9ZmQ5 98RzD2r5sryrbsKq6gL5C1DQKamxylwCzy5P4CeC7Q9EyAgw4NdoQSQEpcWO8TWU2Q0H 0zilqqHj6aBsP6TK4srSnyW4h4+II9eVBplnTDtXvHn5Ulv1HfeG9VsGHAEDFnUdL5iA 7AkmIcR3EloWnf9pjcpZRiClXobUf3TcFFNM9QREVb6b2l5pmtaClG6Lx8Z17+xUPCXD MbZg== X-Gm-Message-State: AOAM530p1YrHTIc5SUFiIbIStttrsnpEeF/Agmwo0G2Yx8t02m2ir9pN gYSRfFe8hACjMkYiA3KtSLTg1gXyV7I= X-Google-Smtp-Source: ABdhPJz3H5u/h/w/d+GjGc1uZlqsx1rCJM9E4KLLiOaeaJjvmt5xA4eeQYXiFdMY+OuSMREJ5zLqug== X-Received: by 2002:ac8:5542:: with SMTP id o2mr1219868qtr.47.1594838272913; Wed, 15 Jul 2020 11:37:52 -0700 (PDT) Received: from [192.168.0.189] ([147.253.86.153]) by smtp.gmail.com with ESMTPSA id z60sm4010802qtc.30.2020.07.15.11.37.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 15 Jul 2020 11:37:52 -0700 (PDT) Subject: Re: [PATCH] drm/msm/adreno: fix gpu probe if no interconnect-names To: Rob Clark , dri-devel@lists.freedesktop.org Cc: Rob Clark , Sean Paul , David Airlie , Daniel Vetter , Jordan Crouse , Bjorn Andersson , Brian Masney , John Stultz , "open list:DRM DRIVER FOR MSM ADRENO GPU" , "open list:DRM DRIVER FOR MSM ADRENO GPU" , open list References: <20200715182955.3081774-1-robdclark@gmail.com> From: Jonathan Marek Message-ID: Date: Wed, 15 Jul 2020 14:36:33 -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: <20200715182955.3081774-1-robdclark@gmail.com> 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/15/20 2:29 PM, Rob Clark wrote: > From: Rob Clark > > If there is no interconnect-names, but there is an interconnects > property, then of_icc_get(dev, "gfx-mem"); would return an error > rather than NULL. > > Also, if there is no interconnect-names property, there will never > be a ocmem path. But of_icc_get(dev, "ocmem") would return -EINVAL > instead of -ENODATA. Just don't bother trying in this case. > > Fixes: 8e29fb37b301 ("drm/msm: handle for EPROBE_DEFER for of_icc_get") > Signed-off-by: Rob Clark > --- > drivers/gpu/drm/msm/adreno/adreno_gpu.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c > index 0527e85184e1..c4ac998b90c8 100644 > --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c > @@ -979,6 +979,7 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, > struct adreno_platform_config *config = dev->platform_data; > struct msm_gpu_config adreno_gpu_config = { 0 }; > struct msm_gpu *gpu = &adreno_gpu->base; > + bool has_interconnect_names = true; > int ret; > > adreno_gpu->funcs = funcs; > @@ -1005,12 +1006,13 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, > > /* Check for an interconnect path for the bus */ > gpu->icc_path = of_icc_get(dev, "gfx-mem"); > - if (!gpu->icc_path) { > + if (IS_ERR_OR_NULL(gpu->icc_path)) { > /* > * Keep compatbility with device trees that don't have an > * interconnect-names property. > */ > gpu->icc_path = of_icc_get(dev, NULL); This is misleading because if it gets a EPROBE_DEFER error (or any other error), it will hit this path. Maybe there's a specific error you can check for instead to identify the "no-interconnect-names" case? Also don't think its a good idea to be calling of_icc_get(dev, NULL) again when there's a EPROBE_DEFER, the interconnect driver could come up between the two calls > + has_interconnect_names = false; > } > if (IS_ERR(gpu->icc_path)) { > ret = PTR_ERR(gpu->icc_path); > @@ -1018,7 +1020,9 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, > return ret; > } > > - gpu->ocmem_icc_path = of_icc_get(dev, "ocmem"); > + if (has_interconnect_names) > + gpu->ocmem_icc_path = of_icc_get(dev, "ocmem"); > + > if (IS_ERR(gpu->ocmem_icc_path)) { > ret = PTR_ERR(gpu->ocmem_icc_path); > gpu->ocmem_icc_path = NULL; >