From patchwork Wed Feb 15 23:02:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marijn Suijten X-Patchwork-Id: 57763 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp465819wrn; Wed, 15 Feb 2023 15:04:03 -0800 (PST) X-Google-Smtp-Source: AK7set8B2VNzhsa78KjGaCFWlXYrbowlLC/+Y0jiuER6KzBfrtc2e3HEmQrryBzDl/eFf/SCBJN5 X-Received: by 2002:a05:6a00:3025:b0:5a8:b881:e906 with SMTP id ay37-20020a056a00302500b005a8b881e906mr185489pfb.7.1676502242944; Wed, 15 Feb 2023 15:04:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676502242; cv=none; d=google.com; s=arc-20160816; b=rzHXjAccKeeTSWTJ94XNXx2SidFODPy/0QnLpDdXjoLF8/s44UUk43BkGaBkr9H0eA vJQPjbnlADUanZToQeixhu0CL/7YnLTWhVw9EevmRfIlh1rv3rCp5Glc1+GAVal8d8hQ 1W7v129mLuKNtTWoX5Pskfhu/b7e9PFLOeVVVauusLLRjVdLyB8S/a6U8R5OPhzRijr9 stOaP+iD85G2rl3eacydIYKCL73jAgddsuDNiuWWrxIvsUCTieL6H9G3NEaNHQtUVYnz wnQid77chTx66gpbw74EQSJeAdY769KahWPXk+WFzn+K8zmX+DAYbA7nC95KtFldYyAR dJrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from; bh=NkVC67WofUxNHXo5CJ2VRbU535J1dfc0+q3bw11ObO0=; b=A4RBNwt2EV3xZRiXXdCL5LYkVtdTVUjnDUPuGlj32Cg4wsPrpdO9SdB/dTltczRd3g HVJPWLVHENaWpCYNJIs3GwxEVtLcuNvbtfgL7yMm40Ewb80isi/t2LlwDXr4E+p6OHGY 3pAtptFcxzarUXWkC5cYbO0HqLmifuHQdMP+RY7qPSh7t2yxWc9ksAou1U2+6UEiDRQK xM5aHSLPsyohK6QBA/sKRm+5eE+7tPuAXSs7kEkOh/KG/zj9FboAJNHcy04uC0lxVH0+ D0d0f9DoyPL96n/LU50uDsgvcn3OCuRYfZp3deNECrHEi3tVuU7fTpGwKQWmArTAu3UN J99A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s13-20020aa78bcd000000b005a8d1616e58si7725352pfd.25.2023.02.15.15.03.50; Wed, 15 Feb 2023 15:04:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229906AbjBOXCk (ORCPT + 99 others); Wed, 15 Feb 2023 18:02:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229809AbjBOXCg (ORCPT ); Wed, 15 Feb 2023 18:02:36 -0500 Received: from relay04.th.seeweb.it (relay04.th.seeweb.it [5.144.164.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 818A538EB7 for ; Wed, 15 Feb 2023 15:02:32 -0800 (PST) Received: from Marijn-Arch-PC.localdomain (94-211-6-86.cable.dynamic.v4.ziggo.nl [94.211.6.86]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by m-r1.th.seeweb.it (Postfix) with ESMTPSA id 29EE420206; Thu, 16 Feb 2023 00:02:30 +0100 (CET) From: Marijn Suijten Date: Thu, 16 Feb 2023 00:02:23 +0100 Subject: [PATCH 1/3] drm/msm/dpu: Read previously-uninitialized SSPP scaler version from hw MIME-Version: 1.0 Message-Id: <20230215-sspp-scaler-version-v1-1-416b1500b85b@somainline.org> References: <20230215-sspp-scaler-version-v1-0-416b1500b85b@somainline.org> In-Reply-To: <20230215-sspp-scaler-version-v1-0-416b1500b85b@somainline.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Archit Taneja , Chandan Uddaraju , Sravanthi Kollukuduru Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, AngeloGioacchino Del Regno , Konrad Dybcio , Martin Botka , Jami Kettunen , phone-devel@vger.kernel.org, Marijn Suijten X-Mailer: b4 0.12.1 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757940015966309647?= X-GMAIL-MSGID: =?utf-8?q?1757940015966309647?= DPU's catalog never assigned dpu_scaler_blk::version leading to initialization code in dpu_hw_setup_scaler3 to wander the wrong codepaths. Instead of hardcoding the correct QSEED algorithm version, read it back from a hardware register. Note that this register is only available starting with QSEED3, where 0x1002 corresponds to QSEED3, 0x2004 to QSEED3LITE and 0x3000 to QSEED4. Fixes: 25fdd5933e4c ("drm/msm: Add SDM845 DPU support") Signed-off-by: Marijn Suijten --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 8 +++++++- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h index ddab9caebb18..96ce1766f4a1 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -324,11 +324,9 @@ struct dpu_src_blk { /** * struct dpu_scaler_blk: Scaler information * @info: HW register and features supported by this sub-blk - * @version: qseed block revision */ struct dpu_scaler_blk { DPU_HW_SUBBLK_INFO; - u32 version; }; struct dpu_csc_blk { diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c index 4246ab0b3bee..d4e181e1378c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c @@ -430,7 +430,7 @@ static void _dpu_hw_sspp_setup_scaler3(struct dpu_hw_pipe *ctx, return; dpu_hw_setup_scaler3(&ctx->hw, scaler3_cfg, idx, - ctx->cap->sblk->scaler_blk.version, + ctx->version, sspp->layout.format); } @@ -807,6 +807,12 @@ struct dpu_hw_pipe *dpu_hw_sspp_init(enum dpu_sspp idx, hw_pipe->mdp = &catalog->mdp[0]; hw_pipe->idx = idx; hw_pipe->cap = cfg; + + if (test_bit(DPU_SSPP_SCALER_QSEED3, &cfg->features) || + test_bit(DPU_SSPP_SCALER_QSEED3LITE, &cfg->features) || + test_bit(DPU_SSPP_SCALER_QSEED4, &cfg->features)) + hw_pipe->version = _dpu_hw_sspp_get_scaler3_ver(hw_pipe); + _setup_layer_ops(hw_pipe, hw_pipe->cap->features); return hw_pipe; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h index 0c95b7e64f6c..eeaf16c6af15 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h @@ -352,6 +352,7 @@ struct dpu_hw_sspp_ops { * @hw: block hardware details * @catalog: back pointer to catalog * @mdp: pointer to associated mdp portion of the catalog + * @version: qseed block revision * @idx: pipe index * @cap: pointer to layer_cfg * @ops: pointer to operations possible for this pipe @@ -362,6 +363,8 @@ struct dpu_hw_pipe { const struct dpu_mdss_cfg *catalog; const struct dpu_mdp_cfg *mdp; + u32 version; + /* Pipe */ enum dpu_sspp idx; const struct dpu_sspp_cfg *cap; From patchwork Wed Feb 15 23:02:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marijn Suijten X-Patchwork-Id: 57761 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp465792wrn; Wed, 15 Feb 2023 15:04:01 -0800 (PST) X-Google-Smtp-Source: AK7set/0J4pB9QDzYzpH2fSG8a0/P9/A5MPJolnnX51azrDmSoA4oZHiHa/BKI9C6oflEsuDLXgK X-Received: by 2002:a17:90a:86c1:b0:234:67ef:304b with SMTP id y1-20020a17090a86c100b0023467ef304bmr3303710pjv.37.1676502241182; Wed, 15 Feb 2023 15:04:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676502241; cv=none; d=google.com; s=arc-20160816; b=DBSxQUop4dXb8jFkkYaVOIo9gvvOEB8a6Oz/6dq2bcVwmJj/UPTVOPUviOgseTdz5+ TkWU9++tF1wPLUDVLVDBY9aaSPvf16bzDXEv0m3aaWUWHTNHCjwKP9DRHO2xvdzwdun2 6iLNShSM6XbwHYuLtTqMTj8E5NyyQICLzc42zMKiYHJY70LSrKc4ja9U0MnXGaDAE5m0 8tvK1VXeM/8fnQgLzhEqBrmDPqHWvaup1yvcCumVp94QoBVlZ4vcfgY0GER7fgj+akPT oAV4bGSdtQA04m7vupONzIWjpDFH6bxaSKxSorryiVoakUKEFPqWb3N8OEl9OjTwNQ2J 8qnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from; bh=yzep8mrtrjU3LtKv/tGIfOXA58C05vdoxjUNh9kG7/M=; b=GNOZT7C7rv6D1dsC/t/6CTPrlijpQdb4/hahwJAHm4d2I1ySIupKFofZGfRfVYlr0z hR1fdmPmB/gzGx8vcL1DbAynNNqjQw981pYbHj27Pfa7OMAP7EtiHCfknKb4vcBW+dQ+ 19XKQe9ALu344n4OSU/2NVaXibRkOa2YoEz36IOeCz28JzZPblRAHm4uDQ3M6+evW6AV lSve9QSJfeBHBvX3wsPVOvqPeQcOW5shbPwrK8IjmtHvIbCcDD5Sn7R+/TUwp0mlj7Qy VzLCweN29Fffaus4i3dNMq5+o71vE33GZg8rifsnYBonSPADg5M0pFNffnZR+SJX6FPF 2hWg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h6-20020a63b006000000b004e03d6859f1si18243105pgf.289.2023.02.15.15.03.46; Wed, 15 Feb 2023 15:04:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229946AbjBOXCn (ORCPT + 99 others); Wed, 15 Feb 2023 18:02:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229862AbjBOXCh (ORCPT ); Wed, 15 Feb 2023 18:02:37 -0500 Received: from relay02.th.seeweb.it (relay02.th.seeweb.it [5.144.164.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47B5334C01 for ; Wed, 15 Feb 2023 15:02:33 -0800 (PST) Received: from Marijn-Arch-PC.localdomain (94-211-6-86.cable.dynamic.v4.ziggo.nl [94.211.6.86]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by m-r1.th.seeweb.it (Postfix) with ESMTPSA id C74CA20410; Thu, 16 Feb 2023 00:02:30 +0100 (CET) From: Marijn Suijten Date: Thu, 16 Feb 2023 00:02:24 +0100 Subject: [PATCH 2/3] drm/msm/dpu: Drop unused get_scaler_ver callback from SSPP MIME-Version: 1.0 Message-Id: <20230215-sspp-scaler-version-v1-2-416b1500b85b@somainline.org> References: <20230215-sspp-scaler-version-v1-0-416b1500b85b@somainline.org> In-Reply-To: <20230215-sspp-scaler-version-v1-0-416b1500b85b@somainline.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Archit Taneja , Chandan Uddaraju , Sravanthi Kollukuduru Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, AngeloGioacchino Del Regno , Konrad Dybcio , Martin Botka , Jami Kettunen , phone-devel@vger.kernel.org, Marijn Suijten X-Mailer: b4 0.12.1 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757940013812177385?= X-GMAIL-MSGID: =?utf-8?q?1757940013812177385?= This pointer callback is never used and should be removed. The helper _dpu_hw_sspp_get_scaler3_ver function is retained as it is being used by dpu_hw_sspp_init which didn't itself compute _sspp_subblk_offset yet. Signed-off-by: Marijn Suijten Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 4 +--- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 6 ------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c index d4e181e1378c..00e5dc2318db 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c @@ -689,10 +689,8 @@ static void _setup_layer_ops(struct dpu_hw_pipe *c, if (test_bit(DPU_SSPP_SCALER_QSEED3, &features) || test_bit(DPU_SSPP_SCALER_QSEED3LITE, &features) || - test_bit(DPU_SSPP_SCALER_QSEED4, &features)) { + test_bit(DPU_SSPP_SCALER_QSEED4, &features)) c->ops.setup_scaler = _dpu_hw_sspp_setup_scaler3; - c->ops.get_scaler_ver = _dpu_hw_sspp_get_scaler3_ver; - } if (test_bit(DPU_SSPP_CDP, &features)) c->ops.setup_cdp = dpu_hw_sspp_setup_cdp; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h index eeaf16c6af15..bebb62c09dd8 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h @@ -329,12 +329,6 @@ struct dpu_hw_sspp_ops { struct dpu_hw_pipe_cfg *pipe_cfg, void *scaler_cfg); - /** - * get_scaler_ver - get scaler h/w version - * @ctx: Pointer to pipe context - */ - u32 (*get_scaler_ver)(struct dpu_hw_pipe *ctx); - /** * setup_cdp - setup client driven prefetch * @ctx: Pointer to pipe context From patchwork Wed Feb 15 23:02:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marijn Suijten X-Patchwork-Id: 57762 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp465813wrn; Wed, 15 Feb 2023 15:04:02 -0800 (PST) X-Google-Smtp-Source: AK7set+c0R4l/jTmbB4zDtUJUtdbM1aGL0gC5QC5F0n5g0jsKJ271pi93kraz/KB3kOsAP01P7Mr X-Received: by 2002:a17:90a:19a:b0:230:a195:b8ac with SMTP id 26-20020a17090a019a00b00230a195b8acmr4949661pjc.7.1676502242456; Wed, 15 Feb 2023 15:04:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676502242; cv=none; d=google.com; s=arc-20160816; b=U1sWL7O3nE7rBZqLskZ+Y6/BchNPRpPNWsJLy4PbLQV4s88+o+mEQvZkrbZONHKDtu BjzLXQZEJR6LixyAyuKW9AHoF9kloj33Hg8yTSMp2UdPARNMtQnjhEmXiquOY+MJS4N3 WyK9CItCyJjSu+1dYA1fzimvtPw+bqnG5qg3/eQzf0iuuZroBzRvuusMllxuhMkxm2Zs fCmP+4Lnj9VvXiFu2rf6OdkI5JxHg9tWyZACUkpIu6ruAreV9vW6AwDfGHpUL7Z4cxZN ib81Pi6CUjumIQsRDHoSOQbk2aV13q7KgUUHGc9oksaRMQF3alolXuNWEF/D0x6bt60j Vtfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from; bh=k34yWq9AJ1ITR9F2CzwQdFjvBFYSKC/WSEawudwqKOo=; b=bUvvpYY+IOxHICgEFqR7It69CnQSHLSEggZ90+I9hTJpk/16M5pglyvyKSD8c6fZNO Avr0fCpXcG1tANk5iv0gkGPsAucP9efEgcLQNmr4Y7qCOtUcJBelXIij7luncTsIMOjX v5B/TkUhGlduq6xJN1qfEnrgD62edaJkiK592ykTG5AnTTvXnH4ikKyU1li36Icaj5pV HxG96hWURznfzgzoAB9DXzaf+EiqxWef6V6vd925/eEpqVrQ0KHqyo4P1UOnsqZoLp+H 1A+8B2aTjJIre1ocKgeX1wh/dlZjdxFFunjte8VvI/rB59Qul3dDWkL1O7JFbFN7TjEM 78ow== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p2-20020a17090ab90200b00233f908c3b7si3166599pjr.143.2023.02.15.15.03.48; Wed, 15 Feb 2023 15:04:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229956AbjBOXCq (ORCPT + 99 others); Wed, 15 Feb 2023 18:02:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229884AbjBOXCj (ORCPT ); Wed, 15 Feb 2023 18:02:39 -0500 Received: from relay04.th.seeweb.it (relay04.th.seeweb.it [5.144.164.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 802B63CE20; Wed, 15 Feb 2023 15:02:33 -0800 (PST) Received: from Marijn-Arch-PC.localdomain (94-211-6-86.cable.dynamic.v4.ziggo.nl [94.211.6.86]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by m-r1.th.seeweb.it (Postfix) with ESMTPSA id 6DC7420416; Thu, 16 Feb 2023 00:02:31 +0100 (CET) From: Marijn Suijten Date: Thu, 16 Feb 2023 00:02:25 +0100 Subject: [PATCH 3/3] drm/msm/dpu: Drop unused qseed_type from catalog dpu_caps MIME-Version: 1.0 Message-Id: <20230215-sspp-scaler-version-v1-3-416b1500b85b@somainline.org> References: <20230215-sspp-scaler-version-v1-0-416b1500b85b@somainline.org> In-Reply-To: <20230215-sspp-scaler-version-v1-0-416b1500b85b@somainline.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Archit Taneja , Chandan Uddaraju , Sravanthi Kollukuduru Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht, AngeloGioacchino Del Regno , Konrad Dybcio , Martin Botka , Jami Kettunen , phone-devel@vger.kernel.org, Marijn Suijten X-Mailer: b4 0.12.1 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757940015546036567?= X-GMAIL-MSGID: =?utf-8?q?1757940015546036567?= The SSPP scaler subblk is responsible for reporting its version (via the .id field, feature bits on the parent SSPP block, and since recently also from reading a register to supersede a read-but-unset version field in the catalog), leaving this global qseed_type field logically unused. Remove this dead code to lighten the catalog and bringup-overhead. Signed-off-by: Marijn Suijten Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 12 ------------ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 2 -- 2 files changed, 14 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c index cf053e8f081e..bd57a4cce4a9 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -300,7 +300,6 @@ static const uint32_t wb2_formats[] = { static const struct dpu_caps msm8998_dpu_caps = { .max_mixer_width = DEFAULT_DPU_OUTPUT_LINE_WIDTH, .max_mixer_blendstages = 0x7, - .qseed_type = DPU_SSPP_SCALER_QSEED3, .smart_dma_rev = DPU_SSPP_SMART_DMA_V1, .ubwc_version = DPU_HW_UBWC_VER_10, .has_src_split = true, @@ -327,7 +326,6 @@ static const struct dpu_caps qcm2290_dpu_caps = { static const struct dpu_caps sdm845_dpu_caps = { .max_mixer_width = DEFAULT_DPU_OUTPUT_LINE_WIDTH, .max_mixer_blendstages = 0xb, - .qseed_type = DPU_SSPP_SCALER_QSEED3, .smart_dma_rev = DPU_SSPP_SMART_DMA_V2, .ubwc_version = DPU_HW_UBWC_VER_20, .has_src_split = true, @@ -343,7 +341,6 @@ static const struct dpu_caps sdm845_dpu_caps = { static const struct dpu_caps sc7180_dpu_caps = { .max_mixer_width = DEFAULT_DPU_OUTPUT_LINE_WIDTH, .max_mixer_blendstages = 0x9, - .qseed_type = DPU_SSPP_SCALER_QSEED4, .smart_dma_rev = DPU_SSPP_SMART_DMA_V2, .ubwc_version = DPU_HW_UBWC_VER_20, .has_dim_layer = true, @@ -355,7 +352,6 @@ static const struct dpu_caps sc7180_dpu_caps = { static const struct dpu_caps sm6115_dpu_caps = { .max_mixer_width = DEFAULT_DPU_OUTPUT_LINE_WIDTH, .max_mixer_blendstages = 0x4, - .qseed_type = DPU_SSPP_SCALER_QSEED3LITE, .smart_dma_rev = DPU_SSPP_SMART_DMA_V2, /* TODO: v2.5 */ .ubwc_version = DPU_HW_UBWC_VER_10, .has_dim_layer = true, @@ -367,7 +363,6 @@ static const struct dpu_caps sm6115_dpu_caps = { static const struct dpu_caps sm8150_dpu_caps = { .max_mixer_width = DEFAULT_DPU_OUTPUT_LINE_WIDTH, .max_mixer_blendstages = 0xb, - .qseed_type = DPU_SSPP_SCALER_QSEED3, .smart_dma_rev = DPU_SSPP_SMART_DMA_V2, /* TODO: v2.5 */ .ubwc_version = DPU_HW_UBWC_VER_30, .has_src_split = true, @@ -383,7 +378,6 @@ static const struct dpu_caps sm8150_dpu_caps = { static const struct dpu_caps sc8180x_dpu_caps = { .max_mixer_width = DEFAULT_DPU_OUTPUT_LINE_WIDTH, .max_mixer_blendstages = 0xb, - .qseed_type = DPU_SSPP_SCALER_QSEED3, .smart_dma_rev = DPU_SSPP_SMART_DMA_V2, /* TODO: v2.5 */ .ubwc_version = DPU_HW_UBWC_VER_30, .has_src_split = true, @@ -399,7 +393,6 @@ static const struct dpu_caps sc8180x_dpu_caps = { static const struct dpu_caps sc8280xp_dpu_caps = { .max_mixer_width = 2560, .max_mixer_blendstages = 11, - .qseed_type = DPU_SSPP_SCALER_QSEED3LITE, .smart_dma_rev = DPU_SSPP_SMART_DMA_V2, /* TODO: v2.5 */ .ubwc_version = DPU_HW_UBWC_VER_40, .has_src_split = true, @@ -413,7 +406,6 @@ static const struct dpu_caps sc8280xp_dpu_caps = { static const struct dpu_caps sm8250_dpu_caps = { .max_mixer_width = DEFAULT_DPU_OUTPUT_LINE_WIDTH, .max_mixer_blendstages = 0xb, - .qseed_type = DPU_SSPP_SCALER_QSEED3LITE, .smart_dma_rev = DPU_SSPP_SMART_DMA_V2, /* TODO: v2.5 */ .ubwc_version = DPU_HW_UBWC_VER_40, .has_src_split = true, @@ -427,7 +419,6 @@ static const struct dpu_caps sm8250_dpu_caps = { static const struct dpu_caps sm8350_dpu_caps = { .max_mixer_width = DEFAULT_DPU_OUTPUT_LINE_WIDTH, .max_mixer_blendstages = 0xb, - .qseed_type = DPU_SSPP_SCALER_QSEED3LITE, .smart_dma_rev = DPU_SSPP_SMART_DMA_V2, /* TODO: v2.5 */ .ubwc_version = DPU_HW_UBWC_VER_40, .has_src_split = true, @@ -441,7 +432,6 @@ static const struct dpu_caps sm8350_dpu_caps = { static const struct dpu_caps sm8450_dpu_caps = { .max_mixer_width = DEFAULT_DPU_OUTPUT_LINE_WIDTH, .max_mixer_blendstages = 0xb, - .qseed_type = DPU_SSPP_SCALER_QSEED4, .smart_dma_rev = DPU_SSPP_SMART_DMA_V2, /* TODO: v2.5 */ .ubwc_version = DPU_HW_UBWC_VER_40, .has_src_split = true, @@ -455,7 +445,6 @@ static const struct dpu_caps sm8450_dpu_caps = { static const struct dpu_caps sm8550_dpu_caps = { .max_mixer_width = DEFAULT_DPU_OUTPUT_LINE_WIDTH, .max_mixer_blendstages = 0xb, - .qseed_type = DPU_SSPP_SCALER_QSEED3LITE, .smart_dma_rev = DPU_SSPP_SMART_DMA_V2, /* TODO: v2.5 */ .ubwc_version = DPU_HW_UBWC_VER_40, .has_src_split = true, @@ -469,7 +458,6 @@ static const struct dpu_caps sm8550_dpu_caps = { static const struct dpu_caps sc7280_dpu_caps = { .max_mixer_width = DEFAULT_DPU_OUTPUT_LINE_WIDTH, .max_mixer_blendstages = 0x7, - .qseed_type = DPU_SSPP_SCALER_QSEED4, .smart_dma_rev = DPU_SSPP_SMART_DMA_V2, .ubwc_version = DPU_HW_UBWC_VER_30, .has_dim_layer = true, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h index 96ce1766f4a1..0f0332d4c5e3 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -390,7 +390,6 @@ struct dpu_rotation_cfg { * @max_mixer_width max layer mixer line width support. * @max_mixer_blendstages max layer mixer blend stages or * supported z order - * @qseed_type qseed2 or qseed3 support. * @smart_dma_rev Supported version of SmartDMA feature. * @ubwc_version UBWC feature version (0x0 for not supported) * @has_src_split source split feature status @@ -405,7 +404,6 @@ struct dpu_rotation_cfg { struct dpu_caps { u32 max_mixer_width; u32 max_mixer_blendstages; - u32 qseed_type; u32 smart_dma_rev; u32 ubwc_version; bool has_src_split;