drm/amd/display: Add DCN3 chip ids
PATCH 179/207 drm/amd/display: Add DCN3 chip ids
From: Bhawanpreet Lakha <[email protected]>
--- drivers/gpu/drm/amd/display/include/dal_asic_id.h | 4 ++++ drivers/gpu/drm/amd/display/include/dal_types.h | 1 + 2 files changed, 5 insertions(+)
drivers/gpu/drm/amd/display/include/dal_asic_id.h +4 -0
@@ -166,6 +166,7 @@ enum {NV_NAVI10_P_A0 =1 ,NV_NAVI12_P_A0 =10 ,NV_NAVI14_M_A0 =20 , +NV_SIENNA_CICHLID_P_A0 =40 , NV_UNKNOWN = 0xFF };
@@ -173,6 +174,9 @@ enum {#define ASICREV_IS_NAVI12_P (eChipRev) ((eChipRev >= NV_NAVI12_P_A0) && (eChipRev < NV_NAVI14_M_A0))#define ASICREV_IS_NAVI14_M (eChipRev) ((eChipRev >= NV_NAVI14_M_A0) && (eChipRev < NV_UNKNOWN))#define ASICREV_IS_RENOIR (eChipRev) ((eChipRev >= RENOIR_A0) && (eChipRev < RAVEN1_F0)) +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +#define ASICREV_IS_SIENNA_CICHLID_P (eChipRev) ((eChipRev >= NV_SIENNA_CICHLID_P_A0)) +#endif /* * ASIC chip ID
drivers/gpu/drm/amd/display/include/dal_types.h +1 -0
@@ -48,6 +48,7 @@ enum dce_version {DCN_VERSION_1_01 ,DCN_VERSION_2_0 ,DCN_VERSION_2_1 , +DCN_VERSION_3_0 , DCN_VERSION_MAX };
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 180/207 drm/amd/display: Add DCN3 DIO
From: Bhawanpreet Lakha <[email protected]>
Add support for the DIO (Display IO) block of DCN3, which entails our stream and link encoders.
HW Blocks:
+--------+
| DIO |
+--------+--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 14 + .../amd/display/dc/dcn10/dcn10_link_encoder.h | 6 + .../display/dc/dcn10/dcn10_stream_encoder.h | 42 + .../amd/display/dc/dcn20/dcn20_link_encoder.h | 4 + .../display/dc/dcn30/dcn30_dio_link_encoder.c | 205 +++++ .../display/dc/dcn30/dcn30_dio_link_encoder.h | 76 ++ .../dc/dcn30/dcn30_dio_stream_encoder.c | 851 ++++++++++++++++++ .../dc/dcn30/dcn30_dio_stream_encoder.h | 269 ++++++ .../amd/display/dc/inc/hw/stream_encoder.h | 4 + 9 files changed, 1471 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_link_encoder.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_link_encoder.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_stream_encoder.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_stream_encoder.h
drivers/gpu/drm/amd/display/dc/core/dc_link.c +14 -0
@@ -3133,6 +3133,11 @@ void core_link_enable_stream( pipe_ctx->stream->link->link_state_valid = true; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +if (pipe_ctx->stream_res.tg->funcs->set_out_mux) + pipe_ctx->stream_res.tg->funcs->set_out_mux (pipe_ctx->stream_res.tg,OUT_MUX_DIO ); +#endif +if (dc_is_dvi_signal (pipe_ctx->stream->signal)) pipe_ctx->stream_res.stream_enc->funcs->dvi_set_stream_attribute( pipe_ctx->stream_res.stream_enc,
@@ -3215,6 +3220,15 @@ void core_link_enable_stream(CONTROLLER_DP_TEST_PATTERN_VIDEOMODE , COLOR_DEPTH_UNDEFINED); +/* This second call is needed to reconfigure the DIG +* as a workaround for the incorrect value being applied +* from transmitter control. +*/ +if (!dc_is_virtual_signal (pipe_ctx->stream->signal)) + stream->link->link_enc->funcs->setup ( + stream->link->link_enc, + pipe_ctx->stream->signal); + dc->hwss.enable_stream (pipe_ctx);/* Set DPS PPS SDP (AKA "info frames") */
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.h +6 -0
@@ -153,6 +153,12 @@ struct dcn10_link_enc_registers {uint32_t RAWLANE2_DIG_PCS_XF_RX_OVRD_IN_3 ;uint32_t RAWLANE3_DIG_PCS_XF_RX_OVRD_IN_2 ;uint32_t RAWLANE3_DIG_PCS_XF_RX_OVRD_IN_3 ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +uint32_t TMDS_DCBALANCER_CONTROL ; +uint32_t PHYA_LINK_CNTL2 ; +uint32_t PHYB_LINK_CNTL2 ; +uint32_t PHYC_LINK_CNTL2 ; +#endif };#define LE_SF (reg_name, field_name, post_fix)\
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.h +42 -0
62 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_link_encoder.h +4 -0
@@ -274,6 +274,10 @@ struct mpll_cfg {bool dp_tx1_vergdrv_byp;bool dp_tx2_vergdrv_byp;bool dp_tx3_vergdrv_byp; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +uint32_t tx_peaking_lvl; +uint32_t ctr_reqs_pll; +#endif };
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_link_encoder.c new file +205 -0
205 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_link_encoder.h new file +76 -0
76 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_stream_encoder.c new file +851 -0
851 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_stream_encoder.h new file +269 -0
269 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h +4 -0
@@ -104,6 +104,10 @@ struct stream_encoder {struct dc_bios *bp;enum engine_id id;uint32_t stream_enc_inst; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +struct vpg *vpg; +struct afmt *afmt; +#endif };struct enc_state {
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 181/207 drm/amd/display: Add DCN3 CLK_MGR
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
Adds support for handling of clocking relevant to the DCN3 block
--- .../gpu/drm/amd/display/dc/clk_mgr/Makefile | 10 + .../gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 22 + .../drm/amd/display/dc/clk_mgr/dcn30/dalsmc.h | 60 ++ .../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 543 ++++++++++++++++++ .../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.h | 38 ++ .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c | 255 ++++++++ .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.h | 108 ++++ drivers/gpu/drm/amd/display/dc/core/dc.c | 51 ++ .../gpu/drm/amd/display/dc/core/dc_stream.c | 37 ++ drivers/gpu/drm/amd/display/dc/dc.h | 26 + .../drm/amd/display/dc/dce/dce_clock_source.c | 153 ++++- .../drm/amd/display/dc/dce/dce_clock_source.h | 42 ++ .../gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 69 +++ .../amd/display/dc/inc/hw/clk_mgr_internal.h | 14 + 14 files changed, 1421 insertions(+), 7 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dalsmc.h create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.h create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.h
drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile +10 -0
@@ -97,3 +97,13 @@ AMD_DAL_CLK_MGR_DCN21 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn21/,$(CLK_MGR_DC AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN21) endif +ifdef CONFIG_DRM_AMD_DC_DCN3_0 +############################################################################### +# DCN30 +############################################################################### +CLK_MGR_DCN30 = dcn30_clk_mgr.o dcn30_clk_mgr_smu_msg.o + +AMD_DAL_CLK_MGR_DCN30 = $(addprefix $(AMDDALPATH)/dc/clk_mgr/dcn30/,$(CLK_MGR_DCN30)) + +AMD_DISPLAY_FILES += $(AMD_DAL_CLK_MGR_DCN30) +endif
drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c +22 -0
@@ -38,6 +38,9 @@#include "dcn10/rv2_clk_mgr.h" #include "dcn20/dcn20_clk_mgr.h" #include "dcn21/rn_clk_mgr.h" +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +#include "dcn30/dcn30_clk_mgr.h" +#endif int clk_mgr_helper_get_active_display_cnt(
@@ -169,6 +172,15 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *pbreak ;case FAMILY_NV : +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +if (ASICREV_IS_SIENNA_CICHLID_P (asic_id.hw_internal_rev)) { +/* TODO: to add SIENNA_CICHLID clk_mgr support, once CLK IP header files are available, +* for now use DCN3AG clk mgr. +*/ +dcn3_clk_mgr_construct (ctx, clk_mgr, pp_smu, dccg); +break ; + } +#endif dcn20_clk_mgr_construct (ctx, clk_mgr, pp_smu, dccg);break ;#endif /* Family RV and NV*/
@@ -184,6 +196,16 @@ struct clk_mgr *dc_clk_mgr_create(struct dc_context *ctx, struct pp_smu_funcs *pvoid dc_destroy_clk_mgr (struct clk_mgr *clk_mgr_base) {struct clk_mgr_internal *clk_mgr =TO_CLK_MGR_INTERNAL (clk_mgr_base); +#ifdef CONFIG_DRM_AMD_DC_DCN3_0 + +switch (clk_mgr_base->ctx->asic_id.chip_family) { +case FAMILY_NV : +if (ASICREV_IS_SIENNA_CICHLID_P (clk_mgr_base->ctx->asic_id.hw_internal_rev)) { +dcn3_clk_mgr_destroy (clk_mgr); +break ; + } + } +#endif kfree (clk_mgr); }
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dalsmc.h new file +60 -0
60 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c new file +543 -0
543 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.h new file +38 -0
@@ -0,0 +1,38 @@ +/* +* Copyright 2020 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: AMD +* +*/ + +#ifndef __DCN30_CLK_MGR_H__ +#define __DCN30_CLK_MGR_H__ + +void dcn3_init_clocks (struct clk_mgr *clk_mgr_base); + +void dcn3_clk_mgr_construct (struct dc_context *ctx, +struct clk_mgr_internal *clk_mgr, +struct pp_smu_funcs *pp_smu, +struct dccg *dccg); + +void dcn3_clk_mgr_destroy (struct clk_mgr_internal *clk_mgr); + +#endif //__DCN30_CLK_MGR_H__
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c new file +255 -0
255 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.h new file +108 -0
108 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/core/dc.c +51 -0
60 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/core/dc_stream.c +37 -0
@@ -243,6 +243,9 @@ bool dc_stream_set_cursor_attributes(struct dc *dc;struct resource_context *res_ctx;struct pipe_ctx *pipe_to_program =NULL ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +bool reset_idle_optimizations = false; +#endif if (NULL == stream) {dm_error ("DC: dc_stream is NULL!\n" );
@@ -262,6 +265,15 @@ bool dc_stream_set_cursor_attributes( res_ctx = &dc->current_state->res_ctx; stream->cursor_attributes = *attributes; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +/* disable idle optimizations while updating cursor */ +if (dc->idle_optimizations_allowed) { + dc->hwss.apply_idle_power_optimizations (dc, false); + reset_idle_optimizations = true; + } + +#endif +for (i =0 ; i <MAX_PIPES ; i++) {struct pipe_ctx *pipe_ctx = &res_ctx->pipe_ctx[i];
@@ -281,6 +293,12 @@ bool dc_stream_set_cursor_attributes(if (pipe_to_program) dc->hwss.cursor_lock (dc, pipe_to_program, false); +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +/* re-enable idle optimizations if necessary */ +if (reset_idle_optimizations) + dc->hwss.apply_idle_power_optimizations (dc, true); + +#endif return true; }
@@ -292,6 +310,9 @@ bool dc_stream_set_cursor_position(struct dc *dc;struct resource_context *res_ctx;struct pipe_ctx *pipe_to_program =NULL ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +bool reset_idle_optimizations = false; +#endif if (NULL == stream) {dm_error ("DC: dc_stream is NULL!\n" );
@@ -305,6 +326,16 @@ bool dc_stream_set_cursor_position( dc = stream->ctx->dc; res_ctx = &dc->current_state->res_ctx; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) + +/* disable idle optimizations if enabling cursor */ +if (dc->idle_optimizations_allowed && + !stream->cursor_position.enable && position->enable) { + dc->hwss.apply_idle_power_optimizations (dc, false); + reset_idle_optimizations = true; + } + +#endif stream->cursor_position = *position;for (i =0 ; i <MAX_PIPES ; i++) {
@@ -328,6 +359,12 @@ bool dc_stream_set_cursor_position(if (pipe_to_program) dc->hwss.cursor_lock (dc, pipe_to_program, false); +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +/* re-enable idle optimizations if necessary */ +if (reset_idle_optimizations) + dc->hwss.apply_idle_power_optimizations (dc, true); + +#endif return true; }
drivers/gpu/drm/amd/display/dc/dc.h +26 -0
@@ -459,6 +459,9 @@ struct dc_debug_options {bool disable_tri_buf;bool dmub_offload_enabled;bool dmcub_emulation; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +bool disable_idle_power_optimizations; +#endif bool dmub_command_table;/* for testing only */ struct dc_bw_validation_profile bw_val_profile;bool disable_fec;
@@ -572,6 +575,9 @@ struct dc {/* Require to optimize clocks and bandwidth for added/removed planes */ bool optimized_required;bool wm_optimized_required; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +bool idle_optimizations_allowed; +#endif /* Require to maintain clocks and bandwidth for UEFI enabled HW */ int optimize_seamless_boot_streams;
@@ -628,6 +634,9 @@ struct dc_init_data {*/ const struct gpu_info_soc_bounding_box_v1_0 *soc_bounding_box;struct dpcd_vendor_signature vendor_signature; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +bool force_smu_not_present; +#endif };struct dc_callback_init {
@@ -1198,6 +1207,23 @@ bool dc_is_dmcu_initialized(struct dc *dc);enum dc_status dc_set_clock (struct dc *dc,enum dc_clock_type clock_type,uint32_t clk_khz,uint32_t stepping);void dc_get_clock (struct dc *dc,enum dc_clock_type clock_type,struct dc_clock_config *clock_cfg); +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) + +void dc_allow_idle_optimizations (struct dc *dc,bool allow); + +/* +* blank all streams, and set min and max memory clock to +* lowest and highest DPM level, respectively +*/ +void dc_unlock_memory_clock_frequency (struct dc *dc); + +/* +* set min memory clock to the min required for current mode, +* max to maxDPM, and unblank streams +*/ +void dc_lock_memory_clock_frequency (struct dc *dc); + +#endif /******************************************************************************* * DSC Interfaces ******************************************************************************/
drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c +146 -7
171 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.h +42 -0
52 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h +69 -0
106 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr_internal.h +14 -0
@@ -101,6 +101,12 @@ enum dentist_divider_range {CLK_SRI (CLK3_CLK_PLL_REQ ,CLK3 ,0 ), \ CLK_SRI(CLK3_CLK2_DFS_CNTL, CLK3, 0) +#ifdef CONFIG_DRM_AMD_DC_DCN3_0 +// TODO: +#define CLK_REG_LIST_DCN3 () \ + SR(DENTIST_DISPCLK_CNTL) +#endif +#define CLK_SF (reg_name, field_name, post_fix)\ .field_name = reg_name ## __ ## field_name ## post_fix
@@ -167,6 +173,10 @@ struct clk_mgr_registers {uint32_t CLK3_CLK2_DFS_CNTL ;uint32_t CLK3_CLK_PLL_REQ ; +#ifdef CONFIG_DRM_AMD_DC_DCN3_0 +uint32_t CLK0_CLK2_DFS_CNTL ; +uint32_t CLK0_CLK_PLL_REQ ; +#endif uint32_t MP1_SMN_C2PMSG_67 ;uint32_t MP1_SMN_C2PMSG_83 ;uint32_t MP1_SMN_C2PMSG_91 ;
@@ -260,6 +270,10 @@ struct clk_mgr_internal {enum dm_pp_clocks_state max_clks_state;enum dm_pp_clocks_state cur_min_clks_state; +#ifdef CONFIG_DRM_AMD_DC_DCN3_0 + +bool smu_present; +#endif };struct clk_mgr_internal_funcs {
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 182/207 drm/amd/display: Add DCN3 DCCG
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
Add programming of the DCCG (Display Controller Clock Generator) block:
HW Blocks:
+--------+ +--------+
| DIO | | DCCG |
+--------+ +--------+--- .../gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 22 ++++ .../gpu/drm/amd/display/dc/dcn30/dcn30_dccg.c | 100 ++++++++++++++++++ .../gpu/drm/amd/display/dc/dcn30/dcn30_dccg.h | 66 ++++++++++++ 3 files changed, 188 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.h
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h +22 -0
@@ -76,18 +76,40 @@type REFCLK_CLOCK_EN ;\type REFCLK_SRC_SEL ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +#define DCCG3_REG_FIELD_LIST (type) \ + type PHYASYMCLK_FORCE_EN;\ + type PHYASYMCLK_FORCE_SRC_SEL;\ + type PHYBSYMCLK_FORCE_EN;\ + type PHYBSYMCLK_FORCE_SRC_SEL;\ + type PHYCSYMCLK_FORCE_EN;\ + type PHYCSYMCLK_FORCE_SRC_SEL; +#endif +struct dccg_shift { DCCG_REG_FIELD_LIST(uint8_t) +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) + DCCG3_REG_FIELD_LIST(uint8_t) +#endif };struct dccg_mask { DCCG_REG_FIELD_LIST(uint32_t) +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) + DCCG3_REG_FIELD_LIST(uint32_t) +#endif };struct dccg_registers {uint32_t DPPCLK_DTO_CTRL;uint32_t DPPCLK_DTO_PARAM[6 ];uint32_t REFCLK_CNTL; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +uint32_t HDMICHARCLK_CLOCK_CNTL[6 ]; +uint32_t PHYASYMCLK_CLOCK_CNTL; +uint32_t PHYBSYMCLK_CLOCK_CNTL; +uint32_t PHYCSYMCLK_CLOCK_CNTL; +#endif };struct dcn_dccg {
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.c new file +100 -0
100 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.h new file +66 -0
66 lines not on this page · raw message
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 183/207 drm/amd/display: Add DCN3 OPTC
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
Add support for programming the DCN3 OPTC (Output Timing Controller)
HW Blocks:
+--------+
| OPTC |
+--------+
|
v
+--------+ +--------+
| DIO | | DCCG |
+--------+ +--------+--- .../gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 10 +- .../gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 62 +++ .../gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 365 ++++++++++++++++++ .../gpu/drm/amd/display/dc/dcn30/dcn30_optc.h | 333 ++++++++++++++++ .../amd/display/dc/inc/hw/timing_generator.h | 19 + 5 files changed, 788 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c +9 -1
@@ -288,8 +288,16 @@ void optc1_program_timing(if (optc1_is_two_pixels_per_containter (&patched_crtc_timing) || optc1->opp_count ==2 ) h_div =H_TIMING_DIV_BY2 ; -REG_UPDATE (OTG_H_TIMING_CNTL , +if (optc1->tg_mask->OTG_H_TIMING_DIV_MODE !=0 ) { +if (optc1->opp_count ==4 ) + h_div =H_TIMING_DIV_BY4 ; + +REG_UPDATE (OTG_H_TIMING_CNTL , +OTG_H_TIMING_DIV_MODE , h_div); + }else { +REG_UPDATE (OTG_H_TIMING_CNTL ,OTG_H_TIMING_DIV_BY2 , h_div); + } } void optc1_set_vtg_params(struct timing_generator *optc,
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h +62 -0
106 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c new file +365 -0
365 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h new file +333 -0
333 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/hw/timing_generator.h +19 -0
@@ -98,9 +98,19 @@ enum crc_selection { INTERSECT_WINDOW_NOT_A_NOT_B, }; +#ifdef CONFIG_DRM_AMD_DC_DCN3_0 +enum otg_out_mux_dest { +OUT_MUX_DIO =0 , +}; +#endif +enum h_timing_div_mode {H_TIMING_NO_DIV ,H_TIMING_DIV_BY2 , +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +H_TIMING_RESERVED , +H_TIMING_DIV_BY4 , +#endif };struct crc_params {
@@ -278,6 +288,15 @@ struct timing_generator_funcs {void (*set_gsl_source_select)(struct timing_generator *optc,int group_idx,uint32_t gsl_ready_signal); +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +void (*set_out_mux)(struct timing_generator *tg,enum otg_out_mux_dest dest); +void (*set_vrr_m_const)(struct timing_generator *optc, +double vtotal_avg); +void (*set_drr_trigger_window)(struct timing_generator *optc, +uint32_t window_start,uint32_t window_end); +void (*set_vtotal_change_limit)(struct timing_generator *optc, +uint32_t limit); +#endif };#endif
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 184/207 drm/amd/display: Add DCN3 OPP header
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
Add support to program the DCN3 OPP (Output Plane Processing)
HW Blocks:
+-------+
| OPP |
+-------+
|
v
+--------+
| OPTC |
+--------+
|
v
+--------+ +--------+
| DIO | | DCCG |
+--------+ +--------+--- .../gpu/drm/amd/display/dc/dcn30/dcn30_opp.h | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_opp.h
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_opp.h new file +36 -0
@@ -0,0 +1,36 @@ +/* Copyright 2020 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: AMD +* +*/ + +#ifndef __DC_OPP_DCN30_H__ +#define __DC_OPP_DCN30_H__ + +#include "dcn20/dcn20_opp.h" + + +#define OPP_REG_LIST_DCN30 (id) \ + OPP_REG_LIST_DCN10(id), \ + OPP_DPG_REG_LIST(id), \ + SRI(FMT_422_CONTROL, FMT, id) + +#endif
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 185/207 drm/amd/display: Add DCN3 MPC
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
Add support to program the DCN3 MPC (Multiple pipe and plane combine)
HW Blocks:
+--------+
| MPC |
+--------+
|
v
+-------+
| OPP |
+-------+
|
v
+--------+
| OPTC |
+--------+
|
v
+--------+ +--------+
| DIO | | DCCG |
+--------+ +--------+--- drivers/gpu/drm/amd/display/dc/core/dc.c | 37 + .../gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 1409 +++++++++++++++++ .../gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h | 665 ++++++++ drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 108 ++ 4 files changed, 2219 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h
drivers/gpu/drm/amd/display/dc/core/dc.c +37 -0
@@ -1370,6 +1370,43 @@ bool dc_commit_state(struct dc *dc, struct dc_state *context)return (result ==DC_OK ); } +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +bool dc_acquire_release_mpc_3dlut ( +struct dc *dc,bool acquire, +struct dc_stream_state *stream, +struct dc_3dlut **lut, +struct dc_transfer_func **shaper) +{ +int pipe_idx; +bool ret = false; +bool found_pipe_idx = false; +const struct resource_pool *pool = dc->res_pool; +struct resource_context *res_ctx = &dc->current_state->res_ctx; +int mpcc_id =0 ; + +if (pool && res_ctx) { +if (acquire) { +/*find pipe idx for the given stream*/ +for (pipe_idx =0 ; pipe_idx < pool->pipe_count; pipe_idx++) { +if (res_ctx->pipe_ctx[pipe_idx].stream == stream) { + found_pipe_idx = true; + mpcc_id = res_ctx->pipe_ctx[pipe_idx].plane_res.hubp->inst; +break ; + } + } + }else + found_pipe_idx = true;/*for release pipe_idx is not required*/ + +if (found_pipe_idx) { +if (acquire && pool->funcs->acquire_post_bldn_3dlut) + ret = pool->funcs->acquire_post_bldn_3dlut (res_ctx, pool, mpcc_id, lut, shaper); +else if (acquire == false && pool->funcs->release_post_bldn_3dlut) + ret = pool->funcs->release_post_bldn_3dlut (res_ctx, pool, lut, shaper); + } + } +return ret; +} +#endif static bool is_flip_pending_in_pipes (struct dc *dc,struct dc_state *context) {int i;
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c new file +1409 -0
1,409 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h new file +665 -0
665 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h +108 -0
149 lines not on this page · raw message
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 186/207 drm/amd/display: Add DCN3 DPP
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
Add support to program the DCN3 DPP (Multiple pipe and plane combine)
HW Blocks:
+--------+
| DPP |
+--------+
|
v
+--------+
| MPC |
+--------+
|
v
+-------+
| OPP |
+-------+
|
v
+--------+
| OPTC |
+--------+
|
v
+--------+ +--------+
| DIO | | DCCG |
+--------+ +--------+--- .../amd/display/dc/dcn30/dcn30_cm_common.c | 640 ++++++++ .../amd/display/dc/dcn30/dcn30_cm_common.h | 78 + .../gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 1414 +++++++++++++++++ .../gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h | 608 +++++++ .../drm/amd/display/dc/dcn30/dcn30_dpp_cm.c | 410 +++++ drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 7 + 6 files changed, 3157 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c new file +640 -0
@@ -0,0 +1,640 @@ +/* +* Copyright 2020 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: AMD +* +*/ + +#include "dm_services.h" +#include "core_types.h" +#include "reg_helper.h" +#include "dcn30_dpp.h" +#include "basics/conversion.h" +#include "dcn30_cm_common.h" +#include "custom_float.h" + +#define REG (reg) reg + +#define CTX \ + ctx //dpp->base.ctx + +#undef FN +#define FN (reg_name, field_name) \ + reg->shifts.field_name, reg->masks.field_name + +void cm_helper_program_gamcor_xfer_func ( +struct dc_context *ctx, +const struct pwl_params *params, +const struct dcn3_xfer_func_reg *reg) +{ +uint32_t reg_region_cur; +unsigned int i =0 ; + +REG_SET_2 (reg->start_cntl_b,0 , + exp_region_start, params->corner_points[0 ].blue.custom_float_x, + exp_resion_start_segment,0 ); +REG_SET_2 (reg->start_cntl_g,0 , + exp_region_start, params->corner_points[0 ].green.custom_float_x, + exp_resion_start_segment,0 ); +REG_SET_2 (reg->start_cntl_r,0 , + exp_region_start, params->corner_points[0 ].red.custom_float_x, + exp_resion_start_segment,0 ); + +REG_SET (reg->start_slope_cntl_b,0 ,//linear slope at start of curve + field_region_linear_slope, params->corner_points[0 ].blue.custom_float_slope); +REG_SET (reg->start_slope_cntl_g,0 , + field_region_linear_slope, params->corner_points[0 ].green.custom_float_slope); +REG_SET (reg->start_slope_cntl_r,0 , + field_region_linear_slope, params->corner_points[0 ].red.custom_float_slope); + +REG_SET (reg->start_end_cntl1_b,0 , + field_region_end_base, params->corner_points[1 ].blue.custom_float_y); +REG_SET (reg->start_end_cntl1_g,0 , + field_region_end_base, params->corner_points[1 ].green.custom_float_y); +REG_SET (reg->start_end_cntl1_r,0 , + field_region_end_base, params->corner_points[1 ].red.custom_float_y); + +REG_SET_2 (reg->start_end_cntl2_b,0 , + field_region_end_slope, params->corner_points[1 ].blue.custom_float_slope, + field_region_end, params->corner_points[1 ].blue.custom_float_x); +REG_SET_2 (reg->start_end_cntl2_g,0 , + field_region_end_slope, params->corner_points[1 ].green.custom_float_slope, + field_region_end, params->corner_points[1 ].green.custom_float_x); +REG_SET_2 (reg->start_end_cntl2_r,0 , + field_region_end_slope, params->corner_points[1 ].red.custom_float_slope, + field_region_end, params->corner_points[1 ].red.custom_float_x); + +for (reg_region_cur = reg->region_start; + reg_region_cur <= reg->region_end; + reg_region_cur++) { + +const struct gamma_curve *curve0 = &(params->arr_curve_points[2 * i]); +const struct gamma_curve *curve1 = &(params->arr_curve_points[(2 * i) +1 ]); + +REG_SET_4 (reg_region_cur,0 , + exp_region0_lut_offset, curve0->offset, + exp_region0_num_segments, curve0->segments_num, + exp_region1_lut_offset, curve1->offset, + exp_region1_num_segments, curve1->segments_num); + + i++; + } +} + +/* driver uses 32 regions or less, but DCN HW has 34, extra 2 are set to 0 */ +#define MAX_REGIONS_NUMBER 34 +#define MAX_LOW_POINT 25 +#define NUMBER_REGIONS 32 +#define NUMBER_SW_SEGMENTS 16 + +bool cm3_helper_translate_curve_to_hw_format ( +const struct dc_transfer_func *output_tf, +struct pwl_params *lut_params,bool fixpoint) +{ +struct curve_points3 *corner_points; +struct pwl_result_data *rgb_resulted; +struct pwl_result_data *rgb; +struct pwl_result_data *rgb_plus_1; +struct fixed31_32 end_value; + +int32_t region_start, region_end; +int32_t i; +uint32_t j, k, seg_distr[MAX_REGIONS_NUMBER ], increment, start_index, hw_points; + +if (output_tf ==NULL || lut_params ==NULL || output_tf->type ==TF_TYPE_BYPASS ) +return false; + +PERF_TRACE_CTX (output_tf->ctx); + + corner_points = lut_params->corner_points; + rgb_resulted = lut_params->rgb_resulted; + hw_points =0 ; + +memset (lut_params,0 ,sizeof (struct pwl_params )); +memset (seg_distr,0 ,sizeof (seg_distr)); + +if (output_tf->tf ==TRANSFER_FUNCTION_PQ || output_tf->tf ==TRANSFER_FUNCTION_GAMMA22 || + output_tf->tf ==TRANSFER_FUNCTION_HLG ) { +/* 32 segments +* segments are from 2^-25 to 2^7 +*/ +for (i =0 ; i <NUMBER_REGIONS ; i++) + seg_distr[i] =3 ; + + region_start = -MAX_LOW_POINT ; + region_end =NUMBER_REGIONS -MAX_LOW_POINT ; + }else { +/* 10 segments +* segment is from 2^-10 to 2^0 +* There are less than 256 points, for optimization +*/ + seg_distr[0 ] =3 ; + seg_distr[1 ] =4 ; + seg_distr[2 ] =4 ; + seg_distr[3 ] =4 ; + seg_distr[4 ] =4 ; + seg_distr[5 ] =4 ; + seg_distr[6 ] =4 ; + seg_distr[7 ] =4 ; + seg_distr[8 ] =4 ; + seg_distr[9 ] =4 ; + + region_start =-10 ; + region_end =0 ; + } + +for (i = region_end - region_start; i <MAX_REGIONS_NUMBER ; i++) + seg_distr[i] =-1 ; + +for (k =0 ; k <MAX_REGIONS_NUMBER ; k++) { +if (seg_distr[k] !=-1 ) + hw_points += (1 << seg_distr[k]); + } + + j =0 ; +for (k =0 ; k < (region_end - region_start); k++) { + increment =NUMBER_SW_SEGMENTS / (1 << seg_distr[k]); + start_index = (region_start + k +MAX_LOW_POINT ) * +NUMBER_SW_SEGMENTS ; +for (i = start_index; i < start_index +NUMBER_SW_SEGMENTS ; + i += increment) { +if (j == hw_points -1 ) +break ; + rgb_resulted[j].red = output_tf->tf_pts.red[i]; + rgb_resulted[j].green = output_tf->tf_pts.green[i]; + rgb_resulted[j].blue = output_tf->tf_pts.blue[i]; + j++; + } + } + +/* last point */ + start_index = (region_end +MAX_LOW_POINT ) *NUMBER_SW_SEGMENTS ; + rgb_resulted[hw_points -1 ].red = output_tf->tf_pts.red[start_index]; + rgb_resulted[hw_points -1 ].green = output_tf->tf_pts.green[start_index]; + rgb_resulted[hw_points -1 ].blue = output_tf->tf_pts.blue[start_index]; + +// All 3 color channels have same x + corner_points[0 ].red.x =dc_fixpt_pow (dc_fixpt_from_int (2 ), +dc_fixpt_from_int (region_start)); + corner_points[0 ].green.x = corner_points[0 ].red.x; + corner_points[0 ].blue.x = corner_points[0 ].red.x; + + corner_points[1 ].red.x =dc_fixpt_pow (dc_fixpt_from_int (2 ), +dc_fixpt_from_int (region_end)); + corner_points[1 ].green.x = corner_points[1 ].red.x; + corner_points[1 ].blue.x = corner_points[1 ].red.x; + + corner_points[0 ].red.y = rgb_resulted[0 ].red; + corner_points[0 ].green.y = rgb_resulted[0 ].green; + corner_points[0 ].blue.y = rgb_resulted[0 ].blue; + + corner_points[0 ].red.slope =dc_fixpt_div (corner_points[0 ].red.y, + corner_points[0 ].red.x); + corner_points[0 ].green.slope =dc_fixpt_div (corner_points[0 ].green.y, + corner_points[0 ].green.x); + corner_points[0 ].blue.slope =dc_fixpt_div (corner_points[0 ].blue.y, + corner_points[0 ].blue.x); + +/* see comment above, m_arrPoints[1].y should be the Y value for the +* region end (m_numOfHwPoints), not last HW point(m_numOfHwPoints - 1) +*/ + corner_points[1 ].red.y = rgb_resulted[hw_points -1 ].red; + corner_points[1 ].green.y = rgb_resulted[hw_points -1 ].green; + corner_points[1 ].blue.y = rgb_resulted[hw_points -1 ].blue; + corner_points[1 ].red.slope = dc_fixpt_zero; + corner_points[1 ].green.slope = dc_fixpt_zero; + corner_points[1 ].blue.slope = dc_fixpt_zero; + +if (output_tf->tf ==TRANSFER_FUNCTION_PQ || output_tf->tf ==TRANSFER_FUNCTION_HLG ) { +/* for PQ/HLG, we want to have a straight line from last HW X point, +* and the slope to be such that we hit 1.0 at 10000/1000 nits. +*/ + +if (output_tf->tf ==TRANSFER_FUNCTION_PQ ) + end_value =dc_fixpt_from_int (125 ); +else + end_value =dc_fixpt_from_fraction (125 ,10 ); + + corner_points[1 ].red.slope =dc_fixpt_div ( +dc_fixpt_sub (dc_fixpt_one, corner_points[1 ].red.y), +dc_fixpt_sub (end_value, corner_points[1 ].red.x)); + corner_points[1 ].green.slope =dc_fixpt_div ( +dc_fixpt_sub (dc_fixpt_one, corner_points[1 ].green.y), +dc_fixpt_sub (end_value, corner_points[1 ].green.x)); + corner_points[1 ].blue.slope =dc_fixpt_div ( +dc_fixpt_sub (dc_fixpt_one, corner_points[1 ].blue.y), +dc_fixpt_sub (end_value, corner_points[1 ].blue.x)); + } + lut_params->hw_points_num = hw_points; + + k =0 ; +for (i =1 ; i <MAX_REGIONS_NUMBER ; i++) { +if (seg_distr[k] !=-1 ) { + lut_params->arr_curve_points[k].segments_num = + seg_distr[k]; + lut_params->arr_curve_points[i].offset = + lut_params->arr_curve_points[k].offset + (1 << seg_distr[k]); + } + k++; + } + +if (seg_distr[k] !=-1 ) + lut_params->arr_curve_points[k].segments_num = seg_distr[k]; + + rgb = rgb_resulted; + rgb_plus_1 = rgb_resulted +1 ; + + i =1 ; +while (i != hw_points +1 ) { +if (dc_fixpt_lt (rgb_plus_1->red, rgb->red)) + rgb_plus_1->red = rgb->red; +if (dc_fixpt_lt (rgb_plus_1->green, rgb->green)) + rgb_plus_1->green = rgb->green; +if (dc_fixpt_lt (rgb_plus_1->blue, rgb->blue)) + rgb_plus_1->blue = rgb->blue; + + rgb->delta_red =dc_fixpt_sub (rgb_plus_1->red, rgb->red); + rgb->delta_green =dc_fixpt_sub (rgb_plus_1->green, rgb->green); + rgb->delta_blue =dc_fixpt_sub (rgb_plus_1->blue, rgb->blue); + +if (fixpoint == true) { + rgb->delta_red_reg =dc_fixpt_clamp_u0d10 (rgb->delta_red); + rgb->delta_green_reg =dc_fixpt_clamp_u0d10 (rgb->delta_green); + rgb->delta_blue_reg =dc_fixpt_clamp_u0d10 (rgb->delta_blue); + rgb->red_reg =dc_fixpt_clamp_u0d14 (rgb->red); + rgb->green_reg =dc_fixpt_clamp_u0d14 (rgb->green); + rgb->blue_reg =dc_fixpt_clamp_u0d14 (rgb->blue); + } + + ++rgb_plus_1; + ++rgb; + ++i; + } +cm3_helper_convert_to_custom_float (rgb_resulted, + lut_params->corner_points, + hw_points, fixpoint); + +return true; +} + +#define NUM_DEGAMMA_REGIONS 12 + + +bool cm3_helper_translate_curve_to_degamma_hw_format ( +const struct dc_transfer_func *output_tf, +struct pwl_params *lut_params) +{ +struct curve_points3 *corner_points; +struct pwl_result_data *rgb_resulted; +struct pwl_result_data *rgb; +struct pwl_result_data *rgb_plus_1; + +int32_t region_start, region_end; +int32_t i; +uint32_t j, k, seg_distr[MAX_REGIONS_NUMBER ], increment, start_index, hw_points; + +if (output_tf ==NULL || lut_params ==NULL || output_tf->type ==TF_TYPE_BYPASS ) +return false; + +PERF_TRACE_CTX (output_tf->ctx); + + corner_points = lut_params->corner_points; + rgb_resulted = lut_params->rgb_resulted; + hw_points =0 ; + +memset (lut_params,0 ,sizeof (struct pwl_params )); +memset (seg_distr,0 ,sizeof (seg_distr)); + + region_start = -NUM_DEGAMMA_REGIONS ; + region_end =0 ; + + +for (i = region_end - region_start; i <MAX_REGIONS_NUMBER ; i++) + seg_distr[i] =-1 ; +/* 12 segments +* segments are from 2^-12 to 0 +*/ +for (i =0 ; i <NUM_DEGAMMA_REGIONS ; i++) + seg_distr[i] =4 ; + +for (k =0 ; k <MAX_REGIONS_NUMBER ; k++) { +if (seg_distr[k] !=-1 ) + hw_points += (1 << seg_distr[k]); + } + + j =0 ; +for (k =0 ; k < (region_end - region_start); k++) { + increment =NUMBER_SW_SEGMENTS / (1 << seg_distr[k]); + start_index = (region_start + k +MAX_LOW_POINT ) * +NUMBER_SW_SEGMENTS ; +for (i = start_index; i < start_index +NUMBER_SW_SEGMENTS ; + i += increment) { +if (j == hw_points -1 ) +break ; + rgb_resulted[j].red = output_tf->tf_pts.red[i]; + rgb_resulted[j].green = output_tf->tf_pts.green[i]; + rgb_resulted[j].blue = output_tf->tf_pts.blue[i]; + j++; + } + } + +/* last point */ + start_index = (region_end +MAX_LOW_POINT ) *NUMBER_SW_SEGMENTS ; + rgb_resulted[hw_points -1 ].red = output_tf->tf_pts.red[start_index]; + rgb_resulted[hw_points -1 ].green = output_tf->tf_pts.green[start_index]; + rgb_resulted[hw_points -1 ].blue = output_tf->tf_pts.blue[start_index]; + + corner_points[0 ].red.x =dc_fixpt_pow (dc_fixpt_from_int (2 ), +dc_fixpt_from_int (region_start)); + corner_points[0 ].green.x = corner_points[0 ].red.x; + corner_points[0 ].blue.x = corner_points[0 ].red.x; + corner_points[1 ].red.x =dc_fixpt_pow (dc_fixpt_from_int (2 ), +dc_fixpt_from_int (region_end)); + corner_points[1 ].green.x = corner_points[1 ].red.x; + corner_points[1 ].blue.x = corner_points[1 ].red.x; + + corner_points[0 ].red.y = rgb_resulted[0 ].red; + corner_points[0 ].green.y = rgb_resulted[0 ].green; + corner_points[0 ].blue.y = rgb_resulted[0 ].blue; + +/* see comment above, m_arrPoints[1].y should be the Y value for the +* region end (m_numOfHwPoints), not last HW point(m_numOfHwPoints - 1) +*/ + corner_points[1 ].red.y = rgb_resulted[hw_points -1 ].red; + corner_points[1 ].green.y = rgb_resulted[hw_points -1 ].green; + corner_points[1 ].blue.y = rgb_resulted[hw_points -1 ].blue; + corner_points[1 ].red.slope = dc_fixpt_zero; + corner_points[1 ].green.slope = dc_fixpt_zero; + corner_points[1 ].blue.slope = dc_fixpt_zero; + +if (output_tf->tf ==TRANSFER_FUNCTION_PQ ) { +/* for PQ, we want to have a straight line from last HW X point, +* and the slope to be such that we hit 1.0 at 10000 nits. +*/ +const struct fixed31_32 end_value = +dc_fixpt_from_int (125 ); + + corner_points[1 ].red.slope =dc_fixpt_div ( +dc_fixpt_sub (dc_fixpt_one, corner_points[1 ].red.y), +dc_fixpt_sub (end_value, corner_points[1 ].red.x)); + corner_points[1 ].green.slope =dc_fixpt_div ( +dc_fixpt_sub (dc_fixpt_one, corner_points[1 ].green.y), +dc_fixpt_sub (end_value, corner_points[1 ].green.x)); + corner_points[1 ].blue.slope =dc_fixpt_div ( +dc_fixpt_sub (dc_fixpt_one, corner_points[1 ].blue.y), +dc_fixpt_sub (end_value, corner_points[1 ].blue.x)); + } + + lut_params->hw_points_num = hw_points; + + k =0 ; +for (i =1 ; i <MAX_REGIONS_NUMBER ; i++) { +if (seg_distr[k] !=-1 ) { + lut_params->arr_curve_points[k].segments_num = + seg_distr[k]; + lut_params->arr_curve_points[i].offset = + lut_params->arr_curve_points[k].offset + (1 << seg_distr[k]); + } + k++; + } + +if (seg_distr[k] !=-1 ) + lut_params->arr_curve_points[k].segments_num = seg_distr[k]; + + rgb = rgb_resulted; + rgb_plus_1 = rgb_resulted +1 ; + + i =1 ; +while (i != hw_points +1 ) { +if (dc_fixpt_lt (rgb_plus_1->red, rgb->red)) + rgb_plus_1->red = rgb->red; +if (dc_fixpt_lt (rgb_plus_1->green, rgb->green)) + rgb_plus_1->green = rgb->green; +if (dc_fixpt_lt (rgb_plus_1->blue, rgb->blue)) + rgb_plus_1->blue = rgb->blue; + + rgb->delta_red =dc_fixpt_sub (rgb_plus_1->red, rgb->red); + rgb->delta_green =dc_fixpt_sub (rgb_plus_1->green, rgb->green); + rgb->delta_blue =dc_fixpt_sub (rgb_plus_1->blue, rgb->blue); + + ++rgb_plus_1; + ++rgb; + ++i; + } +cm3_helper_convert_to_custom_float (rgb_resulted, + lut_params->corner_points, + hw_points, false); + +return true; +} + +bool cm3_helper_convert_to_custom_float ( +struct pwl_result_data *rgb_resulted, +struct curve_points3 *corner_points, +uint32_t hw_points_num, +bool fixpoint) +{ +struct custom_float_format fmt; + +struct pwl_result_data *rgb = rgb_resulted; + +uint32_t i =0 ; + + fmt.exponenta_bits =6 ; + fmt.mantissa_bits =12 ; + fmt.sign = false; + +/* corner_points[0] - beginning base, slope offset for R,G,B +* corner_points[1] - end base, slope offset for R,G,B +*/ +if (!convert_to_custom_float_format (corner_points[0 ].red.x, &fmt, + &corner_points[0 ].red.custom_float_x)) { +BREAK_TO_DEBUGGER (); +return false; + } +if (!convert_to_custom_float_format (corner_points[0 ].green.x, &fmt, + &corner_points[0 ].green.custom_float_x)) { +BREAK_TO_DEBUGGER (); +return false; + } +if (!convert_to_custom_float_format (corner_points[0 ].blue.x, &fmt, + &corner_points[0 ].blue.custom_float_x)) { +BREAK_TO_DEBUGGER (); +return false; + } + +if (!convert_to_custom_float_format (corner_points[0 ].red.offset, &fmt, + &corner_points[0 ].red.custom_float_offset)) { +BREAK_TO_DEBUGGER (); +return false; + } +if (!convert_to_custom_float_format (corner_points[0 ].green.offset, &fmt, + &corner_points[0 ].green.custom_float_offset)) { +BREAK_TO_DEBUGGER (); +return false; + } +if (!convert_to_custom_float_format (corner_points[0 ].blue.offset, &fmt, + &corner_points[0 ].blue.custom_float_offset)) { +BREAK_TO_DEBUGGER (); +return false; + } + +if (!convert_to_custom_float_format (corner_points[0 ].red.slope, &fmt, + &corner_points[0 ].red.custom_float_slope)) { +BREAK_TO_DEBUGGER (); +return false; + } +if (!convert_to_custom_float_format (corner_points[0 ].green.slope, &fmt, + &corner_points[0 ].green.custom_float_slope)) { +BREAK_TO_DEBUGGER (); +return false; + } +if (!convert_to_custom_float_format (corner_points[0 ].blue.slope, &fmt, + &corner_points[0 ].blue.custom_float_slope)) { +BREAK_TO_DEBUGGER (); +return false; + } + +if (fixpoint == true) { + corner_points[1 ].red.custom_float_y = +dc_fixpt_clamp_u0d14 (corner_points[1 ].red.y); + corner_points[1 ].green.custom_float_y = +dc_fixpt_clamp_u0d14 (corner_points[1 ].green.y); + corner_points[1 ].blue.custom_float_y = +dc_fixpt_clamp_u0d14 (corner_points[1 ].blue.y); + }else { +if (!convert_to_custom_float_format (corner_points[1 ].red.y, + &fmt, &corner_points[1 ].red.custom_float_y)) { +BREAK_TO_DEBUGGER (); +return false; + } +if (!convert_to_custom_float_format (corner_points[1 ].green.y, + &fmt, &corner_points[1 ].green.custom_float_y)) { +BREAK_TO_DEBUGGER (); +return false; + } +if (!convert_to_custom_float_format (corner_points[1 ].blue.y, + &fmt, &corner_points[1 ].blue.custom_float_y)) { +BREAK_TO_DEBUGGER (); +return false; + } + } + + fmt.mantissa_bits =10 ; + fmt.sign = false; + +if (!convert_to_custom_float_format (corner_points[1 ].red.x, &fmt, + &corner_points[1 ].red.custom_float_x)) { +BREAK_TO_DEBUGGER (); +return false; + } +if (!convert_to_custom_float_format (corner_points[1 ].green.x, &fmt, + &corner_points[1 ].green.custom_float_x)) { +BREAK_TO_DEBUGGER (); +return false; + } +if (!convert_to_custom_float_format (corner_points[1 ].blue.x, &fmt, + &corner_points[1 ].blue.custom_float_x)) { +BREAK_TO_DEBUGGER (); +return false; + } + +if (!convert_to_custom_float_format (corner_points[1 ].red.slope, &fmt, + &corner_points[1 ].red.custom_float_slope)) { +BREAK_TO_DEBUGGER (); +return false; + } +if (!convert_to_custom_float_format (corner_points[1 ].green.slope, &fmt, + &corner_points[1 ].green.custom_float_slope)) { +BREAK_TO_DEBUGGER (); +return false; + } +if (!convert_to_custom_float_format (corner_points[1 ].blue.slope, &fmt, + &corner_points[1 ].blue.custom_float_slope)) { +BREAK_TO_DEBUGGER (); +return false; + } + +if (hw_points_num ==0 || rgb_resulted ==NULL || fixpoint == true) +return true; + + fmt.mantissa_bits =12 ; + +while (i != hw_points_num) { +if (!convert_to_custom_float_format (rgb->red, &fmt, + &rgb->red_reg)) { +BREAK_TO_DEBUGGER (); +return false; + } + +if (!convert_to_custom_float_format (rgb->green, &fmt, + &rgb->green_reg)) { +BREAK_TO_DEBUGGER (); +return false; + } + +if (!convert_to_custom_float_format (rgb->blue, &fmt, + &rgb->blue_reg)) { +BREAK_TO_DEBUGGER (); +return false; + } + +if (!convert_to_custom_float_format (rgb->delta_red, &fmt, + &rgb->delta_red_reg)) { +BREAK_TO_DEBUGGER (); +return false; + } + +if (!convert_to_custom_float_format (rgb->delta_green, &fmt, + &rgb->delta_green_reg)) { +BREAK_TO_DEBUGGER (); +return false; + } + +if (!convert_to_custom_float_format (rgb->delta_blue, &fmt, + &rgb->delta_blue_reg)) { +BREAK_TO_DEBUGGER (); +return false; + } + + ++rgb; + ++i; + } + +return true; +} + +bool is_rgb_equal (const struct pwl_result_data *rgb,uint32_t num) +{ +uint32_t i; +bool ret = true; + +for (i =0 ; i < num; i++) { +if (rgb[i].red_reg != rgb[i].green_reg || + rgb[i].blue_reg != rgb[i].red_reg || + rgb[i].blue_reg != rgb[i].green_reg) { + ret = false; +break ; + } + } +return ret; +} +
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.h new file +78 -0
78 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c new file +1414 -0
1,414 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h new file +608 -0
608 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp_cm.c new file +410 -0
260 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h +7 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Part of the diff is not shown here. View the raw message.
PATCH 187/207 drm/amd/display: Add DCN3 HUBHUB
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
Add support to program the HUBBUB (DCN memory HUB interface)
HW Blocks:
+--------+
| HUBBUB |
+--------+
|
v
+--------+
| DPP |
+--------+
|
v
+--------+
| MPC |
+--------+
|
v
+-------+
| OPP |
+-------+
|
v
+--------+
| OPTC |
+--------+
|
v
+--------+ +--------+
| DIO | | DCCG |
+--------+ +--------+--- drivers/gpu/drm/amd/display/dc/dc.h | 9 + .../drm/amd/display/dc/dcn20/dcn20_hubbub.c | 9 + .../drm/amd/display/dc/dcn30/dcn30_hubbub.c | 417 ++++++++++++++++++ .../drm/amd/display/dc/dcn30/dcn30_hubbub.h | 119 +++++ .../gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 6 + 5 files changed, 560 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h
drivers/gpu/drm/amd/display/dc/dc.h +9 -0
@@ -186,6 +186,15 @@ struct dc_dcc_setting {unsigned int max_compressed_blk_size;unsigned int max_uncompressed_blk_size;bool independent_64b_blks; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +//These bitfields to be used starting with DCN 3.0 +struct { +uint32_t dcc_256_64_64 :1 ;//available in ASICs before DCN 3.0 (the worst compression case) +uint32_t dcc_128_128_uncontrained :1 ;//available in ASICs before DCN 3.0 +uint32_t dcc_256_128_128 :1 ;//available starting with DCN 3.0 +uint32_t dcc_256_256_unconstrained :1 ;//available in ASICs before DCN 3.0 (the best compression case) + } dcc_controls; +#endif };struct dc_surface_dcc_cap {
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c +9 -0
@@ -153,6 +153,10 @@ bool hubbub2_dcc_support_pixel_format(case SURFACE_PIXEL_FORMAT_GRPH_BGR101111_FIX :case SURFACE_PIXEL_FORMAT_GRPH_RGB111110_FLOAT :case SURFACE_PIXEL_FORMAT_GRPH_BGR101111_FLOAT : +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +case SURFACE_PIXEL_FORMAT_GRPH_RGBE : +case SURFACE_PIXEL_FORMAT_GRPH_RGBE_ALPHA : +#endif *bytes_per_element =4 ;return true;case SURFACE_PIXEL_FORMAT_GRPH_ARGB16161616 :
@@ -339,6 +343,11 @@ static enum dcn_hubbub_page_table_block_size page_table_block_size_to_hw(unsignecase 65536 : block_size =DCN_PAGE_TABLE_BLOCK_SIZE_64KB ;break ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +case 32768 : + block_size =DCN_PAGE_TABLE_BLOCK_SIZE_32KB ; +break ; +#endif default :ASSERT (false); block_size = page_table_block_size;
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c new file +417 -0
417 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h new file +119 -0
119 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h +6 -0
@@ -31,6 +31,9 @@ enum dcc_control { dcc_control__256_256_xxx, dcc_control__128_128_xxx, dcc_control__256_64_64, +#if defined(CONFIG_DRM_AMD_DC_DCN3_0) + dcc_control__256_128_128, +#endif }; enum segment_order {
@@ -62,6 +65,9 @@ enum dcn_hubbub_page_table_depth {enum dcn_hubbub_page_table_block_size {DCN_PAGE_TABLE_BLOCK_SIZE_4KB =0 ,DCN_PAGE_TABLE_BLOCK_SIZE_64KB =4 , +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +DCN_PAGE_TABLE_BLOCK_SIZE_32KB =3 +#endif };struct dcn_hubbub_phys_addr_config {
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 188/207 drm/amd/display: Add DCN3 HUBP
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
Add support to program the DCN3 HUBP (Display to data fabric interface pipe)
HW Blocks:
+--------++------+
| HUBBUB || HUBP |
+--------++------+
|
v
+--------+
| DPP |
+--------+
|
v
+--------+
| MPC |
+--------+
|
v
+-------+
| OPP |
+-------+
|
v
+--------+
| OPTC |
+--------+
|
v
+--------+ +--------+
| DIO | | DCCG |
+--------+ +--------+--- drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 35 ++ .../gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 12 + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 20 + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 41 ++ .../gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 532 ++++++++++++++++++ .../gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h | 292 ++++++++++ drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 4 + 7 files changed, 936 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h
drivers/gpu/drm/amd/display/dc/dc_hw_types.h +35 -0
@@ -62,6 +62,9 @@ enum dc_plane_addr_type {PLN_ADDR_TYPE_GRAPHICS =0 ,PLN_ADDR_TYPE_GRPH_STEREO ,PLN_ADDR_TYPE_VIDEO_PROGRESSIVE , +#if defined(CONFIG_DRM_AMD_DC_DCN3_0) + PLN_ADDR_TYPE_RGBEA +#endif }; struct dc_plane_address {
@@ -84,6 +87,16 @@ struct dc_plane_address {PHYSICAL_ADDRESS_LOC right_meta_addr;union large_integer right_dcc_const_color; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +PHYSICAL_ADDRESS_LOC left_alpha_addr; +PHYSICAL_ADDRESS_LOC left_alpha_meta_addr; +union large_integer left_alpha_dcc_const_color; + +PHYSICAL_ADDRESS_LOC right_alpha_addr; +PHYSICAL_ADDRESS_LOC right_alpha_meta_addr; +union large_integer right_alpha_dcc_const_color; +#endif + } grph_stereo;/*video progressive*/
@@ -96,6 +109,18 @@ struct dc_plane_address {PHYSICAL_ADDRESS_LOC chroma_meta_addr;union large_integer chroma_dcc_const_color; } video_progressive; + +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +struct { +PHYSICAL_ADDRESS_LOC addr; +PHYSICAL_ADDRESS_LOC meta_addr; +union large_integer dcc_const_color; + +PHYSICAL_ADDRESS_LOC alpha_addr; +PHYSICAL_ADDRESS_LOC alpha_meta_addr; +union large_integer alpha_dcc_const_color; + } rgbea; +#endif };union large_integer page_table_base;
@@ -131,9 +156,15 @@ struct dc_plane_dcc_param {int meta_pitch;bool independent_64b_blks; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +uint8_t dcc_ind_blk; +#endif int meta_pitch_c;bool independent_64b_blks_c; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +uint8_t dcc_ind_blk_c; +#endif };/*Displayable pixel format in fb*/
@@ -169,6 +200,10 @@ enum surface_pixel_format { SURFACE_PIXEL_FORMAT_GRPH_BGR101111_FIX,SURFACE_PIXEL_FORMAT_GRPH_RGB111110_FLOAT ,SURFACE_PIXEL_FORMAT_GRPH_BGR101111_FLOAT , +#if defined(CONFIG_DRM_AMD_DC_DCN3_0) +SURFACE_PIXEL_FORMAT_GRPH_RGBE , +SURFACE_PIXEL_FORMAT_GRPH_RGBE_ALPHA , +#endifSURFACE_PIXEL_FORMAT_VIDEO_BEGIN , SURFACE_PIXEL_FORMAT_VIDEO_420_YCbCr = SURFACE_PIXEL_FORMAT_VIDEO_BEGIN,
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c +12 -0
@@ -326,6 +326,18 @@ void hubp1_program_pixel_format(REG_UPDATE (DCSURF_SURFACE_CONFIG ,SURFACE_PIXEL_FORMAT ,119 );break ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +case SURFACE_PIXEL_FORMAT_GRPH_RGBE : +REG_UPDATE_2 (DCSURF_SURFACE_CONFIG , +SURFACE_PIXEL_FORMAT ,116 , +ALPHA_PLANE_EN ,0 ); +break ; +case SURFACE_PIXEL_FORMAT_GRPH_RGBE_ALPHA : +REG_UPDATE_2 (DCSURF_SURFACE_CONFIG , +SURFACE_PIXEL_FORMAT ,116 , +ALPHA_PLANE_EN ,1 ); +break ; +#endif default :BREAK_TO_DEBUGGER ();break ;
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c +20 -0
@@ -336,6 +336,10 @@ void hubp2_program_size(*/ use_pitch_c = format >=SURFACE_PIXEL_FORMAT_VIDEO_BEGIN && format <SURFACE_PIXEL_FORMAT_SUBSAMPLE_END ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) + use_pitch_c = use_pitch_c + || (format ==SURFACE_PIXEL_FORMAT_GRPH_RGBE_ALPHA ); +#endif if (use_pitch_c) {ASSERT (plane_size->chroma_pitch !=0 );/* Chroma pitch zero can cause system hang! */
@@ -360,6 +364,10 @@ void hubp2_program_size( PITCH, pitch, META_PITCH, meta_pitch); use_pitch_c = format >=SURFACE_PIXEL_FORMAT_VIDEO_BEGIN ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) + use_pitch_c = use_pitch_c + || (format ==SURFACE_PIXEL_FORMAT_GRPH_RGBE_ALPHA ); +#endif if (use_pitch_c)REG_UPDATE_2 (DCSURF_SURFACE_PITCH_C ,PITCH_C , pitch_c,META_PITCH_C , meta_pitch_c);
@@ -505,6 +513,18 @@ void hubp2_program_pixel_format(REG_UPDATE (DCSURF_SURFACE_CONFIG ,SURFACE_PIXEL_FORMAT ,119 );break ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +case SURFACE_PIXEL_FORMAT_GRPH_RGBE : +REG_UPDATE_2 (DCSURF_SURFACE_CONFIG , +SURFACE_PIXEL_FORMAT ,116 , +ALPHA_PLANE_EN ,0 ); +break ; +case SURFACE_PIXEL_FORMAT_GRPH_RGBE_ALPHA : +REG_UPDATE_2 (DCSURF_SURFACE_CONFIG , +SURFACE_PIXEL_FORMAT ,116 , +ALPHA_PLANE_EN ,1 ); +break ; +#endif default :BREAK_TO_DEBUGGER ();break ;
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h +41 -0
64 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c new file +532 -0
532 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h new file +292 -0
292 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h +4 -0
@@ -48,6 +48,10 @@ enum cursor_lines_per_chunk {enum hubp_ind_block_size { hubp_ind_block_unconstrained =0 , hubp_ind_block_64b, +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) + hubp_ind_block_128b, + hubp_ind_block_64b_no_128bcl, +#endif };struct hubp {
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 189/207 drm/amd/display: Add DCN3 MMHUBHUB
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
Add support to program the DCN3 MMHUBBUB (Multimedia HUB interface)
HW Blocks:
+--------++------+ +----------+
| HUBBUB || HUBP | <-- | MMHUBBUB |
+--------++------+ +----------+
|
v
+--------+
| DPP |
+--------+
|
v
+--------+
| MPC |
+--------+
|
v
+-------+
| OPP |
+-------+
|
v
+--------+
| OPTC |
+--------+
|
v
+--------+ +--------+
| DIO | | DCCG |
+--------+ +--------+--- drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 36 ++ .../drm/amd/display/dc/dcn30/dcn30_mmhubbub.c | 239 +++++++++ .../drm/amd/display/dc/dcn30/dcn30_mmhubbub.h | 463 ++++++++++++++++++ .../gpu/drm/amd/display/dc/inc/hw/mcif_wb.h | 3 + 4 files changed, 741 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.h
drivers/gpu/drm/amd/display/dc/dc_hw_types.h +36 -0
@@ -848,6 +848,42 @@ enum dwb_stereo_type { DWB_STEREO_TYPE_FRAME_SEQUENTIAL = 3, /* Frame sequential */ }; +#ifdef CONFIG_DRM_AMD_DC_DCN3_0 + +enum dwb_out_format { +DWB_OUT_FORMAT_32BPP_ARGB =0 , +DWB_OUT_FORMAT_32BPP_RGBA =1 , +DWB_OUT_FORMAT_64BPP_ARGB =2 , +DWB_OUT_FORMAT_64BPP_RGBA =3 +}; + +enum dwb_out_denorm { +DWB_OUT_DENORM_10BPC =0 , +DWB_OUT_DENORM_8BPC =1 , +DWB_OUT_DENORM_BYPASS =2 +}; + +enum cm_gamut_remap_select { +CM_GAMUT_REMAP_MODE_BYPASS =0 , +CM_GAMUT_REMAP_MODE_RAMA_COEFF , +CM_GAMUT_REMAP_MODE_RAMB_COEFF , +CM_GAMUT_REMAP_MODE_RESERVED +}; + +enum cm_gamut_coef_format { +CM_GAMUT_REMAP_COEF_FORMAT_S2_13 =0 , +CM_GAMUT_REMAP_COEF_FORMAT_S3_12 =1 +}; + +struct mcif_warmup_params { +union large_integer start_address; +unsigned int address_increment; +unsigned int region_size; +unsigned int p_vmid; +}; + +#endif +#define MCIF_BUF_COUNT 4struct mcif_buf_params {
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.c new file +239 -0
239 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.h new file +463 -0
463 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/hw/mcif_wb.h +3 -0
@@ -43,6 +43,9 @@ struct mcif_arb_params {unsigned int arbitration_slice;unsigned int slice_lines;unsigned int max_scaled_time; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +unsigned int dram_speed_change_duration; +#endif };struct mcif_irq_params {
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 190/207 drm/amd/display: Add DCN3 DWB
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
Add support to program the DCN3 DWB (Display Writeback)
HW Blocks:
+--------++------+ +----------+
| HUBBUB || HUBP | <-- | MMHUBBUB |
+--------++------+ +----------+
| ^
v |
+--------+ +--------+
| DPP | | DWB |
+--------+ +--------+
|
v ^
+--------+ |
| MPC | |
+--------+ |
| |
v |
+-------+ |
| OPP | |
+-------+ |
| |
v |
+--------+ /
| OPTC | --------------
+--------+
|
v
+--------+ +--------+
| DIO | | DCCG |
+--------+ +--------+--- drivers/gpu/drm/amd/display/dc/dc_types.h | 25 + .../gpu/drm/amd/display/dc/dcn30/dcn30_dwb.c | 264 +++++ .../gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h | 923 ++++++++++++++++++ .../drm/amd/display/dc/dcn30/dcn30_dwb_cm.c | 354 +++++++ drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 83 ++ 5 files changed, 1649 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb_cm.c
drivers/gpu/drm/amd/display/dc/dc_types.h +25 -0
@@ -475,6 +475,19 @@ enum display_content_type {DISPLAY_CONTENT_TYPE_GAME =8 }; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +enum cm_gamut_adjust_type { +CM_GAMUT_ADJUST_TYPE_BYPASS =0 , +CM_GAMUT_ADJUST_TYPE_HW ,/* without adjustments */ +CM_GAMUT_ADJUST_TYPE_SW /* use adjustments */ +}; + +struct cm_grph_csc_adjustment { +struct fixed31_32 temperature_matrix[12 ]; +enum cm_gamut_adjust_type gamut_adjust_type; +enum cm_gamut_coef_format gamut_coef_format; +}; +#endif /* writeback */ struct dwb_stereo_params {bool stereo_enabled;/* false: normal mode, true: 3D stereo */
@@ -492,9 +505,21 @@ struct dc_dwb_cnv_params {unsigned int crop_x;/* cropped window start x value at cnv output */ unsigned int crop_y;/* cropped window start y value at cnv output */ enum dwb_cnv_out_bpc cnv_out_bpc;/* cnv output pixel depth - 8bpc or 10bpc */ +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +enum dwb_out_format fc_out_format;/* dwb output pixel format - 2101010 or 16161616 and ARGB or RGBA */ +enum dwb_out_denorm out_denorm_mode;/* dwb output denormalization mode */ +unsigned int out_max_pix_val;/* pixel values greater than out_max_pix_val are clamped to out_max_pix_val */ +unsigned int out_min_pix_val;/* pixel values less than out_min_pix_val are clamped to out_min_pix_val */ +#endif };struct dc_dwb_params { +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +unsigned int dwbscl_black_color;/* must be in FP1.5.10 */ +unsigned int hdr_mult;/* must be in FP1.6.12 */ +struct cm_grph_csc_adjustment csc_params; +struct dwb_stereo_params stereo_params; +#endif struct dc_dwb_cnv_params cnv_params;/* CNV source size and cropping window parameters */ unsigned int dest_width;/* Destination width */ unsigned int dest_height;/* Destination height */
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.c new file +264 -0
264 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h new file +923 -0
923 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb_cm.c new file +354 -0
354 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h +83 -0
95 lines not on this page · raw message
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 191/207 drm/amd/display: Add DCN3 DML
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
Add support for DML(Display mode library) for bandwidth calculations
--- drivers/gpu/drm/amd/display/dc/dml/Makefile | 7 + .../dc/dml/dcn30/display_mode_vba_30.c | 6860 +++++++++++++++++ .../dc/dml/dcn30/display_mode_vba_30.h | 43 + .../dc/dml/dcn30/display_rq_dlg_calc_30.c | 1868 +++++ .../dc/dml/dcn30/display_rq_dlg_calc_30.h | 69 + .../drm/amd/display/dc/dml/display_mode_lib.c | 181 + .../drm/amd/display/dc/dml/display_mode_lib.h | 11 + .../amd/display/dc/dml/display_mode_structs.h | 3 + .../drm/amd/display/dc/dml/display_mode_vba.c | 3 + .../drm/amd/display/dc/dml/display_mode_vba.h | 3 + 10 files changed, 9048 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.h create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.h
drivers/gpu/drm/amd/display/dc/dml/Makefile +7 -0
@@ -61,6 +61,10 @@ CFLAGS_$(AMDDALPATH)/dc/dml/dcn20/display_rq_dlg_calc_20v2.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn21/display_mode_vba_21.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/dcn21/display_rq_dlg_calc_21.o := $(dml_ccflags) endif +ifdef CONFIG_DRM_AMD_DC_DCN3_0 +CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_mode_vba_30.o := $(dml_ccflags) -Wframe-larger-than=2048 +CFLAGS_$(AMDDALPATH)/dc/dml/dcn30/display_rq_dlg_calc_30.o := $(dml_ccflags) +endif CFLAGS_$(AMDDALPATH)/dc/dml/dml1_display_rq_dlg_calc.o := $(dml_ccflags) CFLAGS_$(AMDDALPATH)/dc/dml/display_rq_dlg_helpers.o := $(dml_ccflags)
@@ -72,6 +76,9 @@ DML += dcn20/display_rq_dlg_calc_20v2.o dcn20/display_mode_vba_20v2.o DML += dcn21/display_rq_dlg_calc_21.o dcn21/display_mode_vba_21.o endif +ifdef CONFIG_DRM_AMD_DC_DCN3_0 +DML += dcn30/display_mode_vba_30.o dcn30/display_rq_dlg_calc_30.o +endif AMD_DAL_DML = $(addprefix $(AMDDALPATH)/dc/dml/,$(DML))
drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c new file +6860 -0
2,981 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.h new file +43 -0
43 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c new file +1868 -0
1,868 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.h new file +69 -0
69 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.c +181 -0
181 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/display_mode_lib.h +11 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/dml/display_mode_structs.h +3 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c +3 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h +3 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Part of the diff is not shown here. View the raw message.
PATCH 192/207 drm/amd/display: Add DCN3 IRQ
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
Add IWQ services for DCN3,
This allows us to create/init and manage irqs for DCN3
--- drivers/gpu/drm/amd/display/dc/irq/Makefile | 10 + .../display/dc/irq/dcn30/irq_service_dcn30.c | 384 ++++++++++++++++++ .../display/dc/irq/dcn30/irq_service_dcn30.h | 37 ++ 3 files changed, 431 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn30/irq_service_dcn30.c create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn30/irq_service_dcn30.h
drivers/gpu/drm/amd/display/dc/irq/Makefile +10 -0
@@ -83,3 +83,13 @@ AMD_DAL_IRQ_DCN21= $(addprefix $(AMDDALPATH)/dc/irq/dcn21/,$(IRQ_DCN21)) AMD_DISPLAY_FILES += $(AMD_DAL_IRQ_DCN21) endif +############################################################################### +# DCN 30 +############################################################################### +ifdef CONFIG_DRM_AMD_DC_DCN3_0 +IRQ_DCN3 = irq_service_dcn30.o + +AMD_DAL_IRQ_DCN3 = $(addprefix $(AMDDALPATH)/dc/irq/dcn30/,$(IRQ_DCN3)) + +AMD_DISPLAY_FILES += $(AMD_DAL_IRQ_DCN3) +endif
drivers/gpu/drm/amd/display/dc/irq/dcn30/irq_service_dcn30.c new file +384 -0
384 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/irq/dcn30/irq_service_dcn30.h new file +37 -0
@@ -0,0 +1,37 @@ +/* +* Copyright 2020 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: AMD +* +*/ + +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) + +#ifndef __DAL_IRQ_SERVICE_DCN30_H__ +#define __DAL_IRQ_SERVICE_DCN30_H__ + +#include "../irq_service.h" + +struct irq_service *dal_irq_service_dcn30_create ( +struct irq_service_init_data *init_data); + +#endif /* __DAL_IRQ_SERVICE_DCN30_H__ */ +#endif
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 193/207 drm/amd/display: Add DCN3 GPIO
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
Add support to program GPIO HW block
--- drivers/gpu/drm/amd/display/dc/gpio/Makefile | 10 + .../display/dc/gpio/dcn30/hw_factory_dcn30.c | 257 ++++++++++++ .../display/dc/gpio/dcn30/hw_factory_dcn30.h | 33 ++ .../dc/gpio/dcn30/hw_translate_dcn30.c | 387 ++++++++++++++++++ .../dc/gpio/dcn30/hw_translate_dcn30.h | 35 ++ .../gpu/drm/amd/display/dc/gpio/hw_factory.c | 9 +- .../drm/amd/display/dc/gpio/hw_translate.c | 8 + 7 files changed, 738 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_factory_dcn30.c create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_factory_dcn30.h create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_translate_dcn30.c create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_translate_dcn30.h
drivers/gpu/drm/amd/display/dc/gpio/Makefile +10 -0
@@ -87,6 +87,16 @@ AMD_DAL_GPIO_DCN21 = $(addprefix $(AMDDALPATH)/dc/gpio/dcn21/,$(GPIO_DCN21)) AMD_DISPLAY_FILES += $(AMD_DAL_GPIO_DCN21) endif ############################################################################### +# DCN 3 +############################################################################### +ifdef CONFIG_DRM_AMD_DC_DCN3_0 +GPIO_DCN30 = hw_translate_dcn30.o hw_factory_dcn30.o + +AMD_DAL_GPIO_DCN30 = $(addprefix $(AMDDALPATH)/dc/gpio/dcn30/,$(GPIO_DCN30)) + +AMD_DISPLAY_FILES += $(AMD_DAL_GPIO_DCN30) +endif +############################################################################### # Diagnostics on FPGA ############################################################################### GPIO_DIAG_FPGA = hw_translate_diag.o hw_factory_diag.o
drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_factory_dcn30.c new file +257 -0
257 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_factory_dcn30.h new file +33 -0
@@ -0,0 +1,33 @@ +/* +* Copyright 2020 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: AMD +* +*/ +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +#ifndef __DAL_HW_FACTORY_DCN30_H__ +#define __DAL_HW_FACTORY_DCN30_H__ + +/* Initialize HW factory function pointers and pin info */ +void dal_hw_factory_dcn30_init (struct hw_factory *factory); + +#endif /* __DAL_HW_FACTORY_DCN30_H__ */ +#endif
drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_translate_dcn30.c new file +387 -0
387 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/gpio/dcn30/hw_translate_dcn30.h new file +35 -0
@@ -0,0 +1,35 @@ +/* +* Copyright 2020 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: AMD +* +*/ +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +#ifndef __DAL_HW_TRANSLATE_DCN30_H__ +#define __DAL_HW_TRANSLATE_DCN30_H__ + +struct hw_translate ; + +/* Initialize Hw translate function pointers */ +void dal_hw_translate_dcn30_init (struct hw_translate *tr); + +#endif /* __DAL_HW_TRANSLATE_DCN30_H__ */ +#endif
drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c +8 -1
@@ -50,6 +50,9 @@#include "dcn20/hw_factory_dcn20.h" #include "dcn21/hw_factory_dcn21.h" #endif +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +#include "dcn30/hw_factory_dcn30.h" +#endif #include "diagnostics/hw_factory_diag.h"
@@ -99,7 +102,11 @@ bool dal_hw_factory_init(dal_hw_factory_dcn21_init (factory);return true;#endif - +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +case DCN_VERSION_3_0 : +dal_hw_factory_dcn30_init (factory); +return true; +#endif default :ASSERT_CRITICAL (false);return false;
drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c +8 -0
@@ -48,6 +48,9 @@#include "dcn20/hw_translate_dcn20.h" #include "dcn21/hw_translate_dcn21.h" #endif +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +#include "dcn30/hw_translate_dcn30.h" +#endif #include "diagnostics/hw_translate_diag.h"
@@ -94,6 +97,11 @@ bool dal_hw_translate_init(dal_hw_translate_dcn21_init (translate);return true;#endif +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +case DCN_VERSION_3_0 : +dal_hw_translate_dcn30_init (translate); +return true; +#endif default :BREAK_TO_DEBUGGER ();
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 194/207 drm/amd/display: Add DCN3 DMUB
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
DMUB (Display Micro-Controller Unit)
Used to read/write regs
--- drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 3 + drivers/gpu/drm/amd/display/dmub/src/Makefile | 3 + .../gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 184 ++++++++++++++++++ .../gpu/drm/amd/display/dmub/src/dmub_dcn30.h | 50 +++++ .../gpu/drm/amd/display/dmub/src/dmub_srv.c | 15 ++ 5 files changed, 255 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.h
drivers/gpu/drm/amd/display/dmub/dmub_srv.h +3 -0
@@ -88,6 +88,9 @@ enum dmub_asic {DMUB_ASIC_NONE =0 ,DMUB_ASIC_DCN20 ,DMUB_ASIC_DCN21 , +#ifdef CONFIG_DRM_AMD_DC_DCN3_0 +DMUB_ASIC_DCN30 , +#endif DMUB_ASIC_MAX, };
drivers/gpu/drm/amd/display/dmub/src/Makefile +3 -0
@@ -21,6 +21,9 @@ # DMUB = dmub_srv.o dmub_reg.o dmub_dcn20.o dmub_dcn21.o +ifdef CONFIG_DRM_AMD_DC_DCN3_0 +DMUB += dmub_dcn30.o +endif AMD_DAL_DMUB = $(addprefix $(AMDDALPATH)/dmub/src/,$(DMUB))
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c new file +184 -0
184 lines not on this page · raw message
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.h new file +50 -0
50 lines not on this page · raw message
drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c +15 -0
@@ -27,6 +27,9 @@#include "dmub_dcn20.h" #include "dmub_dcn21.h" #include "dmub_cmd.h" +#ifdef CONFIG_DRM_AMD_DC_DCN3_0 +#include "dmub_dcn30.h" +#endif #include "os_types.h" /* * Note: the DMUB service is standalone. No additional headers should be
@@ -133,6 +136,9 @@ static bool dmub_srv_hw_setup(struct dmub_srv *dmub, enum dmub_asic asic)switch (asic) {case DMUB_ASIC_DCN20 :case DMUB_ASIC_DCN21 : +#ifdef CONFIG_DRM_AMD_DC_DCN3_0 +case DMUB_ASIC_DCN30 : +#endif dmub->regs = &dmub_srv_dcn20_regs; funcs->reset = dmub_dcn20_reset;
@@ -154,6 +160,15 @@ static bool dmub_srv_hw_setup(struct dmub_srv *dmub, enum dmub_asic asic) funcs->is_auto_load_done = dmub_dcn21_is_auto_load_done; funcs->is_phy_init = dmub_dcn21_is_phy_init; } +#ifdef CONFIG_DRM_AMD_DC_DCN3_0 +if (asic ==DMUB_ASIC_DCN30 ) { + dmub->regs = &dmub_srv_dcn30_regs; + + funcs->is_auto_load_done = dmub_dcn30_is_auto_load_done; + funcs->backdoor_load = dmub_dcn30_backdoor_load; + funcs->setup_windows = dmub_dcn30_setup_windows; + } +#endif break ;default :
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 195/207 drm/amd/display: Add DCN3 HWSEQ
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
Add HW sequence programing for DCN3
--- drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 3 + drivers/gpu/drm/amd/display/dc/dc_stream.h | 15 + .../gpu/drm/amd/display/dc/dce/dce_hwseq.h | 46 ++ .../amd/display/dc/dcn10/dcn10_hw_sequencer.c | 5 + .../drm/amd/display/dc/dcn20/dcn20_hwseq.c | 85 +++ .../drm/amd/display/dc/dcn30/dcn30_hwseq.c | 714 ++++++++++++++++++ .../drm/amd/display/dc/dcn30/dcn30_hwseq.h | 70 ++ .../gpu/drm/amd/display/dc/inc/core_types.h | 4 + .../gpu/drm/amd/display/dc/inc/hw/mcif_wb.h | 5 + .../gpu/drm/amd/display/dc/inc/hw_sequencer.h | 4 + 10 files changed, 951 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h
drivers/gpu/drm/amd/display/dc/dc_hw_types.h +3 -0
@@ -893,6 +893,9 @@ struct mcif_buf_params {unsigned int chroma_pitch;unsigned int warmup_pitch;unsigned int swlock; +#ifdef CONFIG_DRM_AMD_DC_DCN3_0 +unsigned int p_vmid; +#endif };
drivers/gpu/drm/amd/display/dc/dc_stream.h +15 -0
@@ -87,6 +87,13 @@ struct dc_writeback_info {int dwb_pipe_inst;struct dc_dwb_params dwb_params;struct mcif_buf_params mcif_buf_params; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +struct mcif_warmup_params mcif_warmup_params; +/* the plane that is the input to TOP_MUX for MPCC that is the DWB source */ +struct dc_plane_state *writeback_source_plane; +/* source MPCC instance. for use by internally by dc */ +int mpcc_inst; +#endif };struct dc_writeback_update {
@@ -200,6 +207,10 @@ struct dc_stream_state {/* writeback */ unsigned int num_wb_info;struct dc_writeback_info writeback_info[MAX_DWB_PIPES ]; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +const struct dc_transfer_func *func_shaper; +const struct dc_3dlut *lut3d_func; +#endif /* Computed state bits */ bool mode_changed : 1;
@@ -251,6 +262,10 @@ struct dc_stream_update {struct dc_writeback_update *wb_update;struct dc_dsc_config *dsc_config; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +struct dc_transfer_func *func_shaper; +struct dc_3dlut *lut3d_func; +#endif }; bool dc_is_stream_unchanged(
drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h +46 -0
64 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c +5 -0
@@ -1453,6 +1453,11 @@ void dcn10_init_hw(struct dc *dc)if (dc->clk_mgr->funcs->notify_wm_ranges) dc->clk_mgr->funcs->notify_wm_ranges (dc->clk_mgr); +#ifdef CONFIG_DRM_AMD_DC_DCN3_0 +if (dc->clk_mgr->funcs->set_hard_max_memclk) + dc->clk_mgr->funcs->set_hard_max_memclk (dc->clk_mgr); +#endif + } void dcn10_reset_hw_ctx_wrap(
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +85 -0
115 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c new file +714 -0
714 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h new file +70 -0
70 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/core_types.h +4 -0
@@ -217,6 +217,10 @@ struct resource_pool {struct dmcu *dmcu;struct dmub_psr *psr; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +struct abm *multiple_abms[MAX_PIPES ]; +#endif +const struct resource_funcs *funcs;const struct resource_caps *res_cap;
drivers/gpu/drm/amd/display/dc/inc/hw/mcif_wb.h +5 -0
@@ -75,6 +75,11 @@ struct mcif_wb {struct mcif_wb_funcs { +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +void (*warmup_mcif)( +struct mcif_wb *mcif_wb, +struct mcif_warmup_params *params); +#endif void (*enable_mcif)(struct mcif_wb *mcif_wb);void (*disable_mcif)(struct mcif_wb *mcif_wb);
drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h +4 -0
@@ -205,6 +205,10 @@ struct hw_sequencer_funcs {void (*set_pipe)(struct pipe_ctx *pipe_ctx); +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +/* Idle Optimization Related */ +bool (*apply_idle_power_optimizations)(struct dc *dc,bool enable); +#endif };
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 196/207 drm/amd/display: Add DCN3 Support in DM (v2)
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
Handle DCN3 in amdgpu_dm
v2: fix num_pkrs handling
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 27 +++++++++++++++++++ .../amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 20 ++++++++++++++ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + drivers/gpu/drm/amd/display/dc/dc_types.h | 9 +++++++ drivers/gpu/drm/amd/display/dc/dm_helpers.h | 23 ++++++++++++++++ 5 files changed, 80 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +27 -0
@@ -94,6 +94,10 @@#define FIRMWARE_RENOIR_DMUB "amdgpu/renoir_dmcub.bin"MODULE_FIRMWARE (FIRMWARE_RENOIR_DMUB ); +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +#define FIRMWARE_SIENNA_CICHLID_DMUB "amdgpu/sienna_cichlid_dmcub.bin" +MODULE_FIRMWARE (FIRMWARE_SIENNA_CICHLID_DMUB ); +#endif #define FIRMWARE_RAVEN_DMCU "amdgpu/raven_dmcu.bin"MODULE_FIRMWARE (FIRMWARE_RAVEN_DMCU );
@@ -1070,6 +1074,9 @@ static int load_dmcu_fw(struct amdgpu_device *adev)case CHIP_NAVI10 :case CHIP_NAVI14 :case CHIP_RENOIR : +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +case CHIP_SIENNA_CICHLID : +#endif return 0 ;case CHIP_NAVI12 : fw_name_dmcu =FIRMWARE_NAVI12_DMCU ;
@@ -1166,6 +1173,12 @@ static int dm_dmub_sw_init(struct amdgpu_device *adev) dmub_asic =DMUB_ASIC_DCN21 ; fw_name_dmub =FIRMWARE_RENOIR_DMUB ;break ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +case CHIP_SIENNA_CICHLID : + dmub_asic =DMUB_ASIC_DCN30 ; + fw_name_dmub =FIRMWARE_SIENNA_CICHLID_DMUB ; +break ; +#endif default :/* ASIC doesn't support DMUB. */
@@ -3205,6 +3218,9 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)case CHIP_NAVI10 :case CHIP_NAVI14 :case CHIP_RENOIR : +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +case CHIP_SIENNA_CICHLID : +#endif if (dcn10_register_irq_handlers (dm->adev)) {DRM_ERROR ("DM: Failed to initialize IRQ\n" ); goto fail;
@@ -3432,6 +3448,9 @@ static int dm_early_init(void *handle)#endif case CHIP_NAVI10 :case CHIP_NAVI12 : +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +case CHIP_SIENNA_CICHLID : +#endif adev->mode_info.num_crtc =6 ; adev->mode_info.num_hpd =6 ; adev->mode_info.num_dig =6 ;
@@ -3752,6 +3771,9 @@ fill_plane_buffer_attributes(struct amdgpu_device *adev, adev->asic_type == CHIP_NAVI10 || adev->asic_type == CHIP_NAVI14 || adev->asic_type == CHIP_NAVI12 || +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) + adev->asic_type == CHIP_SIENNA_CICHLID || +#endif adev->asic_type == CHIP_RENOIR || adev->asic_type == CHIP_RAVEN) {/* Fill GFX9 params */
@@ -3771,6 +3793,11 @@ fill_plane_buffer_attributes(struct amdgpu_device *adev,AMDGPU_TILING_GET (tiling_flags,SWIZZLE_MODE ); tiling_info->gfx9.shaderEnable =1 ; +#ifdef CONFIG_DRM_AMD_DC_DCN3_0 +if (adev->asic_type ==CHIP_SIENNA_CICHLID ) + tiling_info->gfx9.num_pkrs = adev->gfx.config.gb_addr_config_fields.num_pkrs; + +#endif ret = fill_plane_dcc_attributes(adev, afb, format, rotation, plane_size, tiling_info, tiling_flags, dcc, address,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +20 -0
@@ -627,3 +627,23 @@ void dm_set_dcn_clocks(struct dc_context *ctx, struct dc_clocks *clks) {/* TODO: something */ } +#ifdef CONFIG_DRM_AMD_DC_DCN3_0 + +void *dm_helpers_allocate_gpu_mem ( +struct dc_context *ctx, +enum dc_gpu_mem_alloc_type type, +size_t size, +long long *addr) +{ +// TODO +return NULL ; +} + +void dm_helpers_free_gpu_mem ( +struct dc_context *ctx, +enum dc_gpu_mem_alloc_type type, +void *pvMem) +{ +// TODO +} +#endif
drivers/gpu/drm/amd/display/dc/dc_hw_types.h +1 -0
@@ -390,6 +390,7 @@ union dc_tiling_info {bool meta_linear;bool rb_aligned;bool pipe_aligned; +unsigned int num_pkrs; } gfx9; };
drivers/gpu/drm/amd/display/dc/dc_types.h +9 -0
@@ -887,6 +887,15 @@ struct dsc_dec_dpcd_caps {uint32_t branch_max_line_width; }; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +enum dc_gpu_mem_alloc_type { +DC_MEM_ALLOC_TYPE_GART , +DC_MEM_ALLOC_TYPE_FRAME_BUFFER , +DC_MEM_ALLOC_TYPE_INVISIBLE_FRAME_BUFFER , +DC_MEM_ALLOC_TYPE_AGP +}; + +#endif enum dc_psr_version {DC_PSR_VERSION_1 =0 ,DC_PSR_VERSION_UNSUPPORTED =0xFFFFFFFF ,
drivers/gpu/drm/amd/display/dc/dm_helpers.h +23 -0
@@ -35,6 +35,29 @@struct dp_mst_stream_allocation_table ; +#ifdef CONFIG_DRM_AMD_DC_DCN3_0 +/* +* Allocate memory accessible by the GPU +* +* frame buffer allocations must be aligned to a 4096-byte boundary +* +* Returns virtual address, sets addr to physical address +*/ +void *dm_helpers_allocate_gpu_mem ( +struct dc_context *ctx, +enum dc_gpu_mem_alloc_type type, +size_t size, +long long *addr); + +/* +* Free the GPU-accessible memory at the virtual address pvMem +*/ +void dm_helpers_free_gpu_mem ( +struct dc_context *ctx, +enum dc_gpu_mem_alloc_type type, +void *pvMem); + +#endif enum dc_edid_status dm_helpers_parse_edid_caps( struct dc_context *ctx, const struct dc_edid *edid,
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 197/207 drm/amd/display: Add DCN3 Resource
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
Add support for managing resources for DCN3
--- .../gpu/drm/amd/display/dc/core/dc_resource.c | 36 +- drivers/gpu/drm/amd/display/dc/dc.h | 24 + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 20 + .../drm/amd/display/dc/dcn20/dcn20_resource.c | 39 + .../drm/amd/display/dc/dcn30/dcn30_resource.c | 2698 +++++++++++++++++ .../drm/amd/display/dc/dcn30/dcn30_resource.h | 82 + .../gpu/drm/amd/display/dc/inc/core_types.h | 21 + .../gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 9 + drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 + 9 files changed, 2931 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.h
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +35 -1
@@ -52,6 +52,9 @@#include "dcn20/dcn20_resource.h" #include "dcn21/dcn21_resource.h" #endif +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +#include "../dcn30/dcn30_resource.h" +#endif #define DC_LOGGER_INIT (logger)
@@ -107,6 +110,10 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id)case FAMILY_NV : dc_version =DCN_VERSION_2_0 ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +if (ASICREV_IS_SIENNA_CICHLID_P (asic_id.hw_internal_rev)) + dc_version =DCN_VERSION_3_0 ; +#endif break ;default : dc_version =DCE_VERSION_UNKNOWN ;
@@ -168,6 +175,11 @@ struct resource_pool *dc_create_resource_pool(struct dc *dc, res_pool =dcn21_create_resource_pool (init_data, dc);break ;#endif +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +case DCN_VERSION_3_0 : + res_pool =dcn30_create_resource_pool (init_data, dc); +break ; +#endif default :break ;
@@ -282,6 +294,16 @@ bool resource_construct( } } +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +for (i =0 ; i < caps->num_mpc_3dlut; i++) { + pool->mpc_lut[i] =dc_create_3dlut_func (); +if (pool->mpc_lut[i] ==NULL ) +DC_ERR ("DC: failed to create MPC 3dlut!\n" ); + pool->mpc_shaper[i] =dc_create_transfer_func (); +if (pool->mpc_shaper[i] ==NULL ) +DC_ERR ("DC: failed to create MPC shaper!\n" ); + } +#endif dc->caps.dynamic_audio = false;if (pool->audio_count < pool->stream_enc_count) { dc->caps.dynamic_audio = true;
@@ -2049,8 +2071,16 @@ enum dc_status resource_map_pool_resources( }/* Add ABM to the resource if on EDP */ -if (pipe_ctx->stream &&dc_is_embedded_signal (pipe_ctx->stream->signal)) +if (pipe_ctx->stream &&dc_is_embedded_signal (pipe_ctx->stream->signal)) { +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +if (pool->abm) + pipe_ctx->stream_res.abm = pool->abm; +else + pipe_ctx->stream_res.abm = pool->multiple_abms[pipe_ctx->stream_res.tg->inst]; +#else pipe_ctx->stream_res.abm = pool->abm; +#endif + }for (i =0 ; i < context->stream_count; i++)if (context->streams[i] == stream) {
@@ -2867,6 +2897,10 @@ unsigned int resource_pixel_format_to_bpp(enum surface_pixel_format format)case SURFACE_PIXEL_FORMAT_GRPH_ARGB2101010 :case SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010 :case SURFACE_PIXEL_FORMAT_GRPH_ABGR2101010_XR_BIAS : +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +case SURFACE_PIXEL_FORMAT_GRPH_RGBE : +case SURFACE_PIXEL_FORMAT_GRPH_RGBE_ALPHA : +#endif return 32 ;case SURFACE_PIXEL_FORMAT_GRPH_ARGB16161616 :case SURFACE_PIXEL_FORMAT_GRPH_ARGB16161616F :
drivers/gpu/drm/amd/display/dc/dc.h +24 -0
@@ -287,6 +287,9 @@ struct dc_config {bool multi_mon_pp_mclk_switch;bool disable_dmcu;bool enable_4to1MPC; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +bool clamp_min_dcfclk; +#endif };enum visual_confirm {
@@ -464,6 +467,9 @@ struct dc_debug_options {bool skip_detection_link_training;bool remove_disconnect_edp;unsigned int force_odm_combine;//bit vector based on otg inst +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +unsigned int force_odm_combine_4to1;//bit vector based on otg inst +#endif unsigned int force_fclk_khz;bool disable_tri_buf;bool dmub_offload_enabled;
@@ -479,6 +485,9 @@ struct dc_debug_options {* watermarks are not affected. */ unsigned int force_min_dcfclk_mhz; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +int dwb_fi_phase; +#endif bool disable_timing_sync;bool cm_in_bypass;int force_clock_mode;/*every mode change.*/
@@ -839,6 +848,9 @@ struct dc_plane_state {struct dc_transfer_func *in_shaper_func;struct dc_transfer_func *blend_tf; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +struct dc_transfer_func *gamcor_tf; +#endif enum surface_pixel_format format;enum dc_rotation_angle rotation;enum plane_stereo_format stereo_format;
@@ -984,6 +996,14 @@ void dc_resource_state_construct(const struct dc *dc, struct dc_state *dst_ctx); +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +bool dc_acquire_release_mpc_3dlut ( +struct dc *dc,bool acquire, +struct dc_stream_state *stream, +struct dc_3dlut **lut, +struct dc_transfer_func **shaper); +#endif +void dc_resource_state_copy_construct (const struct dc_state *src_ctx,struct dc_state *dst_ctx);
@@ -1103,6 +1123,10 @@ struct hdcp_caps {#include "dc_link.h" +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +uint32_t dc_get_opp_for_plane (struct dc *dc,struct dc_plane_state *plane); + +#endif /******************************************************************************* * Sink Interfaces - A sink corresponds to a display output device ******************************************************************************/
drivers/gpu/drm/amd/display/dc/dce/dce_abm.h +20 -0
@@ -76,6 +76,22 @@SR (DC_ABM1_HGLS_REG_READ_PROGRESS ), \ NBIO_SR(BIOS_SCRATCH_2) +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +#define ABM_DCN301_REG_LIST (id)\ + ABM_COMMON_REG_LIST_DCE_BASE(), \ + SRI(DC_ABM1_HG_SAMPLE_RATE, ABM, id), \ + SRI(DC_ABM1_LS_SAMPLE_RATE, ABM, id), \ + SRI(BL1_PWM_BL_UPDATE_SAMPLE_RATE, ABM, id), \ + SRI(DC_ABM1_HG_MISC_CTRL, ABM, id), \ + SRI(DC_ABM1_IPCSC_COEFF_SEL, ABM, id), \ + SRI(BL1_PWM_CURRENT_ABM_LEVEL, ABM, id), \ + SRI(BL1_PWM_TARGET_ABM_LEVEL, ABM, id), \ + SRI(BL1_PWM_USER_LEVEL, ABM, id), \ + SRI(DC_ABM1_LS_MIN_MAX_PIXEL_VALUE_THRES, ABM, id), \ + SRI(DC_ABM1_HGLS_REG_READ_PROGRESS, ABM, id), \ + NBIO_SR(BIOS_SCRATCH_2) +#endif +#define ABM_SF (reg_name, field_name, post_fix)\ .field_name = reg_name ## __ ## field_name ## post_fix
@@ -149,6 +165,10 @@#define ABM_MASK_SH_LIST_DCN20 (mask_sh) ABM_MASK_SH_LIST_DCE110(mask_sh) +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +#define ABM_MASK_SH_LIST_DCN301 (mask_sh) ABM_MASK_SH_LIST_DCN10(mask_sh) +#endif +#define ABM_REG_FIELD_LIST (type) \ type ABM1_HG_NUM_OF_BINS_SEL; \ type ABM1_HG_VMAX_SEL; \
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +39 -0
@@ -2033,6 +2033,9 @@ int dcn20_populate_dml_pipes_from_context(unsigned int front_porch;int output_bpc; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +struct audio_check aud_check = {0 }; +#endif if (!res_ctx->pipe_ctx[i].stream)continue ;
@@ -2087,6 +2090,11 @@ int dcn20_populate_dml_pipes_from_context(case 1 : pipes[pipe_cnt].pipe.dest.odm_combine = dm_odm_combine_mode_2to1;break ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +case 3 : + pipes[pipe_cnt].pipe.dest.odm_combine = dm_odm_combine_mode_4to1; +break ; +#endif default : pipes[pipe_cnt].pipe.dest.odm_combine = dm_odm_combine_mode_disabled; }
@@ -2183,6 +2191,11 @@ int dcn20_populate_dml_pipes_from_context(/* todo: default max for now, until there is logic reflecting this in dc*/ pipes[pipe_cnt].dout.output_bpc =12 ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +/*fill up the audio sample rate*/ +get_audio_check (&res_ctx->pipe_ctx[i].stream->audio_info, &aud_check); + pipes[pipe_cnt].dout.max_audio_sample_rate = aud_check.max_audiosample_rate; +#endif /* * For graphic plane, cursor number is 1, nv12 is 0 * bw calculations due to cursor on/off
@@ -2230,6 +2243,12 @@ int dcn20_populate_dml_pipes_from_context( pipes[pipe_cnt].pipe.src.viewport_width /=2 ; pipes[pipe_cnt].pipe.dest.recout_width /=2 ; } +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) + else if (pipes[pipe_cnt].pipe.dest.odm_combine == dm_odm_combine_mode_4to1) { + pipes[pipe_cnt].pipe.src.viewport_width /=4 ; + pipes[pipe_cnt].pipe.dest.recout_width /=4 ; + } +#endif }else {struct dc_plane_state *pln = res_ctx->pipe_ctx[i].plane_state;struct scaler_data *scl = &res_ctx->pipe_ctx[i].plane_res.scl_data;
@@ -2250,7 +2269,12 @@ int dcn20_populate_dml_pipes_from_context( pipes[pipe_cnt].pipe.src.surface_height_y = pln->plane_size.surface_size.height; pipes[pipe_cnt].pipe.src.surface_width_c = pln->plane_size.chroma_size.width; pipes[pipe_cnt].pipe.src.surface_height_c = pln->plane_size.chroma_size.height; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +if (pln->format ==SURFACE_PIXEL_FORMAT_GRPH_RGBE_ALPHA + || pln->format >=SURFACE_PIXEL_FORMAT_VIDEO_BEGIN ) { +#else if (pln->format >=SURFACE_PIXEL_FORMAT_VIDEO_BEGIN ) { +#endif pipes[pipe_cnt].pipe.src.data_pitch = pln->plane_size.surface_pitch; pipes[pipe_cnt].pipe.src.data_pitch_c = pln->plane_size.chroma_pitch; pipes[pipe_cnt].pipe.src.meta_pitch = pln->dcc.meta_pitch;
@@ -2266,6 +2290,10 @@ int dcn20_populate_dml_pipes_from_context( pipes[pipe_cnt].pipe.dest.full_recout_width = scl->recout.width;if (pipes[pipe_cnt].pipe.dest.odm_combine == dm_odm_combine_mode_2to1) pipes[pipe_cnt].pipe.dest.full_recout_width *=2 ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) + else if (pipes[pipe_cnt].pipe.dest.odm_combine == dm_odm_combine_mode_4to1) + pipes[pipe_cnt].pipe.dest.full_recout_width *= 4; +#endif else {struct pipe_ctx *split_pipe = res_ctx->pipe_ctx[i].bottom_pipe;
@@ -2322,6 +2350,11 @@ int dcn20_populate_dml_pipes_from_context(case SURFACE_PIXEL_FORMAT_GRPH_PALETA_256_COLORS : pipes[pipe_cnt].pipe.src.source_format = dm_444_8;break ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +case SURFACE_PIXEL_FORMAT_GRPH_RGBE_ALPHA : + pipes[pipe_cnt].pipe.src.source_format = dm_rgbe_alpha; +break ; +#endif default : pipes[pipe_cnt].pipe.src.source_format = dm_444_32;break ;
@@ -2682,6 +2715,12 @@ int dcn20_validate_apply_pipe_split_flags( split[i] =2 ; v->ODMCombineEnablePerState[vlevel][pipe_plane] = dm_odm_combine_mode_2to1; } +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +if (dc->debug.force_odm_combine_4to1 & (1 << pipe->stream_res.tg->inst)) { + split[i] =4 ; + v->ODMCombineEnablePerState[vlevel][pipe_plane] = dm_odm_combine_mode_4to1; + } +#endif v->ODMCombineEnabled[pipe_plane] = v->ODMCombineEnablePerState[vlevel][pipe_plane];
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c new file +2698 -0
2,698 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.h new file +82 -0
49 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/inc/core_types.h +21 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h +9 -0
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/inc/resource.h +3 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Part of the diff is not shown here. View the raw message.
PATCH 198/207 drm/amd/display: Add DCN3 Command Table Helpers
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
-Handle DCN3 cases for bios parser and command tables -Add command function tables for DCN3
--- .../drm/amd/display/dc/bios/bios_parser2.c | 3 ++ .../display/dc/bios/command_table_helper2.c | 5 +++ .../dce112/command_table_helper2_dce112.c | 40 +++++++++++++++++++ .../dce112/command_table_helper2_dce112.h | 3 ++ 4 files changed, 51 insertions(+)
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +3 -0
@@ -1154,6 +1154,9 @@ static enum bp_result bios_parser_get_firmware_info( result =get_firmware_info_v3_2 (bp, info);break ;case 3 : +#ifdef CONFIG_DRM_AMD_DC_DCN3_0 +case 4 : +#endif result =get_firmware_info_v3_2 (bp, info);break ;default :
drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c +5 -0
@@ -65,6 +65,11 @@ bool dal_bios_parser_init_cmd_tbl_helper2( *h =dal_cmd_tbl_helper_dce112_get_table2 ();return true;#endif +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +case DCN_VERSION_3_0 : + *h =dal_cmd_tbl_helper_dce112_get_table2 (); +return true; +#endif default :/* Unsupported DCE */
drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.c +40 -0
@@ -388,3 +388,43 @@ const struct command_table_helper *dal_cmd_tbl_helper_dce112_get_table2(void) {return &command_table_helper_funcs; } + +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +/* function table */ +static const struct command_table_helper command_table_helper_funcs_dcn2x = { + .controller_id_to_atom = dal_cmd_table_helper_controller_id_to_atom2, + .encoder_action_to_atom = encoder_action_to_atom, + .engine_bp_to_atom = engine_bp_to_atom, + .clock_source_id_to_atom = clock_source_id_to_atom, + .clock_source_id_to_atom_phy_clk_src_id = + clock_source_id_to_atom_phy_clk_src_id, + .signal_type_to_atom_dig_mode = signal_type_to_atom_dig_mode, + .hpd_sel_to_atom = hpd_sel_to_atom, + .dig_encoder_sel_to_atom = dig_encoder_sel_to_atom, + .phy_id_to_atom = phy_id_to_atom, + .disp_power_gating_action_to_atom = disp_power_gating_action_to_atom, + .clock_source_id_to_ref_clk_src =NULL , + .transmitter_bp_to_atom =NULL , + .encoder_id_to_atom = dal_cmd_table_helper_encoder_id_to_atom2, + .encoder_mode_bp_to_atom = + dal_cmd_table_helper_encoder_mode_bp_to_atom2, + .dc_clock_type_to_atom = dc_clock_type_to_atom, + .transmitter_color_depth_to_atom = transmitter_color_depth_to_atom, + +}; + +/* +* dal_cmd_tbl_helper_dce110_get_table +* +* @brief +* Initialize command table helper functions +* +* @param +* const struct command_table_helper **h - [out] struct of functions +* +*/ +const struct command_table_helper *dal_cmd_tbl_helper_dcn2_get_table2 (void ) +{ +return &command_table_helper_funcs_dcn2x; +} +#endif
drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.h +3 -0
@@ -30,5 +30,8 @@ struct command_table_helper;/* Initialize command table helper functions */ const struct command_table_helper *dal_cmd_tbl_helper_dce112_get_table2 (void ); +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +const struct command_table_helper *dal_cmd_tbl_helper_dcn2_get_table2 (void ); +#endif #endif /* __DAL_COMMAND_TABLE_HELPER_DCE110_H__ */
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 199/207 drm/amd/display: Add DCN3 AFMT
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
Audio formating
Audio related code for setup/control
--- .../gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c | 206 ++++++++++++++++ .../gpu/drm/amd/display/dc/dcn30/dcn30_afmt.h | 230 ++++++++++++++++++ 2 files changed, 436 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.h
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c new file +206 -0
@@ -0,0 +1,206 @@ +/* +* Copyright 2020 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: AMD +* +*/ + + +#include "dc_bios_types.h" +#include "dcn30_afmt.h" +#include "reg_helper.h" + +#define DC_LOGGER \ + afmt3->base.ctx->logger + +#define REG (reg)\ + (afmt3->regs->reg) + +#undef FN +#define FN (reg_name, field_name) \ + afmt3->afmt_shift->field_name, afmt3->afmt_mask->field_name + + +#define CTX \ + afmt3->base.ctx + + +static void afmt3_setup_hdmi_audio ( +struct afmt *afmt) +{ +struct dcn30_afmt *afmt3 =DCN30_AFMT_FROM_AFMT (afmt); + +/* AFMT_AUDIO_PACKET_CONTROL */ +REG_UPDATE (AFMT_AUDIO_PACKET_CONTROL ,AFMT_60958_CS_UPDATE ,1 ); + +/* AFMT_AUDIO_PACKET_CONTROL2 */ +REG_UPDATE_2 (AFMT_AUDIO_PACKET_CONTROL2 , +AFMT_AUDIO_LAYOUT_OVRD ,0 , +AFMT_60958_OSF_OVRD ,0 ); + +/* AFMT_60958_0__AFMT_60958_CS_CHANNEL_NUMBER_L_MASK & +* AFMT_60958_0__AFMT_60958_CS_CLOCK_ACCURACY_MASK +*/ +REG_UPDATE_2 (AFMT_60958_0 , +AFMT_60958_CS_CHANNEL_NUMBER_L ,1 , +AFMT_60958_CS_CLOCK_ACCURACY ,0 ); + +/* AFMT_60958_1 AFMT_60958_CS_CHALNNEL_NUMBER_R */ +REG_UPDATE (AFMT_60958_1 ,AFMT_60958_CS_CHANNEL_NUMBER_R ,2 ); + +/* AFMT_60958_2 now keep this settings until +* Programming guide comes out +*/ +REG_UPDATE_6 (AFMT_60958_2 , +AFMT_60958_CS_CHANNEL_NUMBER_2 ,3 , +AFMT_60958_CS_CHANNEL_NUMBER_3 ,4 , +AFMT_60958_CS_CHANNEL_NUMBER_4 ,5 , +AFMT_60958_CS_CHANNEL_NUMBER_5 ,6 , +AFMT_60958_CS_CHANNEL_NUMBER_6 ,7 , +AFMT_60958_CS_CHANNEL_NUMBER_7 ,8 ); +} + +static union audio_cea_channels speakers_to_channels ( +struct audio_speaker_flags speaker_flags) +{ +union audio_cea_channels cea_channels = {0 }; + +/* these are one to one */ + cea_channels.channels.FL = speaker_flags.FL_FR; + cea_channels.channels.FR = speaker_flags.FL_FR; + cea_channels.channels.LFE = speaker_flags.LFE; + cea_channels.channels.FC = speaker_flags.FC; + +/* if Rear Left and Right exist move RC speaker to channel 7 +* otherwise to channel 5 +*/ +if (speaker_flags.RL_RR) { + cea_channels.channels.RL_RC = speaker_flags.RL_RR; + cea_channels.channels.RR = speaker_flags.RL_RR; + cea_channels.channels.RC_RLC_FLC = speaker_flags.RC; + }else { + cea_channels.channels.RL_RC = speaker_flags.RC; + } + +/* FRONT Left Right Center and REAR Left Right Center are exclusive */ +if (speaker_flags.FLC_FRC) { + cea_channels.channels.RC_RLC_FLC = speaker_flags.FLC_FRC; + cea_channels.channels.RRC_FRC = speaker_flags.FLC_FRC; + }else { + cea_channels.channels.RC_RLC_FLC = speaker_flags.RLC_RRC; + cea_channels.channels.RRC_FRC = speaker_flags.RLC_RRC; + } + +return cea_channels; +} + +static void afmt3_se_audio_setup ( +struct afmt *afmt, +unsigned int az_inst, +struct audio_info *audio_info) +{ +struct dcn30_afmt *afmt3 =DCN30_AFMT_FROM_AFMT (afmt); + +uint32_t speakers =0 ; +uint32_t channels =0 ; + +ASSERT (audio_info); +/* This should not happen.it does so we don't get BSOD*/ +if (audio_info ==NULL ) +return ; + + speakers = audio_info->flags.info.ALLSPEAKERS; + channels =speakers_to_channels (audio_info->flags.speaker_flags).all; + +/* setup the audio stream source select (audio -> dig mapping) */ +REG_SET (AFMT_AUDIO_SRC_CONTROL ,0 ,AFMT_AUDIO_SRC_SELECT , az_inst); + +/* Channel allocation */ +REG_UPDATE (AFMT_AUDIO_PACKET_CONTROL2 ,AFMT_AUDIO_CHANNEL_ENABLE , channels); + +/* Disable forced mem power off */ +REG_UPDATE (AFMT_MEM_PWR ,AFMT_MEM_PWR_FORCE ,0 ); +} + +static void afmt3_audio_mute_control ( +struct afmt *afmt, +bool mute) +{ +struct dcn30_afmt *afmt3 =DCN30_AFMT_FROM_AFMT (afmt); + +/* enable/disable transmission of audio packets */ +REG_UPDATE (AFMT_AUDIO_PACKET_CONTROL ,AFMT_AUDIO_SAMPLE_SEND , !mute); +} + +static void afmt3_audio_info_immediate_update ( +struct afmt *afmt) +{ +struct dcn30_afmt *afmt3 =DCN30_AFMT_FROM_AFMT (afmt); + +/* update double-buffered AUDIO_INFO registers immediately */ +REG_UPDATE (AFMT_INFOFRAME_CONTROL0 ,AFMT_AUDIO_INFO_UPDATE ,1 ); +} + +static void afmt3_setup_dp_audio ( +struct afmt *afmt) +{ +struct dcn30_afmt *afmt3 =DCN30_AFMT_FROM_AFMT (afmt); + +/* AFMT_AUDIO_PACKET_CONTROL */ +REG_UPDATE (AFMT_AUDIO_PACKET_CONTROL ,AFMT_60958_CS_UPDATE ,1 ); + +/* AFMT_AUDIO_PACKET_CONTROL2 */ +/* Program the ATP and AIP next */ +REG_UPDATE_2 (AFMT_AUDIO_PACKET_CONTROL2 , +AFMT_AUDIO_LAYOUT_OVRD ,0 , +AFMT_60958_OSF_OVRD ,0 ); + +/* AFMT_INFOFRAME_CONTROL0 */ +REG_UPDATE (AFMT_INFOFRAME_CONTROL0 ,AFMT_AUDIO_INFO_UPDATE ,1 ); + +/* AFMT_60958_0__AFMT_60958_CS_CLOCK_ACCURACY_MASK */ +REG_UPDATE (AFMT_60958_0 ,AFMT_60958_CS_CLOCK_ACCURACY ,0 ); +} + +static struct afmt_funcs dcn30_afmt_funcs = { + .setup_hdmi_audio = afmt3_setup_hdmi_audio, + .se_audio_setup = afmt3_se_audio_setup, + .audio_mute_control = afmt3_audio_mute_control, + .audio_info_immediate_update = afmt3_audio_info_immediate_update, + .setup_dp_audio = afmt3_setup_dp_audio, +}; + +void afmt3_construct (struct dcn30_afmt *afmt3, +struct dc_context *ctx, +uint32_t inst, +const struct dcn30_afmt_registers *afmt_regs, +const struct dcn30_afmt_shift *afmt_shift, +const struct dcn30_afmt_mask *afmt_mask) +{ + afmt3->base.ctx = ctx; + + afmt3->base.inst = inst; + afmt3->base.funcs = &dcn30_afmt_funcs; + + afmt3->regs = afmt_regs; + afmt3->afmt_shift = afmt_shift; + afmt3->afmt_mask = afmt_mask; +}
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.h new file +230 -0
230 lines not on this page · raw message
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 200/207 drm/amd/display: Add DCN3 VPG
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
Video Package generator.
used to prepare avi info, DP info etc
--- .../gpu/drm/amd/display/dc/dcn30/dcn30_vpg.c | 194 ++++++++++++++++++ .../gpu/drm/amd/display/dc/dcn30/dcn30_vpg.h | 133 ++++++++++++ 2 files changed, 327 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.h
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.c new file +194 -0
@@ -0,0 +1,194 @@ +/* +* Copyright 2020 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: AMD +* +*/ + + +#include "dc_bios_types.h" +#include "dcn30_vpg.h" +#include "reg_helper.h" + +#define DC_LOGGER \ + vpg3->base.ctx->logger + +#define REG (reg)\ + (vpg3->regs->reg) + +#undef FN +#define FN (reg_name, field_name) \ + vpg3->vpg_shift->field_name, vpg3->vpg_mask->field_name + + +#define CTX \ + vpg3->base.ctx + + +static void vpg3_update_generic_info_packet ( +struct vpg *vpg, +uint32_t packet_index, +const struct dc_info_packet *info_packet) +{ +struct dcn30_vpg *vpg3 =DCN30_VPG_FROM_VPG (vpg); +uint32_t i; + +/* TODOFPGA Figure out a proper number for max_retries polling for lock +* use 50 for now. +*/ +uint32_t max_retries =50 ; + +if (packet_index >14 ) +ASSERT (0 ); + +/* poll dig_update_lock is not locked -> asic internal signal +* assume otg master lock will unlock it +*/ +/* REG_WAIT(AFMT_VBI_PACKET_CONTROL, AFMT_GENERIC_LOCK_STATUS, +* 0, 10, max_retries); +*/ + +/* TODO: Check if this is required */ +/* check if HW reading GSP memory */ +REG_WAIT (VPG_GENERIC_STATUS ,VPG_GENERIC_CONFLICT_OCCURED , +0 ,10 , max_retries); + +/* HW does is not reading GSP memory not reading too long -> +* something wrong. clear GPS memory access and notify? +* hw SW is writing to GSP memory +*/ +REG_UPDATE (VPG_GENERIC_STATUS ,VPG_GENERIC_CONFLICT_CLR ,1 ); + +/* choose which generic packet to use */ +REG_UPDATE (VPG_GENERIC_PACKET_ACCESS_CTRL , +VPG_GENERIC_DATA_INDEX , packet_index*9 ); + +/* write generic packet header +* (4th byte is for GENERIC0 only) +*/ +REG_SET_4 (VPG_GENERIC_PACKET_DATA ,0 , +VPG_GENERIC_DATA_BYTE0 , info_packet->hb0, +VPG_GENERIC_DATA_BYTE1 , info_packet->hb1, +VPG_GENERIC_DATA_BYTE2 , info_packet->hb2, +VPG_GENERIC_DATA_BYTE3 , info_packet->hb3); + +/* write generic packet contents +* (we never use last 4 bytes) +* there are 8 (0-7) mmDIG0_AFMT_GENERIC0_x registers +*/ + { +const uint32_t *content = + (const uint32_t *) &info_packet->sb[0 ]; + +for (i =0 ; i <8 ; i++) { +REG_WRITE (VPG_GENERIC_PACKET_DATA , *content++); + } + } + +/* atomically update double-buffered GENERIC0 registers in frame mode +* (update at next block_update when block_update_lock == 0). +*/ +switch (packet_index) { +case 0 : +REG_UPDATE (VPG_GSP_FRAME_UPDATE_CTRL , +VPG_GENERIC0_FRAME_UPDATE ,1 ); +break ; +case 1 : +REG_UPDATE (VPG_GSP_FRAME_UPDATE_CTRL , +VPG_GENERIC1_FRAME_UPDATE ,1 ); +break ; +case 2 : +REG_UPDATE (VPG_GSP_FRAME_UPDATE_CTRL , +VPG_GENERIC2_FRAME_UPDATE ,1 ); +break ; +case 3 : +REG_UPDATE (VPG_GSP_FRAME_UPDATE_CTRL , +VPG_GENERIC3_FRAME_UPDATE ,1 ); +break ; +case 4 : +REG_UPDATE (VPG_GSP_FRAME_UPDATE_CTRL , +VPG_GENERIC4_FRAME_UPDATE ,1 ); +break ; +case 5 : +REG_UPDATE (VPG_GSP_FRAME_UPDATE_CTRL , +VPG_GENERIC5_FRAME_UPDATE ,1 ); +break ; +case 6 : +REG_UPDATE (VPG_GSP_FRAME_UPDATE_CTRL , +VPG_GENERIC6_FRAME_UPDATE ,1 ); +break ; +case 7 : +REG_UPDATE (VPG_GSP_FRAME_UPDATE_CTRL , +VPG_GENERIC7_FRAME_UPDATE ,1 ); +break ; +case 8 : +REG_UPDATE (VPG_GSP_FRAME_UPDATE_CTRL , +VPG_GENERIC8_FRAME_UPDATE ,1 ); +break ; +case 9 : +REG_UPDATE (VPG_GSP_FRAME_UPDATE_CTRL , +VPG_GENERIC9_FRAME_UPDATE ,1 ); +break ; +case 10 : +REG_UPDATE (VPG_GSP_FRAME_UPDATE_CTRL , +VPG_GENERIC10_FRAME_UPDATE ,1 ); +break ; +case 11 : +REG_UPDATE (VPG_GSP_FRAME_UPDATE_CTRL , +VPG_GENERIC11_FRAME_UPDATE ,1 ); +break ; +case 12 : +REG_UPDATE (VPG_GSP_FRAME_UPDATE_CTRL , +VPG_GENERIC12_FRAME_UPDATE ,1 ); +break ; +case 13 : +REG_UPDATE (VPG_GSP_FRAME_UPDATE_CTRL , +VPG_GENERIC13_FRAME_UPDATE ,1 ); +break ; +case 14 : +REG_UPDATE (VPG_GSP_FRAME_UPDATE_CTRL , +VPG_GENERIC14_FRAME_UPDATE ,1 ); +break ; +default : +break ; + } +} + +static struct vpg_funcs dcn30_vpg_funcs = { + .update_generic_info_packet = vpg3_update_generic_info_packet, +}; + +void vpg3_construct (struct dcn30_vpg *vpg3, +struct dc_context *ctx, +uint32_t inst, +const struct dcn30_vpg_registers *vpg_regs, +const struct dcn30_vpg_shift *vpg_shift, +const struct dcn30_vpg_mask *vpg_mask) +{ + vpg3->base.ctx = ctx; + + vpg3->base.inst = inst; + vpg3->base.funcs = &dcn30_vpg_funcs; + + vpg3->regs = vpg_regs; + vpg3->vpg_shift = vpg_shift; + vpg3->vpg_mask = vpg_mask; +}
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.h new file +133 -0
133 lines not on this page · raw message
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 201/207 drm/amd/display: Init function tables for DCN3
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
Initilize function tables for hw programing
--- .../gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 148 ++++++++++++++++++ .../gpu/drm/amd/display/dc/dcn30/dcn30_init.h | 33 ++++ 2 files changed, 181 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.h
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c new file +148 -0
@@ -0,0 +1,148 @@ +/* +* Copyright 2020 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: AMD +* +*/ + +#include "dce110/dce110_hw_sequencer.h" +#include "dcn10/dcn10_hw_sequencer.h" +#include "dcn20/dcn20_hwseq.h" +#include "dcn30_hwseq.h" + +static const struct hw_sequencer_funcs dcn30_funcs = { + .program_gamut_remap = dcn10_program_gamut_remap, + .init_hw = dcn10_init_hw, + .apply_ctx_to_hw = dce110_apply_ctx_to_hw, + .apply_ctx_for_surface =NULL , + .program_front_end_for_ctx = dcn20_program_front_end_for_ctx, + .post_unlock_program_front_end = dcn20_post_unlock_program_front_end, + .update_plane_addr = dcn20_update_plane_addr, + .update_dchub = dcn10_update_dchub, + .update_pending_status = dcn10_update_pending_status, + .program_output_csc = dcn20_program_output_csc, + .enable_accelerated_mode = dce110_enable_accelerated_mode, + .enable_timing_synchronization = dcn10_enable_timing_synchronization, + .enable_per_frame_crtc_position_reset = dcn10_enable_per_frame_crtc_position_reset, + .update_info_frame = dcn30_update_info_frame, + .send_immediate_sdp_message = dcn10_send_immediate_sdp_message, + .enable_stream = dcn20_enable_stream, + .disable_stream = dce110_disable_stream, + .unblank_stream = dcn20_unblank_stream, + .blank_stream = dce110_blank_stream, + .enable_audio_stream = dce110_enable_audio_stream, + .disable_audio_stream = dce110_disable_audio_stream, + .disable_plane = dcn20_disable_plane, + .pipe_control_lock = dcn20_pipe_control_lock, + .interdependent_update_lock = dcn10_lock_all_pipes, + .cursor_lock = dcn10_cursor_lock, + .prepare_bandwidth = dcn20_prepare_bandwidth, + .optimize_bandwidth = dcn20_optimize_bandwidth, + .update_bandwidth = dcn20_update_bandwidth, + .set_drr = dcn10_set_drr, + .get_position = dcn10_get_position, + .set_static_screen_control = dcn10_set_static_screen_control, + .setup_stereo = dcn10_setup_stereo, + .set_avmute = dcn30_set_avmute, + .log_hw_state = dcn10_log_hw_state, + .get_hw_state = dcn10_get_hw_state, + .clear_status_bits = dcn10_clear_status_bits, + .wait_for_mpcc_disconnect = dcn10_wait_for_mpcc_disconnect, + .edp_power_control = dce110_edp_power_control, + .edp_wait_for_hpd_ready = dce110_edp_wait_for_hpd_ready, + .set_cursor_position = dcn10_set_cursor_position, + .set_cursor_attribute = dcn10_set_cursor_attribute, + .set_cursor_sdr_white_level = dcn10_set_cursor_sdr_white_level, + .setup_periodic_interrupt = dcn10_setup_periodic_interrupt, + .set_clock = dcn10_set_clock, + .get_clock = dcn10_get_clock, + .program_triplebuffer = dcn20_program_triple_buffer, + .enable_writeback = dcn30_enable_writeback, + .disable_writeback = dcn30_disable_writeback, + .update_writeback = dcn30_update_writeback, + .mmhubbub_warmup = dcn30_mmhubbub_warmup, + .dmdata_status_done = dcn20_dmdata_status_done, + .program_dmdata_engine = dcn30_program_dmdata_engine, + .set_dmdata_attributes = dcn20_set_dmdata_attributes, + .init_sys_ctx = dcn20_init_sys_ctx, + .init_vm_ctx = dcn20_init_vm_ctx, + .set_flip_control_gsl = dcn20_set_flip_control_gsl, + .get_vupdate_offset_from_vsync = dcn10_get_vupdate_offset_from_vsync, + .apply_idle_power_optimizations = dcn30_apply_idle_power_optimizations, + .set_backlight_level = dce110_set_backlight_level, + .set_abm_immediate_disable = dce110_set_abm_immediate_disable, +}; + +static const struct hwseq_private_funcs dcn30_private_funcs = { + .init_pipes = dcn10_init_pipes, + .update_plane_addr = dcn20_update_plane_addr, + .plane_atomic_disconnect = dcn10_plane_atomic_disconnect, + .update_mpcc = dcn20_update_mpcc, + .set_input_transfer_func = dcn30_set_input_transfer_func, + .set_output_transfer_func = dcn30_set_output_transfer_func, + .power_down = dce110_power_down, + .enable_display_power_gating = dcn10_dummy_display_power_gating, + .blank_pixel_data = dcn20_blank_pixel_data, + .reset_hw_ctx_wrap = dcn20_reset_hw_ctx_wrap, + .enable_stream_timing = dcn20_enable_stream_timing, + .edp_backlight_control = dce110_edp_backlight_control, + .disable_stream_gating = dcn20_disable_stream_gating, + .enable_stream_gating = dcn20_enable_stream_gating, + .setup_vupdate_interrupt = dcn20_setup_vupdate_interrupt, + .did_underflow_occur = dcn10_did_underflow_occur, + .init_blank = dcn20_init_blank, + .disable_vga = dcn20_disable_vga, + .bios_golden_init = dcn10_bios_golden_init, + .plane_atomic_disable = dcn20_plane_atomic_disable, + .plane_atomic_power_down = dcn10_plane_atomic_power_down, + .enable_power_gating_plane = dcn20_enable_power_gating_plane, + .dpp_pg_control = dcn20_dpp_pg_control, + .hubp_pg_control = dcn20_hubp_pg_control, + .dsc_pg_control =NULL , + .program_all_writeback_pipes_in_tree = dcn30_program_all_writeback_pipes_in_tree, + .update_odm = dcn20_update_odm, + .dsc_pg_control = dcn20_dsc_pg_control, + .get_surface_visual_confirm_color = dcn10_get_surface_visual_confirm_color, + .get_hdr_visual_confirm_color = dcn10_get_hdr_visual_confirm_color, + .set_hdr_multiplier = dcn10_set_hdr_multiplier, + .verify_allow_pstate_change_high = dcn10_verify_allow_pstate_change_high, + .wait_for_blank_complete = dcn20_wait_for_blank_complete, + .dccg_init = dcn20_dccg_init, + .set_blend_lut = dcn30_set_blend_lut, + .set_shaper_3dlut = dcn20_set_shaper_3dlut, +}; + +void dcn30_hw_sequencer_construct (struct dc *dc) +{ + dc->hwss = dcn30_funcs; + dc->hwseq->funcs = dcn30_private_funcs; + +if (IS_FPGA_MAXIMUS_DC (dc->ctx->dce_environment)) { + dc->hwss.init_hw = dcn20_fpga_init_hw; + dc->hwseq->funcs.init_pipes =NULL ; + } + +// TODO: Use generic dcn10_init_hw and dcn10_init_pipes sequence +if (!IS_FPGA_MAXIMUS_DC (dc->ctx->dce_environment)) { + dc->hwss.init_hw = dcn30_init_hw; + dc->hwseq->funcs.init_pipes =NULL ; + } +}
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.h new file +33 -0
@@ -0,0 +1,33 @@ +/* +* Copyright 2020 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +* +* Authors: AMD +* +*/ + +#ifndef __DC_DCN30_INIT_H__ +#define __DC_DCN30_INIT_H__ + +struct dc ; + +void dcn30_hw_sequencer_construct (struct dc *dc); + +#endif /* __DC_DCN30_INIT_H__ */
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 202/207 drm/amd/display: Handle RGBE_ALPHA Pixel Format
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
--- drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c +7 -0
@@ -374,6 +374,13 @@ static void pipe_ctx_to_e2e_pipe_params ( input->src.viewport_width_c = input->src.viewport_width; input->src.viewport_height_c = input->src.viewport_height;break ; +#if defined(CONFIG_DRM_AMD_DC_DCN3_0 ) +case SURFACE_PIXEL_FORMAT_GRPH_RGBE_ALPHA : + input->src.source_format = dm_rgbe_alpha; + input->src.viewport_width_c = input->src.viewport_width; + input->src.viewport_height_c = input->src.viewport_height; +break ; +#endif default : input->src.source_format = dm_444_32; input->src.viewport_width_c = input->src.viewport_width;
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 203/207 drm/amd/display: Remove Unused Registers
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
--- .../gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 17 ----------------- .../gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h | 12 ------------ .../amd/display/dc/dcn20/dcn20_link_encoder.h | 3 +-- 3 files changed, 1 insertion(+), 31 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c +0 -17
@@ -717,22 +717,5 @@ static void dsc_write_to_registers(struct display_stream_compressor *dsc, constRANGE_MAX_QP14 , reg_vals->pps.rc_range_params[14 ].range_max_qp, RANGE_BPG_OFFSET14, reg_vals->pps.rc_range_params[14].range_bpg_offset); -if (IS_FPGA_MAXIMUS_DC (dsc20->base.ctx->dce_environment)) { -/* It's safe to do this as long as debug bus is not being used in DAL Diag environment. -* -* This is because DSCC_PPS_CONFIG4.INITIAL_DEC_DELAY is a read-only register field (because it's a decoder -* value not required by DSC encoder). However, since decoding fails when this value is missing from PPS, it's -* required to communicate this value to the PPS header. When testing on FPGA, the values for PPS header are -* being read from Diag register dump. The register below is used in place of a scratch register to make -* 'initial_dec_delay' available. -*/ - - temp_int = reg_vals->pps.initial_dec_delay; -REG_SET_4 (DSCC_TEST_DEBUG_BUS_ROTATE ,0 , -DSCC_TEST_DEBUG_BUS0_ROTATE , temp_int &0x1f , -DSCC_TEST_DEBUG_BUS1_ROTATE , temp_int >>5 &0x1f , -DSCC_TEST_DEBUG_BUS2_ROTATE , temp_int >>10 &0x1f , -DSCC_TEST_DEBUG_BUS3_ROTATE , temp_int >>15 &0x1 ); - } }
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.h +0 -12
@@ -78,7 +78,6 @@SRI (DSCC_RATE_CONTROL_BUFFER1_MAX_FULLNESS_LEVEL ,DSCC , id),\SRI (DSCC_RATE_CONTROL_BUFFER2_MAX_FULLNESS_LEVEL ,DSCC , id),\SRI (DSCC_RATE_CONTROL_BUFFER3_MAX_FULLNESS_LEVEL ,DSCC , id),\ -SRI (DSCC_TEST_DEBUG_BUS_ROTATE ,DSCC , id),\SRI (DSCCIF_CONFIG0 ,DSCCIF , id),\SRI (DSCCIF_CONFIG1 ,DSCCIF , id),\SRI (DSCRM_DSC_FORWARD_CONFIG ,DSCRM , id)
@@ -95,8 +94,6 @@DSC_SF (DSC_TOP0_DSC_TOP_CONTROL ,DSC_CLOCK_EN , mask_sh), \DSC_SF (DSC_TOP0_DSC_TOP_CONTROL ,DSC_DISPCLK_R_GATE_DIS , mask_sh), \DSC_SF (DSC_TOP0_DSC_TOP_CONTROL ,DSC_DSCCLK_R_GATE_DIS , mask_sh), \ -DSC_SF (DSC_TOP0_DSC_DEBUG_CONTROL ,DSC_DBG_EN , mask_sh), \ -DSC_SF (DSC_TOP0_DSC_DEBUG_CONTROL ,DSC_TEST_CLOCK_MUX_SEL , mask_sh), \DSC_SF (DSCC0_DSCC_CONFIG0 ,ICH_RESET_AT_END_OF_LINE , mask_sh), \DSC_SF (DSCC0_DSCC_CONFIG0 ,NUMBER_OF_SLICES_PER_LINE , mask_sh), \ DSC_SF(DSCC0_DSCC_CONFIG0, ALTERNATE_ICH_ENCODING_EN, mask_sh), \
@@ -249,10 +246,6 @@DSC_SF (DSCC0_DSCC_RATE_CONTROL_BUFFER1_MAX_FULLNESS_LEVEL ,DSCC_RATE_CONTROL_BUFFER1_MAX_FULLNESS_LEVEL , mask_sh), \DSC_SF (DSCC0_DSCC_RATE_CONTROL_BUFFER2_MAX_FULLNESS_LEVEL ,DSCC_RATE_CONTROL_BUFFER2_MAX_FULLNESS_LEVEL , mask_sh), \DSC_SF (DSCC0_DSCC_RATE_CONTROL_BUFFER3_MAX_FULLNESS_LEVEL ,DSCC_RATE_CONTROL_BUFFER3_MAX_FULLNESS_LEVEL , mask_sh), \ -DSC_SF (DSCC0_DSCC_TEST_DEBUG_BUS_ROTATE ,DSCC_TEST_DEBUG_BUS0_ROTATE , mask_sh), \ -DSC_SF (DSCC0_DSCC_TEST_DEBUG_BUS_ROTATE ,DSCC_TEST_DEBUG_BUS1_ROTATE , mask_sh), \ -DSC_SF (DSCC0_DSCC_TEST_DEBUG_BUS_ROTATE ,DSCC_TEST_DEBUG_BUS2_ROTATE , mask_sh), \ -DSC_SF (DSCC0_DSCC_TEST_DEBUG_BUS_ROTATE ,DSCC_TEST_DEBUG_BUS3_ROTATE , mask_sh), \DSC_SF (DSCCIF0_DSCCIF_CONFIG0 ,INPUT_INTERFACE_UNDERFLOW_RECOVERY_EN , mask_sh), \DSC_SF (DSCCIF0_DSCCIF_CONFIG0 ,INPUT_INTERFACE_UNDERFLOW_OCCURRED_INT_EN , mask_sh), \ DSC_SF(DSCCIF0_DSCCIF_CONFIG0, INPUT_INTERFACE_UNDERFLOW_OCCURRED_STATUS, mask_sh), \
@@ -427,10 +420,6 @@type DSCC_UPDATE_PENDING_STATUS ; \type DSCC_UPDATE_TAKEN_STATUS ; \type DSCC_UPDATE_TAKEN_ACK ; \ -type DSCC_TEST_DEBUG_BUS0_ROTATE ; \ -type DSCC_TEST_DEBUG_BUS1_ROTATE ; \ -type DSCC_TEST_DEBUG_BUS2_ROTATE ; \ -type DSCC_TEST_DEBUG_BUS3_ROTATE ; \type DSCC_RATE_BUFFER0_FULLNESS_LEVEL ; \type DSCC_RATE_BUFFER1_FULLNESS_LEVEL ; \type DSCC_RATE_BUFFER2_FULLNESS_LEVEL ; \
@@ -503,7 +492,6 @@ struct dcn20_dsc_registers {uint32_t DSCC_RATE_CONTROL_BUFFER1_MAX_FULLNESS_LEVEL ;uint32_t DSCC_RATE_CONTROL_BUFFER2_MAX_FULLNESS_LEVEL ;uint32_t DSCC_RATE_CONTROL_BUFFER3_MAX_FULLNESS_LEVEL ; -uint32_t DSCC_TEST_DEBUG_BUS_ROTATE ;uint32_t DSCCIF_CONFIG0 ;uint32_t DSCCIF_CONFIG1 ;uint32_t DSCRM_DSC_FORWARD_CONFIG ;
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_link_encoder.h +1 -2
@@ -147,8 +147,7 @@LE_SF (DPCSTX0_DPCSTX_TX_CNTL ,DPCS_TX_DATA_SWAP , mask_sh),\LE_SF (DPCSTX0_DPCSTX_TX_CNTL ,DPCS_TX_DATA_ORDER_INVERT , mask_sh),\LE_SF (DPCSTX0_DPCSTX_TX_CNTL ,DPCS_TX_FIFO_EN , mask_sh),\ -LE_SF (DPCSTX0_DPCSTX_TX_CNTL ,DPCS_TX_FIFO_RD_START_DELAY , mask_sh),\ - LE_SF(DPCSTX0_DPCSTX_DEBUG_CONFIG, DPCS_DBG_CBUS_DIS, mask_sh) + LE_SF(DPCSTX0_DPCSTX_TX_CNTL, DPCS_TX_FIFO_RD_START_DELAY, mask_sh)#define DPCS_DCN2_MASK_SH_LIST (mask_sh)\ DPCS_MASK_SH_LIST(mask_sh),\
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 204/207 drm/amdgpu: Enable DM block for DCN3
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/nv.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/amdgpu/nv.c +4 -0
@@ -497,6 +497,10 @@ int nv_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &smu_v11_0_ip_block);if (adev->enable_virtual_display ||amdgpu_sriov_vf (adev))amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block); +#if defined(CONFIG_DRM_AMD_DC ) + else if (amdgpu_device_has_dc_support(adev)) + amdgpu_device_ip_block_add(adev, &dm_ip_block); +#endif amdgpu_device_ip_block_add (adev, &gfx_v10_0_ip_block);amdgpu_device_ip_block_add (adev, &sdma_v5_2_ip_block);amdgpu_device_ip_block_add (adev, &vcn_v3_0_ip_block);
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 205/207 drm/amd/display: fix and simplify pipe split logic for DCN3
In reply to Alex DeucherFrom: Dmytro Laktyushkin <[email protected]>
This was done already done for DCN
From:f7a695da88cf ("drm/amd/display: fix and simplify pipe split logic")
--- .../drm/amd/display/dc/dcn30/dcn30_resource.c | 213 ++++++++---------- 1 file changed, 93 insertions(+), 120 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_resource.c +93 -120
@@ -1875,19 +1875,57 @@ static bool init_soc_bounding_box(struct dc *dc,return true; } -bool dcn30_build_params_mpc_split (struct pipe_ctx *primary_pipe) +static bool dcn30_split_stream_for_mpc_or_odm ( +const struct dc *dc, +struct resource_context *res_ctx, +struct pipe_ctx *pri_pipe, +struct pipe_ctx *sec_pipe, +bool odm) { -struct pipe_ctx *current_pipe = primary_pipe; +int pipe_idx = sec_pipe->pipe_idx; +const struct resource_pool *pool = dc->res_pool; + + *sec_pipe = *pri_pipe; + + sec_pipe->pipe_idx = pipe_idx; + sec_pipe->plane_res.mi = pool->mis[pipe_idx]; + sec_pipe->plane_res.hubp = pool->hubps[pipe_idx]; + sec_pipe->plane_res.ipp = pool->ipps[pipe_idx]; + sec_pipe->plane_res.xfm = pool->transforms[pipe_idx]; + sec_pipe->plane_res.dpp = pool->dpps[pipe_idx]; + sec_pipe->plane_res.mpcc_inst = pool->dpps[pipe_idx]->inst; + sec_pipe->stream_res.dsc =NULL ; +if (odm) { +if (pri_pipe->next_odm_pipe) { +ASSERT (pri_pipe->next_odm_pipe != sec_pipe); + sec_pipe->next_odm_pipe = pri_pipe->next_odm_pipe; + sec_pipe->next_odm_pipe->prev_odm_pipe = sec_pipe; + } + pri_pipe->next_odm_pipe = sec_pipe; + sec_pipe->prev_odm_pipe = pri_pipe; +ASSERT (sec_pipe->top_pipe ==NULL ); + + sec_pipe->stream_res.opp = pool->opps[pipe_idx]; +if (sec_pipe->stream->timing.flags.DSC ==1 ) { +dcn20_acquire_dsc (dc, res_ctx, &sec_pipe->stream_res.dsc, pipe_idx); +ASSERT (sec_pipe->stream_res.dsc); +if (sec_pipe->stream_res.dsc ==NULL ) +return false; + } + }else { +if (pri_pipe->bottom_pipe) { +ASSERT (pri_pipe->bottom_pipe != sec_pipe); + sec_pipe->bottom_pipe = pri_pipe->bottom_pipe; + sec_pipe->bottom_pipe->top_pipe = sec_pipe; + } + pri_pipe->bottom_pipe = sec_pipe; + sec_pipe->top_pipe = pri_pipe; -while (current_pipe) { -if (!resource_build_scaling_params (current_pipe)) -return false; - current_pipe = current_pipe->bottom_pipe; +ASSERT (pri_pipe->plane_state); }return true; } - static bool dcn30_fast_validate_bw( struct dc *dc, struct dc_state *context,
@@ -1945,7 +1983,7 @@ static bool dcn30_fast_validate_bw(continue ;/* We only support full screen mpo with ODM */ -if (vba->ODMCombineEnabled[pipe_idx] != dm_odm_combine_mode_disabled +if (vba->ODMCombineEnabled[vba->pipe_plane[pipe_idx]] != dm_odm_combine_mode_disabled && pipe->plane_state && mpo_pipe && memcmp(&mpo_pipe->plane_res.scl_data.recout, &pipe->plane_res.scl_data.recout,
@@ -1966,10 +2004,13 @@ static bool dcn30_fast_validate_bw(if (!merge[i])continue ; -/* if ODM merge we ignore mpc tree, mpo pipes will have their own flags -*/ +/* if ODM merge we ignore mpc tree, mpo pipes will have their own flags */ if (pipe->prev_odm_pipe) {/*split off odm pipe*/ + pipe->prev_odm_pipe->next_odm_pipe = pipe->next_odm_pipe; +if (pipe->next_odm_pipe) + pipe->next_odm_pipe->prev_odm_pipe = pipe->prev_odm_pipe; + pipe->bottom_pipe =NULL ; pipe->next_odm_pipe =NULL ; pipe->plane_state =NULL ;
@@ -1980,15 +2021,11 @@ static bool dcn30_fast_validate_bw(dcn20_release_dsc (&context->res_ctx, dc->res_pool, &pipe->stream_res.dsc);memset (&pipe->plane_res,0 ,sizeof (pipe->plane_res));memset (&pipe->stream_res,0 ,sizeof (pipe->stream_res)); - }else if (pipe->next_odm_pipe) { -/*initial odm pipe*/ - pipe->next_odm_pipe =NULL ; - }else { + }else if (pipe->top_pipe && pipe->top_pipe->plane_state == pipe->plane_state) {struct pipe_ctx *top_pipe = pipe->top_pipe;struct pipe_ctx *bottom_pipe = pipe->bottom_pipe; -if (top_pipe) - top_pipe->bottom_pipe = bottom_pipe; + top_pipe->bottom_pipe = bottom_pipe;if (bottom_pipe) bottom_pipe->top_pipe = top_pipe;
@@ -1998,141 +2035,77 @@ static bool dcn30_fast_validate_bw( pipe->stream =NULL ;memset (&pipe->plane_res,0 ,sizeof (pipe->plane_res));memset (&pipe->stream_res,0 ,sizeof (pipe->stream_res)); - } + }else +ASSERT (0 );/* Should never try to merge master pipe */ } -for (i =0 ; i < dc->res_pool->pipe_count; i++) { -struct pipe_ctx *pipe = &context->res_ctx.pipe_ctx[i]; - -if (pipe->plane_state) { -if (!resource_build_scaling_params (pipe)) - goto validate_fail; - } - } -for (i =0 , pipe_idx =-1 ; i < dc->res_pool->pipe_count; i++) {struct pipe_ctx *pipe = &context->res_ctx.pipe_ctx[i];struct pipe_ctx *hsplit_pipe =NULL ; +bool odm;if (!pipe->stream || newly_split[i])continue ; pipe_idx++; + odm = vba->ODMCombineEnabled[vba->pipe_plane[pipe_idx]] != dm_odm_combine_mode_disabled; -if (!pipe->top_pipe && !pipe->plane_state && split[i] !=0 - && vba->ODMCombineEnabled[pipe_idx] != dm_odm_combine_mode_disabled) { +if (!pipe->plane_state && !odm) +continue ; + +if (split[i]) { hsplit_pipe =find_idle_secondary_pipe (&context->res_ctx, dc->res_pool, pipe);ASSERT (hsplit_pipe);if (!hsplit_pipe) goto validate_fail; -if (!dcn20_split_stream_for_odm ( + +if (!dcn30_split_stream_for_mpc_or_odm ( dc, &context->res_ctx, - pipe, hsplit_pipe)) + pipe, hsplit_pipe, odm)) goto validate_fail; + newly_split[hsplit_pipe->pipe_idx] = true; -if (vba->ODMCombineEnabled[pipe_idx] == dm_odm_combine_mode_4to1) { -struct pipe_ctx *pipe_4to1 =find_idle_secondary_pipe (&context->res_ctx, dc->res_pool, pipe); - -ASSERT (pipe_4to1); -if (!dcn20_split_stream_for_odm ( - dc, &context->res_ctx, - pipe, pipe_4to1)) - goto validate_fail; - newly_split[pipe_4to1->pipe_idx] = true; - - pipe_4to1 =find_idle_secondary_pipe (&context->res_ctx, dc->res_pool, pipe); -ASSERT (pipe_4to1); -if (!dcn20_split_stream_for_odm ( - dc, &context->res_ctx, - hsplit_pipe, pipe_4to1)) - goto validate_fail; - newly_split[pipe_4to1->pipe_idx] = true; - } -dcn20_build_mapped_resource (dc, context, pipe->stream); repopulate_pipes = true; } +if (split[i] ==4 ) { +struct pipe_ctx *pipe_4to1 =find_idle_secondary_pipe (&context->res_ctx, dc->res_pool, pipe); -if (!pipe->plane_state) -continue ; - -if (split[i] ==2 ) { - hsplit_pipe =find_idle_secondary_pipe (&context->res_ctx, dc->res_pool, pipe); -ASSERT (hsplit_pipe); -if (!hsplit_pipe) +ASSERT (pipe_4to1); +if (!pipe_4to1) goto validate_fail; +if (!dcn30_split_stream_for_mpc_or_odm ( + dc, &context->res_ctx, + pipe, pipe_4to1, odm)) + goto validate_fail; + newly_split[pipe_4to1->pipe_idx] = true; -if (vba->ODMCombineEnabled[pipe_idx] != dm_odm_combine_mode_disabled) { -if (!dcn20_split_stream_for_odm ( - dc, &context->res_ctx, - pipe, hsplit_pipe)) - goto validate_fail; -if (vba->ODMCombineEnabled[pipe_idx] == dm_odm_combine_mode_4to1) { -struct pipe_ctx *pipe_4to1 =find_idle_secondary_pipe (&context->res_ctx, dc->res_pool, pipe); - -ASSERT (pipe_4to1); -if (!pipe_4to1) - goto validate_fail; -if (!dcn20_split_stream_for_odm ( - dc, &context->res_ctx, - pipe, pipe_4to1)) - goto validate_fail; - newly_split[pipe_4to1->pipe_idx] = true; - - pipe_4to1 =find_idle_secondary_pipe (&context->res_ctx, dc->res_pool, pipe); -ASSERT (pipe_4to1); -if (!pipe_4to1) - goto validate_fail; -if (!dcn20_split_stream_for_odm ( - dc, &context->res_ctx, - hsplit_pipe, pipe_4to1)) - goto validate_fail; - newly_split[pipe_4to1->pipe_idx] = true; - } -dcn20_build_mapped_resource (dc, context, pipe->stream); - }else { -/* Going from 2 pipe split to 4 pipe split case */ -if (dcn20_find_previous_split_count (pipe) ==2 ) { -dcn20_split_stream_for_mpc ( - &context->res_ctx, dc->res_pool, - pipe, hsplit_pipe); - newly_split[hsplit_pipe->pipe_idx] = true; - hsplit_pipe =find_idle_secondary_pipe (&context->res_ctx, dc->res_pool, pipe); -dcn20_split_stream_for_mpc ( - &context->res_ctx, dc->res_pool, - pipe, hsplit_pipe); -if (!dcn30_build_params_mpc_split (pipe)) - goto validate_fail; - }else { -dcn20_split_stream_for_mpc ( - &context->res_ctx, dc->res_pool, - pipe, hsplit_pipe); -if (!resource_build_scaling_params (pipe) || !resource_build_scaling_params (hsplit_pipe)) - goto validate_fail; - } - } - newly_split[hsplit_pipe->pipe_idx] = true; - repopulate_pipes = true; + pipe_4to1 =find_idle_secondary_pipe (&context->res_ctx, dc->res_pool, pipe); +ASSERT (pipe_4to1); +if (!pipe_4to1) + goto validate_fail; +if (!dcn30_split_stream_for_mpc_or_odm ( + dc, &context->res_ctx, + hsplit_pipe, pipe_4to1, odm)) + goto validate_fail; + newly_split[pipe_4to1->pipe_idx] = true; } -if (split[i] ==4 ) { -struct pipe_ctx *pipe_4to1; +if (odm) +dcn20_build_mapped_resource (dc, context, pipe->stream); + } - hsplit_pipe =find_idle_secondary_pipe (&context->res_ctx, dc->res_pool, pipe); -for (i =0 ; i <3 ; i++) { - pipe_4to1 =find_idle_secondary_pipe (&context->res_ctx, dc->res_pool, pipe); -ASSERT (pipe_4to1); -dcn20_split_stream_for_mpc (&context->res_ctx, dc->res_pool, pipe, pipe_4to1); - newly_split[pipe_4to1->pipe_idx] = true; - } -if (!dcn30_build_params_mpc_split (pipe)) +for (i =0 ; i < dc->res_pool->pipe_count; i++) { +struct pipe_ctx *pipe = &context->res_ctx.pipe_ctx[i]; + +if (pipe->plane_state) { +if (!resource_build_scaling_params (pipe)) goto validate_fail; - repopulate_pipes = true; } } +/* Actual dsc count per stream dsc validation*/ if (!dcn20_validate_dsc (dc, context)) { - context->bw_ctx.dml.vba.ValidationStatus[context->bw_ctx.dml.vba.soc.num_states] = -DML_FAIL_DSC_VALIDATION_FAILURE ; + vba->ValidationStatus[vba->soc.num_states] =DML_FAIL_DSC_VALIDATION_FAILURE ; goto validate_fail; }
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 206/207 drm/amd/display: Add DCN3 blocks to Makefile
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
--- drivers/gpu/drm/amd/display/dc/Makefile | 4 ++ drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 54 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dcn30/Makefile
drivers/gpu/drm/amd/display/dc/Makefile +4 -0
@@ -32,6 +32,10 @@ DC_LIBS += dcn10 dml DC_LIBS += dcn21 endif +ifdef CONFIG_DRM_AMD_DC_DCN3_0 +DC_LIBS += dcn30 +endif + DC_LIBS += dce120 DC_LIBS += dce112
drivers/gpu/drm/amd/display/dc/dcn30/Makefile new file +54 -0
54 lines not on this page · raw message
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 207/207 drm/amd/display: Add DCN3 to Kconfig
In reply to Alex DeucherFrom: Bhawanpreet Lakha <[email protected]>
--- drivers/gpu/drm/amd/display/Kconfig | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/amd/display/Kconfig +8 -0
@@ -17,6 +17,14 @@ config DRM_AMD_DC_DCN help Raven, Navi and Renoir family support for display engine +config DRM_AMD_DC_DCN3_0 + bool "DCN 3.0 family" + depends on DRM_AMD_DC && X86 + depends on DRM_AMD_DC_DCN + help + Choose this option if you want to have + sienna_cichlid support for display engine + config DRM_AMD_DC_HDCP bool "Enable HDCP support in DC" depends on DRM_AMD_DC
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx