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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6771C77B75 for ; Tue, 2 May 2023 23:59:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229980AbjEBX7g (ORCPT ); Tue, 2 May 2023 19:59:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229569AbjEBX7f (ORCPT ); Tue, 2 May 2023 19:59:35 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71864E6A for ; Tue, 2 May 2023 16:59:33 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-4effb818c37so5118089e87.3 for ; Tue, 02 May 2023 16:59:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683071971; x=1685663971; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Vrzm20KVvWkxv1M0pGs1v67Yn/sf7zTbzt4N4hbrnik=; b=J+Mzp+sJUyrk1MWCpFGUsEfhawOtWFB2MK/WYz4ZbwrOonVtj+6biksOfu2n/SS9c6 Kg6c5+FD2uypjrSP31uP6nMwK+bE2r/G8iPGlbvItP1GumCWelkXL40O/7MhI12BxDYm EvqhwR2kR+0dRHHTWRNlgUihltGl1YQUc7yl+uZ0/dH9V/tyBjhy0sYm3oYCKcvDcRoU 6tLiTLVwDl89b8HpXk+1vb4KJru3ISCw7Wk+aPFpiii7M225Og0zLMteSZZdGa3Gs6m5 KbDdmePVbeID7VGIJldmW2yOEevK5JBiI+MU00x1DgYouxvRIvtmuIdSRkH4K7QZY6Uv dTgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683071971; x=1685663971; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Vrzm20KVvWkxv1M0pGs1v67Yn/sf7zTbzt4N4hbrnik=; b=Va4u/VZnj8jY/36XJjw+pYoeI+3VpBAxoa5pWV9SjQCkCzKDGEl8Zh+BmLEsAWP03D k0QY67mRXPFOMZyYExt9OFG7jfKHATDeKMeVj5rSx8eR45iQIt6ihZuBIrNzcbyswYND e4FUPvfLRgla7nD7NfQwK5Wfl1cTz9Lc8s0rNPK7JccxTYplmBUh0j49GQY2Le8VYGjt UcZWIShIECjfXFxW6qdp6tgGeX5YHCioZFg+2FmbuS9Ff5ZYQ5o9lV0pOJ3LjibrULAT 5Fv/lJV3sPiBbe2J0zowe2BDuynORqxBV/x5HiLpO928vme3JAyDfct0zBtUJyMl/ZRc 4RkA== X-Gm-Message-State: AC+VfDweu1/P6+lzQtd1NX4jl5Y9eMFrurH4TePW/1TlMi1hqN8ZgLRg Ll/T54haTYVQDXXhXalO5i8NuQ== X-Google-Smtp-Source: ACHHUZ6WCTLdZ0zveC63gn2RwIgBXoxDWUQSXyxCMG8eCrFiydyY5Mkjdx3/GOyNhq58Jm8JWXlGJg== X-Received: by 2002:ac2:421a:0:b0:4ec:a19c:32b0 with SMTP id y26-20020ac2421a000000b004eca19c32b0mr379343lfh.5.1683071971677; Tue, 02 May 2023 16:59:31 -0700 (PDT) Received: from ?IPV6:2001:14ba:a0db:1f00::8a5? (dzdqv0yyyyyyyyyyybcwt-3.rev.dnainternet.fi. [2001:14ba:a0db:1f00::8a5]) by smtp.gmail.com with ESMTPSA id d24-20020ac24c98000000b004e88a166eb6sm5587218lfl.46.2023.05.02.16.59.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 02 May 2023 16:59:31 -0700 (PDT) Message-ID: Date: Wed, 3 May 2023 02:59:30 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: [PATCH 5/7] drm/msm/dpu: inline dpu_encoder_get_wb() Content-Language: en-GB To: Abhinav Kumar , Rob Clark , Sean Paul , Marijn Suijten Cc: Stephen Boyd , David Airlie , Daniel Vetter , Bjorn Andersson , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org References: <20230430235732.3341119-1-dmitry.baryshkov@linaro.org> <20230430235732.3341119-6-dmitry.baryshkov@linaro.org> <6ad0c581-1955-3013-0ef3-6340240d0c1b@quicinc.com> <9f977692-d74d-9f49-e626-399aeeef7f18@linaro.org> <7f88318c-c7f9-efdd-7bc8-aa121d8430c5@quicinc.com> From: Dmitry Baryshkov In-Reply-To: <7f88318c-c7f9-efdd-7bc8-aa121d8430c5@quicinc.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 03/05/2023 02:58, Abhinav Kumar wrote: > > > On 5/2/2023 4:54 PM, Dmitry Baryshkov wrote: >> On 03/05/2023 02:51, Abhinav Kumar wrote: >>> >>> >>> On 4/30/2023 4:57 PM, Dmitry Baryshkov wrote: >>>> The function dpu_encoder_get_wb() returns controller_id if the >>>> corresponding WB is present in the catalog. We can inline this function >>>> and rely on dpu_rm_get_wb() returning NULL for indices for which the >>>> WB is not present on the device. >>>> >>>> Signed-off-by: Dmitry Baryshkov >>>> --- >>>>   drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 24 >>>> ++------------------- >>>>   1 file changed, 2 insertions(+), 22 deletions(-) >>>> >>>> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c >>>> b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c >>>> index 4c85cbb030e4..507ff3f88c67 100644 >>>> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c >>>> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c >>>> @@ -1277,22 +1277,6 @@ static enum dpu_intf >>>> dpu_encoder_get_intf(const struct dpu_mdss_cfg *catalog, >>>>       return INTF_MAX; >>>>   } >>>> -static enum dpu_wb dpu_encoder_get_wb(const struct dpu_mdss_cfg >>>> *catalog, >>>> -        enum dpu_intf_type type, u32 controller_id) >>>> -{ >>>> -    int i = 0; >>>> - >>>> -    if (type != INTF_WB) >>>> -        return WB_MAX; >>>> - >>>> -    for (i = 0; i < catalog->wb_count; i++) { >>>> -        if (catalog->wb[i].id == controller_id) >>>> -            return catalog->wb[i].id; >>>> -    } >>>> - >>>> -    return WB_MAX; >>>> -} >>>> - >>>>   void dpu_encoder_vblank_callback(struct drm_encoder *drm_enc, >>>>           struct dpu_encoder_phys *phy_enc) >>>>   { >>>> @@ -2261,7 +2245,6 @@ static int dpu_encoder_setup_display(struct >>>> dpu_encoder_virt *dpu_enc, >>>>            */ >>>>           u32 controller_id = disp_info->h_tile_instance[i]; >>>>           enum dpu_intf intf_idx; >>>> -        enum dpu_wb wb_idx; >>>>           if (disp_info->num_of_h_tiles > 1) { >>>>               if (i == 0) >>>> @@ -2279,14 +2262,11 @@ static int dpu_encoder_setup_display(struct >>>> dpu_encoder_virt *dpu_enc, >>>>                                   disp_info->intf_type, >>>>                                   controller_id); >>>> -        wb_idx = dpu_encoder_get_wb(dpu_kms->catalog, >>>> -                disp_info->intf_type, controller_id); >>>> - >>>>           if (intf_idx >= INTF_0 && intf_idx < INTF_MAX) >>>>               phys_params.hw_intf = dpu_rm_get_intf(&dpu_kms->rm, >>>> intf_idx); >>>> -        if (wb_idx >= WB_0 && wb_idx < WB_MAX) >>>> -            phys_params.hw_wb = dpu_rm_get_wb(&dpu_kms->rm, wb_idx); >>>> +        if (disp_info->intf_type == INTF_WB && controller_id < WB_MAX) >>>> +            phys_params.hw_wb = dpu_rm_get_wb(&dpu_kms->rm, >>>> controller_id); >>> >>> >>>  From what I see, with >>> https://patchwork.freedesktop.org/patch/534776/?series=117146&rev=1 >>> we are dropping those checks from the RM too, so we are going to rely >>> totally on entering the values correctly in catalog from now on? >> >> Yes. I see no reason to mistrust the kernel data itself. > > Alright, if thats the overall plan, this change itself is fine. Yes, I think this is what we discussed some time ago for UBWC and QSEED programming. > > Reviewed-by: Abhinav Kumar >> >>> >>>>           if (!phys_params.hw_intf && !phys_params.hw_wb) { >>>>               DPU_ERROR_ENC(dpu_enc, "no intf or wb block assigned >>>> at idx: %d\n", i); >> -- With best wishes Dmitry