From patchwork Fri Oct 6 13:14:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 730415 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 3CEAEE81DF5 for ; Fri, 6 Oct 2023 13:14:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232310AbjJFNO5 (ORCPT ); Fri, 6 Oct 2023 09:14:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232159AbjJFNO4 (ORCPT ); Fri, 6 Oct 2023 09:14:56 -0400 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B259283 for ; Fri, 6 Oct 2023 06:14:53 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-5043a01ee20so2629346e87.0 for ; Fri, 06 Oct 2023 06:14:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696598092; x=1697202892; 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=itYPcSWRtAATpzEiTYMgzBqAA5lAMODL1AvBzjtdwpA=; b=dqfRHcPFwA+8RJhStz9wKnOSal33rJRhkPeeI83r/iUNXxWUh8qaQ1ILA9UdSkw5px 1K4Ur37dDJan3OY/92Vv5i7rbihTn1ZwwMyiTHWsxrMS6222rOb6Qh4QPkV5QLb3w86l ek2b+gMxvYIB7J+X9/gBQVzjzVBIs9bQb6eFTaM3KVI3Slj66cg718fOQxeccs+wNpec MFh/W9fBsgB5fC4jwE7g+65mhRBKkEwfYNtywl5kF0acuIvZdFccnH6rO5Epq+h9Jia+ Ichhy8tgAMDAbFgbxeyBY55Vew17iVUvnPOUEReKlTIBq+eMfLZV0CI6suaxk1blG5ki B5Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696598092; x=1697202892; 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=itYPcSWRtAATpzEiTYMgzBqAA5lAMODL1AvBzjtdwpA=; b=mMic6bFeFqJNl4azfnlHzMrKA75dut9CbtE7KrYPOmLfHJ4Np9e3CNdBSE+7ylcFzM K6j5OjQE3nwliD0jVhR4UxHjzPBNkrW7/2562M+jo22hAb9z+rwqK54VRdzUmPBE2ia+ lV2nGH46tyBUfyoLPYO/y+sy+xC2oYHJE/VaajIlzIdEvOMJf8M5AVARrkZGI256JfHj HJyOA0uOrRDvUa7A/l+c9uyAB3+5laMCf1fVSMArt4oxHEIzS9GRgi9PpDhbQmjtHbS+ +DyYKqXd3ba26ZC7OyoGAnL8qIKg0IPAhDYB8kfclsbkjM2zV5ERgfghCLJ7qN5r0erl s1tA== X-Gm-Message-State: AOJu0Yzcs3siyduKjTL+l6EaST/O9lQP3fpMI2Rvp7Q/T6vZI8pz+Fq8 fulZpPxY+9CVEVI6JQn82si9iw== X-Google-Smtp-Source: AGHT+IHbq76vq4MURTNm9Y5LCqyAQE07bF27ciPppI8aHjPFl4y5DPbVytYX/AkjdLIJxDGOFvlztg== X-Received: by 2002:ac2:4e6a:0:b0:501:c779:b3bb with SMTP id y10-20020ac24e6a000000b00501c779b3bbmr6332687lfs.60.1696598091881; Fri, 06 Oct 2023 06:14:51 -0700 (PDT) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id g9-20020a19ee09000000b004fbb011c9bcsm301285lfb.161.2023.10.06.06.14.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 06:14:51 -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 v6 00/10] drm/msm/dpu: simplify DPU sub-blocks info Date: Fri, 6 Oct 2023 16:14:40 +0300 Message-Id: <20231006131450.2436688-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 v5: - Fixed the rogue vig_qseed3_noscale sblk. There is no qseed3 in the noscale VIG blocks. 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(-)