From patchwork Thu Oct 5 21:26:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 729756 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 54341E92FC0 for ; Thu, 5 Oct 2023 21:27:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231330AbjJEV1K (ORCPT ); Thu, 5 Oct 2023 17:27:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229552AbjJEV1J (ORCPT ); Thu, 5 Oct 2023 17:27:09 -0400 Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 60A42F2 for ; Thu, 5 Oct 2023 14:27:06 -0700 (PDT) Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2c012232792so17819381fa.0 for ; Thu, 05 Oct 2023 14:27:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696541224; x=1697146024; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=1TqfAnPm+aqKJ7RICtUDzyL8tsOmR1pfL3HN7VslD1A=; b=e4PffEWKjMGUS9Mg8ORzcwNrn0+d/svxH1f/Ec+3aHQ1RERvmP18lzAtR5mJPMWSo/ 8YLENoKnKoR6w0YrWu+noxa+GRu/SxyEH6e83kNUgSrRfV7fluWjidJTI50dMi1WJOcH Cy0x2grmEr+2Cvr6BMiR1bA7wIZBaNt3MtSafBb7zpevAnfEpgkJQOjfGjzDKCt3GlDN SuOilzxXJC6WUqSpzRXC75NH8ItQWGSFMHdxNVUkHj2QN0W9Eu8xz4hWEvWRpDWM/sCJ E6kka/OoRdgc0npHV1pVAWYpmr+FZPKEV5jPR48+8fjoxSJEHNomjEcOIkt+VtGbX/PF jBFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696541224; x=1697146024; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1TqfAnPm+aqKJ7RICtUDzyL8tsOmR1pfL3HN7VslD1A=; b=PDxaBRBH90VdrqKJ0GXxeURSxV9Ys+Fr9QX+N/KkDQ77utMctg7eYC4hQ2IhmEPoxs iQKNP+3aTwyeyLkNT65ptFvfOnCXWWMU0/RllqMFU/6imVDOoPbZ3N3UAJX2pV9Y6COP HLIkNV1nsh7fBAZzOATI7B8jt4wPbd7kohY8u78iyBE4Ne5bCgXZqKaabs8IZzJglwR8 tCrE5Jc52mVpmU2OIjQ8xm/NZD2QV2diyyXOjyyCcJwJINR9fVoLLdd+qqMtMcLR0CIA y6fvre5GgD9WPWqx8yKHTCskVogarwUfQfO7stqxztJy8L2X1PeqDyAZbPqMs76Fbh2+ z5dQ== X-Gm-Message-State: AOJu0Yw48hMNOErxGqTdKH0f9NjTjFjkuQUfIa/DdeC/EveVApMFMIGu VVA49lhaOJU2KzuswcgYcIG1Wg== X-Google-Smtp-Source: AGHT+IE8eeNcaGwdHHDKL7oAQH/f8hwSAGWHRjnz17Ynq4w9wAL3eMkq28AUxhtbQsWQJguCw23EIQ== X-Received: by 2002:a19:6518:0:b0:500:acf1:b42f with SMTP id z24-20020a196518000000b00500acf1b42fmr4576828lfb.53.1696541224048; Thu, 05 Oct 2023 14:27:04 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id a6-20020a19f806000000b00500b3157ec6sm8435lff.143.2023.10.05.14.27.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 14:27:03 -0700 (PDT) From: Dmitry Baryshkov To: Rob Clark , Sean Paul , Abhinav Kumar , 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 Subject: [PATCH v5 00/10] drm/msm/dpu: simplify DPU sub-blocks info Date: Fri, 6 Oct 2023 00:26:53 +0300 Message-Id: <20231005212703.2400237-1-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The handling code also usually knows, which sub-block it is now looking at. Drop unused 'id' field and arguments and merge some of sub-block declarations. While we are at it, also fix all VIG subblocks to contain correct scaler block version and drop the becoming unused QSEED-related feature bits. Changes since v4: - Renamed dpu_vig_sblk_x_y to dpu_vig_sblk_qseed3_1_2 (Abhinav) Note: I've choosen _qseed3_ instead of the suggested _scaler_, as there are other scaler types which might have their own versioning scheme - Dropped the DPU_SSPP_SCALER and DPU_SSPP_CSC_ANY defines (Abhinav) Changes since v3: - Proprely describe dpu_scaler_blk::version field as the register value (Marijn) - Picked up Marijn's prior art patches (sorry, missed them while preparing v3) (Marijn) Changes since v2: - Reworked the VIG SBLK definitions to set the scaler version (Marijn, Abhinav) - Rebased the reset of the patches on top of this (intrusive) change. - Folded QSEED3LITE and QSEED4 feature bits into QSEED3 Dmitry Baryshkov (8): drm/msm/dpu: populate SSPP scaler block version drm/msm/dpu: drop the `id' field from DPU_HW_SUBBLK_INFO drm/msm/dpu: drop the `smart_dma_priority' field from struct dpu_sspp_sub_blks drm/msm/dpu: deduplicate some (most) of SSPP sub-blocks drm/msm/dpu: drop DPU_HW_SUBBLK_INFO macro drm/msm/dpu: rewrite scaler and CSC presense checks drm/msm/dpu: merge DPU_SSPP_SCALER_QSEED3, QSEED3LITE, QSEED4 drm/msm/gpu: drop duplicating VIG feature masks Marijn Suijten (2): drm/msm/dpu: Drop unused get_scaler_ver callback from SSPP drm/msm/dpu: Drop unused qseed_type from catalog dpu_caps .../msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 17 +- .../msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 17 +- .../msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 17 +- .../msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 17 +- .../msm/disp/dpu1/catalog/dpu_5_4_sm6125.h | 8 +- .../msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 25 ++- .../msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 11 +- .../msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 7 +- .../msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 11 +- .../msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 4 +- .../msm/disp/dpu1/catalog/dpu_6_9_sm6375.h | 7 +- .../msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 25 ++- .../msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 9 +- .../msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 25 ++- .../msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 25 ++- .../msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 29 ++-- .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 145 +++++++----------- .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 55 +++---- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 20 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 21 --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 6 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 3 - drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 7 +- 23 files changed, 201 insertions(+), 310 deletions(-)