| Message ID | 1644009445-17320-2-git-send-email-quic_abhinavk@quicinc.com |
|---|---|
| State | Accepted |
| Commit | 53324b99bd7b4d6a65364ea0a992bf0bb1108513 |
| Headers | show |
| Series | Add writeback block support for DPU | expand |
On 05/02/2022 00:17, Abhinav Kumar wrote: > Add writeback blocks to the sm8250 DPU hardware catalog. Other > chipsets support writeback too but add it to sm8250 to prototype > the feature so that it can be easily extended to other chipsets. > > Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 73 +++++++++++++++++++++++++- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 66 ++++++++++++++++++++++- > 2 files changed, 137 insertions(+), 2 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 aa75991..fdd878d 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c > @@ -1,5 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0-only > -/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. > +/* Copyright (c) 2022. Qualcomm Innovation Center, Inc. All rights reserved. > + * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. > */ > > #define pr_fmt(fmt) "[drm:%s:%d] " fmt, __func__, __LINE__ > @@ -90,6 +91,15 @@ > BIT(MDP_INTF3_INTR) | \ > BIT(MDP_INTF4_INTR)) > > +#define WB_SM8250_MASK (BIT(DPU_WB_LINE_MODE) | \ > + BIT(DPU_WB_UBWC) | \ > + BIT(DPU_WB_YUV_CONFIG) | \ > + BIT(DPU_WB_PIPE_ALPHA) | \ > + BIT(DPU_WB_XY_ROI_OFFSET) | \ > + BIT(DPU_WB_QOS) | \ > + BIT(DPU_WB_QOS_8LVL) | \ > + BIT(DPU_WB_CDP) | \ > + BIT(DPU_WB_INPUT_CTRL)) > > #define DEFAULT_PIXEL_RAM_SIZE (50 * 1024) > #define DEFAULT_DPU_LINE_WIDTH 2048 > @@ -177,6 +187,40 @@ static const uint32_t plane_formats_yuv[] = { > DRM_FORMAT_YVU420, > }; > > +static const uint32_t wb2_formats[] = { > + DRM_FORMAT_RGB565, > + DRM_FORMAT_BGR565, > + DRM_FORMAT_RGB888, > + DRM_FORMAT_ARGB8888, > + DRM_FORMAT_RGBA8888, > + DRM_FORMAT_ABGR8888, > + DRM_FORMAT_XRGB8888, > + DRM_FORMAT_RGBX8888, > + DRM_FORMAT_XBGR8888, > + DRM_FORMAT_ARGB1555, > + DRM_FORMAT_RGBA5551, > + DRM_FORMAT_XRGB1555, > + DRM_FORMAT_RGBX5551, > + DRM_FORMAT_ARGB4444, > + DRM_FORMAT_RGBA4444, > + DRM_FORMAT_RGBX4444, > + DRM_FORMAT_XRGB4444, > + DRM_FORMAT_BGR565, > + DRM_FORMAT_BGR888, > + DRM_FORMAT_ABGR8888, > + DRM_FORMAT_BGRA8888, > + DRM_FORMAT_BGRX8888, > + DRM_FORMAT_XBGR8888, > + DRM_FORMAT_ABGR1555, > + DRM_FORMAT_BGRA5551, > + DRM_FORMAT_XBGR1555, > + DRM_FORMAT_BGRX5551, > + DRM_FORMAT_ABGR4444, > + DRM_FORMAT_BGRA4444, > + DRM_FORMAT_BGRX4444, > + DRM_FORMAT_XBGR4444, > +}; > + > /************************************************************* > * DPU sub blocks config > *************************************************************/ > @@ -317,6 +361,8 @@ static const struct dpu_mdp_cfg sm8250_mdp[] = { > .reg_off = 0x2C4, .bit_off = 8}, > .clk_ctrls[DPU_CLK_CTRL_REG_DMA] = { > .reg_off = 0x2BC, .bit_off = 20}, > + .clk_ctrls[DPU_CLK_CTRL_WB2] = { > + .reg_off = 0x3B8, .bit_off = 24}, > }, > }; > > @@ -862,6 +908,29 @@ static const struct dpu_intf_cfg sc7280_intf[] = { > }; > > /************************************************************* > + * Writeback blocks config > + *************************************************************/ > +#define WB_BLK(_name, _id, _base, _features, _clk_ctrl, \ > + __xin_id, vbif_id, _reg, _wb_done_bit) \ > + { \ > + .name = _name, .id = _id, \ > + .base = _base, .len = 0x2c8, \ > + .features = _features, \ > + .format_list = wb2_formats, \ > + .num_formats = ARRAY_SIZE(wb2_formats), \ > + .clk_ctrl = _clk_ctrl, \ > + .xin_id = __xin_id, \ > + .vbif_idx = vbif_id, \ > + .maxlinewidth = DEFAULT_DPU_LINE_WIDTH, \ > + .intr_wb_done = DPU_IRQ_IDX(_reg, _wb_done_bit) \ > + } > + > +static const struct dpu_wb_cfg sm8250_wb[] = { > + WB_BLK("wb_2", WB_2, 0x65000, WB_SM8250_MASK, DPU_CLK_CTRL_WB2, 6, > + VBIF_RT, MDP_SSPP_TOP0_INTR, 4), > +}; > + > +/************************************************************* > * VBIF sub blocks config > *************************************************************/ > /* VBIF QOS remap */ > @@ -1225,6 +1294,8 @@ static void sm8250_cfg_init(struct dpu_mdss_cfg *dpu_cfg) > .intf = sm8150_intf, > .vbif_count = ARRAY_SIZE(sdm845_vbif), > .vbif = sdm845_vbif, > + .wb_count = ARRAY_SIZE(sm8250_wb), > + .wb = sm8250_wb, > .reg_dma_count = 1, > .dma_cfg = sm8250_regdma, > .perf = sm8250_perf_data, > 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 31af04a..a3ca695 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h > @@ -1,5 +1,7 @@ > /* SPDX-License-Identifier: GPL-2.0-only */ > -/* Copyright (c) 2015-2018, 2020 The Linux Foundation. All rights reserved. > +/* > + * Copyright (c) 2022. Qualcomm Innovation Center, Inc. All rights reserved. > + * Copyright (c) 2015-2018, 2020 The Linux Foundation. All rights reserved. > */ > > #ifndef _DPU_HW_CATALOG_H > @@ -209,6 +211,42 @@ enum { > }; > > /** > + * WB sub-blocks and features > + * @DPU_WB_LINE_MODE Writeback module supports line/linear mode > + * @DPU_WB_BLOCK_MODE Writeback module supports block mode read > + * @DPU_WB_CHROMA_DOWN, Writeback chroma down block, > + * @DPU_WB_DOWNSCALE, Writeback integer downscaler, > + * @DPU_WB_DITHER, Dither block > + * @DPU_WB_TRAFFIC_SHAPER, Writeback traffic shaper bloc > + * @DPU_WB_UBWC, Writeback Universal bandwidth compression > + * @DPU_WB_YUV_CONFIG Writeback supports output of YUV colorspace > + * @DPU_WB_PIPE_ALPHA Writeback supports pipe alpha > + * @DPU_WB_XY_ROI_OFFSET Writeback supports x/y-offset of out ROI in > + * the destination image > + * @DPU_WB_QOS, Writeback supports QoS control, danger/safe/creq > + * @DPU_WB_QOS_8LVL, Writeback supports 8-level QoS control > + * @DPU_WB_CDP Writeback supports client driven prefetch > + * @DPU_WB_INPUT_CTRL Writeback supports from which pp block input pixel > + * data arrives. > + * @DPU_WB_CROP CWB supports cropping > + * @DPU_WB_MAX maximum value > + */ > +enum { > + DPU_WB_LINE_MODE = 0x1, > + DPU_WB_BLOCK_MODE, > + DPU_WB_UBWC, > + DPU_WB_YUV_CONFIG, > + DPU_WB_PIPE_ALPHA, > + DPU_WB_XY_ROI_OFFSET, > + DPU_WB_QOS, > + DPU_WB_QOS_8LVL, > + DPU_WB_CDP, > + DPU_WB_INPUT_CTRL, > + DPU_WB_CROP, > + DPU_WB_MAX > +}; > + > +/** > * VBIF sub-blocks and features > * @DPU_VBIF_QOS_OTLIM VBIF supports OT Limit > * @DPU_VBIF_QOS_REMAP VBIF supports QoS priority remap > @@ -439,6 +477,7 @@ enum dpu_clk_ctrl_type { > DPU_CLK_CTRL_CURSOR1, > DPU_CLK_CTRL_INLINE_ROT0_SSPP, > DPU_CLK_CTRL_REG_DMA, > + DPU_CLK_CTRL_WB2, > DPU_CLK_CTRL_MAX, > }; > > @@ -577,6 +616,28 @@ struct dpu_intf_cfg { > }; > > /** > + * struct dpu_wb_cfg - information of writeback blocks > + * @DPU_HW_BLK_INFO: refer to the description above for DPU_HW_BLK_INFO > + * @vbif_idx: vbif client index > + * @maxlinewidth: max line width supported by writeback block > + * @xin_id: bus client identifier > + * @intr_wb_done: interrupt index for WB_DONE > + * @format_list: list of formats supported by this writeback block > + * @num_formats: number of formats supported by this writeback block > + * @clk_ctrl: clock control identifier > + */ > +struct dpu_wb_cfg { > + DPU_HW_BLK_INFO; > + u8 vbif_idx; > + u32 maxlinewidth; > + u32 xin_id; > + s32 intr_wb_done; > + const u32 *format_list; > + u32 num_formats; > + enum dpu_clk_ctrl_type clk_ctrl; > +}; > + > +/** > * struct dpu_vbif_dynamic_ot_cfg - dynamic OT setting > * @pps pixel per seconds > * @ot_limit OT limit to use up to specified pixel per second > @@ -758,6 +819,9 @@ struct dpu_mdss_cfg { > u32 vbif_count; > const struct dpu_vbif_cfg *vbif; > > + u32 wb_count; > + const struct dpu_wb_cfg *wb; > + > u32 reg_dma_count; > struct dpu_reg_dma_cfg dma_cfg; >
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 aa75991..fdd878d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only -/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. +/* Copyright (c) 2022. Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. */ #define pr_fmt(fmt) "[drm:%s:%d] " fmt, __func__, __LINE__ @@ -90,6 +91,15 @@ BIT(MDP_INTF3_INTR) | \ BIT(MDP_INTF4_INTR)) +#define WB_SM8250_MASK (BIT(DPU_WB_LINE_MODE) | \ + BIT(DPU_WB_UBWC) | \ + BIT(DPU_WB_YUV_CONFIG) | \ + BIT(DPU_WB_PIPE_ALPHA) | \ + BIT(DPU_WB_XY_ROI_OFFSET) | \ + BIT(DPU_WB_QOS) | \ + BIT(DPU_WB_QOS_8LVL) | \ + BIT(DPU_WB_CDP) | \ + BIT(DPU_WB_INPUT_CTRL)) #define DEFAULT_PIXEL_RAM_SIZE (50 * 1024) #define DEFAULT_DPU_LINE_WIDTH 2048 @@ -177,6 +187,40 @@ static const uint32_t plane_formats_yuv[] = { DRM_FORMAT_YVU420, }; +static const uint32_t wb2_formats[] = { + DRM_FORMAT_RGB565, + DRM_FORMAT_BGR565, + DRM_FORMAT_RGB888, + DRM_FORMAT_ARGB8888, + DRM_FORMAT_RGBA8888, + DRM_FORMAT_ABGR8888, + DRM_FORMAT_XRGB8888, + DRM_FORMAT_RGBX8888, + DRM_FORMAT_XBGR8888, + DRM_FORMAT_ARGB1555, + DRM_FORMAT_RGBA5551, + DRM_FORMAT_XRGB1555, + DRM_FORMAT_RGBX5551, + DRM_FORMAT_ARGB4444, + DRM_FORMAT_RGBA4444, + DRM_FORMAT_RGBX4444, + DRM_FORMAT_XRGB4444, + DRM_FORMAT_BGR565, + DRM_FORMAT_BGR888, + DRM_FORMAT_ABGR8888, + DRM_FORMAT_BGRA8888, + DRM_FORMAT_BGRX8888, + DRM_FORMAT_XBGR8888, + DRM_FORMAT_ABGR1555, + DRM_FORMAT_BGRA5551, + DRM_FORMAT_XBGR1555, + DRM_FORMAT_BGRX5551, + DRM_FORMAT_ABGR4444, + DRM_FORMAT_BGRA4444, + DRM_FORMAT_BGRX4444, + DRM_FORMAT_XBGR4444, +}; + /************************************************************* * DPU sub blocks config *************************************************************/ @@ -317,6 +361,8 @@ static const struct dpu_mdp_cfg sm8250_mdp[] = { .reg_off = 0x2C4, .bit_off = 8}, .clk_ctrls[DPU_CLK_CTRL_REG_DMA] = { .reg_off = 0x2BC, .bit_off = 20}, + .clk_ctrls[DPU_CLK_CTRL_WB2] = { + .reg_off = 0x3B8, .bit_off = 24}, }, }; @@ -862,6 +908,29 @@ static const struct dpu_intf_cfg sc7280_intf[] = { }; /************************************************************* + * Writeback blocks config + *************************************************************/ +#define WB_BLK(_name, _id, _base, _features, _clk_ctrl, \ + __xin_id, vbif_id, _reg, _wb_done_bit) \ + { \ + .name = _name, .id = _id, \ + .base = _base, .len = 0x2c8, \ + .features = _features, \ + .format_list = wb2_formats, \ + .num_formats = ARRAY_SIZE(wb2_formats), \ + .clk_ctrl = _clk_ctrl, \ + .xin_id = __xin_id, \ + .vbif_idx = vbif_id, \ + .maxlinewidth = DEFAULT_DPU_LINE_WIDTH, \ + .intr_wb_done = DPU_IRQ_IDX(_reg, _wb_done_bit) \ + } + +static const struct dpu_wb_cfg sm8250_wb[] = { + WB_BLK("wb_2", WB_2, 0x65000, WB_SM8250_MASK, DPU_CLK_CTRL_WB2, 6, + VBIF_RT, MDP_SSPP_TOP0_INTR, 4), +}; + +/************************************************************* * VBIF sub blocks config *************************************************************/ /* VBIF QOS remap */ @@ -1225,6 +1294,8 @@ static void sm8250_cfg_init(struct dpu_mdss_cfg *dpu_cfg) .intf = sm8150_intf, .vbif_count = ARRAY_SIZE(sdm845_vbif), .vbif = sdm845_vbif, + .wb_count = ARRAY_SIZE(sm8250_wb), + .wb = sm8250_wb, .reg_dma_count = 1, .dma_cfg = sm8250_regdma, .perf = sm8250_perf_data, 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 31af04a..a3ca695 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -/* Copyright (c) 2015-2018, 2020 The Linux Foundation. All rights reserved. +/* + * Copyright (c) 2022. Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2015-2018, 2020 The Linux Foundation. All rights reserved. */ #ifndef _DPU_HW_CATALOG_H @@ -209,6 +211,42 @@ enum { }; /** + * WB sub-blocks and features + * @DPU_WB_LINE_MODE Writeback module supports line/linear mode + * @DPU_WB_BLOCK_MODE Writeback module supports block mode read + * @DPU_WB_CHROMA_DOWN, Writeback chroma down block, + * @DPU_WB_DOWNSCALE, Writeback integer downscaler, + * @DPU_WB_DITHER, Dither block + * @DPU_WB_TRAFFIC_SHAPER, Writeback traffic shaper bloc + * @DPU_WB_UBWC, Writeback Universal bandwidth compression + * @DPU_WB_YUV_CONFIG Writeback supports output of YUV colorspace + * @DPU_WB_PIPE_ALPHA Writeback supports pipe alpha + * @DPU_WB_XY_ROI_OFFSET Writeback supports x/y-offset of out ROI in + * the destination image + * @DPU_WB_QOS, Writeback supports QoS control, danger/safe/creq + * @DPU_WB_QOS_8LVL, Writeback supports 8-level QoS control + * @DPU_WB_CDP Writeback supports client driven prefetch + * @DPU_WB_INPUT_CTRL Writeback supports from which pp block input pixel + * data arrives. + * @DPU_WB_CROP CWB supports cropping + * @DPU_WB_MAX maximum value + */ +enum { + DPU_WB_LINE_MODE = 0x1, + DPU_WB_BLOCK_MODE, + DPU_WB_UBWC, + DPU_WB_YUV_CONFIG, + DPU_WB_PIPE_ALPHA, + DPU_WB_XY_ROI_OFFSET, + DPU_WB_QOS, + DPU_WB_QOS_8LVL, + DPU_WB_CDP, + DPU_WB_INPUT_CTRL, + DPU_WB_CROP, + DPU_WB_MAX +}; + +/** * VBIF sub-blocks and features * @DPU_VBIF_QOS_OTLIM VBIF supports OT Limit * @DPU_VBIF_QOS_REMAP VBIF supports QoS priority remap @@ -439,6 +477,7 @@ enum dpu_clk_ctrl_type { DPU_CLK_CTRL_CURSOR1, DPU_CLK_CTRL_INLINE_ROT0_SSPP, DPU_CLK_CTRL_REG_DMA, + DPU_CLK_CTRL_WB2, DPU_CLK_CTRL_MAX, }; @@ -577,6 +616,28 @@ struct dpu_intf_cfg { }; /** + * struct dpu_wb_cfg - information of writeback blocks + * @DPU_HW_BLK_INFO: refer to the description above for DPU_HW_BLK_INFO + * @vbif_idx: vbif client index + * @maxlinewidth: max line width supported by writeback block + * @xin_id: bus client identifier + * @intr_wb_done: interrupt index for WB_DONE + * @format_list: list of formats supported by this writeback block + * @num_formats: number of formats supported by this writeback block + * @clk_ctrl: clock control identifier + */ +struct dpu_wb_cfg { + DPU_HW_BLK_INFO; + u8 vbif_idx; + u32 maxlinewidth; + u32 xin_id; + s32 intr_wb_done; + const u32 *format_list; + u32 num_formats; + enum dpu_clk_ctrl_type clk_ctrl; +}; + +/** * struct dpu_vbif_dynamic_ot_cfg - dynamic OT setting * @pps pixel per seconds * @ot_limit OT limit to use up to specified pixel per second @@ -758,6 +819,9 @@ struct dpu_mdss_cfg { u32 vbif_count; const struct dpu_vbif_cfg *vbif; + u32 wb_count; + const struct dpu_wb_cfg *wb; + u32 reg_dma_count; struct dpu_reg_dma_cfg dma_cfg;
Add writeback blocks to the sm8250 DPU hardware catalog. Other chipsets support writeback too but add it to sm8250 to prototype the feature so that it can be easily extended to other chipsets. Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com> --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 73 +++++++++++++++++++++++++- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 66 ++++++++++++++++++++++- 2 files changed, 137 insertions(+), 2 deletions(-)