From: Konrad Dybcio <konrad.dybcio@linaro.org>
To: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>,
Abhinav Kumar <quic_abhinavk@quicinc.com>
Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org,
Bjorn Andersson <andersson@kernel.org>,
dri-devel@lists.freedesktop.org,
Stephen Boyd <swboyd@chromium.org>,
Daniel Vetter <daniel@ffwll.ch>, David Airlie <airlied@gmail.com>
Subject: Re: [v2,30/50] drm/msm/dpu: split SDM845 catalog entry to the separate file
Date: Thu, 30 Mar 2023 14:19:45 +0200 [thread overview]
Message-ID: <8670c929-3266-e4b0-6be6-acc9b71a2e52@linaro.org> (raw)
In-Reply-To: <20230211231259.1308718-31-dmitry.baryshkov@linaro.org>
On 12.02.2023 00:12, Dmitry Baryshkov wrote:
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
> .../msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 203 +++++++++++++++++
> .../gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 208 +-----------------
> 2 files changed, 204 insertions(+), 207 deletions(-)
> create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
> new file mode 100644
> index 000000000000..739a301afcb4
> --- /dev/null
> +++ b/drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h
> @@ -0,0 +1,203 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +/*
> + * Copyright (c) 2022. Qualcomm Innovation Center, Inc. All rights reserved.
> + * Copyright (c) 2015-2018, 2020 The Linux Foundation. All rights reserved.
> + */
> +
> +#ifndef _DPU_4_0_SDM845_H
> +#define _DPU_4_0_SDM845_H
> +
> +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,
Rebase
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> + .has_src_split = true,
> + .has_dim_layer = true,
> + .has_idle_pc = true,
> + .has_3d_merge = true,
> + .max_linewidth = DEFAULT_DPU_OUTPUT_LINE_WIDTH,
> + .pixel_ram_size = DEFAULT_PIXEL_RAM_SIZE,
> + .max_hdeci_exp = MAX_HORZ_DECIMATION,
> + .max_vdeci_exp = MAX_VERT_DECIMATION,
> +};
> +
> +static const struct dpu_ubwc_cfg sdm845_ubwc_cfg = {
> + .ubwc_version = DPU_HW_UBWC_VER_20,
> + .highest_bank_bit = 0x2,
> +};
> +
> +static const struct dpu_mdp_cfg sdm845_mdp[] = {
> + {
> + .name = "top_0", .id = MDP_TOP,
> + .base = 0x0, .len = 0x45c,
> + .features = BIT(DPU_MDP_AUDIO_SELECT),
> + .clk_ctrls[DPU_CLK_CTRL_VIG0] = { .reg_off = 0x2ac, .bit_off = 0 },
> + .clk_ctrls[DPU_CLK_CTRL_VIG1] = { .reg_off = 0x2b4, .bit_off = 0 },
> + .clk_ctrls[DPU_CLK_CTRL_VIG2] = { .reg_off = 0x2bc, .bit_off = 0 },
> + .clk_ctrls[DPU_CLK_CTRL_VIG3] = { .reg_off = 0x2c4, .bit_off = 0 },
> + .clk_ctrls[DPU_CLK_CTRL_DMA0] = { .reg_off = 0x2ac, .bit_off = 8 },
> + .clk_ctrls[DPU_CLK_CTRL_DMA1] = { .reg_off = 0x2b4, .bit_off = 8 },
> + .clk_ctrls[DPU_CLK_CTRL_DMA2] = { .reg_off = 0x2bc, .bit_off = 8 },
> + .clk_ctrls[DPU_CLK_CTRL_DMA3] = { .reg_off = 0x2c4, .bit_off = 8 },
> + },
> +};
> +
> +static const struct dpu_ctl_cfg sdm845_ctl[] = {
> + {
> + .name = "ctl_0", .id = CTL_0,
> + .base = 0x1000, .len = 0xe4,
> + .features = BIT(DPU_CTL_SPLIT_DISPLAY),
> + .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9),
> + },
> + {
> + .name = "ctl_1", .id = CTL_1,
> + .base = 0x1200, .len = 0xe4,
> + .features = BIT(DPU_CTL_SPLIT_DISPLAY),
> + .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10),
> + },
> + {
> + .name = "ctl_2", .id = CTL_2,
> + .base = 0x1400, .len = 0xe4,
> + .features = 0,
> + .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11),
> + },
> + {
> + .name = "ctl_3", .id = CTL_3,
> + .base = 0x1600, .len = 0xe4,
> + .features = 0,
> + .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12),
> + },
> + {
> + .name = "ctl_4", .id = CTL_4,
> + .base = 0x1800, .len = 0xe4,
> + .features = 0,
> + .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13),
> + },
> +};
> +
> +static const struct dpu_sspp_cfg sdm845_sspp[] = {
> + SSPP_BLK("sspp_0", SSPP_VIG0, 0x4000, 0x1c8, VIG_SDM845_MASK,
> + sdm845_vig_sblk_0, 0, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG0),
> + SSPP_BLK("sspp_1", SSPP_VIG1, 0x6000, 0x1c8, VIG_SDM845_MASK,
> + sdm845_vig_sblk_1, 4, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG1),
> + SSPP_BLK("sspp_2", SSPP_VIG2, 0x8000, 0x1c8, VIG_SDM845_MASK,
> + sdm845_vig_sblk_2, 8, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG2),
> + SSPP_BLK("sspp_3", SSPP_VIG3, 0xa000, 0x1c8, VIG_SDM845_MASK,
> + sdm845_vig_sblk_3, 12, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG3),
> + SSPP_BLK("sspp_8", SSPP_DMA0, 0x24000, 0x1c8, DMA_SDM845_MASK,
> + sdm845_dma_sblk_0, 1, SSPP_TYPE_DMA, DPU_CLK_CTRL_DMA0),
> + SSPP_BLK("sspp_9", SSPP_DMA1, 0x26000, 0x1c8, DMA_SDM845_MASK,
> + sdm845_dma_sblk_1, 5, SSPP_TYPE_DMA, DPU_CLK_CTRL_DMA1),
> + SSPP_BLK("sspp_10", SSPP_DMA2, 0x28000, 0x1c8, DMA_CURSOR_SDM845_MASK,
> + sdm845_dma_sblk_2, 9, SSPP_TYPE_DMA, DPU_CLK_CTRL_DMA2),
> + SSPP_BLK("sspp_11", SSPP_DMA3, 0x2a000, 0x1c8, DMA_CURSOR_SDM845_MASK,
> + sdm845_dma_sblk_3, 13, SSPP_TYPE_DMA, DPU_CLK_CTRL_DMA3),
> +};
> +
> +static const struct dpu_lm_cfg sdm845_lm[] = {
> + LM_BLK("lm_0", LM_0, 0x44000, MIXER_SDM845_MASK,
> + &sdm845_lm_sblk, PINGPONG_0, LM_1, 0),
> + LM_BLK("lm_1", LM_1, 0x45000, MIXER_SDM845_MASK,
> + &sdm845_lm_sblk, PINGPONG_1, LM_0, 0),
> + LM_BLK("lm_2", LM_2, 0x46000, MIXER_SDM845_MASK,
> + &sdm845_lm_sblk, PINGPONG_2, LM_5, 0),
> + LM_BLK("lm_3", LM_3, 0x0, MIXER_SDM845_MASK,
> + &sdm845_lm_sblk, PINGPONG_MAX, 0, 0),
> + LM_BLK("lm_4", LM_4, 0x0, MIXER_SDM845_MASK,
> + &sdm845_lm_sblk, PINGPONG_MAX, 0, 0),
> + LM_BLK("lm_5", LM_5, 0x49000, MIXER_SDM845_MASK,
> + &sdm845_lm_sblk, PINGPONG_3, LM_2, 0),
> +};
> +
> +static const struct dpu_pingpong_cfg sdm845_pp[] = {
> + PP_BLK_TE("pingpong_0", PINGPONG_0, 0x70000, 0, sdm845_pp_sblk_te,
> + DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
> + DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),
> + PP_BLK_TE("pingpong_1", PINGPONG_1, 0x70800, 0, sdm845_pp_sblk_te,
> + DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
> + DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13)),
> + PP_BLK("pingpong_2", PINGPONG_2, 0x71000, 0, sdm845_pp_sblk,
> + DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
> + DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14)),
> + PP_BLK("pingpong_3", PINGPONG_3, 0x71800, 0, sdm845_pp_sblk,
> + DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),
> + DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15)),
> +};
> +
> +static const struct dpu_dsc_cfg sdm845_dsc[] = {
> + DSC_BLK("dsc_0", DSC_0, 0x80000, 0),
> + DSC_BLK("dsc_1", DSC_1, 0x80400, 0),
> + DSC_BLK("dsc_2", DSC_2, 0x80800, 0),
> + DSC_BLK("dsc_3", DSC_3, 0x80c00, 0),
> +};
> +
> +static const struct dpu_intf_cfg sdm845_intf[] = {
> + INTF_BLK("intf_0", INTF_0, 0x6a000, 0x280, INTF_DP, 0, 24, INTF_SDM845_MASK, MDP_SSPP_TOP0_INTR, 24, 25),
> + INTF_BLK("intf_1", INTF_1, 0x6a800, 0x280, INTF_DSI, 0, 24, INTF_SDM845_MASK, MDP_SSPP_TOP0_INTR, 26, 27),
> + INTF_BLK("intf_2", INTF_2, 0x6b000, 0x280, INTF_DSI, 1, 24, INTF_SDM845_MASK, MDP_SSPP_TOP0_INTR, 28, 29),
> + INTF_BLK("intf_3", INTF_3, 0x6b800, 0x280, INTF_DP, 1, 24, INTF_SDM845_MASK, MDP_SSPP_TOP0_INTR, 30, 31),
> +};
> +
> +static const struct dpu_perf_cfg sdm845_perf_data = {
> + .max_bw_low = 6800000,
> + .max_bw_high = 6800000,
> + .min_core_ib = 2400000,
> + .min_llcc_ib = 800000,
> + .min_dram_ib = 800000,
> + .undersized_prefill_lines = 2,
> + .xtra_prefill_lines = 2,
> + .dest_scale_prefill_lines = 3,
> + .macrotile_prefill_lines = 4,
> + .yuv_nv12_prefill_lines = 8,
> + .linear_prefill_lines = 1,
> + .downscaling_prefill_lines = 1,
> + .amortizable_threshold = 25,
> + .min_prefill_lines = 24,
> + .danger_lut_tbl = {0xf, 0xffff, 0x0},
> + .safe_lut_tbl = {0xfff0, 0xf000, 0xffff},
> + .qos_lut_tbl = {
> + {.nentry = ARRAY_SIZE(sdm845_qos_linear),
> + .entries = sdm845_qos_linear
> + },
> + {.nentry = ARRAY_SIZE(sdm845_qos_macrotile),
> + .entries = sdm845_qos_macrotile
> + },
> + {.nentry = ARRAY_SIZE(sdm845_qos_nrt),
> + .entries = sdm845_qos_nrt
> + },
> + },
> + .cdp_cfg = {
> + {.rd_enable = 1, .wr_enable = 1},
> + {.rd_enable = 1, .wr_enable = 0}
> + },
> + .clk_inefficiency_factor = 105,
> + .bw_inefficiency_factor = 120,
> +};
> +
> +static const struct dpu_mdss_cfg sdm845_dpu_cfg = {
> + .caps = &sdm845_dpu_caps,
> + .ubwc = &sdm845_ubwc_cfg,
> + .mdp_count = ARRAY_SIZE(sdm845_mdp),
> + .mdp = sdm845_mdp,
> + .ctl_count = ARRAY_SIZE(sdm845_ctl),
> + .ctl = sdm845_ctl,
> + .sspp_count = ARRAY_SIZE(sdm845_sspp),
> + .sspp = sdm845_sspp,
> + .mixer_count = ARRAY_SIZE(sdm845_lm),
> + .mixer = sdm845_lm,
> + .pingpong_count = ARRAY_SIZE(sdm845_pp),
> + .pingpong = sdm845_pp,
> + .dsc_count = ARRAY_SIZE(sdm845_dsc),
> + .dsc = sdm845_dsc,
> + .intf_count = ARRAY_SIZE(sdm845_intf),
> + .intf = sdm845_intf,
> + .vbif_count = ARRAY_SIZE(sdm845_vbif),
> + .vbif = sdm845_vbif,
> + .reg_dma_count = 1,
> + .dma_cfg = &sdm845_regdma,
> + .perf = &sdm845_perf_data,
> + .mdss_irqs = IRQ_SDM845_MASK,
> +};
> +
> +#endif
> 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 b40e9f0f8e8a..82a1d18cbaa3 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c
> @@ -294,90 +294,6 @@ static const uint32_t wb2_formats[] = {
> DRM_FORMAT_XBGR4444,
> };
>
> -/*************************************************************
> - * DPU sub blocks config
> - *************************************************************/
> -/* DPU top level 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,
> - .has_src_split = true,
> - .has_dim_layer = true,
> - .has_idle_pc = true,
> - .has_3d_merge = true,
> - .max_linewidth = DEFAULT_DPU_OUTPUT_LINE_WIDTH,
> - .pixel_ram_size = DEFAULT_PIXEL_RAM_SIZE,
> - .max_hdeci_exp = MAX_HORZ_DECIMATION,
> - .max_vdeci_exp = MAX_VERT_DECIMATION,
> -};
> -
> -static const struct dpu_ubwc_cfg sdm845_ubwc_cfg = {
> - .ubwc_version = DPU_HW_UBWC_VER_20,
> - .highest_bank_bit = 0x2,
> -};
> -
> -static const struct dpu_mdp_cfg sdm845_mdp[] = {
> - {
> - .name = "top_0", .id = MDP_TOP,
> - .base = 0x0, .len = 0x45C,
> - .features = BIT(DPU_MDP_AUDIO_SELECT),
> - .clk_ctrls[DPU_CLK_CTRL_VIG0] = {
> - .reg_off = 0x2AC, .bit_off = 0},
> - .clk_ctrls[DPU_CLK_CTRL_VIG1] = {
> - .reg_off = 0x2B4, .bit_off = 0},
> - .clk_ctrls[DPU_CLK_CTRL_VIG2] = {
> - .reg_off = 0x2BC, .bit_off = 0},
> - .clk_ctrls[DPU_CLK_CTRL_VIG3] = {
> - .reg_off = 0x2C4, .bit_off = 0},
> - .clk_ctrls[DPU_CLK_CTRL_DMA0] = {
> - .reg_off = 0x2AC, .bit_off = 8},
> - .clk_ctrls[DPU_CLK_CTRL_DMA1] = {
> - .reg_off = 0x2B4, .bit_off = 8},
> - .clk_ctrls[DPU_CLK_CTRL_DMA2] = {
> - .reg_off = 0x2BC, .bit_off = 8},
> - .clk_ctrls[DPU_CLK_CTRL_DMA3] = {
> - .reg_off = 0x2C4, .bit_off = 8},
> - },
> -};
> -
> -/*************************************************************
> - * CTL sub blocks config
> - *************************************************************/
> -static const struct dpu_ctl_cfg sdm845_ctl[] = {
> - {
> - .name = "ctl_0", .id = CTL_0,
> - .base = 0x1000, .len = 0xE4,
> - .features = BIT(DPU_CTL_SPLIT_DISPLAY),
> - .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 9),
> - },
> - {
> - .name = "ctl_1", .id = CTL_1,
> - .base = 0x1200, .len = 0xE4,
> - .features = BIT(DPU_CTL_SPLIT_DISPLAY),
> - .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 10),
> - },
> - {
> - .name = "ctl_2", .id = CTL_2,
> - .base = 0x1400, .len = 0xE4,
> - .features = 0,
> - .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 11),
> - },
> - {
> - .name = "ctl_3", .id = CTL_3,
> - .base = 0x1600, .len = 0xE4,
> - .features = 0,
> - .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 12),
> - },
> - {
> - .name = "ctl_4", .id = CTL_4,
> - .base = 0x1800, .len = 0xE4,
> - .features = 0,
> - .intr_start = DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR2, 13),
> - },
> -};
> -
> /*************************************************************
> * SSPP sub blocks config
> *************************************************************/
> @@ -477,25 +393,6 @@ static const struct dpu_sspp_sub_blks sdm845_dma_sblk_3 = _DMA_SBLK("11", 4);
> .clk_ctrl = _clkctrl \
> }
>
> -static const struct dpu_sspp_cfg sdm845_sspp[] = {
> - SSPP_BLK("sspp_0", SSPP_VIG0, 0x4000, 0x1c8, VIG_SDM845_MASK,
> - sdm845_vig_sblk_0, 0, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG0),
> - SSPP_BLK("sspp_1", SSPP_VIG1, 0x6000, 0x1c8, VIG_SDM845_MASK,
> - sdm845_vig_sblk_1, 4, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG1),
> - SSPP_BLK("sspp_2", SSPP_VIG2, 0x8000, 0x1c8, VIG_SDM845_MASK,
> - sdm845_vig_sblk_2, 8, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG2),
> - SSPP_BLK("sspp_3", SSPP_VIG3, 0xa000, 0x1c8, VIG_SDM845_MASK,
> - sdm845_vig_sblk_3, 12, SSPP_TYPE_VIG, DPU_CLK_CTRL_VIG3),
> - SSPP_BLK("sspp_8", SSPP_DMA0, 0x24000, 0x1c8, DMA_SDM845_MASK,
> - sdm845_dma_sblk_0, 1, SSPP_TYPE_DMA, DPU_CLK_CTRL_DMA0),
> - SSPP_BLK("sspp_9", SSPP_DMA1, 0x26000, 0x1c8, DMA_SDM845_MASK,
> - sdm845_dma_sblk_1, 5, SSPP_TYPE_DMA, DPU_CLK_CTRL_DMA1),
> - SSPP_BLK("sspp_10", SSPP_DMA2, 0x28000, 0x1c8, DMA_CURSOR_SDM845_MASK,
> - sdm845_dma_sblk_2, 9, SSPP_TYPE_DMA, DPU_CLK_CTRL_DMA2),
> - SSPP_BLK("sspp_11", SSPP_DMA3, 0x2a000, 0x1c8, DMA_CURSOR_SDM845_MASK,
> - sdm845_dma_sblk_3, 13, SSPP_TYPE_DMA, DPU_CLK_CTRL_DMA3),
> -};
> -
> static const struct dpu_sspp_sub_blks sc7180_vig_sblk_0 =
> _VIG_SBLK("0", 4, DPU_SSPP_SCALER_QSEED4);
>
> @@ -596,21 +493,6 @@ static const struct dpu_lm_sub_blks sdm845_lm_sblk = {
> },
> };
>
> -static const struct dpu_lm_cfg sdm845_lm[] = {
> - LM_BLK("lm_0", LM_0, 0x44000, MIXER_SDM845_MASK,
> - &sdm845_lm_sblk, PINGPONG_0, LM_1, 0),
> - LM_BLK("lm_1", LM_1, 0x45000, MIXER_SDM845_MASK,
> - &sdm845_lm_sblk, PINGPONG_1, LM_0, 0),
> - LM_BLK("lm_2", LM_2, 0x46000, MIXER_SDM845_MASK,
> - &sdm845_lm_sblk, PINGPONG_2, LM_5, 0),
> - LM_BLK("lm_3", LM_3, 0x0, MIXER_SDM845_MASK,
> - &sdm845_lm_sblk, PINGPONG_MAX, 0, 0),
> - LM_BLK("lm_4", LM_4, 0x0, MIXER_SDM845_MASK,
> - &sdm845_lm_sblk, PINGPONG_MAX, 0, 0),
> - LM_BLK("lm_5", LM_5, 0x49000, MIXER_SDM845_MASK,
> - &sdm845_lm_sblk, PINGPONG_3, LM_2, 0),
> -};
> -
> /* SC7180 */
>
> static const struct dpu_lm_sub_blks sc7180_lm_sblk = {
> @@ -710,21 +592,6 @@ static const struct dpu_pingpong_sub_blks sc7280_pp_sblk = {
> .intr_rdptr = _rdptr, \
> }
>
> -static const struct dpu_pingpong_cfg sdm845_pp[] = {
> - PP_BLK_TE("pingpong_0", PINGPONG_0, 0x70000, 0, sdm845_pp_sblk_te,
> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 8),
> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 12)),
> - PP_BLK_TE("pingpong_1", PINGPONG_1, 0x70800, 0, sdm845_pp_sblk_te,
> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 9),
> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 13)),
> - PP_BLK("pingpong_2", PINGPONG_2, 0x71000, 0, sdm845_pp_sblk,
> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 10),
> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 14)),
> - PP_BLK("pingpong_3", PINGPONG_3, 0x71800, 0, sdm845_pp_sblk,
> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 11),
> - DPU_IRQ_IDX(MDP_SSPP_TOP0_INTR, 15)),
> -};
> -
> /*************************************************************
> * MERGE_3D sub blocks config
> *************************************************************/
> @@ -746,13 +613,6 @@ static const struct dpu_pingpong_cfg sdm845_pp[] = {
> .features = _features, \
> }
>
> -static const struct dpu_dsc_cfg sdm845_dsc[] = {
> - DSC_BLK("dsc_0", DSC_0, 0x80000, 0),
> - DSC_BLK("dsc_1", DSC_1, 0x80400, 0),
> - DSC_BLK("dsc_2", DSC_2, 0x80800, 0),
> - DSC_BLK("dsc_3", DSC_3, 0x80c00, 0),
> -};
> -
> /*************************************************************
> * INTF sub blocks config
> *************************************************************/
> @@ -768,13 +628,6 @@ static const struct dpu_dsc_cfg sdm845_dsc[] = {
> .intr_vsync = DPU_IRQ_IDX(_reg, _vsync_bit), \
> }
>
> -static const struct dpu_intf_cfg sdm845_intf[] = {
> - INTF_BLK("intf_0", INTF_0, 0x6A000, 0x280, INTF_DP, 0, 24, INTF_SDM845_MASK, MDP_SSPP_TOP0_INTR, 24, 25),
> - INTF_BLK("intf_1", INTF_1, 0x6A800, 0x280, INTF_DSI, 0, 24, INTF_SDM845_MASK, MDP_SSPP_TOP0_INTR, 26, 27),
> - INTF_BLK("intf_2", INTF_2, 0x6B000, 0x280, INTF_DSI, 1, 24, INTF_SDM845_MASK, MDP_SSPP_TOP0_INTR, 28, 29),
> - INTF_BLK("intf_3", INTF_3, 0x6B800, 0x280, INTF_DP, 1, 24, INTF_SDM845_MASK, MDP_SSPP_TOP0_INTR, 30, 31),
> -};
> -
> /*************************************************************
> * Writeback blocks config
> *************************************************************/
> @@ -997,70 +850,11 @@ static const struct dpu_qos_lut_entry sc7180_qos_nrt[] = {
> {.fl = 0, .lut = 0x0},
> };
>
> -static const struct dpu_perf_cfg sdm845_perf_data = {
> - .max_bw_low = 6800000,
> - .max_bw_high = 6800000,
> - .min_core_ib = 2400000,
> - .min_llcc_ib = 800000,
> - .min_dram_ib = 800000,
> - .undersized_prefill_lines = 2,
> - .xtra_prefill_lines = 2,
> - .dest_scale_prefill_lines = 3,
> - .macrotile_prefill_lines = 4,
> - .yuv_nv12_prefill_lines = 8,
> - .linear_prefill_lines = 1,
> - .downscaling_prefill_lines = 1,
> - .amortizable_threshold = 25,
> - .min_prefill_lines = 24,
> - .danger_lut_tbl = {0xf, 0xffff, 0x0},
> - .safe_lut_tbl = {0xfff0, 0xf000, 0xffff},
> - .qos_lut_tbl = {
> - {.nentry = ARRAY_SIZE(sdm845_qos_linear),
> - .entries = sdm845_qos_linear
> - },
> - {.nentry = ARRAY_SIZE(sdm845_qos_macrotile),
> - .entries = sdm845_qos_macrotile
> - },
> - {.nentry = ARRAY_SIZE(sdm845_qos_nrt),
> - .entries = sdm845_qos_nrt
> - },
> - },
> - .cdp_cfg = {
> - {.rd_enable = 1, .wr_enable = 1},
> - {.rd_enable = 1, .wr_enable = 0}
> - },
> - .clk_inefficiency_factor = 105,
> - .bw_inefficiency_factor = 120,
> -};
> -
> /*************************************************************
> * Hardware catalog
> *************************************************************/
>
> -static const struct dpu_mdss_cfg sdm845_dpu_cfg = {
> - .caps = &sdm845_dpu_caps,
> - .ubwc = &sdm845_ubwc_cfg,
> - .mdp_count = ARRAY_SIZE(sdm845_mdp),
> - .mdp = sdm845_mdp,
> - .ctl_count = ARRAY_SIZE(sdm845_ctl),
> - .ctl = sdm845_ctl,
> - .sspp_count = ARRAY_SIZE(sdm845_sspp),
> - .sspp = sdm845_sspp,
> - .mixer_count = ARRAY_SIZE(sdm845_lm),
> - .mixer = sdm845_lm,
> - .pingpong_count = ARRAY_SIZE(sdm845_pp),
> - .pingpong = sdm845_pp,
> - .dsc_count = ARRAY_SIZE(sdm845_dsc),
> - .dsc = sdm845_dsc,
> - .intf_count = ARRAY_SIZE(sdm845_intf),
> - .intf = sdm845_intf,
> - .vbif_count = ARRAY_SIZE(sdm845_vbif),
> - .vbif = sdm845_vbif,
> - .reg_dma_count = 1,
> - .dma_cfg = &sdm845_regdma,
> - .perf = &sdm845_perf_data,
> - .mdss_irqs = IRQ_SDM845_MASK,
> -};
> +#include "catalog/dpu_4_0_sdm845.h"
>
> #include "catalog/dpu_3_0_msm8998.h"
>
next prev parent reply other threads:[~2023-03-30 12:19 UTC|newest]
Thread overview: 127+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-11 23:12 [PATCH v2 00/50] drm/msm/dpu: rework HW catalog Dmitry Baryshkov
2023-02-11 23:12 ` [PATCH v2 01/50] drm/msm/dpu: set DPU_MDP_PERIPH_0_REMOVED for sc8280xp Dmitry Baryshkov
2023-03-16 0:27 ` (subset) " Abhinav Kumar
2023-02-11 23:12 ` [PATCH v2 02/50] drm/msm/dpu: disable features unsupported by QCM2290 Dmitry Baryshkov
2023-03-16 0:30 ` (subset) " Abhinav Kumar
2023-02-11 23:12 ` [PATCH v2 03/50] drm/msm/dpu: fix typo in in sm8550's dma_sblk_5 Dmitry Baryshkov
2023-02-13 17:37 ` Neil Armstrong
2023-02-24 18:06 ` Abhinav Kumar
2023-02-11 23:12 ` [PATCH v2 04/50] drm/msm/dpu: fix len of sc7180 ctl blocks Dmitry Baryshkov
2023-02-24 18:12 ` Abhinav Kumar
2023-02-11 23:12 ` [PATCH v2 05/50] drm/msm/dpu: fix sm6115 and qcm2290 mixer width limits Dmitry Baryshkov
2023-02-24 19:11 ` Abhinav Kumar
2023-02-11 23:12 ` [PATCH v2 06/50] drm/msm/dpu: correct sm8550 scaler Dmitry Baryshkov
2023-02-13 10:41 ` Neil Armstrong
2023-02-13 11:16 ` Dmitry Baryshkov
2023-02-13 17:36 ` neil.armstrong
2023-02-24 20:51 ` Abhinav Kumar
2023-02-25 23:06 ` Dmitry Baryshkov
2023-02-25 23:27 ` Abhinav Kumar
2023-02-26 0:06 ` Dmitry Baryshkov
2023-02-26 2:10 ` Abhinav Kumar
2023-02-26 12:59 ` Dmitry Baryshkov
2023-02-11 23:12 ` [PATCH v2 07/50] drm/msm/dpu: correct sc8280xp scaler Dmitry Baryshkov
2023-02-25 22:55 ` Abhinav Kumar
2023-02-11 23:12 ` [PATCH v2 08/50] drm/msm/dpu: correct sm8450 scaler Dmitry Baryshkov
2023-02-25 22:55 ` Abhinav Kumar
2023-02-11 23:12 ` [PATCH v2 09/50] drm/msm/dpu: correct sm8250 and sm8350 scaler Dmitry Baryshkov
2023-02-25 22:59 ` Abhinav Kumar
2023-02-11 23:12 ` [PATCH v2 10/50] drm/msm/dpu: correct sm6115 scaler Dmitry Baryshkov
2023-02-25 23:11 ` Abhinav Kumar
2023-02-26 0:01 ` Dmitry Baryshkov
2023-02-11 23:12 ` [PATCH v2 11/50] drm/msm/dpu: drop DPU_DIM_LAYER from MIXER_MSM8998_MASK Dmitry Baryshkov
2023-02-28 23:04 ` Abhinav Kumar
2023-02-11 23:12 ` [PATCH v2 12/50] drm/msm/dpu: fix clocks settings for msm8998 SSPP blocks Dmitry Baryshkov
2023-02-25 23:32 ` Abhinav Kumar
2023-02-11 23:12 ` [PATCH v2 13/50] drm/msm/dpu: don't use DPU_CLK_CTRL_CURSORn for DMA SSPP clocks Dmitry Baryshkov
2023-02-11 23:12 ` [PATCH v2 14/50] drm/msm/dpu: Allow variable SSPP/INTF_BLK size Dmitry Baryshkov
2023-02-13 11:01 ` Konrad Dybcio
2023-02-13 11:18 ` Dmitry Baryshkov
2023-03-29 20:01 ` Dmitry Baryshkov
2023-02-11 23:12 ` [PATCH v2 15/50] drm/msm/dpu: constify DSC data structures Dmitry Baryshkov
2023-03-29 19:49 ` [v2,15/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 16/50] drm/msm/dpu: mark remaining pp data as const Dmitry Baryshkov
2023-03-29 20:15 ` [v2,16/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 17/50] drm/msm/dpu: move UBWC/memory configuration to separate struct Dmitry Baryshkov
2023-03-29 20:23 ` [v2,17/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 18/50] drm/msm/dpu: split SM8550 catalog entry to the separate file Dmitry Baryshkov
2023-03-29 20:25 ` [v2,18/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 19/50] drm/msm/dpu: split SM8450 " Dmitry Baryshkov
2023-03-30 11:34 ` [v2,19/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 20/50] drm/msm/dpu: split SC8280XP " Dmitry Baryshkov
2023-03-30 11:39 ` [v2,20/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 21/50] drm/msm/dpu: split SC7280 " Dmitry Baryshkov
2023-03-30 11:41 ` [v2,21/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 22/50] drm/msm/dpu: split SM8350 " Dmitry Baryshkov
2023-03-30 11:46 ` [v2,22/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 23/50] drm/msm/dpu: split SM6115 " Dmitry Baryshkov
2023-03-30 11:47 ` [v2,23/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 24/50] drm/msm/dpu: split QCM2290 " Dmitry Baryshkov
2023-03-30 11:50 ` [v2,24/50] " Konrad Dybcio
2023-03-30 11:52 ` Dmitry Baryshkov
2023-03-30 11:53 ` Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 25/50] drm/msm/dpu: split SC7180 " Dmitry Baryshkov
2023-03-30 11:55 ` [v2,25/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 26/50] drm/msm/dpu: split SM8250 " Dmitry Baryshkov
2023-03-30 12:06 ` [v2,26/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 27/50] drm/msm/dpu: split SC8180X " Dmitry Baryshkov
2023-03-30 12:08 ` [v2,27/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 28/50] drm/msm/dpu: split SM8150 " Dmitry Baryshkov
2023-03-30 12:10 ` [v2,28/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 29/50] drm/msm/dpu: split MSM8998 " Dmitry Baryshkov
2023-03-30 12:14 ` [v2,29/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 30/50] drm/msm/dpu: split SDM845 " Dmitry Baryshkov
2023-03-30 12:19 ` Konrad Dybcio [this message]
2023-02-11 23:12 ` [PATCH v2 31/50] drm/msm/dpu: duplicate sdm845 catalog entries Dmitry Baryshkov
2023-03-30 12:21 ` [v2,31/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 32/50] drm/msm/dpu: duplicate sc7180 " Dmitry Baryshkov
2023-03-30 12:22 ` [v2,32/50] " Konrad Dybcio
2023-03-30 12:24 ` Dmitry Baryshkov
2023-02-11 23:12 ` [PATCH v2 33/50] drm/msm/dpu: duplicate sm8150 " Dmitry Baryshkov
2023-03-30 12:26 ` [v2,33/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 34/50] drm/msm/dpu: duplicate sm8250 " Dmitry Baryshkov
2023-03-30 12:27 ` [v2,34/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 35/50] drm/msm/dpu: duplicate sm8350 " Dmitry Baryshkov
2023-03-30 12:27 ` [v2,35/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 36/50] drm/msm/dpu: use defined symbol for sc8280xp's maxwidth Dmitry Baryshkov
2023-03-30 12:28 ` [v2,36/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 37/50] drm/msm/dpu: enable DPU_CTL_SPLIT_DISPLAY for sc8280xp Dmitry Baryshkov
2023-03-30 12:29 ` [v2,37/50] " Konrad Dybcio
2023-03-30 21:32 ` Dmitry Baryshkov
2023-02-11 23:12 ` [PATCH v2 38/50] drm/msm/dpu: enable DSPP_2/3 for LM_2/3 on sm8450 Dmitry Baryshkov
2023-03-30 12:33 ` [v2,38/50] " Konrad Dybcio
2023-03-30 12:38 ` Dmitry Baryshkov
2023-03-30 12:42 ` Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 39/50] drm/msm/dpu: drop duplicate vig_sblk instances Dmitry Baryshkov
2023-03-07 18:31 ` Dmitry Baryshkov
2023-03-30 12:34 ` [v2,39/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 40/50] drm/msm/dpu: enable DSPP on sc8180x Dmitry Baryshkov
2023-03-30 12:39 ` [v2,40/50] " Konrad Dybcio
2023-03-30 21:46 ` Dmitry Baryshkov
2023-02-11 23:12 ` [PATCH v2 41/50] drm/msm/dpu: deduplicate sc8180x with sm8150 Dmitry Baryshkov
2023-03-30 12:55 ` [v2,41/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 42/50] drm/msm/dpu: deduplicate sm6115 with qcm2290 Dmitry Baryshkov
2023-03-30 12:56 ` [v2,42/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 43/50] drm/msm/dpu: deduplicate sc8280xp with sm8450 Dmitry Baryshkov
2023-03-30 12:59 ` [v2,43/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 44/50] drm/msm/dpu: drop unused macros from hw catalog Dmitry Baryshkov
2023-03-30 13:02 ` [v2,44/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 45/50] drm/msm/dpu: inline IRQ_n_MASK defines Dmitry Baryshkov
2023-03-30 13:08 ` [v2,45/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 46/50] drm/msm/dpu: rename INTF_foo_MASK to contain major DPU version Dmitry Baryshkov
2023-03-30 13:14 ` [v2,46/50] " Konrad Dybcio
2023-03-30 13:25 ` Dmitry Baryshkov
2023-02-11 23:12 ` [PATCH v2 47/50] drm/msm/dpu: rename CTL_foo_MASK " Dmitry Baryshkov
2023-03-30 13:15 ` [v2,47/50] " Konrad Dybcio
2023-03-30 13:16 ` Konrad Dybcio
2023-03-30 13:26 ` Dmitry Baryshkov
2023-03-30 13:27 ` Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 48/50] drm/msm/dpu: rename VIG and DMA_foo_MASK " Dmitry Baryshkov
2023-03-30 13:24 ` [v2,48/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 49/50] drm/msm/dpu: rename MIXER_foo_MASK " Dmitry Baryshkov
2023-03-30 13:25 ` [v2,49/50] " Konrad Dybcio
2023-02-11 23:12 ` [PATCH v2 50/50] drm/msm/dpu: rename MERGE_3D_foo_MASK " Dmitry Baryshkov
2023-03-30 13:26 ` [v2,50/50] " Konrad Dybcio
2023-03-07 18:02 ` [PATCH v2 00/50] drm/msm/dpu: rework HW catalog Dmitry Baryshkov
2023-03-07 18:20 ` [Freedreno] " Abhinav Kumar
2023-03-16 2:28 ` (subset) " Abhinav Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8670c929-3266-e4b0-6be6-acc9b71a2e52@linaro.org \
--to=konrad.dybcio@linaro.org \
--cc=airlied@gmail.com \
--cc=andersson@kernel.org \
--cc=daniel@ffwll.ch \
--cc=dmitry.baryshkov@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=quic_abhinavk@quicinc.com \
--cc=robdclark@gmail.com \
--cc=sean@poorly.run \
--cc=swboyd@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox