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