DAL Patches Nov 21, 2016
Subsystems (2)
cover DAL Patches Nov 21, 2016
DAL patches for the last 4 weeks.
- a bunch of cleanup to get rid of components like asic_capability and adapter service
- some cleanup to use same HW programming sequences on different DCEs with DCE specific register definitions
- some other minor bug fixes
I will start sending these on a regular basis, hopefully daily but at least twice a week.
Amy Zhang (1):
drm/amd/dal: PSR second monitor blackout fix
Andrey Grodzovsky (3):
drm/amd/dal: Refactor i2c_hw_engine drm/amd/dal: Modify regsiter access to use macro. drm/amd/dal: Fix MST crash by skipping branch connector.
Ding Wang (1):
drm/amd/dal: Remove unused function from dc
Dmytro Laktyushkin (7):
drm/amd/dal: bring all of dc under a single log category table drm/amd/dal: fix dc creation
drm/amd/dal: add chroma support to program_size_and_rotation drm/amd/dal: add meta address to video address struct drm/amd/dal: add stoney bounding box to bw_calcs drm/amd/dal: fix initial bw_calc parameters
drm/amd/dal: disable break_to_debugger for bandwidth failures in diags
Harry Wentland (10):
drm/amd/dal: Remove wireless_data_source drm/amd/dal: Move gpio_service out of adapter_service drm/amd/dal: Fix warning about comparing different types drm/amd/dal: Use future proof reg access for HPD and DDC drm/amd/dal: Remove adapter service dependency in power_down drm/amd/dal: Make set_overscan_blank_color optional drm/amd/dal: Fix null pointer missed in earlier refactor drm/amd/dal: Don't read I2C_DATA register when in write mode drm/amd/dal: Make bunch of scaler structs static drm/amd/dal: Expose Polaris validate functions
Hersen Wu (2):
drm/amd/dal: modify DCE HW sequence to be re-usable for next gen HW drm/amd/dal: Expose some HWS functions so we can re-use them
Jordan Lazare (1):
drm/amd/dal: Remove unnecessary increment in scaler ratio calculation
Tony Cheng (27):
drm/amd/dal: clean up asic cap
drm/amd/dal: DCC support
drm/amd/dal: refactor bios scratch register access drm/amd/dal: remove unnessary AS dependency drm/amd/dal: remove AS dependency from i2c_aux drm/amd/dal: remove dal_adapter_service_get_integrated_info drm/amd/dal: instantiate i2caux outside of AS drm/amd/dal: fix DDC pad mode detection logic drm/amd/dal: remove supported_stream_engines drm/amd/dal: remove unnessary adapter service functions drm/amd/dal: remove dal_override_parameters drm/amd/dal: remove unnessary adapter service functions drm/amd/dal: remove unnessary adapter service functions drm/amd/dal: fix typo disalbe_dfs_bypass drm/amd/dal: remove dal_adapter_service_should_optimize drm/amd/dal: remove dal_adapter_service_get_feature_value drm/amd/dal: remove adapter_service from drm/amd/dal: remove adapter_service dependency drm/amd/dal: remove SKIP_PSR_WAIT_FOR_PLL_LOCK_BIT drm/amd/dal: remove adapter_service and asic_capability drm/amd/dal: consolidate DCE hw_sequencer drm/amd/dal: consolidate DCE hw_sequencer drm/amd/dal: debug options
drm/amd/dal: remove dc_clock_gating in gpu drm/amd/dal: dce_crtc_switch_to_clk_src drm/amd/dal: include dm_services.h in reg_helper.h drm/amd/dal: consolidate mem_input
Vitaly Prosyak (3):
drm/amd/dal: rotation and mirror support
drm/amd/dal: Rotation and mirror support
drm/amd/dal: Rotation and mirror support
Wenjing Liu (7):
drm/amd/dal: Lower max link cap by reportedLinkCap drm/amd/dal: Allow timing with req_bw equal to max_bw drm/amd/dal: Perform link training in dp_retrain_link drm/amd/dal: Poll AUX_SW_DONE to 0 before AUX_SW_GO drm/amd/dal: Fallback LT without retry in verify_link_cap drm/amd/dal: Disable bit depth reduction in set link test pattern drm/amd/dal: Handle AUX error during RECIEVE state of transaction
Wesley Chalmers (1):
drm/amd/dal: Hard-coded LB_MEMORY_SIZE
Yongqiang Sun (5):
drm/amd/dal: Remove adapter service dependency from dc_link drm/amd/dal: Fixed wrong return value check condition. drm/amd/dal: Add surface log to dc
drm/amd/dal: Fixe linux compile error. drm/amd/dal: Add reg check before access.
Zeyu Fan (8):
drm/amd/dal: Remove unused code in dce112 hwss. drm/amd/dal: Consolidate link encoder from each dce version. drm/amd/dal: Remove adapter service from display clock drm/amd/dal: Pass in shift and mask for stream encoder. drm/amd/dal: Update stream_encoder programming sequence drm/amd/dal: Add YCBCR420 to stream encoder drm/amd/dal: Implement DCHUB interface drm/amd/dal: Fix typo in mem_input
drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c | 22 -
.../gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_helpers.c | 60 -
.../drm/amd/dal/amdgpu_dm/amdgpu_dm_mst_types.c | 6 +-
drivers/gpu/drm/amd/dal/dc/Makefile | 4 +-
drivers/gpu/drm/amd/dal/dc/adapter/Makefile | 10 -
.../gpu/drm/amd/dal/dc/adapter/adapter_service.c | 1281 --------------------
.../gpu/drm/amd/dal/dc/adapter/adapter_service.h | 60 -
.../drm/amd/dal/dc/adapter/wireless_data_source.c | 208 ----
.../drm/amd/dal/dc/adapter/wireless_data_source.h | 79 --
.../gpu/drm/amd/dal/dc/asic_capability/Makefile | 50 -
.../amd/dal/dc/asic_capability/asic_capability.c | 192 ---
.../dc/asic_capability/carrizo_asic_capability.c | 147 ---
.../dc/asic_capability/carrizo_asic_capability.h | 36 -
.../dc/asic_capability/hawaii_asic_capability.c | 149 ---
.../dc/asic_capability/hawaii_asic_capability.h | 37 -
.../dc/asic_capability/polaris10_asic_capability.c | 146 ---
.../dc/asic_capability/polaris10_asic_capability.h | 36 -
.../dal/dc/asic_capability/tonga_asic_capability.c | 144 ---
.../dal/dc/asic_capability/tonga_asic_capability.h | 18 -
drivers/gpu/drm/amd/dal/dc/basics/Makefile | 3 +-
drivers/gpu/drm/amd/dal/dc/basics/log_helpers.c | 100 ++
drivers/gpu/drm/amd/dal/dc/basics/logger.c | 676 ++---------
drivers/gpu/drm/amd/dal/dc/basics/logger.h | 4 +-
drivers/gpu/drm/amd/dal/dc/bios/Makefile | 6 -
drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c | 72 +-
.../gpu/drm/amd/dal/dc/bios/bios_parser_helper.c | 65 +-
.../gpu/drm/amd/dal/dc/bios/bios_parser_helper.h | 26 +-
.../gpu/drm/amd/dal/dc/bios/dce110/bios_dce110.h | 6 -
.../dal/dc/bios/dce110/bios_parser_helper_dce110.c | 118 --
.../dal/dc/bios/dce110/bios_parser_helper_dce110.h | 34 -
.../dal/dc/bios/dce112/bios_parser_helper_dce112.c | 81 --
.../dal/dc/bios/dce112/bios_parser_helper_dce112.h | 34 -
.../dal/dc/bios/dce80/bios_parser_helper_dce80.c | 67 -
drivers/gpu/drm/amd/dal/dc/calcs/bandwidth_calcs.c | 114 +-
drivers/gpu/drm/amd/dal/dc/core/dc.c | 225 ++--
drivers/gpu/drm/amd/dal/dc/core/dc_debug.c | 270 +++++
drivers/gpu/drm/amd/dal/dc/core/dc_link.c | 103 +-
drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c | 39 +-
drivers/gpu/drm/amd/dal/dc/core/dc_link_dp.c | 168 +--
drivers/gpu/drm/amd/dal/dc/core/dc_link_hwss.c | 10 +-
drivers/gpu/drm/amd/dal/dc/core/dc_resource.c | 60 +-
drivers/gpu/drm/amd/dal/dc/core/dc_target.c | 30 +-
drivers/gpu/drm/amd/dal/dc/dc.h | 77 +-
drivers/gpu/drm/amd/dal/dc/dc_bios_types.h | 16 +-
drivers/gpu/drm/amd/dal/dc/dc_ddc_types.h | 1 -
drivers/gpu/drm/amd/dal/dc/dc_helper.c | 28 +
drivers/gpu/drm/amd/dal/dc/dc_hw_types.h | 48 +-
drivers/gpu/drm/amd/dal/dc/dc_types.h | 101 +-
drivers/gpu/drm/amd/dal/dc/dce/Makefile | 3 +-
.../gpu/drm/amd/dal/dc/dce/dce110_stream_encoder.h | 182 ---
drivers/gpu/drm/amd/dal/dc/dce/dce_audio.c | 11 +-
drivers/gpu/drm/amd/dal/dc/dce/dce_hwseq.c | 195 +++
drivers/gpu/drm/amd/dal/dc/dce/dce_hwseq.h | 250 ++++
.../dce_link_encoder.c} | 109 +-
.../dce_link_encoder.h} | 0
drivers/gpu/drm/amd/dal/dc/dce/dce_mem_input.c | 193 +++
drivers/gpu/drm/amd/dal/dc/dce/dce_mem_input.h | 134 ++
...ce110_stream_encoder.c => dce_stream_encoder.c} | 290 ++---
.../gpu/drm/amd/dal/dc/dce/dce_stream_encoder.h | 560 +++++++++
drivers/gpu/drm/amd/dal/dc/dce100/Makefile | 2 +-
.../drm/amd/dal/dc/dce100/dce100_hw_sequencer.c | 159 ---
.../drm/amd/dal/dc/dce100/dce100_link_encoder.c | 92 --
.../drm/amd/dal/dc/dce100/dce100_link_encoder.h | 42 -
.../gpu/drm/amd/dal/dc/dce100/dce100_resource.c | 133 +-
.../gpu/drm/amd/dal/dc/dce100/dce100_resource.h | 2 -
drivers/gpu/drm/amd/dal/dc/dce110/Makefile | 2 +-
.../drm/amd/dal/dc/dce110/dce110_clock_source.c | 49 +-
.../gpu/drm/amd/dal/dc/dce110/dce110_compressor.c | 76 +-
.../gpu/drm/amd/dal/dc/dce110/dce110_compressor.h | 5 +-
.../drm/amd/dal/dc/dce110/dce110_hw_sequencer.c | 431 +++----
.../drm/amd/dal/dc/dce110/dce110_hw_sequencer.h | 26 +-
.../gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c | 312 +----
.../gpu/drm/amd/dal/dc/dce110/dce110_mem_input.h | 27 +-
.../gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.c | 12 +-
.../gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.h | 3 +-
.../gpu/drm/amd/dal/dc/dce110/dce110_opp_regamma.c | 4 +-
.../gpu/drm/amd/dal/dc/dce110/dce110_resource.c | 194 ++-
.../gpu/drm/amd/dal/dc/dce110/dce110_resource.h | 2 -
.../amd/dal/dc/dce110/dce110_timing_generator.c | 7 +-
.../amd/dal/dc/dce110/dce110_timing_generator.h | 1 -
.../amd/dal/dc/dce110/dce110_timing_generator_v.c | 22 +-
.../amd/dal/dc/dce110/dce110_timing_generator_v.h | 1 -
.../gpu/drm/amd/dal/dc/dce110/dce110_transform.c | 2 +
.../amd/dal/dc/dce110/dce110_transform_bit_depth.c | 26 +-
.../drm/amd/dal/dc/dce110/dce110_transform_scl.c | 22 +-
.../gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c | 2 +-
drivers/gpu/drm/amd/dal/dc/dce112/Makefile | 2 +-
.../drm/amd/dal/dc/dce112/dce112_clock_source.c | 4 +-
.../gpu/drm/amd/dal/dc/dce112/dce112_compressor.c | 75 +-
.../gpu/drm/amd/dal/dc/dce112/dce112_compressor.h | 5 +-
.../drm/amd/dal/dc/dce112/dce112_hw_sequencer.c | 214 ----
.../drm/amd/dal/dc/dce112/dce112_link_encoder.c | 191 ---
.../drm/amd/dal/dc/dce112/dce112_link_encoder.h | 41 -
.../gpu/drm/amd/dal/dc/dce112/dce112_mem_input.c | 3 +-
.../gpu/drm/amd/dal/dc/dce112/dce112_mem_input.h | 1 -
.../drm/amd/dal/dc/dce112/dce112_opp_formatter.c | 3 +-
.../gpu/drm/amd/dal/dc/dce112/dce112_resource.c | 179 ++-
.../gpu/drm/amd/dal/dc/dce112/dce112_resource.h | 18 +-
drivers/gpu/drm/amd/dal/dc/dce80/Makefile | 2 +-
.../gpu/drm/amd/dal/dc/dce80/dce80_compressor.c | 77 +-
.../gpu/drm/amd/dal/dc/dce80/dce80_compressor.h | 5 +-
.../gpu/drm/amd/dal/dc/dce80/dce80_hw_sequencer.c | 117 +-
.../gpu/drm/amd/dal/dc/dce80/dce80_link_encoder.c | 339 ------
.../gpu/drm/amd/dal/dc/dce80/dce80_link_encoder.h | 39 -
drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.c | 25 +-
drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.h | 1 -
.../gpu/drm/amd/dal/dc/dce80/dce80_opp_regamma.c | 4 +-
drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c | 133 +-
drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.h | 2 -
.../drm/amd/dal/dc/dce80/dce80_timing_generator.c | 5 -
.../drm/amd/dal/dc/dce80/dce80_timing_generator.h | 1 -
drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.c | 2 +
.../amd/dal/dc/dce80/dce80_transform_bit_depth.c | 10 +-
.../gpu/drm/amd/dal/dc/dce80/dce80_transform_scl.c | 8 +-
drivers/gpu/drm/amd/dal/dc/dm_helpers.h | 38 -
drivers/gpu/drm/amd/dal/dc/dm_services.h | 93 +-
drivers/gpu/drm/amd/dal/dc/dm_services_types.h | 32 +-
.../drm/amd/dal/dc/gpio/dce110/hw_factory_dce110.c | 14 +-
.../drm/amd/dal/dc/gpio/dce80/hw_factory_dce80.c | 3 +
drivers/gpu/drm/amd/dal/dc/gpio/ddc_regs.h | 8 +-
drivers/gpu/drm/amd/dal/dc/gpio/hpd_regs.h | 6 +-
drivers/gpu/drm/amd/dal/dc/gpio/hw_ddc.c | 78 +-
drivers/gpu/drm/amd/dal/dc/gpu/Makefile | 6 +-
.../amd/dal/dc/gpu/dce110/dc_clock_gating_dce110.c | 105 --
.../amd/dal/dc/gpu/dce110/dc_clock_gating_dce110.h | 33 -
.../amd/dal/dc/gpu/dce110/display_clock_dce110.c | 82 +-
.../amd/dal/dc/gpu/dce112/dc_clock_gating_dce112.c | 89 --
.../amd/dal/dc/gpu/dce112/dc_clock_gating_dce112.h | 33 -
.../amd/dal/dc/gpu/dce112/display_clock_dce112.c | 66 +-
.../amd/dal/dc/gpu/dce112/display_clock_dce112.h | 3 +-
.../amd/dal/dc/gpu/dce80/dc_clock_gating_dce80.c | 52 -
.../amd/dal/dc/gpu/dce80/dc_clock_gating_dce80.h | 31 -
.../drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c | 65 +-
.../drm/amd/dal/dc/gpu/dce80/display_clock_dce80.h | 3 +-
drivers/gpu/drm/amd/dal/dc/gpu/display_clock.c | 6 +-
drivers/gpu/drm/amd/dal/dc/gpu/display_clock.h | 4 +-
.../drm/amd/dal/dc/i2caux/dce100/i2caux_dce100.c | 22 +-
.../drm/amd/dal/dc/i2caux/dce100/i2caux_dce100.h | 1 -
.../amd/dal/dc/i2caux/dce110/aux_engine_dce110.c | 9 +-
.../dal/dc/i2caux/dce110/i2c_hw_engine_dce110.c | 612 ++--------
.../drm/amd/dal/dc/i2caux/dce110/i2caux_dce110.c | 22 +-
.../drm/amd/dal/dc/i2caux/dce110/i2caux_dce110.h | 6 +-
.../drm/amd/dal/dc/i2caux/dce112/i2caux_dce112.c | 55 +-
.../drm/amd/dal/dc/i2caux/dce112/i2caux_dce112.h | 1 -
.../gpu/drm/amd/dal/dc/i2caux/dce80/i2caux_dce80.c | 8 +-
.../gpu/drm/amd/dal/dc/i2caux/dce80/i2caux_dce80.h | 1 -
.../amd/dal/dc/i2caux/diagnostics/i2caux_diag.c | 6 +-
.../amd/dal/dc/i2caux/diagnostics/i2caux_diag.h | 1 -
drivers/gpu/drm/amd/dal/dc/i2caux/i2caux.c | 32 +-
drivers/gpu/drm/amd/dal/dc/i2caux/i2caux.h | 3 +-
drivers/gpu/drm/amd/dal/dc/inc/bandwidth_calcs.h | 1 +
drivers/gpu/drm/amd/dal/dc/inc/compressor.h | 1 +
drivers/gpu/drm/amd/dal/dc/inc/core_dc.h | 1 +
drivers/gpu/drm/amd/dal/dc/inc/core_types.h | 7 +-
drivers/gpu/drm/amd/dal/dc/inc/dc_link_ddc.h | 2 -
drivers/gpu/drm/amd/dal/dc/inc/hw/link_encoder.h | 4 +-
drivers/gpu/drm/amd/dal/dc/inc/hw/mem_input.h | 19 +-
drivers/gpu/drm/amd/dal/dc/inc/hw/stream_encoder.h | 3 +-
drivers/gpu/drm/amd/dal/dc/inc/hw/transform.h | 1 +
drivers/gpu/drm/amd/dal/dc/inc/hw_sequencer.h | 31 +-
drivers/gpu/drm/amd/dal/dc/inc/reg_helper.h | 121 +-
drivers/gpu/drm/amd/dal/dc/inc/resource.h | 13 +-
.../drm/amd/dal/dc/irq/dce110/irq_service_dce110.c | 12 +-
drivers/gpu/drm/amd/dal/dc/irq/irq_service.c | 12 +-
.../bios_parser_helper_dce80.h => os_types.h} | 38 +-
.../drm/amd/dal/dc/virtual/virtual_link_encoder.c | 2 -
.../amd/dal/dc/virtual/virtual_stream_encoder.c | 3 +-
.../amd/dal/include/adapter_service_interface.h | 149 +--
.../amd/dal/include/asic_capability_interface.h | 1 -
.../drm/amd/dal/include/asic_capability_types.h | 17 +-
.../drm/amd/dal/include/bios_parser_interface.h | 1 -
.../drm/amd/dal/include/display_clock_interface.h | 9 +-
drivers/gpu/drm/amd/dal/include/fixed31_32.h | 2 +
drivers/gpu/drm/amd/dal/include/fixed32_32.h | 3 +
.../drm/amd/dal/include/grph_object_ctrl_defs.h | 30 -
drivers/gpu/drm/amd/dal/include/grph_object_id.h | 16 -
drivers/gpu/drm/amd/dal/include/i2caux_interface.h | 2 -
.../gpu/drm/amd/dal/include/link_service_types.h | 1 -
drivers/gpu/drm/amd/dal/include/logger_interface.h | 130 +-
drivers/gpu/drm/amd/dal/include/logger_types.h | 352 +-----
180 files changed, 4101 insertions(+), 8868 deletions(-)
delete mode 100644 drivers/gpu/drm/amd/dal/dc/adapter/Makefile
delete mode 100644 drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c
delete mode 100644 drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.h
delete mode 100644 drivers/gpu/drm/amd/dal/dc/adapter/wireless_data_source.c
delete mode 100644 drivers/gpu/drm/amd/dal/dc/adapter/wireless_data_source.h
delete mode 100644 drivers/gpu/drm/amd/dal/dc/asic_capability/Makefile
delete mode 100644 drivers/gpu/drm/amd/dal/dc/asic_capability/asic_capability.c
delete mode 100644 drivers/gpu/drm/amd/dal/dc/asic_capability/carrizo_asic_capability.c
delete mode 100644 drivers/gpu/drm/amd/dal/dc/asic_capability/carrizo_asic_capability.h
delete mode 100644 drivers/gpu/drm/amd/dal/dc/asic_capability/hawaii_asic_capability.c
delete mode 100644 drivers/gpu/drm/amd/dal/dc/asic_capability/hawaii_asic_capability.h
delete mode 100644 drivers/gpu/drm/amd/dal/dc/asic_capability/polaris10_asic_capability.c
delete mode 100644 drivers/gpu/drm/amd/dal/dc/asic_capability/polaris10_asic_capability.h
delete mode 100644 drivers/gpu/drm/amd/dal/dc/asic_capability/tonga_asic_capability.c
delete mode 100644 drivers/gpu/drm/amd/dal/dc/asic_capability/tonga_asic_capability.h
create mode 100644 drivers/gpu/drm/amd/dal/dc/basics/log_helpers.c
delete mode 100644 drivers/gpu/drm/amd/dal/dc/bios/dce110/bios_dce110.h
delete mode 100644 drivers/gpu/drm/amd/dal/dc/bios/dce110/bios_parser_helper_dce110.c
delete mode 100644 drivers/gpu/drm/amd/dal/dc/bios/dce110/bios_parser_helper_dce110.h
delete mode 100644 drivers/gpu/drm/amd/dal/dc/bios/dce112/bios_parser_helper_dce112.c
delete mode 100644 drivers/gpu/drm/amd/dal/dc/bios/dce112/bios_parser_helper_dce112.h
delete mode 100644 drivers/gpu/drm/amd/dal/dc/bios/dce80/bios_parser_helper_dce80.c
create mode 100644 drivers/gpu/drm/amd/dal/dc/core/dc_debug.c
delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce/dce110_stream_encoder.h
create mode 100644 drivers/gpu/drm/amd/dal/dc/dce/dce_hwseq.c
create mode 100644 drivers/gpu/drm/amd/dal/dc/dce/dce_hwseq.h
rename drivers/gpu/drm/amd/dal/dc/{dce110/dce110_link_encoder.c => dce/dce_link_encoder.c} (96%)
rename drivers/gpu/drm/amd/dal/dc/{dce110/dce110_link_encoder.h => dce/dce_link_encoder.h} (100%)
create mode 100644 drivers/gpu/drm/amd/dal/dc/dce/dce_mem_input.c
create mode 100644 drivers/gpu/drm/amd/dal/dc/dce/dce_mem_input.h
rename drivers/gpu/drm/amd/dal/dc/dce/{dce110_stream_encoder.c => dce_stream_encoder.c} (87%)
create mode 100644 drivers/gpu/drm/amd/dal/dc/dce/dce_stream_encoder.h
delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce100/dce100_link_encoder.c
delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce100/dce100_link_encoder.h
delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce112/dce112_link_encoder.c
delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce112/dce112_link_encoder.h
delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce80/dce80_link_encoder.c
delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce80/dce80_link_encoder.h
delete mode 100644 drivers/gpu/drm/amd/dal/dc/gpu/dce110/dc_clock_gating_dce110.c
delete mode 100644 drivers/gpu/drm/amd/dal/dc/gpu/dce110/dc_clock_gating_dce110.h
delete mode 100644 drivers/gpu/drm/amd/dal/dc/gpu/dce112/dc_clock_gating_dce112.c
delete mode 100644 drivers/gpu/drm/amd/dal/dc/gpu/dce112/dc_clock_gating_dce112.h
delete mode 100644 drivers/gpu/drm/amd/dal/dc/gpu/dce80/dc_clock_gating_dce80.c
delete mode 100644 drivers/gpu/drm/amd/dal/dc/gpu/dce80/dc_clock_gating_dce80.h
rename drivers/gpu/drm/amd/dal/dc/{bios/dce80/bios_parser_helper_dce80.h => os_types.h} (59%)Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20161121230136.5208-1-harry.wentland-5C7GfCeVMHo@public.gmane.org
PATCH 1/76 drm/amd/dal: bring all of dc under a single log category table
From: Dmytro Laktyushkin <[email protected]>
--- .../gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_helpers.c | 60 -- .../gpu/drm/amd/dal/dc/adapter/adapter_service.c | 12 +- .../amd/dal/dc/asic_capability/asic_capability.c | 4 +- .../dc/asic_capability/hawaii_asic_capability.c | 4 +- drivers/gpu/drm/amd/dal/dc/basics/Makefile | 3 +- drivers/gpu/drm/amd/dal/dc/basics/log_helpers.c | 100 +++ drivers/gpu/drm/amd/dal/dc/basics/logger.c | 674 +++------------------ drivers/gpu/drm/amd/dal/dc/basics/logger.h | 4 +- drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c | 4 +- drivers/gpu/drm/amd/dal/dc/core/dc.c | 27 +- drivers/gpu/drm/amd/dal/dc/core/dc_link.c | 59 +- drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c | 6 +- drivers/gpu/drm/amd/dal/dc/core/dc_link_dp.c | 68 +-- drivers/gpu/drm/amd/dal/dc/core/dc_resource.c | 4 +- drivers/gpu/drm/amd/dal/dc/core/dc_target.c | 30 +- drivers/gpu/drm/amd/dal/dc/dc.h | 5 +- .../gpu/drm/amd/dal/dc/dce/dce110_stream_encoder.c | 6 +- drivers/gpu/drm/amd/dal/dc/dce/dce_audio.c | 6 +- .../drm/amd/dal/dc/dce110/dce110_clock_source.c | 48 +- .../gpu/drm/amd/dal/dc/dce110/dce110_compressor.c | 48 +- .../drm/amd/dal/dc/dce110/dce110_hw_sequencer.c | 14 +- .../drm/amd/dal/dc/dce110/dce110_link_encoder.c | 52 +- .../gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c | 4 +- .../gpu/drm/amd/dal/dc/dce110/dce110_opp_regamma.c | 4 +- .../gpu/drm/amd/dal/dc/dce110/dce110_resource.c | 25 +- .../amd/dal/dc/dce110/dce110_timing_generator.c | 3 +- .../amd/dal/dc/dce110/dce110_timing_generator_v.c | 18 +- .../amd/dal/dc/dce110/dce110_transform_bit_depth.c | 20 +- .../drm/amd/dal/dc/dce112/dce112_clock_source.c | 4 +- .../gpu/drm/amd/dal/dc/dce112/dce112_compressor.c | 48 +- .../drm/amd/dal/dc/dce112/dce112_opp_formatter.c | 3 +- .../gpu/drm/amd/dal/dc/dce112/dce112_resource.c | 25 +- .../gpu/drm/amd/dal/dc/dce80/dce80_compressor.c | 48 +- .../gpu/drm/amd/dal/dc/dce80/dce80_link_encoder.c | 12 +- drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.c | 4 +- .../gpu/drm/amd/dal/dc/dce80/dce80_opp_regamma.c | 4 +- .../amd/dal/dc/dce80/dce80_transform_bit_depth.c | 8 +- .../gpu/drm/amd/dal/dc/dce80/dce80_transform_scl.c | 8 +- drivers/gpu/drm/amd/dal/dc/dm_helpers.h | 38 -- drivers/gpu/drm/amd/dal/dc/dm_services_types.h | 32 +- .../amd/dal/dc/gpu/dce110/dc_clock_gating_dce110.c | 2 +- .../amd/dal/dc/gpu/dce110/display_clock_dce110.c | 28 +- .../amd/dal/dc/gpu/dce112/dc_clock_gating_dce112.c | 2 +- .../amd/dal/dc/gpu/dce112/display_clock_dce112.c | 28 +- .../drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c | 12 +- .../dal/dc/i2caux/dce110/i2c_hw_engine_dce110.c | 6 +- .../drm/amd/dal/dc/irq/dce110/irq_service_dce110.c | 12 +- drivers/gpu/drm/amd/dal/dc/irq/irq_service.c | 12 +- drivers/gpu/drm/amd/dal/dc/os_types.h | 61 ++ drivers/gpu/drm/amd/dal/include/fixed31_32.h | 2 + drivers/gpu/drm/amd/dal/include/fixed32_32.h | 3 + drivers/gpu/drm/amd/dal/include/logger_interface.h | 116 ++-- drivers/gpu/drm/amd/dal/include/logger_types.h | 351 ++--------- 53 files changed, 558 insertions(+), 1623 deletions(-) create mode 100644 drivers/gpu/drm/amd/dal/dc/basics/log_helpers.c create mode 100644 drivers/gpu/drm/amd/dal/dc/os_types.h
drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_helpers.c +0 -60
@@ -42,12 +42,6 @@#include "dm_helpers.h" -/* Maximum line char number for connectivity log, -* in case of output EDID, needs at least 256x3 bytes plus some other -* message, so set line size to 896. -*/ -#define CONN_MAX_LINE_SIZE 896 -/* dm_helpers_parse_edid_caps * * Parse edid caps
@@ -487,57 +481,3 @@ bool dm_helpers_submit_i2c(return result; } - -void dm_helper_conn_log (struct dc_context *ctx, -const struct dc_link *link, -uint8_t *hex_data, -int hex_data_count, -enum conn_event event, -const char *msg, - ...) -{ -struct amdgpu_device *adev = ctx->driver_context; -struct drm_device *dev = adev->ddev; -struct amdgpu_connector *aconnector =get_connector_for_link (dev, link); -char buffer[CONN_MAX_LINE_SIZE ] = {0 }; -va_list args; -int size; -enum log_minor minor = event; - -if (!aconnector) { -DRM_ERROR ("Failed to found connector for link!" ); -return ; - } - -va_start (args, msg); - -sprintf (buffer,"[%s] " , aconnector->base.name); - - size =strlen (buffer); - - size +=dm_log_to_buffer ( - &buffer[size],CONN_MAX_LINE_SIZE , msg, args); - -if (buffer[strlen (buffer) -1 ] =='\n' ) { - buffer[strlen (buffer) -1 ] ='\0' ; - size--; - } - -if (hex_data_count > (CONN_MAX_LINE_SIZE - size)) -return ; - -if (hex_data) { -int i; - -for (i =0 ; i < hex_data_count; i++) -sprintf (&buffer[size + i *3 ],"%2.2X " , hex_data[i]); - } - -strcat (buffer,"^\n" ); - -dal_logger_write (ctx->logger, -LOG_MAJOR_CONNECTIVITY , - minor, - buffer); -va_end (args); -}
drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c +3 -9
@@ -221,9 +221,7 @@ static void initialize_backlight_caps(struct dc_bios *dcb = as->ctx->dc_bios;if (!(PM_GET_EXTENDED_BRIGHNESS_CAPS & as->platform_methods_mask)) { -dal_logger_write (as->ctx->logger, -LOG_MAJOR_BACKLIGHT , -LOG_MINOR_BACKLIGHT_BRIGHTESS_CAPS , +dm_logger_write (as->ctx->logger,LOG_BACKLIGHT ,"This method is not supported\n" );return ; }
@@ -362,16 +360,12 @@ static void log_overriden_features( uint32_t value) {if (bool_feature) -dal_logger_write (as->ctx->logger, -LOG_MAJOR_FEATURE_OVERRIDE , -LOG_MINOR_FEATURE_OVERRIDE , +dm_logger_write (as->ctx->logger,LOG_FEATURE_OVERRIDE ,"Overridden %s is %s now\n" , feature_name, (value ==0 ) ?"disabled" :"enabled" );else -dal_logger_write (as->ctx->logger, -LOG_MAJOR_FEATURE_OVERRIDE , -LOG_MINOR_FEATURE_OVERRIDE , +dm_logger_write (as->ctx->logger,LOG_FEATURE_OVERRIDE ,"Overridden %s new value: %d\n" , feature_name, value);
drivers/gpu/drm/amd/dal/dc/asic_capability/asic_capability.c +1 -3
@@ -118,9 +118,7 @@ static bool construct( }if (false == asic_supported) { -dal_logger_write (ctx->logger, -LOG_MAJOR_ERROR , -LOG_MINOR_MASK_ALL , +dm_logger_write (ctx->logger,LOG_ERROR ,"%s: ASIC not supported!\n" , __func__); }
drivers/gpu/drm/amd/dal/dc/asic_capability/hawaii_asic_capability.c +1 -3
@@ -94,9 +94,7 @@ void dal_hawaii_asic_capability_create(struct asic_capability *cap, cap->data[ASIC_DATA_MEMORYTYPE_MULTIPLIER ] =4 ;break ;default : -dal_logger_write (cap->ctx->logger, -LOG_MAJOR_ERROR , -LOG_MINOR_MASK_ALL , +dm_logger_write (cap->ctx->logger,LOG_ERROR ,"%s:Unrecognized memory type!" , __func__); cap->data[ASIC_DATA_MEMORYTYPE_MULTIPLIER ] =2 ;break ;
drivers/gpu/drm/amd/dal/dc/basics/Makefile +2 -1
@@ -3,7 +3,8 @@ # It provides the general basic services required by other DAL # subcomponents. -BASICS = conversion.o fixpt31_32.o fixpt32_32.o grph_object_id.o logger.o register_logger.o signal_types.o vector.o +BASICS = conversion.o fixpt31_32.o fixpt32_32.o grph_object_id.o \ + logger.o log_helpers.o register_logger.o signal_types.o vector.o AMD_DAL_BASICS = $(addprefix $(AMDDALPATH)/dc/basics/,$(BASICS))
drivers/gpu/drm/amd/dal/dc/basics/log_helpers.c new file +100 -0
100 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/basics/logger.c +89 -585
816 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/basics/logger.h +2 -2
@@ -33,7 +33,7 @@/*Connectivity log needs to output EDID, which needs at lease 256x3 bytes, * change log line size to 896 to meet the request. */ -#define DAL_LOGGER_BUFFER_MAX_LOG_LINE_SIZE 896 +#define LOG_MAX_LINE_SIZE 896#include "include/logger_types.h"
@@ -58,7 +58,7 @@ struct dal_logger {char *log_buffer;/* Pointer to malloc'ed buffer */ uint32_t log_buffer_size;/* Size of circular buffer */ -uint32_t *log_enable_mask_minors;/*array of masks for major elements*/ +uint32_t mask;/*array of masks for major elements*/ union logger_flags flags;struct dc_context *ctx;
drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c +1 -3
@@ -3374,9 +3374,7 @@ static enum bp_result patch_bios_image_from_ext_display_connection_info( opm_object, &ext_display_connection_info_tbl) != BP_RESULT_OK) { -dal_logger_write (bp->base.ctx->logger, -LOG_MAJOR_BIOS , -LOG_MINOR_BIOS_CMD_TABLE , +dm_logger_write (bp->base.ctx->logger,LOG_BIOS ,"%s: Failed to read Connection Info Table" , __func__);return BP_RESULT_UNSUPPORTED ; }
drivers/gpu/drm/amd/dal/dc/core/dc.c +7 -20
@@ -653,9 +653,7 @@ struct dc *dc_create(const struct dc_init_data *init_params) core_dc->public.config.gpu_vm_support = init_params->flags.gpu_vm_support; -dal_logger_write (core_dc->ctx->logger, -LOG_MAJOR_INTERFACE_TRACE , -LOG_MINOR_COMPONENT_DC , +dm_logger_write (core_dc->ctx->logger,LOG_DC ,"Display Core initialized\n" );return &core_dc->public;
@@ -733,9 +731,7 @@ bool dc_validate_resources( context_alloc_fail:if (result !=DC_OK ) { -dal_logger_write (core_dc->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_TOPOLOGY_MANAGER , +dm_logger_write (core_dc->ctx->logger,LOG_WARNING ,"%s:resource validation failed, dc_status:%d\n" , __func__, result);
@@ -765,9 +761,7 @@ bool dc_validate_guaranteed( context_alloc_fail:if (result !=DC_OK ) { -dal_logger_write (core_dc->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_TOPOLOGY_MANAGER , +dm_logger_write (core_dc->ctx->logger,LOG_WARNING ,"%s:guaranteed validation failed, dc_status:%d\n" , __func__, result);
@@ -1044,9 +1038,7 @@ bool dc_commit_targets(if (false ==targets_changed (core_dc, targets, target_count))return DC_OK ; -dal_logger_write (core_dc->ctx->logger, -LOG_MAJOR_INTERFACE_TRACE , -LOG_MINOR_COMPONENT_DC , +dm_logger_write (core_dc->ctx->logger,LOG_DC ,"%s: %d targets\n" , __func__, target_count);
@@ -1056,8 +1048,7 @@ bool dc_commit_targets(dc_target_log (target, core_dc->ctx->logger, -LOG_MAJOR_INTERFACE_TRACE , -LOG_MINOR_COMPONENT_DC ); +LOG_DC ); set[i].target = targets[i]; set[i].surface_count =0 ;
@@ -1070,9 +1061,7 @@ bool dc_commit_targets( result = core_dc->res_pool->funcs->validate_with_context (core_dc, set, target_count, context);if (result !=DC_OK ){ -dal_logger_write (core_dc->ctx->logger, -LOG_MAJOR_ERROR , -LOG_MINOR_COMPONENT_DC , +dm_logger_write (core_dc->ctx->logger,LOG_ERROR ,"%s: Context validation failed! dc_status:%d\n" , __func__, result);
@@ -1196,9 +1185,7 @@ bool dc_pre_update_surfaces_to_target(resource_validate_ctx_copy_construct (core_dc->current_context, context); - dal_logger_write(core_dc->ctx->logger, - LOG_MAJOR_INTERFACE_TRACE, - LOG_MINOR_COMPONENT_DC, + dm_logger_write(core_dc->ctx->logger, LOG_DC, "%s: commit %d surfaces to target 0x%x\n", __func__, new_surface_count,
drivers/gpu/drm/amd/dal/dc/core/dc_link.c +16 -43
151 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c +2 -4
@@ -541,10 +541,8 @@ static uint8_t aux_read_edid_block( &cmd);if (false == result) -dal_logger_write ( - ddc->ctx->logger, -LOG_MAJOR_ERROR , -LOG_MINOR_COMPONENT_DISPLAY_CAPABILITY_SERVICE , +dm_logger_write ( + ddc->ctx->logger,LOG_ERROR ,"%s: Writing of EDID Segment (0x30) failed!\n" , __func__); }
drivers/gpu/drm/amd/dal/dc/core/dc_link_dp.c +17 -51
169 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/core/dc_resource.c +1 -3
@@ -559,9 +559,7 @@ bool resource_build_scaling_params( pipe_ctx->xfm, &pipe_ctx->scl_data, &surface->scaling_quality); } - dal_logger_write(pipe_ctx->stream->ctx->logger, - LOG_MAJOR_DCP, - LOG_MINOR_DCP_SCALER, + dm_logger_write(pipe_ctx->stream->ctx->logger, LOG_SCALER, "%s: Viewport:\nheight:%d width:%d x:%d " "y:%d\n dst_rect:\nheight:%d width:%d x:%d " "y:%d\n",
drivers/gpu/drm/amd/dal/dc/core/dc_target.c +12 -18
@@ -285,18 +285,16 @@ uint32_t dc_target_get_scanoutpos(void dc_target_log (const struct dc_target *dc_target, -struct dal_logger *dal_logger, -enum log_major log_major, -enum log_minor log_minor) +struct dal_logger *dm_logger, +enum dc_log_type log_type) {int i;const struct core_target *core_target =CONST_DC_TARGET_TO_CORE (dc_target); -dal_logger_write (dal_logger, - log_major, - log_minor, +dm_logger_write (dm_logger, + log_type,"core_target 0x%x: stream_count=%d\n" , core_target, core_target->public.stream_count);
@@ -305,9 +303,8 @@ void dc_target_log(const struct core_stream *core_stream =DC_STREAM_TO_CORE (core_target->public.streams[i]); - dal_logger_write(dal_logger, - log_major, - log_minor, + dm_logger_write(dm_logger, + log_type, "core_stream 0x%x: src: %d, %d, %d, %d; dst: %d, %d, %d, %d;\n", core_stream, core_stream->public.src.x,
@@ -318,22 +315,19 @@ void dc_target_log( core_stream->public.dst.y, core_stream->public.dst.width, core_stream->public.dst.height); -dal_logger_write (dal_logger, - log_major, - log_minor, +dm_logger_write (dm_logger, + log_type,"\tpix_clk_khz: %d, h_total: %d, v_total: %d\n" , core_stream->public.timing.pix_clk_khz, core_stream->public.timing.h_total, core_stream->public.timing.v_total); -dal_logger_write (dal_logger, - log_major, - log_minor, +dm_logger_write (dm_logger, + log_type,"\tsink name: %s, serial: %d\n" , core_stream->sink->public.edid_caps.display_name, core_stream->sink->public.edid_caps.serial_number); -dal_logger_write (dal_logger, - log_major, - log_minor, +dm_logger_write (dm_logger, + log_type,"\tlink: %d\n" , core_stream->sink->link->public.link_index); }
drivers/gpu/drm/amd/dal/dc/dc.h +2 -3
@@ -342,9 +342,8 @@ void dc_target_retain(const struct dc_target *dc_target);void dc_target_release (const struct dc_target *dc_target);void dc_target_log (const struct dc_target *dc_target, -struct dal_logger *dal_logger, -enum log_major log_major, -enum log_minor log_minor); +struct dal_logger *dc_logger, +enum dc_log_type log_type);uint8_t dc_get_current_target_count (const struct dc *dc);struct dc_target *dc_get_target_at_index (const struct dc *dc,uint8_t i);
drivers/gpu/drm/amd/dal/dc/dce/dce110_stream_encoder.c +2 -4
@@ -165,10 +165,8 @@ static void dce110_update_hdmi_info_packet(break ;default :/* invalid HW packet index */ -dal_logger_write ( - ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_ENCODER , +dm_logger_write ( + ctx->logger,LOG_WARNING ,"Invalid HW packet index: %s()\n" , __func__);return ;
drivers/gpu/drm/amd/dal/dc/dce/dce_audio.c +2 -4
@@ -66,8 +66,7 @@ static void write_indirect_azalia_reg(struct audio *audio,REG_SET (AZALIA_F0_CODEC_ENDPOINT_DATA ,0 ,AZALIA_ENDPOINT_REG_DATA , reg_data); -dal_logger_write (CTX ->logger, -LOG_MAJOR_HW_TRACE ,LOG_MINOR_HW_TRACE_AUDIO , +dm_logger_write (CTX ->logger,LOG_HW_AUDIO ,"AUDIO:write_indirect_azalia_reg: index: %u data: %u\n" , reg_index, reg_data); }
@@ -85,8 +84,7 @@ static uint32_t read_indirect_azalia_reg(struct audio *audio, uint32_t reg_index/* AZALIA_F0_CODEC_ENDPOINT_DATA endpoint data */ value =REG_READ (AZALIA_F0_CODEC_ENDPOINT_DATA ); -dal_logger_write (CTX ->logger, -LOG_MAJOR_HW_TRACE ,LOG_MINOR_HW_TRACE_AUDIO , +dm_logger_write (CTX ->logger,LOG_HW_AUDIO ,"AUDIO:read_indirect_azalia_reg: index: %u data: %u\n" , reg_index, value);
drivers/gpu/drm/amd/dal/dc/dce110/dce110_clock_source.c +12 -36
110 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/dce110/dce110_compressor.c +16 -32
95 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c +2 -12
@@ -1534,18 +1534,12 @@ static void set_plane_config( struct resource_context *res_ctx) {struct mem_input *mi = pipe_ctx->mi; -struct pipe_ctx *old_pipe =NULL ;struct dc_context *ctx = pipe_ctx->stream->ctx;struct core_surface *surface = pipe_ctx->surface;struct xfm_grph_csc_adjustment adjust;struct out_csc_color_matrix tbl_entry;unsigned int i; -if (dc->current_context) - old_pipe = - &dc->current_context-> - res_ctx.pipe_ctx[pipe_ctx->pipe_idx]; -memset (&adjust,0 ,sizeof (adjust));memset (&tbl_entry,0 ,sizeof (tbl_entry)); adjust.gamut_adjust_type =GRAPHICS_GAMUT_ADJUST_TYPE_BYPASS ;
@@ -1963,9 +1957,7 @@ static void dce110_program_front_end_for_pipe( &surface->public.tiling_info, surface->public.rotation); -dal_logger_write (dc->ctx->logger, -LOG_MAJOR_INTERFACE_TRACE , -LOG_MINOR_COMPONENT_SURFACE , +dm_logger_write (dc->ctx->logger,LOG_SURFACE ,"Pipe:%d 0x%x: addr hi:0x%x, " "addr low:0x%x, " "src: %d, %d, %d,"
@@ -1988,9 +1980,7 @@ static void dce110_program_front_end_for_pipe( pipe_ctx->surface->public.clip_rect.width, pipe_ctx->surface->public.clip_rect.height); - dal_logger_write(dc->ctx->logger, - LOG_MAJOR_INTERFACE_TRACE, - LOG_MINOR_COMPONENT_SURFACE, + dm_logger_write(dc->ctx->logger, LOG_SURFACE, "Pipe %d: width, height, x, y\n" "viewport:%d, %d, %d, %d\n" "recout: %d, %d, %d, %d\n",
drivers/gpu/drm/amd/dal/dc/dce110/dce110_link_encoder.c +13 -39
128 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c +1 -3
@@ -870,9 +870,7 @@ void dce110_allocate_mem_input( }while (retry_count >0 );if (field ==0 ) -dal_logger_write (mi->ctx->logger, -LOG_MAJOR_ERROR , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (mi->ctx->logger,LOG_ERROR ,"%s: DMIF allocation failed" , __func__);
drivers/gpu/drm/amd/dal/dc/dce110/dce110_opp_regamma.c +1 -3
@@ -422,9 +422,7 @@ static void program_pwl( }if (counter == max_tries) { - dal_logger_write(opp110->base.ctx->logger, - LOG_MAJOR_WARNING, - LOG_MINOR_COMPONENT_CONTROLLER, + dm_logger_write(opp110->base.ctx->logger, LOG_WARNING, "%s: regamma lut was not powered on " "in a timely manner," " programming still proceeds\n",
drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c +10 -15
@@ -778,10 +778,8 @@ enum dc_status dce110_validate_bandwidth( {enum dc_status result =DC_ERROR_UNEXPECTED ; -dal_logger_write ( - dc->ctx->logger, -LOG_MAJOR_BWM , -LOG_MINOR_BWM_REQUIRED_BANDWIDTH_CALCS , +dm_logger_write ( + dc->ctx->logger,LOG_BANDWIDTH_CALCS ,"%s: start" , __func__);
@@ -797,9 +795,7 @@ enum dc_status dce110_validate_bandwidth( result =DC_OK ;if (result ==DC_FAIL_BANDWIDTH_VALIDATE ) - dal_logger_write(dc->ctx->logger, - LOG_MAJOR_BWM, - LOG_MINOR_BWM_MODE_VALIDATION, + dm_logger_write(dc->ctx->logger, LOG_BANDWIDTH_VALIDATION, "%s: %dx%d@%d Bandwidth validation failed!\n", __func__, context->targets[0]->public.streams[0]->timing.h_addressable,
@@ -809,12 +805,11 @@ enum dc_status dce110_validate_bandwidth(if (memcmp (&dc->current_context->bw_results, &context->bw_results,sizeof (context->bw_results))) {struct log_entry log_entry; -dal_logger_open ( +dm_logger_open ( dc->ctx->logger, &log_entry, -LOG_MAJOR_BWM , -LOG_MINOR_BWM_REQUIRED_BANDWIDTH_CALCS ); - dal_logger_append(&log_entry, "%s: finish,\n" +LOG_BANDWIDTH_CALCS ); + dm_logger_append(&log_entry, "%s: finish,\n" "nbpMark_b: %d nbpMark_a: %d urgentMark_b: %d urgentMark_a: %d\n" "stutMark_b: %d stutMark_a: %d\n", __func__,
@@ -824,7 +819,7 @@ enum dc_status dce110_validate_bandwidth( context->bw_results.urgent_wm_ns[0 ].a_mark, context->bw_results.stutter_exit_wm_ns[0 ].b_mark, context->bw_results.stutter_exit_wm_ns[0].a_mark); - dal_logger_append(&log_entry, + dm_logger_append(&log_entry, "nbpMark_b: %d nbpMark_a: %d urgentMark_b: %d urgentMark_a: %d\n" "stutMark_b: %d stutMark_a: %d\n", context->bw_results.nbp_state_change_wm_ns[1].b_mark,
@@ -833,7 +828,7 @@ enum dc_status dce110_validate_bandwidth( context->bw_results.urgent_wm_ns[1 ].a_mark, context->bw_results.stutter_exit_wm_ns[1 ].b_mark, context->bw_results.stutter_exit_wm_ns[1].a_mark); - dal_logger_append(&log_entry, + dm_logger_append(&log_entry, "nbpMark_b: %d nbpMark_a: %d urgentMark_b: %d urgentMark_a: %d\n" "stutMark_b: %d stutMark_a: %d stutter_mode_enable: %d\n", context->bw_results.nbp_state_change_wm_ns[2].b_mark,
@@ -843,7 +838,7 @@ enum dc_status dce110_validate_bandwidth( context->bw_results.stutter_exit_wm_ns[2 ].b_mark, context->bw_results.stutter_exit_wm_ns[2 ].a_mark, context->bw_results.stutter_mode_enable); - dal_logger_append(&log_entry, + dm_logger_append(&log_entry, "cstate: %d pstate: %d nbpstate: %d sync: %d dispclk: %d\n" "sclk: %d sclk_sleep: %d yclk: %d blackout_recovery_time_us: %d\n", context->bw_results.cpuc_state_change_enable,
@@ -855,7 +850,7 @@ enum dc_status dce110_validate_bandwidth( context->bw_results.required_sclk_deep_sleep, context->bw_results.required_yclk, context->bw_results.blackout_recovery_time_us); -dal_logger_close (&log_entry); +dm_logger_close (&log_entry); }return result; }
drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator.c +1 -2
@@ -1844,8 +1844,7 @@ bool dce110_tg_set_blank(struct timing_generator *tg, }if (counter ==100 ) { -dal_logger_write (tg->ctx->logger,LOG_MAJOR_ERROR , -LOG_MINOR_COMPONENT_CONTROLLER , +dm_logger_write (tg->ctx->logger,LOG_ERROR ,"timing generator %d blank timing out.\n" , tg110->controller_id);return false;
drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator_v.c +6 -12
@@ -112,8 +112,7 @@ static bool dce110_timing_generator_v_blank_crtc(struct timing_generator *tg) }if (!counter) { -dal_logger_write (tg->ctx->logger,LOG_MAJOR_ERROR , -LOG_MINOR_COMPONENT_CONTROLLER , +dm_logger_write (tg->ctx->logger,LOG_ERROR ,"timing generator %d blank timing out.\n" , tg110->controller_id);return false;
@@ -635,8 +634,7 @@ static uint32_t dce110_timing_generator_v_get_vblank_counter(struct timing_generstatic bool dce110_timing_generator_v_did_triggered_reset_occur (struct timing_generator *tg) { -dal_logger_write (tg->ctx->logger,LOG_MAJOR_ERROR , -LOG_MINOR_COMPONENT_CONTROLLER , +dm_logger_write (tg->ctx->logger,LOG_ERROR ,"Timing Sync not supported on underlay pipe\n" );return false; }
@@ -645,8 +643,7 @@ static void dce110_timing_generator_v_setup_global_swap_lock( struct timing_generator *tg, const struct dcp_gsl_params *gsl_params) { - dal_logger_write(tg->ctx->logger, LOG_MAJOR_ERROR, - LOG_MINOR_COMPONENT_CONTROLLER, + dm_logger_write(tg->ctx->logger, LOG_ERROR, "Timing Sync not supported on underlay pipe\n");return ; }
@@ -655,8 +652,7 @@ static void dce110_timing_generator_v_enable_reset_trigger( struct timing_generator *tg, int source_tg_inst) { - dal_logger_write(tg->ctx->logger, LOG_MAJOR_ERROR, - LOG_MINOR_COMPONENT_CONTROLLER, + dm_logger_write(tg->ctx->logger, LOG_ERROR, "Timing Sync not supported on underlay pipe\n");return ; }
@@ -664,8 +660,7 @@ static void dce110_timing_generator_v_enable_reset_trigger(static void dce110_timing_generator_v_disable_reset_trigger (struct timing_generator *tg) { -dal_logger_write (tg->ctx->logger,LOG_MAJOR_ERROR , -LOG_MINOR_COMPONENT_CONTROLLER , +dm_logger_write (tg->ctx->logger,LOG_ERROR ,"Timing Sync not supported on underlay pipe\n" );return ; }
@@ -673,8 +668,7 @@ static void dce110_timing_generator_v_disable_reset_trigger(static void dce110_timing_generator_v_tear_down_global_swap_lock (struct timing_generator *tg) { -dal_logger_write (tg->ctx->logger,LOG_MAJOR_ERROR , -LOG_MINOR_COMPONENT_CONTROLLER , +dm_logger_write (tg->ctx->logger,LOG_ERROR ,"Timing Sync not supported on underlay pipe\n" );return ; }
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_bit_depth.c +5 -15
@@ -566,9 +566,7 @@ int32_t dce110_transform_get_max_num_of_supported_lines(break ;default : -dal_logger_write (xfm->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (xfm->ctx->logger,LOG_WARNING ,"%s: Invalid LB pixel depth" , __func__);ASSERT_CRITICAL (false);
@@ -649,9 +647,7 @@ bool dce110_transform_get_current_pixel_storage_depth( *depth =LB_PIXEL_DEPTH_36BPP ;break ;default : -dal_logger_write (xfm->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (xfm->ctx->logger,LOG_WARNING ,"%s: Invalid LB pixel depth" , __func__); *depth =LB_PIXEL_DEPTH_30BPP ;
@@ -762,9 +758,7 @@ bool dce110_transform_set_pixel_storage_depth(if (!(xfm110->lb_pixel_depth_supported & depth)) {/*we should use unsupported capabilities * unless it is required by w/a*/ -dal_logger_write (xfm->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (xfm->ctx->logger,LOG_WARNING ,"%s: Capability not supported" , __func__); }
@@ -829,9 +823,7 @@ bool dce110_transform_v_get_current_pixel_storage_depth( *depth =LB_PIXEL_DEPTH_36BPP ;break ;default : -dal_logger_write (xfm->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (xfm->ctx->logger,LOG_WARNING ,"%s: Invalid LB pixel depth" , __func__); *depth =LB_PIXEL_DEPTH_30BPP ;
@@ -900,9 +892,7 @@ bool dce110_transform_v_set_pixel_storage_depth(if (!(xfm110->lb_pixel_depth_supported & depth)) {/*we should use unsupported capabilities * unless it is required by w/a*/ -dal_logger_write (xfm->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (xfm->ctx->logger,LOG_WARNING ,"%s: Capability not supported" , __func__); }
drivers/gpu/drm/amd/dal/dc/dce112/dce112_clock_source.c +1 -3
@@ -58,9 +58,7 @@ uint32_t dce112_get_pix_clk_dividers(if (pix_clk_params ==NULL || pll_settings ==NULL || pix_clk_params->requested_pix_clk ==0 ) { -dal_logger_write (cs->ctx->logger, -LOG_MAJOR_ERROR , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (cs->ctx->logger,LOG_ERROR ,"%s: Invalid parameters!!\n" , __func__);return 0 ; }
drivers/gpu/drm/amd/dal/dc/dce112/dce112_compressor.c +16 -32
95 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/dce112/dce112_opp_formatter.c +1 -2
@@ -184,8 +184,7 @@ static void program_formatter_reset_dig_resync_fifo(struct output_pixel_processo }if (counter ==0 ) -dal_logger_write (opp->ctx->logger,LOG_MAJOR_ERROR , -LOG_MINOR_COMPONENT_CONTROLLER , +dm_logger_write (opp->ctx->logger,LOG_ERROR ,"%s:opp program formattter reset dig resync info time out.\n" , __func__); }
drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c +10 -15
@@ -768,10 +768,8 @@ enum dc_status dce112_validate_bandwidth( {enum dc_status result =DC_ERROR_UNEXPECTED ; -dal_logger_write ( - dc->ctx->logger, -LOG_MAJOR_BWM , -LOG_MINOR_BWM_REQUIRED_BANDWIDTH_CALCS , +dm_logger_write ( + dc->ctx->logger,LOG_BANDWIDTH_CALCS ,"%s: start" , __func__);
@@ -787,21 +785,18 @@ enum dc_status dce112_validate_bandwidth( result =DC_OK ;if (result ==DC_FAIL_BANDWIDTH_VALIDATE ) -dal_logger_write (dc->ctx->logger, -LOG_MAJOR_BWM , -LOG_MINOR_BWM_MODE_VALIDATION , +dm_logger_write (dc->ctx->logger,LOG_BANDWIDTH_VALIDATION ,"%s: Bandwidth validation failed!" , __func__);if (memcmp (&dc->current_context->bw_results, &context->bw_results,sizeof (context->bw_results))) {struct log_entry log_entry; -dal_logger_open ( +dm_logger_open ( dc->ctx->logger, &log_entry, -LOG_MAJOR_BWM , -LOG_MINOR_BWM_REQUIRED_BANDWIDTH_CALCS ); - dal_logger_append(&log_entry, "%s: finish,\n" +LOG_BANDWIDTH_CALCS ); + dm_logger_append(&log_entry, "%s: finish,\n" "nbpMark_b: %d nbpMark_a: %d urgentMark_b: %d urgentMark_a: %d\n" "stutMark_b: %d stutMark_a: %d\n", __func__,
@@ -811,7 +806,7 @@ enum dc_status dce112_validate_bandwidth( context->bw_results.urgent_wm_ns[0 ].a_mark, context->bw_results.stutter_exit_wm_ns[0 ].b_mark, context->bw_results.stutter_exit_wm_ns[0].a_mark); - dal_logger_append(&log_entry, + dm_logger_append(&log_entry, "nbpMark_b: %d nbpMark_a: %d urgentMark_b: %d urgentMark_a: %d\n" "stutMark_b: %d stutMark_a: %d\n", context->bw_results.nbp_state_change_wm_ns[1].b_mark,
@@ -820,7 +815,7 @@ enum dc_status dce112_validate_bandwidth( context->bw_results.urgent_wm_ns[1 ].a_mark, context->bw_results.stutter_exit_wm_ns[1 ].b_mark, context->bw_results.stutter_exit_wm_ns[1].a_mark); - dal_logger_append(&log_entry, + dm_logger_append(&log_entry, "nbpMark_b: %d nbpMark_a: %d urgentMark_b: %d urgentMark_a: %d\n" "stutMark_b: %d stutMark_a: %d stutter_mode_enable: %d\n", context->bw_results.nbp_state_change_wm_ns[2].b_mark,
@@ -830,7 +825,7 @@ enum dc_status dce112_validate_bandwidth( context->bw_results.stutter_exit_wm_ns[2 ].b_mark, context->bw_results.stutter_exit_wm_ns[2 ].a_mark, context->bw_results.stutter_mode_enable); - dal_logger_append(&log_entry, + dm_logger_append(&log_entry, "cstate: %d pstate: %d nbpstate: %d sync: %d dispclk: %d\n" "sclk: %d sclk_sleep: %d yclk: %d blackout_recovery_time_us: %d\n", context->bw_results.cpuc_state_change_enable,
@@ -842,7 +837,7 @@ enum dc_status dce112_validate_bandwidth( context->bw_results.required_sclk_deep_sleep, context->bw_results.required_yclk, context->bw_results.blackout_recovery_time_us); -dal_logger_close (&log_entry); +dm_logger_close (&log_entry); }return result; }
drivers/gpu/drm/amd/dal/dc/dce80/dce80_compressor.c +16 -32
95 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/dce80/dce80_link_encoder.c +3 -9
@@ -123,9 +123,7 @@ static void dce80_link_encoder_enable_tmds_output( result =link_transmitter_control (enc110, &cntl);if (result !=BP_RESULT_OK ) { -dal_logger_write (ctx->logger, -LOG_MAJOR_ERROR , -LOG_MINOR_COMPONENT_ENCODER , +dm_logger_write (ctx->logger,LOG_ERROR ,"%s: Failed to execute VBIOS command table!\n" , __func__);BREAK_TO_DEBUGGER ();
@@ -183,9 +181,7 @@ static void dce80_link_encoder_enable_dp_output( result =link_transmitter_control (enc110, &cntl);if (result !=BP_RESULT_OK ) { -dal_logger_write (ctx->logger, -LOG_MAJOR_ERROR , -LOG_MINOR_COMPONENT_ENCODER , +dm_logger_write (ctx->logger,LOG_ERROR ,"%s: Failed to execute VBIOS command table!\n" , __func__);BREAK_TO_DEBUGGER ();
@@ -308,9 +304,7 @@ bool dce80_link_encoder_construct(break ; } -dal_logger_write (init_data->ctx->logger, -LOG_MAJOR_I2C_AUX , -LOG_MINOR_I2C_AUX_CFG , +dm_logger_write (init_data->ctx->logger,LOG_I2C_AUX ,"Using channel: %s [%d]\n" ,DECODE_CHANNEL_ID (init_data->channel), init_data->channel);
drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.c +1 -3
@@ -143,9 +143,7 @@ static void allocate_mem_input( }while (retry_count >0 );if (field ==0 ) -dal_logger_write (mi->ctx->logger, -LOG_MAJOR_ERROR , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (mi->ctx->logger,LOG_ERROR ,"%s: DMIF allocation failed" , __func__);
drivers/gpu/drm/amd/dal/dc/dce80/dce80_opp_regamma.c +1 -3
@@ -427,9 +427,7 @@ static void program_pwl( }if (counter == max_tries) { - dal_logger_write(opp80->base.ctx->logger, - LOG_MAJOR_WARNING, - LOG_MINOR_COMPONENT_CONTROLLER, + dm_logger_write(opp80->base.ctx->logger, LOG_WARNING, "%s: regamma lut was not powered on " "in a timely manner," " programming still proceeds\n",
drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_bit_depth.c +2 -6
@@ -591,9 +591,7 @@ bool dce80_transform_get_current_pixel_storage_depth( *depth =LB_PIXEL_DEPTH_36BPP ;break ;default : -dal_logger_write (xfm->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (xfm->ctx->logger,LOG_WARNING ,"%s: Invalid LB pixel depth" , __func__); *depth =LB_PIXEL_DEPTH_30BPP ;
@@ -706,9 +704,7 @@ bool dce80_transform_set_pixel_storage_depth(if (!(xfm80->lb_pixel_depth_supported & depth)) {/*we should use unsupported capabilities * unless it is required by w/a*/ -dal_logger_write (xfm->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (xfm->ctx->logger,LOG_WARNING ,"%s: Capability not supported" , __func__); }
drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_scl.c +2 -6
@@ -666,9 +666,7 @@ bool dce80_transform_set_scaler(program_two_taps_filter (xfm80, false, true);if (!program_multi_taps_filter (xfm80, data, false)) { -dal_logger_write (ctx->logger, -LOG_MAJOR_DCP , -LOG_MINOR_DCP_SCALER , +dm_logger_write (ctx->logger,LOG_SCALER ,"Failed vertical taps programming\n" );return false; }
@@ -680,9 +678,7 @@ bool dce80_transform_set_scaler(program_two_taps_filter (xfm80, false, false);if (!program_multi_taps_filter (xfm80, data, true)) { -dal_logger_write (ctx->logger, -LOG_MAJOR_DCP , -LOG_MINOR_DCP_SCALER , +dm_logger_write (ctx->logger,LOG_SCALER ,"Failed horizontal taps programming\n" );return false; }
drivers/gpu/drm/amd/dal/dc/dm_helpers.h +0 -38
@@ -35,42 +35,11 @@struct dp_mst_stream_allocation_table ; -enum conn_event { -CONN_EVENT_MODE_SET , -CONN_EVENT_DETECTION , -CONN_EVENT_LINK_TRAINING , -CONN_EVENT_LINK_LOSS , -CONN_EVENT_UNDERFLOW , -}; -enum dc_edid_status dm_helpers_parse_edid_caps (struct dc_context *ctx,const struct dc_edid *edid,struct dc_edid_caps *edid_caps); - -/* Connectivity log format: -* [time stamp] [drm] [Major_minor] [connector name] message..... -* eg: -* [ 26.590965] [drm] [Conn_LKTN] [DP-1] HBRx4 pass VS=0, PE=0^ -* [ 26.881060] [drm] [Conn_Mode] [DP-1] {2560x1080, 2784x1111@185580Khz}^ -*/ - -#define CONN_DATA_DETECT (link, hex_data, hex_len, ...) \ - dm_helper_conn_log(link->ctx, &link->public, hex_data, hex_len, \ - CONN_EVENT_DETECTION, ##__VA_ARGS__) - -#define CONN_DATA_LINK_LOSS (link, hex_data, hex_len, ...) \ - dm_helper_conn_log(link->ctx, &link->public, hex_data, hex_len, \ - CONN_EVENT_LINK_LOSS, ##__VA_ARGS__) - -#define CONN_MSG_LT (link, ...) \ - dm_helper_conn_log(link->ctx, &link->public, NULL, 0, \ - CONN_EVENT_LINK_TRAINING, ##__VA_ARGS__) - -#define CONN_MSG_MODE (link, ...) \ - dm_helper_conn_log(link->ctx, &link->public, NULL, 0, \ - CONN_EVENT_MODE_SET, ##__VA_ARGS__)/* * Writes payload allocation table in immediate downstream device. */
@@ -128,12 +97,5 @@ bool dm_helpers_submit_i2c(const struct dc_link *link, struct i2c_command *cmd); -void dm_helper_conn_log (struct dc_context *ctx, -const struct dc_link *link, -uint8_t *hex_data, -int hex_data_count, -enum conn_event event, -const char *msg, - ...);#endif /* __DM_HELPERS__ */
drivers/gpu/drm/amd/dal/dc/dm_services_types.h +1 -31
@@ -26,37 +26,7 @@#ifndef __DM_SERVICES_TYPES_H__#define __DM_SERVICES_TYPES_H__ -#if defined __KERNEL__ - -#include <asm/byteorder.h> -#include <linux/types.h> -#include <drm/drmP.h> - -#include "cgs_linux.h" - -#if defined(__BIG_ENDIAN) && !defined(BIGENDIAN_CPU ) -#define BIGENDIAN_CPU -#elif defined(__LITTLE_ENDIAN) && !defined(LITTLEENDIAN_CPU ) -#define LITTLEENDIAN_CPU -#endif - -#undef READ -#undef WRITE -#undef FRAME_SIZE - -#define dm_output_to_console (fmt, ...) DRM_INFO(fmt, ##__VA_ARGS__) - -#define dm_error (fmt, ...) DRM_ERROR(fmt, ##__VA_ARGS__) - -#define dm_debug (fmt, ...) DRM_DEBUG_KMS(fmt, ##__VA_ARGS__) - -#define dm_vlog (fmt, args) vprintk(fmt, args) - -#define dm_min (x, y) min(x, y) -#define dm_max (x, y) max(x, y) - -#endif - +#include "os_types.h" #include "dc_types.h" struct dm_pp_clock_range {
drivers/gpu/drm/amd/dal/dc/gpu/dce110/dc_clock_gating_dce110.c +1 -1
@@ -35,7 +35,7 @@* Macro definitions *****************************************************************************/ -#define NOT_IMPLEMENTED () DAL_LOGGER_NOT_IMPL(LOG_MINOR_COMPONENT_GPU, \ +#define NOT_IMPLEMENTED () DAL_LOGGER_NOT_IMPL( \ "%s:%s()\n", __FILE__, __func__)/******************************************************************************
drivers/gpu/drm/amd/dal/dc/gpu/dce110/display_clock_dce110.c +7 -21
@@ -150,9 +150,7 @@ static bool set_min_clocks_state(if (clocks_state > dc->max_clks_state) {/*Requested state exceeds max supported state.*/ -dal_logger_write (base->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (base->ctx->logger,LOG_WARNING ,"Requested state exceeds max supported state" );return false; }else if (clocks_state == base->cur_min_clks_state) {
@@ -176,9 +174,7 @@ static bool set_min_clocks_state(break ;case CLOCKS_STATE_INVALID :default : -dal_logger_write (base->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (base->ctx->logger,LOG_WARNING ,"Requested state invalid state" );return false; }
@@ -298,9 +294,7 @@ static uint32_t get_validation_clock(struct display_clock *dc)case CLOCKS_STATE_INVALID :default :/*Invalid Clocks State*/ -dal_logger_write (dc->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (dc->ctx->logger,LOG_WARNING ,"Invalid clock state" );/* just return the display engine clock for * lowest supported state*/
@@ -461,9 +455,7 @@ static uint32_t calc_single_display_min_clks(bool panning_allowed = false;/* TODO: receive this value from AS */ if (params ==NULL ) { -dal_logger_write (base->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (base->ctx->logger,LOG_WARNING ,"Invalid input parameter in %s" , __func__);return 0 ;
@@ -483,9 +475,7 @@ static uint32_t calc_single_display_min_clks( params->source_view.height, params->dest_view.height); }else { -dal_logger_write (base->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (base->ctx->logger,LOG_WARNING ,"Destination height or width is 0!\n" ); }
@@ -790,9 +780,7 @@ static enum clocks_state get_required_clocks_state(if (!req_clocks) {/* NULL pointer*/ -dal_logger_write (dc->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (dc->ctx->logger,LOG_WARNING ,"%s: Invalid parameter" , __func__);return CLOCKS_STATE_INVALID ;
@@ -949,9 +937,7 @@ static bool dal_display_clock_dce110_construct( dc110->dfs_bypass_disp_clk =0 ;if (!display_clock_integrated_info_construct (dc110, as)) -dal_logger_write (dc_base->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (dc_base->ctx->logger,LOG_WARNING ,"Cannot obtain VBIOS integrated info\n" ); dc110->gpu_pll_ss_percentage =0 ;
drivers/gpu/drm/amd/dal/dc/gpu/dce112/dc_clock_gating_dce112.c +1 -1
@@ -35,7 +35,7 @@* Macro definitions *****************************************************************************/ -#define NOT_IMPLEMENTED () DAL_LOGGER_NOT_IMPL(LOG_MINOR_COMPONENT_GPU, \ +#define NOT_IMPLEMENTED () DAL_LOGGER_NOT_IMPL(\ "%s:%s()\n", __FILE__, __func__)/******************************************************************************
drivers/gpu/drm/amd/dal/dc/gpu/dce112/display_clock_dce112.c +7 -21
@@ -125,9 +125,7 @@ bool dispclk_dce112_set_min_clocks_state(if (clocks_state > dc->max_clks_state) {/*Requested state exceeds max supported state.*/ -dal_logger_write (base->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (base->ctx->logger,LOG_WARNING ,"Requested state exceeds max supported state" );return false; }else if (clocks_state == base->cur_min_clks_state) {
@@ -151,9 +149,7 @@ bool dispclk_dce112_set_min_clocks_state(break ;case CLOCKS_STATE_INVALID :default : -dal_logger_write (base->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (base->ctx->logger,LOG_WARNING ,"Requested state invalid state" );return false; }
@@ -275,9 +271,7 @@ uint32_t dispclk_dce112_get_validation_clock(struct display_clock *dc)case CLOCKS_STATE_INVALID :default :/*Invalid Clocks State*/ -dal_logger_write (dc->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (dc->ctx->logger,LOG_WARNING ,"Invalid clock state" );/* just return the display engine clock for * lowest supported state*/
@@ -438,9 +432,7 @@ static uint32_t calc_single_display_min_clks(bool panning_allowed = false;/* TODO: receive this value from AS */ if (params ==NULL ) { -dal_logger_write (base->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (base->ctx->logger,LOG_WARNING ,"Invalid input parameter in %s" , __func__);return 0 ;
@@ -460,9 +452,7 @@ static uint32_t calc_single_display_min_clks( params->source_view.height, params->dest_view.height); }else { -dal_logger_write (base->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (base->ctx->logger,LOG_WARNING ,"Destination height or width is 0!\n" ); }
@@ -754,9 +744,7 @@ enum clocks_state dispclk_dce112_get_required_clocks_state(if (!req_clocks) {/* NULL pointer*/ -dal_logger_write (dc->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (dc->ctx->logger,LOG_WARNING ,"%s: Invalid parameter" , __func__);return CLOCKS_STATE_INVALID ;
@@ -876,9 +864,7 @@ bool dal_display_clock_dce112_construct( dc112->dfs_bypass_disp_clk =0 ;if (!display_clock_integrated_info_construct (dc112, as)) -dal_logger_write (dc_base->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (dc_base->ctx->logger,LOG_WARNING ,"Cannot obtain VBIOS integrated info\n" ); dc112->gpu_pll_ss_percentage =0 ;
drivers/gpu/drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c +3 -9
@@ -587,9 +587,7 @@ static bool set_min_clocks_state(if (clocks_state > disp_clk->max_clks_state) {/*Requested state exceeds max supported state.*/ -dal_logger_write (dc->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (dc->ctx->logger,LOG_WARNING ,"Requested state exceeds max supported state" );return false; }else if (clocks_state == dc->cur_min_clks_state) {
@@ -613,9 +611,7 @@ static bool set_min_clocks_state(break ;case CLOCKS_STATE_INVALID :default : -dal_logger_write (dc->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (dc->ctx->logger,LOG_WARNING ,"Requested state invalid state" );return false; }
@@ -897,9 +893,7 @@ static bool display_clock_construct(display_clock_ss_construct (disp_clk, as);if (!display_clock_integrated_info_construct (disp_clk, as)) { -dal_logger_write (dc_base->ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_GPU , +dm_logger_write (dc_base->ctx->logger,LOG_WARNING ,"Cannot obtain VBIOS integrated info" ); }
drivers/gpu/drm/amd/dal/dc/i2caux/dce110/i2c_hw_engine_dce110.c +2 -4
@@ -898,10 +898,8 @@ bool i2c_hw_engine_dce110_construct( XTAL_REF_DIV);if (xtal_ref_div ==0 ) { -dal_logger_write ( - hw_engine->base.base.base.ctx->logger, -LOG_MAJOR_WARNING , -LOG_MINOR_COMPONENT_I2C_AUX , +dm_logger_write ( + hw_engine->base.base.base.ctx->logger,LOG_WARNING ,"Invalid base timer divider\n" , __func__); xtal_ref_div =2 ;
drivers/gpu/drm/amd/dal/dc/irq/dce110/irq_service_dce110.c +4 -8
@@ -161,10 +161,8 @@ bool dal_irq_service_dummy_set( const struct irq_source_info *info, bool enable) { - dal_logger_write( - irq_service->ctx->logger, - LOG_MAJOR_ERROR, - LOG_MINOR_COMPONENT_IRQ_SERVICE, + dm_logger_write( + irq_service->ctx->logger, LOG_ERROR,"%s: called for non-implemented irq source\n" , __func__);return false;
@@ -174,10 +172,8 @@ bool dal_irq_service_dummy_ack( struct irq_service *irq_service, const struct irq_source_info *info) { - dal_logger_write( - irq_service->ctx->logger, - LOG_MAJOR_ERROR, - LOG_MINOR_COMPONENT_IRQ_SERVICE, + dm_logger_write( + irq_service->ctx->logger, LOG_ERROR,"%s: called for non-implemented irq source\n" , __func__);return false;
drivers/gpu/drm/amd/dal/dc/irq/irq_service.c +4 -8
@@ -97,10 +97,8 @@ bool dal_irq_service_set(find_irq_source_info (irq_service, source);if (!info) { -dal_logger_write ( - irq_service->ctx->logger, -LOG_MAJOR_ERROR , -LOG_MINOR_COMPONENT_IRQ_SERVICE , +dm_logger_write ( + irq_service->ctx->logger,LOG_ERROR ,"%s: cannot find irq info table entry for %d\n" , __func__, source);
@@ -137,10 +135,8 @@ bool dal_irq_service_ack(find_irq_source_info (irq_service, source);if (!info) { -dal_logger_write ( - irq_service->ctx->logger, -LOG_MAJOR_ERROR , -LOG_MINOR_COMPONENT_IRQ_SERVICE , +dm_logger_write ( + irq_service->ctx->logger,LOG_ERROR ,"%s: cannot find irq info table entry for %d\n" , __func__, source);
drivers/gpu/drm/amd/dal/dc/os_types.h new file +61 -0
61 lines not on this page · raw message
drivers/gpu/drm/amd/dal/include/fixed31_32.h +2 -0
@@ -26,6 +26,8 @@#ifndef __DAL_FIXED31_32_H__#define __DAL_FIXED31_32_H__ +#include "os_types.h" +/* * @brief * Arithmetic operations on real numbers
drivers/gpu/drm/amd/dal/include/fixed32_32.h +3 -0
@@ -23,9 +23,12 @@* */ +#ifndef __DAL_FIXED32_32_H__#define __DAL_FIXED32_32_H__ +#include "os_types.h" +struct fixed32_32 {uint64_t value; };
drivers/gpu/drm/amd/dal/include/logger_interface.h +43 -73
59 lines not on this page · raw message
drivers/gpu/drm/amd/dal/include/logger_types.h +39 -312
351 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
2.10.1 _______________________________________________ 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 2/76 drm/amd/dal: clean up asic cap
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
ASIC_DATA_LINEBUFFER_NUM:
not used. each pipe has it's own lb.
ASIC_DATA_MAX_COFUNC_NONDP_DISPLAYS:
not needed. clk_src management algorithm take care of this.
ASIC_DATA_CLOCKSOURCES_NUM:
verify correct num of clk to create is already baked in resource.
remove duplicate information from hw_asic_id.
--- .../gpu/drm/amd/dal/dc/adapter/adapter_service.c | 88 ---------------------- .../amd/dal/dc/asic_capability/asic_capability.c | 5 -- .../dc/asic_capability/carrizo_asic_capability.c | 11 --- .../dc/asic_capability/hawaii_asic_capability.c | 9 --- .../dc/asic_capability/polaris10_asic_capability.c | 18 ----- .../dal/dc/asic_capability/tonga_asic_capability.c | 9 --- drivers/gpu/drm/amd/dal/dc/core/dc.c | 2 + drivers/gpu/drm/amd/dal/dc/core/dc_link.c | 4 +- drivers/gpu/drm/amd/dal/dc/core/dc_resource.c | 2 +- .../gpu/drm/amd/dal/dc/dce100/dce100_resource.c | 9 ++- .../gpu/drm/amd/dal/dc/dce110/dce110_resource.c | 40 ++++++---- .../gpu/drm/amd/dal/dc/dce112/dce112_resource.c | 32 ++++++-- drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c | 11 ++- drivers/gpu/drm/amd/dal/dc/inc/core_dc.h | 1 + drivers/gpu/drm/amd/dal/dc/inc/core_types.h | 1 + drivers/gpu/drm/amd/dal/dc/inc/resource.h | 4 +- .../amd/dal/include/adapter_service_interface.h | 20 +---- .../drm/amd/dal/include/asic_capability_types.h | 13 +--- 18 files changed, 77 insertions(+), 202 deletions(-)
drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c +0 -88
@@ -109,10 +109,8 @@ static const struct feature_source_entry feature_entry_table[] = { {FEATURE_NO_HPD_LOW_POLLING_VCC_OFF, false, true}, {FEATURE_ENABLE_DFS_BYPASS, false, true}, {FEATURE_WIRELESS_FULL_TIMING_ADJUSTMENT, false, true}, - {FEATURE_MAX_COFUNC_NON_DP_DISPLAYS, 2, false}, {FEATURE_WIRELESS_LIMIT_720P, false, true}, {FEATURE_MODIFY_TIMINGS_FOR_WIRELESS, false, true}, - {FEATURE_SUPPORTED_HDMI_CONNECTION_NUM, 0, false}, {FEATURE_DETECT_REQUIRE_HPD_HIGH, false, true}, {FEATURE_NO_HPD_LOW_POLLING_VCC_OFF, false, true}, {FEATURE_LB_HIGH_RESOLUTION, false, true},
@@ -453,10 +451,6 @@ static bool get_feature_value_from_data_sources( }switch (feature_entry_table[idx].feature_id) { -case FEATURE_MAX_COFUNC_NON_DP_DISPLAYS : - *data = as->asic_cap->data[ASIC_DATA_MAX_COFUNC_NONDP_DISPLAYS ]; -break ; -case FEATURE_WIRELESS_LIMIT_720P : *data = as->asic_cap->caps.WIRELESS_LIMIT_TO_720P;break ;
@@ -469,11 +463,6 @@ static bool get_feature_value_from_data_sources( *data = as->asic_cap->caps.WIRELESS_TIMING_ADJUSTMENT;break ; -case FEATURE_SUPPORTED_HDMI_CONNECTION_NUM : - *data = - as->asic_cap->data[ASIC_DATA_SUPPORTED_HDMI_CONNECTION_NUM ]; -break ; -case FEATURE_DETECT_REQUIRE_HPD_HIGH : *data = as->asic_cap->caps.HPD_CHECK_FOR_EDID;break ;
@@ -893,72 +882,6 @@ bool dal_adapter_service_is_device_id_supported(struct adapter_service *as, }/* -* dal_adapter_service_get_clock_sources_num -* -* Get number of clock sources -*/ -uint8_t dal_adapter_service_get_clock_sources_num ( -struct adapter_service *as) -{ -struct firmware_info fw_info; -uint32_t max_clk_src =0 ; -uint32_t num = as->asic_cap->data[ASIC_DATA_CLOCKSOURCES_NUM ]; -struct dc_bios *dcb = as->ctx->dc_bios; - -/* -* Check is system supports the use of the External clock source -* as a clock source for DP -*/ -enum bp_result bp_result = dcb->funcs->get_firmware_info (dcb, &fw_info); - -if (BP_RESULT_OK == bp_result && - fw_info.external_clock_source_frequency_for_dp !=0 ) - ++num; - -/* -* Add clock source for wireless if supported -*/ - num += (uint32_t )wireless_get_clocks_num (as); - -/* Check the "max number of clock sources" feature */ -if (dal_adapter_service_get_feature_value (as, -FEATURE_MAX_CLOCK_SOURCE_NUM , - &max_clk_src, -sizeof (uint32_t ))) -if ((max_clk_src !=0 ) && (max_clk_src < num)) - num = max_clk_src; - -return num; -} - -/* -* dal_adapter_service_get_func_controllers_num -* -* Get number of controllers -*/ -uint8_t dal_adapter_service_get_func_controllers_num ( -struct adapter_service *as) -{ -uint32_t result = - as->asic_cap->data[ASIC_DATA_FUNCTIONAL_CONTROLLERS_NUM ]; - -/* Check the "max num of controllers" feature, -* use it for debugging purposes only */ - -/* Limit number of controllers by OS */ - -struct asic_feature_flags flags; - - flags.raw = as->asic_cap->data[ASIC_DATA_FEATURE_FLAGS ]; - -if (flags.bits.LEGACY_CLIENT && - (result >LEGACY_MAX_NUM_OF_CONTROLLERS )) - result =LEGACY_MAX_NUM_OF_CONTROLLERS ; - -return result; -} - -/* * dal_adapter_service_is_feature_supported * * Return if a given feature is supported by the ASIC. The feature has to be
@@ -1098,17 +1021,6 @@ bool dal_adapter_service_get_firmware_info( }/* -* dal_adapter_service_get_stream_engines_num -* -* Get number of stream engines -*/ -uint8_t dal_adapter_service_get_stream_engines_num ( -struct adapter_service *as) -{ -return as->asic_cap->data[ASIC_DATA_DIGFE_NUM ]; -} - -/* * dal_adapter_service_get_feature_value * * Get the cached value of a given feature. This value can be a boolean, int,
drivers/gpu/drm/amd/dal/dc/asic_capability/asic_capability.c +0 -5
@@ -54,15 +54,10 @@ static bool construct(memset (cap->data,0 ,sizeof (cap->data));/* ASIC data */ - cap->data[ASIC_DATA_VRAM_TYPE ] = init->vram_type; cap->data[ASIC_DATA_VRAM_BITWIDTH ] = init->vram_width; - cap->data[ASIC_DATA_FEATURE_FLAGS ] = init->feature_flags; cap->runtime_flags = init->runtime_flags; - cap->data[ASIC_DATA_REVISION_ID ] = init->hw_internal_rev; cap->data[ASIC_DATA_MAX_UNDERSCAN_PERCENTAGE ] =10 ; cap->data[ASIC_DATA_VIEWPORT_PIXEL_GRANULARITY ] =4 ; - cap->data[ASIC_DATA_SUPPORTED_HDMI_CONNECTION_NUM ] =1 ; - cap->data[ASIC_DATA_NUM_OF_VIDEO_PLANES ] =0 ; cap->data[ASIC_DATA_DEFAULT_I2C_SPEED_IN_KHZ ] =25 ; cap->data[ASIC_DATA_DOWNSCALE_LIMIT ] =200 ;
drivers/gpu/drm/amd/dal/dc/asic_capability/carrizo_asic_capability.c +0 -11
@@ -48,23 +48,15 @@ void carrizo_asic_capability_create(struct asic_capability *cap, {uint32_t e_fuse_setting;/* ASIC data */ - cap->data[ASIC_DATA_CONTROLLERS_NUM ] =3 ; - cap->data[ASIC_DATA_DIGFE_NUM ] =3 ; - cap->data[ASIC_DATA_FUNCTIONAL_CONTROLLERS_NUM ] =3 ; - cap->data[ASIC_DATA_LINEBUFFER_NUM ] =3 ; cap->data[ASIC_DATA_PATH_NUM_PER_DPMST_CONNECTOR ] =4 ; cap->data[ASIC_DATA_DCE_VERSION ] =0x110 ;/* DCE 11 */ cap->data[ASIC_DATA_LINEBUFFER_SIZE ] =1712 *144 ; cap->data[ASIC_DATA_DRAM_BANDWIDTH_EFFICIENCY ] =45 ; - cap->data[ASIC_DATA_CLOCKSOURCES_NUM ] =2 ; cap->data[ASIC_DATA_MC_LATENCY ] =5000 ; cap->data[ASIC_DATA_STUTTERMODE ] =0x200A ; cap->data[ASIC_DATA_VIEWPORT_PIXEL_GRANULARITY ] =2 ; - cap->data[ASIC_DATA_MAX_COFUNC_NONDP_DISPLAYS ] =2 ; cap->data[ASIC_DATA_MEMORYTYPE_MULTIPLIER ] =2 ; cap->data[ASIC_DATA_DEFAULT_I2C_SPEED_IN_KHZ ] =100 ; - cap->data[ASIC_DATA_NUM_OF_VIDEO_PLANES ] =1 ; - cap->data[ASIC_DATA_SUPPORTED_HDMI_CONNECTION_NUM ] =3 ; cap->data[ASIC_DATA_DOWNSCALE_LIMIT ] =150 ;/* ASIC basic capability */
@@ -135,9 +127,6 @@ void carrizo_asic_capability_create(struct asic_capability *cap, {/* Stoney is the same DCE11, but only two pipes, three digs. * and HW added 64bit back for non SG */ - cap->data[ASIC_DATA_CONTROLLERS_NUM ] =2 ; - cap->data[ASIC_DATA_FUNCTIONAL_CONTROLLERS_NUM ] =2 ; - cap->data[ASIC_DATA_LINEBUFFER_NUM ] =2 ;/*3 DP MST per connector, limited by number of pipe and number * of Dig.*/ cap->data[ASIC_DATA_PATH_NUM_PER_DPMST_CONNECTOR ] =2 ;
drivers/gpu/drm/amd/dal/dc/asic_capability/hawaii_asic_capability.c +0 -9
@@ -54,11 +54,6 @@ void dal_hawaii_asic_capability_create(struct asic_capability *cap,uint32_t mc_seq_misc0;/* ASIC data */ - cap->data[ASIC_DATA_CONTROLLERS_NUM ] =6 ; - cap->data[ASIC_DATA_FUNCTIONAL_CONTROLLERS_NUM ] =6 ; - cap->data[ASIC_DATA_DIGFE_NUM ] =6 ; - cap->data[ASIC_DATA_LINEBUFFER_NUM ] =6 ; - cap->data[ASIC_DATA_MAX_COFUNC_NONDP_DISPLAYS ] =2 ; cap->data[ASIC_DATA_MIN_DISPCLK_FOR_UNDERSCAN ] =300000 ; cap->data[ASIC_DATA_DCE_VERSION ] =0x80 ;/* DCE 8.0 */
@@ -67,7 +62,6 @@ void dal_hawaii_asic_capability_create(struct asic_capability *cap,* in other words 246528 bits. */ cap->data[ASIC_DATA_LINEBUFFER_SIZE ] =1712 *144 ; cap->data[ASIC_DATA_DRAM_BANDWIDTH_EFFICIENCY ] =70 ; - cap->data[ASIC_DATA_CLOCKSOURCES_NUM ] =3 ; cap->data[ASIC_DATA_MC_LATENCY ] =5000 ;/* units of ns */ /* StutterModeEnhanced; Quad DMIF Buffer */
@@ -75,9 +69,6 @@ void dal_hawaii_asic_capability_create(struct asic_capability *cap, cap->data[ASIC_DATA_PATH_NUM_PER_DPMST_CONNECTOR ] =4 ; cap->data[ASIC_DATA_VIEWPORT_PIXEL_GRANULARITY ] =2 ; -/* 3 HDMI support by default */ - cap->data[ASIC_DATA_SUPPORTED_HDMI_CONNECTION_NUM ] =3 ; - cap->data[ASIC_DATA_DEFAULT_I2C_SPEED_IN_KHZ ] =40 ; mc_seq_misc0 =dm_read_reg (cap->ctx, mmMC_SEQ_MISC0);
drivers/gpu/drm/amd/dal/dc/asic_capability/polaris10_asic_capability.c +0 -18
@@ -47,23 +47,6 @@ void polaris10_asic_capability_create(struct asic_capability *cap, {uint32_t e_fuse_setting;/* ASIC data */ -if (ASIC_REV_IS_POLARIS11_M (init->hw_internal_rev)) { - cap->data[ASIC_DATA_CONTROLLERS_NUM ] =5 ; - cap->data[ASIC_DATA_FUNCTIONAL_CONTROLLERS_NUM ] =5 ; - cap->data[ASIC_DATA_LINEBUFFER_NUM ] =5 ; - cap->data[ASIC_DATA_DIGFE_NUM ] =5 ; - cap->data[ASIC_DATA_CLOCKSOURCES_NUM ] =7 ; - cap->data[ASIC_DATA_MAX_COFUNC_NONDP_DISPLAYS ] =5 ; - cap->data[ASIC_DATA_SUPPORTED_HDMI_CONNECTION_NUM ] =5 ; - }else { - cap->data[ASIC_DATA_CONTROLLERS_NUM ] =6 ; - cap->data[ASIC_DATA_FUNCTIONAL_CONTROLLERS_NUM ] =6 ; - cap->data[ASIC_DATA_LINEBUFFER_NUM ] =6 ; - cap->data[ASIC_DATA_DIGFE_NUM ] =6 ; - cap->data[ASIC_DATA_CLOCKSOURCES_NUM ] =8 ; - cap->data[ASIC_DATA_MAX_COFUNC_NONDP_DISPLAYS ] =6 ; - cap->data[ASIC_DATA_SUPPORTED_HDMI_CONNECTION_NUM ] =6 ; - } cap->data[ASIC_DATA_PATH_NUM_PER_DPMST_CONNECTOR ] =4 ; cap->data[ASIC_DATA_DCE_VERSION ] =0x112 ;/* DCE 11 */
@@ -76,7 +59,6 @@ void polaris10_asic_capability_create(struct asic_capability *cap, cap->data[ASIC_DATA_MEMORYTYPE_MULTIPLIER ] =4 ; cap->data[ASIC_DATA_DEFAULT_I2C_SPEED_IN_KHZ ] =100 ; - cap->data[ASIC_DATA_NUM_OF_VIDEO_PLANES ] =0 ; cap->data[ASIC_DATA_MIN_DISPCLK_FOR_UNDERSCAN ] =300000 ;
drivers/gpu/drm/amd/dal/dc/asic_capability/tonga_asic_capability.c +0 -9
@@ -47,27 +47,18 @@ void tonga_asic_capability_create(struct asic_capability *cap, {uint32_t e_fuse_setting;/* ASIC data */ - cap->data[ASIC_DATA_CONTROLLERS_NUM ] =6 ; - cap->data[ASIC_DATA_FUNCTIONAL_CONTROLLERS_NUM ] =6 ; - cap->data[ASIC_DATA_DIGFE_NUM ] =6 ; - cap->data[ASIC_DATA_LINEBUFFER_NUM ] =6 ; - cap->data[ASIC_DATA_LINEBUFFER_SIZE ] =1712 *144 ; cap->data[ASIC_DATA_DRAM_BANDWIDTH_EFFICIENCY ] =70 ; - cap->data[ASIC_DATA_CLOCKSOURCES_NUM ] =3 ; cap->data[ASIC_DATA_MC_LATENCY ] =5000 ; cap->data[ASIC_DATA_STUTTERMODE ] =0x2002 ; cap->data[ASIC_DATA_PATH_NUM_PER_DPMST_CONNECTOR ] =4 ; cap->data[ASIC_DATA_VIEWPORT_PIXEL_GRANULARITY ] =2 ; - cap->data[ASIC_DATA_SUPPORTED_HDMI_CONNECTION_NUM ] =3 ; cap->data[ASIC_DATA_MIN_DISPCLK_FOR_UNDERSCAN ] =300000 ; cap->data[ASIC_DATA_DCE_VERSION ] =0x100 ;/* DCE 11 */ - cap->data[ASIC_DATA_MAX_COFUNC_NONDP_DISPLAYS ] =2 ; cap->data[ASIC_DATA_MEMORYTYPE_MULTIPLIER ] =4 ; cap->data[ASIC_DATA_DEFAULT_I2C_SPEED_IN_KHZ ] =40 ; - cap->data[ASIC_DATA_NUM_OF_VIDEO_PLANES ] =0 ;/* ASIC basic capability */ cap->caps.IS_FUSION = true;
drivers/gpu/drm/amd/dal/dc/core/dc.c +2 -0
@@ -504,6 +504,8 @@ static bool construct(struct core_dc *dc, dc_ctx->driver_context = init_params->driver; dc_ctx->dc = &dc->public; + dc->asic_id = init_params->asic_id; +/* Create logger */ logger =dal_logger_create (dc_ctx);
drivers/gpu/drm/amd/dal/dc/core/dc_link.c +2 -2
@@ -37,6 +37,7 @@#include "stream_encoder.h" #include "link_encoder.h" #include "hw_sequencer.h" +#include "resource.h" #include "fixed31_32.h" #include "adapter/adapter_service.h" #include "include/asic_capability_interface.h"
@@ -1566,8 +1567,7 @@ bool dc_link_setup_psr(const struct dc_link *dc_link, asic_cap->caps.SKIP_PSR_WAIT_FOR_PLL_LOCK_BIT; psr_context.numberOfControllers = - link->link_enc->adapter_service->asic_cap-> - data[ASIC_DATA_CONTROLLERS_NUM ]; + link->dc->res_pool->res_cap->num_timing_generator; psr_context.rfb_update_auto_en = true;
drivers/gpu/drm/amd/dal/dc/core/dc_resource.c +1 -1
@@ -133,10 +133,10 @@ bool resource_construct(unsigned int num_virtual_links, struct core_dc *dc, struct resource_pool *pool, - const struct resource_caps *caps, const struct resource_create_funcs *create_funcs) { struct dc_context *ctx = dc->ctx; +const struct resource_caps *caps = pool->res_cap;int i;unsigned int num_audio = caps->num_audio;struct resource_straps straps = {0 };
drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c +6 -3
@@ -360,8 +360,10 @@ static const struct dce110_opp_reg_offsets dce100_opp_reg_offsets[] = { };static const struct resource_caps res_cap = { + .num_timing_generator =6 , .num_audio =6 , - .num_stream_encoder =6 + .num_stream_encoder =6 , + .num_pll =3 };#define CTX ctx
@@ -855,6 +857,7 @@ static bool construct(struct dm_pp_static_clock_info static_clk_info = {0 }; pool->base.adapter_srv = as; + pool->base.res_cap = &res_cap; pool->base.funcs = &dce100_res_pool_funcs; pool->base.underlay_pipe_index =-1 ;
@@ -936,7 +939,7 @@ static bool construct(* Resource + asic cap harcoding * *************************************************/ pool->base.underlay_pipe_index =-1 ; - pool->base.pipe_count =dal_adapter_service_get_func_controllers_num (as); + pool->base.pipe_count = res_cap.num_timing_generator; pool->base.scaler_filter =dal_scaler_filter_create (ctx); dc->public.caps.max_downscale_ratio =200 ; dc->public.caps.i2c_speed_in_khz =40 ;
@@ -1000,7 +1003,7 @@ static bool construct( }if (!resource_construct (num_virtual_links, dc, &pool->base, - &res_cap, &res_create_funcs)) + &res_create_funcs)) goto res_create_fail;/* Create hardware sequencer */
drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c +27 -13
@@ -325,9 +325,20 @@ static const struct dce110_clk_src_reg_offsets dce110_clk_src_reg_offsets[] = { }; -static const struct resource_caps res_cap = { - .num_audio =3 , - .num_stream_encoder =3 +static const struct resource_caps carrizo_resource_cap = { + .num_timing_generator =3 , + .num_video_plane =1 , + .num_audio =3 , + .num_stream_encoder =3 , + .num_pll =2 , +}; + +static const struct resource_caps stoney_resource_cap = { + .num_timing_generator =2 , + .num_video_plane =1 , + .num_audio =3 , + .num_stream_encoder =3 , + .num_pll =2 , };#define CTX ctx
@@ -1140,6 +1151,15 @@ enum clocks_state dce110_resource_convert_clock_state_pp_to_dc(return dc_clocks_state; } +const struct resource_caps *dce110_resource_cap ( +struct hw_asic_id *asic_id) +{ +if (ASIC_REV_IS_STONEY (asic_id->hw_internal_rev)) +return &stoney_resource_cap; +else +return &carrizo_resource_cap; +} + static bool construct( struct adapter_service *as, uint8_t num_virtual_links,
@@ -1155,19 +1175,15 @@ static bool construct(struct resource_straps straps = {0 }; pool->base.adapter_srv = as; + pool->base.res_cap =dce110_resource_cap (&dc->asic_id); pool->base.funcs = &dce110_res_pool_funcs;/************************************************* * Resource + asic cap harcoding * *************************************************/ - pool->base.pipe_count =3 ; - pool->base.underlay_pipe_index =3 ; - -if (ASIC_REV_IS_STONEY (asic_id.hw_internal_rev)) { - pool->base.pipe_count =2 ; - pool->base.underlay_pipe_index =2 ; - } + pool->base.pipe_count = pool->base.res_cap->num_timing_generator; + pool->base.underlay_pipe_index = pool->base.pipe_count; dc->public.caps.max_downscale_ratio =150 ; dc->public.caps.i2c_speed_in_khz =100 ;
@@ -1175,8 +1191,6 @@ static bool construct(/************************************************* * Create resources * *************************************************/ - - pool->base.stream_engines.engine.ENGINE_ID_DIGA =1 ; pool->base.stream_engines.engine.ENGINE_ID_DIGB =1 ; pool->base.stream_engines.engine.ENGINE_ID_DIGC =1 ;
@@ -1299,7 +1313,7 @@ static bool construct(underlay_create (ctx, &pool->base);if (!resource_construct (num_virtual_links, dc, &pool->base, - &res_cap, &res_create_funcs)) + &res_create_funcs)) goto res_create_fail;/* Create hardware sequencer */
drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c +25 -7
@@ -375,9 +375,18 @@ static const struct dce112_clk_src_reg_offsets dce112_clk_src_reg_offsets[] = { } }; -static const struct resource_caps res_cap = { - .num_audio =6 , - .num_stream_encoder =6 +static const struct resource_caps polaris_10_resource_cap = { + .num_timing_generator =6 , + .num_audio =6 , + .num_stream_encoder =6 , + .num_pll =8 ,/* why 8? 6 combo PHY PLL + 2 regular PLLs? */ +}; + +static const struct resource_caps polaris_11_resource_cap = { + .num_timing_generator =5 , + .num_audio =5 , + .num_stream_encoder =5 , + .num_pll =8 ,/* why 8? 6 combo PHY PLL + 2 regular PLLs? */ };#define CTX ctx
@@ -1155,6 +1164,15 @@ static void bw_calcs_data_update_from_pplib(struct core_dc *dc)dm_pp_notify_wm_clock_changes (dc->ctx, &clk_ranges); } +const struct resource_caps *dce112_resource_cap ( +struct hw_asic_id *asic_id) +{ +if (ASIC_REV_IS_POLARIS11_M (asic_id->hw_internal_rev)) +return &polaris_11_resource_cap; +else +return &polaris_10_resource_cap; +} + static bool construct( struct adapter_service *adapter_serv, uint8_t num_virtual_links,
@@ -1166,14 +1184,14 @@ static bool construct(struct dm_pp_static_clock_info static_clk_info = {0 }; pool->base.adapter_srv = adapter_serv; + pool->base.res_cap =dce112_resource_cap (&dc->asic_id); pool->base.funcs = &dce112_res_pool_funcs;/************************************************* * Resource + asic cap harcoding * *************************************************/ pool->base.underlay_pipe_index =-1 ; - pool->base.pipe_count = -dal_adapter_service_get_func_controllers_num (adapter_serv); + pool->base.pipe_count = pool->base.res_cap->num_timing_generator; dc->public.caps.max_downscale_ratio =200 ; dc->public.caps.i2c_speed_in_khz =100 ;
@@ -1332,8 +1350,8 @@ static bool construct( } } -if (!resource_construct (num_virtual_links, dc, - &pool->base, &res_cap, &res_create_funcs)) +if (!resource_construct (num_virtual_links, dc, &pool->base, + &res_create_funcs)) goto res_create_fail;/* Create hardware sequencer */
drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c +7 -4
@@ -350,8 +350,10 @@ static const struct dce110_clk_src_reg_offsets dce80_clk_src_reg_offsets[] = { };static const struct resource_caps res_cap = { - .num_audio =6 , - .num_stream_encoder =6 + .num_timing_generator =6 , + .num_audio =6 , + .num_stream_encoder =6 , + .num_pll =3 , };#define CTX ctx
@@ -848,6 +850,7 @@ static bool construct(struct dm_pp_static_clock_info static_clk_info = {0 }; pool->base.adapter_srv = as; + pool->base.res_cap = &res_cap; pool->base.funcs = &dce80_res_pool_funcs;
@@ -855,7 +858,7 @@ static bool construct(* Resource + asic cap harcoding * *************************************************/ pool->base.underlay_pipe_index =-1 ; - pool->base.pipe_count =dal_adapter_service_get_func_controllers_num (as); + pool->base.pipe_count = res_cap.num_timing_generator; dc->public.caps.max_downscale_ratio =200 ; dc->public.caps.i2c_speed_in_khz =40 ;
@@ -986,7 +989,7 @@ static bool construct( }if (!resource_construct (num_virtual_links, dc, &pool->base, - &res_cap, &res_create_funcs)) + &res_create_funcs)) goto res_create_fail;/* Create hardware sequencer */
drivers/gpu/drm/amd/dal/dc/inc/core_dc.h +1 -0
@@ -17,6 +17,7 @@struct core_dc {struct dc public;struct dc_context *ctx; +struct hw_asic_id asic_id;uint8_t link_count;struct core_link *links[MAX_PIPES *2 ];
drivers/gpu/drm/amd/dal/dc/inc/core_types.h +1 -0
@@ -270,6 +270,7 @@ struct resource_pool {struct irq_service *irqs;const struct resource_funcs *funcs; +const struct resource_caps *res_cap; };struct pipe_ctx {
drivers/gpu/drm/amd/dal/dc/inc/resource.h +3 -1
@@ -37,8 +37,11 @@ enum dce_version resource_parse_asic_id( struct hw_asic_id asic_id);struct resource_caps { +int num_timing_generator; +int num_video_plane;int num_audio;int num_stream_encoder; +int num_pll; };struct resource_straps {
@@ -64,7 +67,6 @@ bool resource_construct(unsigned int num_virtual_links, struct core_dc *dc, struct resource_pool *pool, - const struct resource_caps *caps, const struct resource_create_funcs *create_funcs); struct resource_pool *dc_create_resource_pool(struct adapter_service *adapter_serv,
drivers/gpu/drm/amd/dal/include/adapter_service_interface.h +1 -19
@@ -145,18 +145,8 @@ enum adapter_feature_id {FEATURE_SET_06_START =FEATURE_DCP_PROGRAMMING_WA ,FEATURE_SET_06_END =FEATURE_SET_06_START +31 , -/* UInt set, 1 entry: Maximum co-functional non-DP displays */ -FEATURE_MAX_COFUNC_NON_DP_DISPLAYS =FEATURE_SET_06_END +1 , -FEATURE_SET_07_START =FEATURE_MAX_COFUNC_NON_DP_DISPLAYS , -FEATURE_SET_07_END =FEATURE_SET_07_START +31 , - -/* UInt set, 1 entry: Number of supported HDMI connection */ -FEATURE_SUPPORTED_HDMI_CONNECTION_NUM =FEATURE_SET_07_END +1 , -FEATURE_SET_08_START =FEATURE_SUPPORTED_HDMI_CONNECTION_NUM , -FEATURE_SET_08_END =FEATURE_SET_08_START +31 , -/* UInt set, 1 entry: Maximum number of controllers */ -FEATURE_MAX_CONTROLLER_NUM =FEATURE_SET_08_END +1 , +FEATURE_MAX_CONTROLLER_NUM =FEATURE_SET_06_END +1 ,FEATURE_SET_09_START =FEATURE_MAX_CONTROLLER_NUM , FEATURE_SET_09_END = FEATURE_SET_09_START + 31,
@@ -336,14 +326,6 @@ bool dal_adapter_service_get_firmware_info(struct adapter_service *as, struct firmware_info *info); -/* Get number of controllers */ -uint8_t dal_adapter_service_get_func_controllers_num ( -struct adapter_service *as); - -/* Get number of stream engines */ -uint8_t dal_adapter_service_get_stream_engines_num ( -struct adapter_service *as); -/* Get number of spread spectrum entries from BIOS */ uint32_t dal_adapter_service_get_ss_info_num( struct adapter_service *as,
drivers/gpu/drm/amd/dal/include/asic_capability_types.h +1 -12
@@ -84,30 +84,19 @@ struct asic_bugs {*/ enum asic_data {ASIC_DATA_FIRST =0 , -ASIC_DATA_CONTROLLERS_NUM =ASIC_DATA_FIRST , -ASIC_DATA_FUNCTIONAL_CONTROLLERS_NUM , -ASIC_DATA_DCE_VERSION , +ASIC_DATA_DCE_VERSION =ASIC_DATA_FIRST ,ASIC_DATA_DCE_VERSION_MINOR , -ASIC_DATA_VRAM_TYPE ,ASIC_DATA_VRAM_BITWIDTH , -ASIC_DATA_FEATURE_FLAGS , -ASIC_DATA_LINEBUFFER_NUM ,ASIC_DATA_LINEBUFFER_SIZE ,ASIC_DATA_DRAM_BANDWIDTH_EFFICIENCY ,ASIC_DATA_MC_LATENCY ,ASIC_DATA_MC_LATENCY_SLOW , -ASIC_DATA_CLOCKSOURCES_NUM ,ASIC_DATA_MEMORYTYPE_MULTIPLIER ,ASIC_DATA_STUTTERMODE ,ASIC_DATA_PATH_NUM_PER_DPMST_CONNECTOR , -ASIC_DATA_MAX_COFUNC_NONDP_DISPLAYS , -ASIC_DATA_REVISION_ID ,ASIC_DATA_MAX_UNDERSCAN_PERCENTAGE ,ASIC_DATA_VIEWPORT_PIXEL_GRANULARITY , -ASIC_DATA_DIGFE_NUM , -ASIC_DATA_SUPPORTED_HDMI_CONNECTION_NUM ,ASIC_DATA_MIN_DISPCLK_FOR_UNDERSCAN , -ASIC_DATA_NUM_OF_VIDEO_PLANES ,ASIC_DATA_DEFAULT_I2C_SPEED_IN_KHZ ,ASIC_DATA_DOWNSCALE_LIMIT ,ASIC_DATA_MAX_NUMBER /* end of enum */
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/76 drm/amd/dal: Remove unused code in dce112 hwss.
In reply to a message not in the archiveFrom: Zeyu Fan <[email protected]>
--- .../drm/amd/dal/dc/dce112/dce112_hw_sequencer.c | 23 ---------------------- 1 file changed, 23 deletions(-)
drivers/gpu/drm/amd/dal/dc/dce112/dce112_hw_sequencer.c +0 -23
@@ -260,29 +260,6 @@ static void dce112_init_pte(struct dc_context *ctx)uint32_t chunk_int =0 ;uint32_t chunk_mul =0 ; - addr = mmUNP_DVMM_PTE_CONTROL; - value =dm_read_reg (ctx, addr); - -set_reg_field_value ( - value, -0 , -DVMM_PTE_CONTROL , -DVMM_USE_SINGLE_PTE ); - -set_reg_field_value ( - value, -1 , -DVMM_PTE_CONTROL , -DVMM_PTE_BUFFER_MODE0 ); - -set_reg_field_value ( - value, -1 , -DVMM_PTE_CONTROL , -DVMM_PTE_BUFFER_MODE1 ); - -dm_write_reg (ctx, addr, value); - addr = mmDVMM_PTE_REQ; value =dm_read_reg (ctx, addr);
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/76 drm/amd/dal: Consolidate link encoder from each dce version.
In reply to a message not in the archiveFrom: Zeyu Fan <[email protected]>
---
drivers/gpu/drm/amd/dal/dc/core/dc_link_hwss.c | 5 +-
drivers/gpu/drm/amd/dal/dc/dce/Makefile | 2 +-
.../dce_link_encoder.c} | 10 +-
.../dce_link_encoder.h} | 0
...ce110_stream_encoder.c => dce_stream_encoder.c} | 4 +-
...ce110_stream_encoder.h => dce_stream_encoder.h} | 0
drivers/gpu/drm/amd/dal/dc/dce100/Makefile | 2 +-
.../drm/amd/dal/dc/dce100/dce100_link_encoder.c | 92 ------
.../drm/amd/dal/dc/dce100/dce100_link_encoder.h | 42 ---
.../gpu/drm/amd/dal/dc/dce100/dce100_resource.c | 13 +-
drivers/gpu/drm/amd/dal/dc/dce110/Makefile | 2 +-
.../gpu/drm/amd/dal/dc/dce110/dce110_resource.c | 11 +-
drivers/gpu/drm/amd/dal/dc/dce112/Makefile | 2 +-
.../drm/amd/dal/dc/dce112/dce112_link_encoder.c | 191 ------------
.../drm/amd/dal/dc/dce112/dce112_link_encoder.h | 41 ---
.../gpu/drm/amd/dal/dc/dce112/dce112_resource.c | 14 +-
drivers/gpu/drm/amd/dal/dc/dce80/Makefile | 2 +-
.../gpu/drm/amd/dal/dc/dce80/dce80_link_encoder.c | 333 ---------------------
.../gpu/drm/amd/dal/dc/dce80/dce80_link_encoder.h | 39 ---
drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c | 14 +-
drivers/gpu/drm/amd/dal/dc/inc/hw/link_encoder.h | 1 +
21 files changed, 50 insertions(+), 770 deletions(-)
rename drivers/gpu/drm/amd/dal/dc/{dce110/dce110_link_encoder.c => dce/dce_link_encoder.c} (99%)
rename drivers/gpu/drm/amd/dal/dc/{dce110/dce110_link_encoder.h => dce/dce_link_encoder.h} (100%)
rename drivers/gpu/drm/amd/dal/dc/dce/{dce110_stream_encoder.c => dce_stream_encoder.c} (99%)
rename drivers/gpu/drm/amd/dal/dc/dce/{dce110_stream_encoder.h => dce_stream_encoder.h} (100%)
delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce100/dce100_link_encoder.c
delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce100/dce100_link_encoder.h
delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce112/dce112_link_encoder.c
delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce112/dce112_link_encoder.h
delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce80/dce80_link_encoder.c
delete mode 100644 drivers/gpu/drm/amd/dal/dc/dce80/dce80_link_encoder.hdrivers/gpu/drm/amd/dal/dc/core/dc_link_hwss.c +3 -2
@@ -1,5 +1,6 @@/* Copyright 2015 Advanced Micro Devices, Inc. */ +#include "dm_services.h" #include "dc.h" #include "inc/core_dc.h"
@@ -9,8 +10,8 @@#include "hw_sequencer.h" #include "dc_link_ddc.h" #include "dm_helpers.h" -#include "dce110/dce110_link_encoder.h" -#include "dce/dce110_stream_encoder.h" +#include "dce/dce_link_encoder.h" +#include "dce/dce_stream_encoder.h" enum dc_status core_link_read_dpcd( struct core_link* link,
drivers/gpu/drm/amd/dal/dc/dce/Makefile +1 -1
@@ -5,7 +5,7 @@ # - register programming through common macros that look up register # offset/shift/mask stored in dce_hw struct -DCE = dce_audio.o dce110_stream_encoder.o +DCE = dce_audio.o dce_stream_encoder.o dce_link_encoder.o AMD_DAL_DCE = $(addprefix $(AMDDALPATH)/dc/dce/,$(DCE))
drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c renamed from drivers/gpu/drm/amd/dal/dc/dce110/dce110_link_encoder.c +5 -5
@@ -23,12 +23,13 @@* */ + +#include "dm_services.h" #include "core_types.h" #include "link_encoder.h" +#include "dce_link_encoder.h" #include "stream_encoder.h" -#include "dce110_link_encoder.h" -#include "i2caux_interface.h" #include "dc_bios_types.h"
@@ -907,7 +908,8 @@ static bool dce110_link_encoder_validate_hdmi_output(return false;/* DCE11 HW does not support 420 */ -if (crtc_timing->pixel_encoding ==PIXEL_ENCODING_YCBCR420 ) +if (!enc110->base.features.ycbcr420_supported && + crtc_timing->pixel_encoding ==PIXEL_ENCODING_YCBCR420 )return false;return true;
@@ -993,8 +995,6 @@ bool dce110_link_encoder_construct( enc110->base.features.max_pixel_clock =MAX_ENCODER_CLK ; - enc110->base.features.max_hdmi_pixel_clock = -DCE11_UNIPHY_MAX_PIXEL_CLK_IN_KHZ ; enc110->base.features.max_deep_color =COLOR_DEPTH_121212 ; enc110->base.features.max_hdmi_deep_color =COLOR_DEPTH_121212 ;
drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.h renamed from drivers/gpu/drm/amd/dal/dc/dce110/dce110_link_encoder.h +0 -0
drivers/gpu/drm/amd/dal/dc/dce/dce_stream_encoder.c renamed from drivers/gpu/drm/amd/dal/dc/dce/dce110_stream_encoder.c +2 -2
@@ -23,10 +23,10 @@* */ +#include "dm_services.h" #include "dc_bios_types.h" -#include "dce110_stream_encoder.h" - +#include "dce_stream_encoder.h" #include "dce/dce_11_0_d.h" #include "dce/dce_11_0_sh_mask.h" #include "dce/dce_11_0_enum.h"
drivers/gpu/drm/amd/dal/dc/dce/dce_stream_encoder.h renamed from drivers/gpu/drm/amd/dal/dc/dce/dce110_stream_encoder.h +0 -0
drivers/gpu/drm/amd/dal/dc/dce100/Makefile +1 -1
@@ -2,7 +2,7 @@ # Makefile for the 'controller' sub-component of DAL. # It provides the control and status of HW CRTC block. -DCE100 = dce100_resource.o dce100_hw_sequencer.o dce100_link_encoder.o +DCE100 = dce100_resource.o dce100_hw_sequencer.o AMD_DAL_DCE100 = $(addprefix $(AMDDALPATH)/dc/dce100/,$(DCE100))
drivers/gpu/drm/amd/dal/dc/dce100/dce100_link_encoder.c deleted +0 -92
92 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/dce100/dce100_link_encoder.h deleted +0 -42
42 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c +8 -5
@@ -34,13 +34,12 @@#include "dce110/dce110_resource.h" #include "dce110/dce110_timing_generator.h" #include "irq/dce110/irq_service_dce110.h" -#include "dce110/dce110_link_encoder.h" +#include "dce/dce_link_encoder.h" +#include "dce/dce_stream_encoder.h" #include "dce110/dce110_mem_input.h" #include "dce110/dce110_mem_input_v.h" #include "dce110/dce110_ipp.h" #include "dce110/dce110_transform.h" -#include "dce100/dce100_link_encoder.h" -#include "dce/dce110_stream_encoder.h" #include "dce110/dce110_opp.h" #include "dce110/dce110_clock_source.h" #include "dce/dce_audio.h"
@@ -515,13 +514,17 @@ struct link_encoder *dce100_link_encoder_create(if (!enc110)return NULL ; -if (dce100_link_encoder_construct ( +if (dce110_link_encoder_construct ( enc110, enc_init_data, &link_enc_regs[enc_init_data->transmitter], &link_enc_aux_regs[enc_init_data->channel -1 ], - &link_enc_hpd_regs[enc_init_data->hpd_source])) + &link_enc_hpd_regs[enc_init_data->hpd_source])) { + + enc110->base.features.ycbcr420_supported = false; + enc110->base.features.max_hdmi_pixel_clock =300000 ;return &enc110->base; + }BREAK_TO_DEBUGGER ();dm_free (enc110);
drivers/gpu/drm/amd/dal/dc/dce110/Makefile +1 -1
@@ -3,7 +3,7 @@ # It provides the control and status of HW CRTC block. DCE110 = dce110_ipp.o dce110_ipp_cursor.o \ -dce110_ipp_gamma.o dce110_link_encoder.o dce110_opp.o \ +dce110_ipp_gamma.o dce110_opp.o \ dce110_opp_formatter.o dce110_opp_regamma.o \ dce110_timing_generator.o dce110_transform.o dce110_transform_v.o \ dce110_transform_gamut.o dce110_transform_scl.o dce110_opp_csc.o\
drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c +8 -3
@@ -30,18 +30,19 @@#include "resource.h" #include "dce110/dce110_resource.h" +#include "include/irq_service_interface.h" #include "dce/dce_audio.h" #include "dce110/dce110_timing_generator.h" #include "irq/dce110/irq_service_dce110.h" #include "dce110/dce110_timing_generator_v.h" -#include "dce110/dce110_link_encoder.h" +#include "dce/dce_link_encoder.h" +#include "dce/dce_stream_encoder.h" #include "dce110/dce110_mem_input.h" #include "dce110/dce110_mem_input_v.h" #include "dce110/dce110_ipp.h" #include "dce110/dce110_transform.h" #include "dce110/dce110_transform_v.h" -#include "dce/dce110_stream_encoder.h" #include "dce110/dce110_opp.h" #include "dce110/dce110_opp_v.h" #include "dce110/dce110_clock_source.h"
@@ -495,8 +496,12 @@ struct link_encoder *dce110_link_encoder_create( enc_init_data, &link_enc_regs[enc_init_data->transmitter], &link_enc_aux_regs[enc_init_data->channel - 1], - &link_enc_hpd_regs[enc_init_data->hpd_source])) + &link_enc_hpd_regs[enc_init_data->hpd_source])) { + + enc110->base.features.ycbcr420_supported = false; + enc110->base.features.max_hdmi_pixel_clock =594000 ;return &enc110->base; + }BREAK_TO_DEBUGGER ();dm_free (enc110);
drivers/gpu/drm/amd/dal/dc/dce112/Makefile +1 -1
@@ -2,7 +2,7 @@ # Makefile for the 'controller' sub-component of DAL. # It provides the control and status of HW CRTC block. -DCE112 = dce112_link_encoder.o dce112_compressor.o dce112_hw_sequencer.o \ +DCE112 = dce112_compressor.o dce112_hw_sequencer.o \ dce112_resource.o dce112_clock_source.o dce112_mem_input.o dce112_opp_formatter.o \ dce112_opp.o
drivers/gpu/drm/amd/dal/dc/dce112/dce112_link_encoder.c deleted +0 -191
191 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/dce112/dce112_link_encoder.h deleted +0 -41
41 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c +9 -5
@@ -34,11 +34,11 @@#include "dce110/dce110_resource.h" #include "dce110/dce110_timing_generator.h" #include "dce112/dce112_mem_input.h" -#include "dce112/dce112_link_encoder.h" -#include "dce110/dce110_link_encoder.h" +#include "irq/dce110/irq_service_dce110.h" #include "dce110/dce110_transform.h" -#include "dce/dce110_stream_encoder.h" +#include "dce/dce_link_encoder.h" +#include "dce/dce_stream_encoder.h" #include "dce/dce_audio.h" #include "dce112/dce112_opp.h" #include "dce110/dce110_ipp.h"
@@ -518,13 +518,17 @@ struct link_encoder *dce112_link_encoder_create(if (!enc110)return NULL ; -if (dce112_link_encoder_construct ( +if (dce110_link_encoder_construct ( enc110, enc_init_data, &link_enc_regs[enc_init_data->transmitter], &link_enc_aux_regs[enc_init_data->channel -1 ], - &link_enc_hpd_regs[enc_init_data->hpd_source])) + &link_enc_hpd_regs[enc_init_data->hpd_source])) { + + enc110->base.features.ycbcr420_supported = false; + enc110->base.features.max_hdmi_pixel_clock =600000 ;return &enc110->base; + }BREAK_TO_DEBUGGER ();dm_free (enc110);
drivers/gpu/drm/amd/dal/dc/dce80/Makefile +1 -1
@@ -2,7 +2,7 @@ # Makefile for the 'controller' sub-component of DAL. # It provides the control and status of HW CRTC block. -DCE80 = dce80_ipp.o dce80_ipp_gamma.o dce80_link_encoder.o dce80_opp.o \ +DCE80 = dce80_ipp.o dce80_ipp_gamma.o dce80_opp.o \ dce80_opp_formatter.o dce80_opp_regamma.o \ dce80_timing_generator.o dce80_transform.o dce80_transform_gamut.o \ dce80_transform_scl.o dce80_opp_csc.o\
drivers/gpu/drm/amd/dal/dc/dce80/dce80_link_encoder.c deleted +0 -333
333 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/dce80/dce80_link_encoder.h deleted +0 -39
@@ -1,39 +0,0 @@ -/* -* Copyright 2012-15 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_LINK_ENCODER__DCE80_H__ -#define __DC_LINK_ENCODER__DCE80_H__ - -#include "link_encoder.h" -#include "../dce110/dce110_link_encoder.h" - -bool dce80_link_encoder_construct ( -struct dce110_link_encoder *enc110, -const struct encoder_init_data *init_data, -const struct dce110_link_enc_registers *link_regs, -const struct dce110_link_enc_aux_registers *aux_regs, -const struct dce110_link_enc_hpd_registers *hpd_regs); - -#endif /* __DC_LINK_ENCODER__DCE80_H__ */
drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c +9 -5
@@ -23,6 +23,7 @@* */ +#include "dm_services.h" #include "link_encoder.h"
@@ -36,12 +37,11 @@#include "dce110/dce110_mem_input.h" #include "dce110/dce110_resource.h" #include "dce80/dce80_timing_generator.h" -#include "dce80/dce80_link_encoder.h" -#include "dce110/dce110_link_encoder.h" +#include "dce/dce_link_encoder.h" +#include "dce/dce_stream_encoder.h" #include "dce80/dce80_mem_input.h" #include "dce80/dce80_ipp.h" #include "dce80/dce80_transform.h" -#include "dce/dce110_stream_encoder.h" #include "dce80/dce80_opp.h" #include "dce110/dce110_ipp.h" #include "dce110/dce110_clock_source.h"
@@ -504,13 +504,17 @@ struct link_encoder *dce80_link_encoder_create(if (!enc110)return NULL ; -if (dce80_link_encoder_construct ( +if (dce110_link_encoder_construct ( enc110, enc_init_data, &link_enc_regs[enc_init_data->transmitter], &link_enc_aux_regs[enc_init_data->channel -1 ], - &link_enc_hpd_regs[enc_init_data->hpd_source])) + &link_enc_hpd_regs[enc_init_data->hpd_source])) { + + enc110->base.features.ycbcr420_supported = false; + enc110->base.features.max_hdmi_pixel_clock =297000 ;return &enc110->base; + }BREAK_TO_DEBUGGER ();dm_free (enc110);
drivers/gpu/drm/amd/dal/dc/inc/hw/link_encoder.h +1 -0
@@ -64,6 +64,7 @@ struct encoder_feature_support {/* maximum supported clock */ unsigned int max_pixel_clock;unsigned int max_hdmi_pixel_clock; +bool ycbcr420_supported; };enum physical_phy_id {
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/76 drm/amd/dal: Remove wireless_data_source
In reply to a message not in the archive--- drivers/gpu/drm/amd/dal/dc/adapter/Makefile | 2 +- .../gpu/drm/amd/dal/dc/adapter/adapter_service.c | 36 +--- .../gpu/drm/amd/dal/dc/adapter/adapter_service.h | 2 - .../drm/amd/dal/dc/adapter/wireless_data_source.c | 208 --------------------- .../drm/amd/dal/dc/adapter/wireless_data_source.h | 79 -------- 5 files changed, 8 insertions(+), 319 deletions(-) delete mode 100644 drivers/gpu/drm/amd/dal/dc/adapter/wireless_data_source.c delete mode 100644 drivers/gpu/drm/amd/dal/dc/adapter/wireless_data_source.h
drivers/gpu/drm/amd/dal/dc/adapter/Makefile +1 -1
@@ -2,7 +2,7 @@ # Makefile for the 'adapter' sub-component of DAL. # It provides the control and status of HW adapter. -ADAPTER = adapter_service.o wireless_data_source.o +ADAPTER = adapter_service.o AMD_DAL_ADAPTER = $(addprefix $(AMDDALPATH)/dc/adapter/,$(ADAPTER))
drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c +7 -29
@@ -36,8 +36,6 @@#include "adapter_service.h" -#include "wireless_data_source.h" -#include "atom.h" #define ABSOLUTE_BACKLIGHT_MAX 255
@@ -475,10 +473,6 @@ static bool get_feature_value_from_data_sources( *data = as->asic_cap->data[ASIC_DATA_STUTTERMODE ];break ; -case FEATURE_WIRELESS_ENABLE : - *data = as->wireless_data.wireless_enable; -break ; -case FEATURE_8BPP_SUPPORTED : *data = as->asic_cap->caps.SUPPORT_8BPP;break ;
@@ -810,18 +804,6 @@ enum dce_version dal_adapter_service_get_dce_version( } } -static bool is_wireless_object (struct graphics_object_id id) -{ -if ((id.type ==OBJECT_TYPE_ENCODER && - id.id ==ENCODER_ID_INTERNAL_WIRELESS ) || - (id.type ==OBJECT_TYPE_CONNECTOR && id.id == -CONNECTOR_ID_WIRELESS ) || - (id.type ==OBJECT_TYPE_CONNECTOR && id.id == -CONNECTOR_ID_MIRACAST )) -return true; -return false; -} -/** * Get the source objects of an object *
@@ -841,17 +823,13 @@ struct graphics_object_id dal_adapter_service_get_src_obj(struct graphics_object_id src_object_id;struct dc_bios *dcb = as->ctx->dc_bios; -if (is_wireless_object (id)) - src_object_id =wireless_get_src_obj_id (as, id, index); -else { -if (BP_RESULT_OK != dcb->funcs->get_src_obj (dcb, id, index, - &src_object_id)) { - src_object_id = -dal_graphics_object_id_init ( -0 , -ENUM_ID_UNKNOWN , -OBJECT_TYPE_UNKNOWN ); - } +if (BP_RESULT_OK != dcb->funcs->get_src_obj (dcb, id, index, + &src_object_id)) { + src_object_id = +dal_graphics_object_id_init ( +0 , +ENUM_ID_UNKNOWN , +OBJECT_TYPE_UNKNOWN ); }return src_object_id;
drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.h +0 -2
@@ -29,7 +29,6 @@/* Include */ #include "dc_bios_types.h" #include "include/adapter_service_interface.h" -#include "wireless_data_source.h" #define SIZEOF_BACKLIGHT_LUT 101
@@ -46,7 +45,6 @@ struct adapter_service {enum dce_environment dce_environment;struct gpio_service *gpio_service;struct i2caux *i2caux; -struct wireless_data wireless_data;struct integrated_info *integrated_info;uint32_t platform_methods_mask;uint32_t ac_level_percentage;
drivers/gpu/drm/amd/dal/dc/adapter/wireless_data_source.c deleted +0 -208
208 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/adapter/wireless_data_source.h deleted +0 -79
79 lines not on this page · raw message
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/76 drm/amd/dal: Move gpio_service out of adapter_service
In reply to a message not in the archive--- .../gpu/drm/amd/dal/dc/adapter/adapter_service.c | 16 --------------- .../gpu/drm/amd/dal/dc/adapter/adapter_service.h | 24 ---------------------- drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c | 2 +- drivers/gpu/drm/amd/dal/dc/core/dc.c | 20 +++++++++++++++++- drivers/gpu/drm/amd/dal/dc/core/dc_link.c | 2 +- drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c | 2 +- drivers/gpu/drm/amd/dal/dc/dc_types.h | 1 + drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c | 2 +- .../amd/dal/include/adapter_service_interface.h | 20 +++++++++++++++++- 9 files changed, 43 insertions(+), 46 deletions(-)
drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c +0 -16
@@ -610,7 +610,6 @@ static void adapter_service_destruct(struct dc_bios *dcb = as->ctx->dc_bios;dal_i2caux_destroy (&as->i2caux); -dal_gpio_service_destroy (&as->gpio_service);dal_asic_capability_destroy (&as->asic_cap); dcb->funcs->destroy_integrated_info (dcb, &as->integrated_info);
@@ -674,18 +673,6 @@ static bool adapter_service_construct( dcb = as->ctx->dc_bios; - -/* Create GPIO service */ - as->gpio_service =dal_gpio_service_create ( - dce_version, - as->dce_environment, - as->ctx); - -if (!as->gpio_service) { -ASSERT_CRITICAL (false); - goto failed_to_create_gpio_service; - } -/* Create I2C AUX */ as->i2caux =dal_i2caux_create (as, as->ctx);
@@ -714,9 +701,6 @@ failed_to_generate_features:dal_i2caux_destroy (&as->i2caux); failed_to_create_i2caux: -dal_gpio_service_destroy (&as->gpio_service); - -failed_to_create_gpio_service:dal_asic_capability_destroy (&as->asic_cap);return false;
drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.h +0 -24
@@ -30,29 +30,5 @@#include "dc_bios_types.h" #include "include/adapter_service_interface.h" -#define SIZEOF_BACKLIGHT_LUT 101 - -/* -* Forward declaration -*/ -struct gpio_service ; -struct asic_cap ; - -/* Adapter service */ -struct adapter_service { -struct dc_context *ctx; -struct asic_capability *asic_cap; -enum dce_environment dce_environment; -struct gpio_service *gpio_service; -struct i2caux *i2caux; -struct integrated_info *integrated_info; -uint32_t platform_methods_mask; -uint32_t ac_level_percentage; -uint32_t dc_level_percentage; -uint32_t backlight_caps_initialized; -uint32_t backlight_8bit_lut[SIZEOF_BACKLIGHT_LUT ]; -uint32_t adapter_feature_set[FEATURE_MAXIMUM /32 ]; -uint32_t default_values[FEATURE_MAXIMUM ]; -};#endif /* __DAL_ADAPTER_SERVICE_H__ */
drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c +1 -1
@@ -2932,7 +2932,7 @@ static bool i2c_read( i2c_info->i2c_hw_assist, i2c_info->i2c_line }; - ddc =dal_gpio_create_ddc (as->gpio_service, + ddc =dal_gpio_create_ddc (as->ctx->gpio_service, i2c_info->gpio_info.clk_a_register_index, (1 << i2c_info->gpio_info.clk_a_shift), &hw_info);
drivers/gpu/drm/amd/dal/dc/core/dc.c +19 -1
@@ -537,7 +537,7 @@ static bool construct(struct core_dc *dc,if (!dc_ctx->dc_bios) {ASSERT_CRITICAL (false); - goto as_fail; + goto bios_fail; } dc_ctx->created_bios = true;
@@ -554,6 +554,17 @@ static bool construct(struct core_dc *dc, } } +/* Create GPIO service */ + dc_ctx->gpio_service =dal_gpio_service_create ( + dc_version, + as->dce_environment, + as->ctx); + +if (!dc_ctx->gpio_service) { +ASSERT_CRITICAL (false); + goto gpio_fail; + } + dc->res_pool = dc_create_resource_pool( as, dc,
@@ -574,9 +585,15 @@ static bool construct(struct core_dc *dc, create_links_fail: dc->res_pool->funcs->destroy (&dc->res_pool); create_resource_fail: +if (dc->ctx->gpio_service) +dal_gpio_service_destroy (&dc_ctx->gpio_service); +gpio_fail:if (as)dal_adapter_service_destroy (&as); as_fail: +if (dc->ctx->created_bios) +dal_bios_parser_destroy (&dc->ctx->dc_bios); +bios_fail:dal_logger_destroy (&dc_ctx->logger); logger_fail:dm_free (dc->current_context);
@@ -588,6 +605,7 @@ ctx_fail:static void destruct (struct core_dc *dc) { +dal_gpio_service_destroy (&dc->ctx->gpio_service);resource_validate_ctx_destruct (dc->current_context);dm_free (dc->current_context);dm_free (dc->temp_flip_context);
drivers/gpu/drm/amd/dal/dc/core/dc_link.c +1 -1
@@ -110,7 +110,7 @@ static struct gpio *get_hpd_gpio(const struct core_link *link) }return dal_gpio_service_create_irq ( - link->adapter_srv->gpio_service, + link->ctx->gpio_service, pin_info.offset, pin_info.mask); }
drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c +1 -1
@@ -280,7 +280,7 @@ static bool construct(enum connector_id connector_id =dal_graphics_object_id_get_connector_id (init_data->id); -struct gpio_service *gpio_service = init_data->as->gpio_service; +struct gpio_service *gpio_service = init_data->ctx->gpio_service;struct graphics_object_i2c_info i2c_info;struct gpio_ddc_hw_info hw_info;struct dc_bios *dcb = init_data->ctx->dc_bios;
drivers/gpu/drm/amd/dal/dc/dc_types.h +1 -0
@@ -75,6 +75,7 @@ struct dc_context {struct dc_bios *dc_bios;bool created_bios; +struct gpio_service *gpio_service; };/*
drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c +1 -1
@@ -582,7 +582,7 @@ static struct gpio *get_hpd_gpio(const struct link_encoder *enc) }return dal_gpio_service_create_irq ( - enc->adapter_service->gpio_service, + enc->ctx->gpio_service, pin_info.offset, pin_info.mask); }
drivers/gpu/drm/amd/dal/include/adapter_service_interface.h +19 -1
@@ -33,9 +33,11 @@#include "dal_types.h" #include "asic_capability_types.h" +#define SIZEOF_BACKLIGHT_LUT 101 +/* forward declaration */ struct i2caux ; -struct adapter_service ; +struct asic_cap ;/* * enum adapter_feature_id
@@ -293,6 +295,22 @@ enum adapter_feature_id {FEATURE_MAXIMUM }; +/* Adapter service */ +struct adapter_service { +struct dc_context *ctx; +struct asic_capability *asic_cap; +enum dce_environment dce_environment; +struct i2caux *i2caux; +struct integrated_info *integrated_info; +uint32_t platform_methods_mask; +uint32_t ac_level_percentage; +uint32_t dc_level_percentage; +uint32_t backlight_caps_initialized; +uint32_t backlight_8bit_lut[SIZEOF_BACKLIGHT_LUT ]; +uint32_t adapter_feature_set[FEATURE_MAXIMUM /32 ]; +uint32_t default_values[FEATURE_MAXIMUM ]; +}; +/* Adapter Service type of DRR support*/ enum as_drr_support {AS_DRR_SUPPORT_DISABLED =0x0 ,
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/76 drm/amd/dal: Fix warning about comparing different types
In reply to a message not in the archive--- drivers/gpu/drm/amd/dal/dc/core/dc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/dal/dc/core/dc.c +1 -1
@@ -650,7 +650,7 @@ void ProgramPixelDurationV(unsigned int pixelClockInKHz )struct dc *dc_create (const struct dc_init_data *init_params) {struct core_dc *core_dc =dm_alloc (sizeof (*core_dc)); -int full_pipe_count; +unsigned int full_pipe_count;if (NULL == core_dc) goto alloc_fail;
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/76 drm/amd/dal: fix dc creation
In reply to a message not in the archiveFrom: Dmytro Laktyushkin <[email protected]>
--- drivers/gpu/drm/amd/dal/dc/core/dc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/dal/dc/core/dc.c +2 -2
@@ -557,8 +557,8 @@ static bool construct(struct core_dc *dc,/* Create GPIO service */ dc_ctx->gpio_service =dal_gpio_service_create ( dc_version, - as->dce_environment, - as->ctx); + dc_ctx->dce_environment, + dc_ctx);if (!dc_ctx->gpio_service) {ASSERT_CRITICAL (false);
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 9/76 drm/amd/dal: add chroma support to program_size_and_rotation
In reply to a message not in the archiveFrom: Dmytro Laktyushkin <[email protected]>
--- drivers/gpu/drm/amd/dal/dc/dc_hw_types.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/dal/dc/dc_hw_types.h +2 -0
@@ -114,6 +114,7 @@ union plane_size {* 32 pixel aligned. */ uint32_t luma_pitch; +uint32_t meta_luma_pitch;struct rect chroma_size;/* Graphic surface pitch in pixels.
@@ -121,6 +122,7 @@ union plane_size {* 32 pixel aligned. */ uint32_t chroma_pitch; +uint32_t meta_chroma_pitch; } video; };
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 10/76 drm/amd/dal: add meta address to video address struct
In reply to a message not in the archiveFrom: Dmytro Laktyushkin <[email protected]>
--- drivers/gpu/drm/amd/dal/dc/dc_hw_types.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/dal/dc/dc_hw_types.h +2 -0
@@ -76,6 +76,8 @@ struct dc_plane_address {/*video progressive*/ struct { +PHYSICAL_ADDRESS_LOC meta_chroma; +PHYSICAL_ADDRESS_LOC meta_luma;PHYSICAL_ADDRESS_LOC chroma_addr;PHYSICAL_ADDRESS_LOC luma_addr; } video_progressive;
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 11/76 drm/amd/dal: Refactor i2c_hw_engine
In reply to a message not in the archiveFrom: Andrey Grodzovsky <[email protected]>
Pass dce110_i2c_hw_engine_registers as parameter.
Fixup hw_engine regs set. asssign registers array starting from element 0 and not 1
--- .../drm/amd/dal/dc/i2caux/dce100/i2caux_dce100.c | 22 ++++++++- .../drm/amd/dal/dc/i2caux/dce110/i2caux_dce110.c | 14 ++++-- .../drm/amd/dal/dc/i2caux/dce110/i2caux_dce110.h | 4 +- .../drm/amd/dal/dc/i2caux/dce112/i2caux_dce112.c | 52 +++------------------- 4 files changed, 40 insertions(+), 52 deletions(-)
drivers/gpu/drm/amd/dal/dc/i2caux/dce100/i2caux_dce100.c +21 -1
@@ -33,6 +33,7 @@#include "../i2c_hw_engine.h" #include "../dce110/aux_engine_dce110.h" +#include "../dce110/i2c_hw_engine_dce110.h" #include "../dce110/i2caux_dce110.h" #include "dce/dce_10_0_d.h"
@@ -52,6 +53,11 @@ .AUX_RESET_MASK = 0 \ } +#define hw_engine_regs (id)\ +{\ + I2C_HW_ENGINE_COMMON_REG_LIST(id) \ +} +static const struct dce110_aux_registers dce100_aux_regs[] = {aux_regs (0 ),aux_regs (1 ),
@@ -61,6 +67,15 @@ static const struct dce110_aux_registers dce100_aux_regs[] = { aux_regs(5), }; +static const struct dce110_i2c_hw_engine_registers dce100_hw_engine_regs[] = { +hw_engine_regs (1 ), +hw_engine_regs (2 ), +hw_engine_regs (3 ), +hw_engine_regs (4 ), +hw_engine_regs (5 ), +hw_engine_regs (6 ) +}; +struct i2caux *dal_i2caux_dce100_create (struct adapter_service *as,struct dc_context *ctx)
@@ -73,7 +88,12 @@ struct i2caux *dal_i2caux_dce100_create(return NULL ; } -if (dal_i2caux_dce110_construct (i2caux_dce110, as, ctx, dce100_aux_regs)) +if (dal_i2caux_dce110_construct ( + i2caux_dce110, + as, + ctx, + dce100_aux_regs, + dce100_hw_engine_regs))return &i2caux_dce110->base;ASSERT_CRITICAL (false);
drivers/gpu/drm/amd/dal/dc/i2caux/dce110/i2caux_dce110.c +10 -4
@@ -166,7 +166,7 @@ static const struct i2caux_funcs i2caux_funcs = { }#define hw_engine_regs (id)\ -[id] = {\ +{\ I2C_HW_ENGINE_COMMON_REG_LIST(id) \ }
@@ -192,7 +192,8 @@ bool dal_i2caux_dce110_construct(struct i2caux_dce110 *i2caux_dce110, struct adapter_service *as, struct dc_context *ctx, - const struct dce110_aux_registers aux_regs[]) + const struct dce110_aux_registers aux_regs[], + const struct dce110_i2c_hw_engine_registers i2c_hw_engine_regs[]) { uint32_t i = 0;uint32_t reference_frequency =0 ;
@@ -239,7 +240,7 @@ bool dal_i2caux_dce110_construct( hw_arg_dce110.reference_frequency = reference_frequency; hw_arg_dce110.default_speed = base->default_i2c_hw_speed; hw_arg_dce110.ctx = ctx; - hw_arg_dce110.regs = &i2c_hw_engine_regs[i +1 ]; + hw_arg_dce110.regs = &i2c_hw_engine_regs[i]; base->i2c_hw_engines[line_id] =dal_i2c_hw_engine_dce110_create (&hw_arg_dce110);
@@ -298,7 +299,12 @@ struct i2caux *dal_i2caux_dce110_create(return NULL ; } -if (dal_i2caux_dce110_construct (i2caux_dce110, as, ctx, dce110_aux_regs)) +if (dal_i2caux_dce110_construct ( + i2caux_dce110, + as, + ctx, + dce110_aux_regs, + i2c_hw_engine_regs))return &i2caux_dce110->base;ASSERT_CRITICAL (false);
drivers/gpu/drm/amd/dal/dc/i2caux/dce110/i2caux_dce110.h +3 -1
@@ -35,6 +35,7 @@ struct i2caux_dce110 { };struct dce110_aux_registers ; +struct dce110_i2c_hw_engine_registers ; struct i2caux *dal_i2caux_dce110_create( struct adapter_service *as,
@@ -44,6 +45,7 @@ bool dal_i2caux_dce110_construct(struct i2caux_dce110 *i2caux_dce110, struct adapter_service *as, struct dc_context *ctx, - const struct dce110_aux_registers *aux_regs); + const struct dce110_aux_registers *aux_regs, + const struct dce110_i2c_hw_engine_registers *i2c_hw_engine_regs);#endif /* __DAL_I2C_AUX_DCE110_H__ */
drivers/gpu/drm/amd/dal/dc/i2caux/dce112/i2caux_dce112.c +6 -46
68 lines not on this page · raw message
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 12/76 drm/amd/dal: modify DCE HW sequence to be re-usable for next gen HW
In reply to a message not in the archiveFrom: Hersen Wu <[email protected]>
--- .../drm/amd/dal/dc/dce110/dce110_hw_sequencer.c | 50 +++++++++++----------- 1 file changed, 25 insertions(+), 25 deletions(-)
drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c +25 -25
@@ -774,6 +774,12 @@ static enum dc_status apply_single_controller_ctx_to_hw(struct tg_color black_color = {0 };if (!pipe_ctx_old->stream) { + +/* program blank color */ +color_space_to_black_color (stream->public.output_color_space, &black_color); + pipe_ctx->tg->funcs->set_blank_color ( + pipe_ctx->tg, + &black_color);/* * Must blank CRTC after disabling power gating and before any * programming, otherwise CRTC will be hung in bad state
@@ -794,14 +800,6 @@ static enum dc_status apply_single_controller_ctx_to_hw( true); } -/*TODO: mst support - use total stream count*/ - pipe_ctx->mi->funcs->allocate_mem_input ( - pipe_ctx->mi, - stream->public.timing.h_total, - stream->public.timing.v_total, - stream->public.timing.pix_clk_khz, - context->target_count); -if (!pipe_ctx_old->stream) {if (false == pipe_ctx->tg->funcs->enable_crtc ( pipe_ctx->tg)) {
@@ -810,13 +808,6 @@ static enum dc_status apply_single_controller_ctx_to_hw( } } -/* TODO: move to stream encoder */ -if (pipe_ctx->stream->signal !=SIGNAL_TYPE_VIRTUAL ) -if (DC_OK !=bios_parser_crtc_source_select (pipe_ctx)) { -BREAK_TO_DEBUGGER (); -return DC_ERROR_UNEXPECTED ; - } - pipe_ctx->opp->funcs->opp_set_dyn_expansion( pipe_ctx->opp, COLOR_SPACE_YCBCR601,
@@ -828,6 +819,13 @@ static enum dc_status apply_single_controller_ctx_to_hw( &stream->bit_depth_params, &stream->clamping); +/* TODO: move to stream encoder */ +if (pipe_ctx->stream->signal !=SIGNAL_TYPE_VIRTUAL ) +if (DC_OK !=bios_parser_crtc_source_select (pipe_ctx)) { +BREAK_TO_DEBUGGER (); +return DC_ERROR_UNEXPECTED ; + } +if (pipe_ctx->stream->signal !=SIGNAL_TYPE_VIRTUAL ) stream->sink->link->link_enc->funcs->setup( stream->sink->link->link_enc,
@@ -852,12 +850,6 @@ static enum dc_status apply_single_controller_ctx_to_hw( (pipe_ctx->stream->signal ==SIGNAL_TYPE_DVI_DUAL_LINK ) ? true : false); -/* program blank color */ -color_space_to_black_color (stream->public.output_color_space, &black_color); - pipe_ctx->tg->funcs->set_blank_color ( - pipe_ctx->tg, - &black_color); -if (!pipe_ctx_old->stream) {core_link_enable_stream (pipe_ctx);
@@ -871,6 +863,14 @@ static enum dc_status apply_single_controller_ctx_to_hw( sizeof(struct scaler_data)) != 0)program_scaler (dc, pipe_ctx); +/*TODO: mst support - use total stream count*/ + pipe_ctx->mi->funcs->allocate_mem_input ( + pipe_ctx->mi, + stream->public.timing.h_total, + stream->public.timing.v_total, + stream->public.timing.pix_clk_khz, + context->target_count); +return DC_OK ; }
@@ -1335,7 +1335,7 @@ static enum dc_status apply_ctx_to_hw(/* Reset old context */ /* look up the targets that have been removed since last commit */ -for (i =0 ; i <MAX_PIPES ; i++) { +for (i =0 ; i < context->res_ctx.pool->pipe_count; i++) {struct pipe_ctx *pipe_ctx_old = &dc->current_context->res_ctx.pipe_ctx[i];struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i];
@@ -1362,7 +1362,7 @@ static enum dc_status apply_ctx_to_hw(/* Apply new context */ dcb->funcs->set_scratch_critical_state (dcb, true); -for (i =0 ; i <MAX_PIPES ; i++) { +for (i =0 ; i < context->res_ctx.pool->pipe_count; i++) {struct pipe_ctx *pipe_ctx_old = &dc->current_context->res_ctx.pipe_ctx[i];struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i];
@@ -1390,7 +1390,7 @@ static enum dc_status apply_ctx_to_hw( > dc->current_context->bw_results.dispclk_khz)set_display_clock (context); -for (i =0 ; i <MAX_PIPES ; i++) { +for (i =0 ; i < context->res_ctx.pool->pipe_count; i++) {struct pipe_ctx *pipe_ctx_old = &dc->current_context->res_ctx.pipe_ctx[i];struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i];
@@ -1428,7 +1428,7 @@ static enum dc_status apply_ctx_to_hw(* find first available pipe with audio, setup audio wall DTO per topology * instead of per pipe. */ -for (i =0 ; i <MAX_PIPES ; i++) { +for (i =0 ; i < context->res_ctx.pool->pipe_count; i++) {if (context->res_ctx.pipe_ctx[i].audio !=NULL ) {struct audio_output audio_output;struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i];
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 13/76 drm/amd/dal: DCC support
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
--- drivers/gpu/drm/amd/dal/dc/dc.h | 43 ++++++++++++++++--- drivers/gpu/drm/amd/dal/dc/dc_hw_types.h | 48 ++++++++++++++++++++-- .../drm/amd/dal/dc/dce110/dce110_hw_sequencer.c | 2 +- .../gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c | 2 +- .../gpu/drm/amd/dal/dc/dce110/dce110_mem_input.h | 2 +- .../gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.c | 2 +- drivers/gpu/drm/amd/dal/dc/inc/hw/mem_input.h | 2 +- 7 files changed, 87 insertions(+), 14 deletions(-)
drivers/gpu/drm/amd/dal/dc/dc.h +38 -5
@@ -50,21 +50,52 @@ struct dc_caps {uint32_t i2c_speed_in_khz; }; + +struct dc_dcc_surface_param { +enum surface_pixel_format format; +struct dc_size surface_size; +enum dc_scan_direction scan; +}; + +struct dc_dcc_setting { +unsigned int max_compressed_blk_size; +unsigned int max_uncompressed_blk_size; +bool independent_64b_blks; +}; + +struct dc_surface_dcc_cap { +bool capable; +bool const_color_support; + +union { +struct { +struct dc_dcc_setting rgb; + } grph; + +struct { +struct dc_dcc_setting luma; +struct dc_dcc_setting chroma; + } video; + }; +}; +/* Forward declaration*/ struct dc ;struct dc_surface ;struct validate_context ; +struct dc_cap_funcs { +int i; +}; +struct dc_stream_funcs { -bool (*adjust_vmin_vmax)( -struct dc *dc, +bool (*adjust_vmin_vmax)(struct dc *dc,const struct dc_stream **stream,int num_streams,int vmin,int vmax); -void (*stream_update_scaling)( -const struct dc *dc, +void (*stream_update_scaling)(const struct dc *dc,const struct dc_stream *dc_stream,const struct rect *src,const struct rect *dst);
@@ -106,10 +137,12 @@ struct dc_config {struct dc_debug {bool surface_visual_confirm;bool disable_stutter; +bool disable_dcc; };struct dc {struct dc_caps caps; +struct dc_cap_funcs cap_funcs;struct dc_stream_funcs stream_funcs;struct dc_link_funcs link_funcs;struct dc_config config;
@@ -189,8 +222,8 @@ struct dc_surface {union plane_size plane_size;union dc_tiling_info tiling_info; +struct dc_plane_dcc_param dcc;enum dc_color_space color_space; -bool compressed;enum surface_pixel_format format;enum dc_rotation_angle rotation;
drivers/gpu/drm/amd/dal/dc/dc_hw_types.h +44 -4
81 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c +1 -1
@@ -1606,7 +1606,7 @@ static void set_plane_config( &surface->public.tiling_info, &surface->public.plane_size, surface->public.rotation, - false); + NULL);if (dc->public.config.gpu_vm_support) mi->funcs->mem_input_program_pte_vm(
drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c +1 -1
@@ -525,7 +525,7 @@ bool dce110_mem_input_program_surface_config(union dc_tiling_info *tiling_info, union plane_size *plane_size, enum dc_rotation_angle rotation, - bool compressed) + struct dc_plane_dcc_param *dcc) { struct dce110_mem_input *mem_input110 = TO_DCE110_MEM_INPUT(mem_input);
drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.h +1 -1
@@ -128,7 +128,7 @@ bool dce110_mem_input_program_surface_config(union dc_tiling_info *tiling_info, union plane_size *plane_size, enum dc_rotation_angle rotation, - bool compressed); + struct dc_plane_dcc_param *dcc);/* * dce110_mem_input_program_pte_vm
drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.c +1 -1
@@ -666,7 +666,7 @@ bool dce110_mem_input_v_program_surface_config(union dc_tiling_info *tiling_info, union plane_size *plane_size, enum dc_rotation_angle rotation, - bool compressed) + struct dc_plane_dcc_param *dcc) { struct dce110_mem_input *mem_input110 = TO_DCE110_MEM_INPUT(mem_input);
drivers/gpu/drm/amd/dal/dc/inc/hw/mem_input.h +1 -1
@@ -80,7 +80,7 @@ struct mem_input_funcs {union dc_tiling_info *tiling_info, union plane_size *plane_size, enum dc_rotation_angle rotation, - bool compressed); + struct dc_plane_dcc_param *dcc);bool (*mem_input_is_flip_pending)(struct mem_input *mem_input); };
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 14/76 drm/amd/dal: Expose some HWS functions so we can re-use them
In reply to a message not in the archiveFrom: Hersen Wu <[email protected]>
--- .../drm/amd/dal/dc/dce110/dce110_hw_sequencer.c | 134 ++++++++++++++++----- .../drm/amd/dal/dc/dce110/dce110_hw_sequencer.h | 25 ++++ drivers/gpu/drm/amd/dal/dc/inc/hw_sequencer.h | 8 ++ 3 files changed, 136 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c +103 -31
@@ -502,7 +502,7 @@ static enum dc_status bios_parser_crtc_source_select(return DC_OK ; } -static void update_info_frame (struct pipe_ctx *pipe_ctx) +void dce110_update_info_frame (struct pipe_ctx *pipe_ctx) {if (dc_is_hdmi_signal (pipe_ctx->stream->signal)) pipe_ctx->stream_enc->funcs->update_hdmi_info_packets(
@@ -514,7 +514,7 @@ static void update_info_frame(struct pipe_ctx *pipe_ctx) &pipe_ctx->encoder_info_frame); } -static void enable_stream (struct pipe_ctx *pipe_ctx) +void dce110_enable_stream (struct pipe_ctx *pipe_ctx) {enum dc_lane_count lane_count = pipe_ctx->stream->sink->link->public.cur_link_settings.lane_count;
@@ -529,7 +529,8 @@ static void enable_stream(struct pipe_ctx *pipe_ctx)uint32_t early_control =0 ;struct timing_generator *tg = pipe_ctx->tg; -update_info_frame (pipe_ctx); +/* TODOFPGA may change to hwss.update_info_frame */ +dce110_update_info_frame (pipe_ctx);/* enable early control to avoid corruption on DP monitor*/ active_total_with_borders = timing->h_addressable
@@ -559,7 +560,7 @@ static void enable_stream(struct pipe_ctx *pipe_ctx) } -static void disable_stream (struct pipe_ctx *pipe_ctx) +void dce110_disable_stream (struct pipe_ctx *pipe_ctx) {struct core_stream *stream = pipe_ctx->stream;struct core_link *link = stream->sink->link;
@@ -606,7 +607,7 @@ static void disable_stream(struct pipe_ctx *pipe_ctx) } -static void unblank_stream (struct pipe_ctx *pipe_ctx, +void dce110_unblank_stream (struct pipe_ctx *pipe_ctx,struct dc_link_settings *link_settings) {struct encoder_unblank_param params = { {0 } };
@@ -763,7 +764,7 @@ static void program_scaler(const struct core_dc *dc, &pipe_ctx->scl_data); } -static enum dc_status apply_single_controller_ctx_to_hw ( +static enum dc_status prog_pixclk_crtc_otg (struct pipe_ctx *pipe_ctx,struct validate_context *context,struct core_dc *dc)
@@ -808,6 +809,21 @@ static enum dc_status apply_single_controller_ctx_to_hw( } } +return DC_OK ; +} + +static enum dc_status apply_single_controller_ctx_to_hw ( +struct pipe_ctx *pipe_ctx, +struct validate_context *context, +struct core_dc *dc) +{ +struct core_stream *stream = pipe_ctx->stream; +struct pipe_ctx *pipe_ctx_old = &dc->current_context->res_ctx. + pipe_ctx[pipe_ctx->pipe_idx]; + +/* */ + dc->hwss.prog_pixclk_crtc_otg (pipe_ctx, context, dc); + pipe_ctx->opp->funcs->opp_set_dyn_expansion( pipe_ctx->opp, COLOR_SPACE_YCBCR601,
@@ -819,6 +835,10 @@ static enum dc_status apply_single_controller_ctx_to_hw( &stream->bit_depth_params, &stream->clamping); +/* FPGA does not program backend */ +if (IS_FPGA_MAXIMUS_DC (dc->ctx->dce_environment)) +return DC_OK ; +/* TODO: move to stream encoder */ if (pipe_ctx->stream->signal !=SIGNAL_TYPE_VIRTUAL )if (DC_OK !=bios_parser_crtc_source_select (pipe_ctx)) {
@@ -854,17 +874,18 @@ static enum dc_status apply_single_controller_ctx_to_hw(core_link_enable_stream (pipe_ctx);if (dc_is_dp_signal (pipe_ctx->stream->signal)) -unblank_stream (pipe_ctx, +dce110_unblank_stream (pipe_ctx, &stream->sink->link->public.cur_link_settings); } +/* program_scaler and allocate_mem_input are not new asic */ if (!pipe_ctx_old ||memcmp (&pipe_ctx_old->scl_data, &pipe_ctx->scl_data,sizeof (struct scaler_data )) !=0 )program_scaler (dc, pipe_ctx); -/*TODO: mst support - use total stream count*/ - pipe_ctx->mi->funcs->allocate_mem_input( +/* mst support - use total stream count */ + pipe_ctx->mi->funcs->allocate_mem_input( pipe_ctx->mi, stream->public.timing.h_total, stream->public.timing.v_total,
@@ -949,7 +970,7 @@ static void disable_vga_and_power_gate_all_controllers(* 3. Enable power gating for controller * 4. Set acc_mode_change bit (VBIOS will clear this bit when going to FSDOS) */ -static void enable_accelerated_mode (struct core_dc *dc) +void dce110_enable_accelerated_mode (struct core_dc *dc) {power_down_all_hw_blocks (dc);
@@ -960,7 +981,7 @@ static void enable_accelerated_mode(struct core_dc *dc)/** * Call display_engine_clock_dce80 to perform the Dclk programming. */ -static void set_display_clock (struct validate_context *context) +void dce110_set_display_clock (struct validate_context *context) {/* Program the display engine clock. * Check DFS bypass mode support or not. DFSbypass feature is only when
@@ -1094,7 +1115,7 @@ static void program_wm_for_pipe(struct core_dc *dc, total_dest_line_time_ns); } -static void set_displaymarks ( +void dce110_set_displaymarks (const struct core_dc *dc,struct validate_context *context) {
@@ -1304,6 +1325,7 @@ static void apply_min_clocks( pipe_ctx->dis_clk, *clocks_state))return ; +/* TODOFPGA */ }/* get the required state based on state dependent clocks:
@@ -1322,16 +1344,42 @@ static void apply_min_clocks( } } -/*TODO: const validate_context*/ -static enum dc_status apply_ctx_to_hw ( +static enum dc_status apply_ctx_to_hw_fpga (struct core_dc *dc,struct validate_context *context) { +enum dc_status status =DC_ERROR_UNEXPECTED ; +int i;struct dc_bios *dcb = dc->ctx->dc_bios; -enum dc_status status; + +for (i =0 ; i < context->res_ctx.pool->pipe_count; i++) { +struct pipe_ctx *pipe_ctx_old = + &dc->current_context->res_ctx.pipe_ctx[i]; +struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i]; + +if (pipe_ctx->stream ==NULL ) +continue ; + +if (pipe_ctx->stream == pipe_ctx_old->stream) +continue ; + + status =apply_single_controller_ctx_to_hw ( + pipe_ctx, + context, + dc); + +if (status !=DC_OK ) +return status; + } + +return DC_OK ; +} + +static void reset_hw_ctx_wrap ( +struct core_dc *dc, +struct validate_context *context) +{int i; -bool programmed_audio_dto = false; -enum clocks_state clocks_state =CLOCKS_STATE_INVALID ;/* Reset old context */ /* look up the targets that have been removed since last commit */
@@ -1354,14 +1402,36 @@ static enum dc_status apply_ctx_to_hw(reset_single_pipe_hw_ctx ( dc, pipe_ctx_old, dc->current_context); } +} + +/*TODO: const validate_context*/ +enum dc_status dce110_apply_ctx_to_hw ( +struct core_dc *dc, +struct validate_context *context) +{ +struct dc_bios *dcb = dc->ctx->dc_bios; +enum dc_status status; +int i; +bool programmed_audio_dto = false; +enum clocks_state clocks_state =CLOCKS_STATE_INVALID ; + +/* Reset old context */ +/* look up the targets that have been removed since last commit */ + dc->hwss.reset_hw_ctx_wrap (dc, context);/* Skip applying if no targets */ if (context->target_count <=0 )return DC_OK ; +if (IS_FPGA_MAXIMUS_DC (dc->ctx->dce_environment)) { +apply_ctx_to_hw_fpga (dc, context); +return DC_OK ; + } +/* Apply new context */ dcb->funcs->set_scratch_critical_state (dcb, true); +/* below is for real asic only */ for (i =0 ; i < context->res_ctx.pool->pipe_count; i++) {struct pipe_ctx *pipe_ctx_old = &dc->current_context->res_ctx.pipe_ctx[i];
@@ -1388,7 +1458,7 @@ static enum dc_status apply_ctx_to_hw(if (context->bw_results.dispclk_khz > dc->current_context->bw_results.dispclk_khz) -set_display_clock (context); + dc->hwss.set_display_clock (context);for (i =0 ; i < context->res_ctx.pool->pipe_count; i++) { struct pipe_ctx *pipe_ctx_old =
@@ -1635,7 +1705,7 @@ static void update_plane_addr(const struct core_dc *dc, pipe_ctx->tg->funcs->set_blank (pipe_ctx->tg, false); } -static void update_pending_status (struct pipe_ctx *pipe_ctx) +void dce110_update_pending_status (struct pipe_ctx *pipe_ctx) {struct core_surface *surface = pipe_ctx->surface;
@@ -1652,7 +1722,7 @@ static void update_pending_status(struct pipe_ctx *pipe_ctx) surface->status.current_address = pipe_ctx->mi->current_address; } -static void power_down (struct core_dc *dc) +void dce110_power_down (struct core_dc *dc) {power_down_all_hw_blocks (dc);disable_vga_and_power_gate_all_controllers (dc);
@@ -2068,20 +2138,20 @@ static void dce110_power_down_fe(struct core_dc *dc, struct pipe_ctx *pipe)static const struct hw_sequencer_funcs dce110_funcs = { .init_hw = init_hw, - .apply_ctx_to_hw = apply_ctx_to_hw, + .apply_ctx_to_hw = dce110_apply_ctx_to_hw, .prepare_pipe_for_context = dce110_prepare_pipe_for_context, .apply_ctx_for_surface = dce110_apply_ctx_for_surface, .set_plane_config = set_plane_config, .update_plane_addr = update_plane_addr, - .update_pending_status = update_pending_status, + .update_pending_status = dce110_update_pending_status, .set_gamma_correction = set_gamma_ramp, - .power_down = power_down, - .enable_accelerated_mode = enable_accelerated_mode, + .power_down = dce110_power_down, + .enable_accelerated_mode = dce110_enable_accelerated_mode, .enable_timing_synchronization = dce110_enable_timing_synchronization, - .update_info_frame = update_info_frame, - .enable_stream = enable_stream, - .disable_stream = disable_stream, - .unblank_stream = unblank_stream, + .update_info_frame = dce110_update_info_frame, + .enable_stream = dce110_enable_stream, + .disable_stream = dce110_disable_stream, + .unblank_stream = dce110_unblank_stream, .enable_display_pipe_clock_gating = enable_display_pipe_clock_gating, .crtc_switch_to_clk_src = dce110_crtc_switch_to_clk_src, .enable_display_power_gating = dce110_enable_display_power_gating,
@@ -2090,12 +2160,14 @@ static const struct hw_sequencer_funcs dce110_funcs = { .pipe_control_lock = dce110_pipe_control_lock, .set_blender_mode = dce110_set_blender_mode, .clock_gating_power_up = dal_dc_clock_gating_dce110_power_up, - .set_display_clock = set_display_clock, - .set_displaymarks = set_displaymarks, + .set_display_clock = dce110_set_display_clock, + .set_displaymarks = dce110_set_displaymarks, .increase_watermarks_for_pipe = dce110_increase_watermarks_for_pipe, .set_bandwidth = dce110_set_bandwidth, .set_drr = set_drr, - .set_static_screen_control = set_static_screen_control + .set_static_screen_control = set_static_screen_control, + .reset_hw_ctx_wrap = reset_hw_ctx_wrap, + .prog_pixclk_crtc_otg = prog_pixclk_crtc_otg, };bool dce110_hw_sequencer_construct (struct core_dc *dc)
drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.h +25 -0
@@ -34,5 +34,30 @@ struct core_dc;bool dce110_hw_sequencer_construct (struct core_dc *dc); +enum dc_status dce110_apply_ctx_to_hw ( +struct core_dc *dc, +struct validate_context *context); + +void dce110_set_display_clock (struct validate_context *context); + +void dce110_set_displaymarks ( +const struct core_dc *dc, +struct validate_context *context); + +void dce110_enable_stream (struct pipe_ctx *pipe_ctx); + +void dce110_disable_stream (struct pipe_ctx *pipe_ctx); + +void dce110_unblank_stream (struct pipe_ctx *pipe_ctx, +struct dc_link_settings *link_settings); + +void dce110_update_info_frame (struct pipe_ctx *pipe_ctx); + +void dce110_enable_accelerated_mode (struct core_dc *dc); + +void dce110_power_down (struct core_dc *dc); + +void dce110_update_pending_status (struct pipe_ctx *pipe_ctx); +#endif /* __DC_HWSS_DCE110_H__ */
drivers/gpu/drm/amd/dal/dc/inc/hw_sequencer.h +8 -0
@@ -51,6 +51,9 @@ struct hw_sequencer_funcs {enum dc_status (*apply_ctx_to_hw)(struct core_dc *dc,struct validate_context *context); +void (*reset_hw_ctx_wrap)( +struct core_dc *dc,struct validate_context *context); + void (*prepare_pipe_for_context)( struct core_dc *dc, struct pipe_ctx *pipe_ctx,
@@ -149,6 +152,11 @@ struct hw_sequencer_funcs {void (*set_static_screen_control)(struct pipe_ctx **pipe_ctx,int num_pipes,int value); + +enum dc_status (*prog_pixclk_crtc_otg)( +struct pipe_ctx *pipe_ctx, +struct validate_context *context, +struct core_dc *dc); }; void color_space_to_black_color(
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 15/76 drm/amd/dal: Modify regsiter access to use macro.
In reply to a message not in the archiveFrom: Andrey Grodzovsky <[email protected]>
--- .../dal/dc/i2caux/dce110/i2c_hw_engine_dce110.c | 607 ++++----------------- 1 file changed, 115 insertions(+), 492 deletions(-)
drivers/gpu/drm/amd/dal/dc/i2caux/dce110/i2c_hw_engine_dce110.c +115 -492
@@ -98,20 +98,10 @@ enum { (hw_engine->regs->reg_name)#include "reg_helper.h" -static void disable_i2c_hw_engine (struct i2c_hw_engine_dce110 *hw_engine) { -uint32_t value =0 ; - value =REG_READ (SETUP ); - -set_reg_field_value ( - value, -0 , -DC_I2C_DDC1_SETUP , -DC_I2C_DDC1_ENABLE ); - -REG_WRITE (SETUP , value); +REG_UPDATE_N (SETUP ,1 ,FN (DC_I2C_DDC1_SETUP ,DC_I2C_DDC1_ENABLE ),0 ); } static void release_engine(
@@ -121,7 +111,6 @@ static void release_engine(struct i2c_engine *base =NULL ;bool safe_to_reset; -uint32_t value =0 ; base = &hw_engine->base.base;
@@ -130,49 +119,23 @@ static void release_engine( base->funcs->set_speed (base, hw_engine->base.original_speed);/* Release I2C */ - { - value =REG_READ (DC_I2C_ARBITRATION ); - -set_reg_field_value ( - value, -1 , -DC_I2C_ARBITRATION , -DC_I2C_SW_DONE_USING_I2C_REG ); - -REG_WRITE (DC_I2C_ARBITRATION , value); - } +REG_UPDATE (DC_I2C_ARBITRATION ,DC_I2C_SW_DONE_USING_I2C_REG ,1 );/* Reset HW engine */ {uint32_t i2c_sw_status =0 ; - - value =REG_READ (DC_I2C_SW_STATUS ); - - i2c_sw_status =get_reg_field_value ( - value, -DC_I2C_SW_STATUS , -DC_I2C_SW_STATUS ); +REG_GET (DC_I2C_SW_STATUS ,DC_I2C_SW_STATUS , &i2c_sw_status);/* if used by SW, safe to reset */ safe_to_reset = (i2c_sw_status ==1 ); } - { - value =REG_READ (DC_I2C_CONTROL );if (safe_to_reset) -set_reg_field_value ( - value, -1 , -DC_I2C_CONTROL , -DC_I2C_SOFT_RESET ); - -set_reg_field_value ( - value, -1 , -DC_I2C_CONTROL , -DC_I2C_SW_STATUS_RESET ); - -REG_WRITE (DC_I2C_CONTROL , value); - } +REG_UPDATE_2 ( +DC_I2C_CONTROL , +DC_I2C_SOFT_RESET ,1 , +DC_I2C_SW_STATUS_RESET ,1 ); +else +REG_UPDATE (DC_I2C_CONTROL ,DC_I2C_SW_STATUS_RESET ,1 );/* HW I2c engine - clock gating feature */ if (!hw_engine->engine_keep_power_up_count)
@@ -182,92 +145,32 @@ static void release_engine(static bool setup_engine (struct i2c_engine *i2c_engine) { -uint32_t value =0 ;struct i2c_hw_engine_dce110 *hw_engine =FROM_I2C_ENGINE (i2c_engine);/* Program pin select */ - { - value =REG_READ (DC_I2C_CONTROL ); - -set_reg_field_value ( - value, -0 , -DC_I2C_CONTROL , -DC_I2C_GO ); - -set_reg_field_value ( - value, -0 , -DC_I2C_CONTROL , -DC_I2C_SOFT_RESET ); - -set_reg_field_value ( - value, -0 , -DC_I2C_CONTROL , -DC_I2C_SEND_RESET ); - -set_reg_field_value ( - value, -1 , +REG_UPDATE_6 (DC_I2C_CONTROL , -DC_I2C_SW_STATUS_RESET ); - -set_reg_field_value ( - value, -0 , -DC_I2C_CONTROL , -DC_I2C_TRANSACTION_COUNT ); - -set_reg_field_value ( - value, - hw_engine->engine_id, -DC_I2C_CONTROL , -DC_I2C_DDC_SELECT ); - -REG_WRITE (DC_I2C_CONTROL , value); - } +DC_I2C_GO ,0 , +DC_I2C_SOFT_RESET ,0 , +DC_I2C_SEND_RESET ,0 , +DC_I2C_SW_STATUS_RESET ,1 , +DC_I2C_TRANSACTION_COUNT ,0 , +DC_I2C_DDC_SELECT , hw_engine->engine_id);/* Program time limit */ - { - value =REG_READ (SETUP ); - -set_reg_field_value ( - value, -I2C_SETUP_TIME_LIMIT , -DC_I2C_DDC1_SETUP , -DC_I2C_DDC1_TIME_LIMIT ); - -set_reg_field_value ( - value, -1 , -DC_I2C_DDC1_SETUP , -DC_I2C_DDC1_ENABLE ); - -REG_WRITE (SETUP , value); - } +REG_UPDATE_N ( +SETUP ,2 , +FN (DC_I2C_DDC1_SETUP ,DC_I2C_DDC1_TIME_LIMIT ),I2C_SETUP_TIME_LIMIT , +FN (DC_I2C_DDC1_SETUP ,DC_I2C_DDC1_ENABLE ),1 );/* Program HW priority * set to High - interrupt software I2C at any time * Enable restart of SW I2C that was interrupted by HW * disable queuing of software while I2C is in use by HW */ - { - value =REG_READ (DC_I2C_ARBITRATION ); - -set_reg_field_value ( - value, -0 , -DC_I2C_ARBITRATION , -DC_I2C_NO_QUEUED_SW_GO ); - -set_reg_field_value ( - value, -DC_I2C_ARBITRATION__DC_I2C_SW_PRIORITY_NORMAL , +REG_UPDATE_2 (DC_I2C_ARBITRATION , -DC_I2C_SW_PRIORITY ); - -REG_WRITE (DC_I2C_ARBITRATION , value); - } +DC_I2C_NO_QUEUED_SW_GO ,0 , +DC_I2C_SW_PRIORITY ,DC_I2C_ARBITRATION__DC_I2C_SW_PRIORITY_NORMAL );return true; }
@@ -277,16 +180,13 @@ static uint32_t get_speed( {const struct i2c_hw_engine_dce110 *hw_engine =FROM_I2C_ENGINE (i2c_engine);uint32_t pre_scale =0 ; -uint32_t value =REG_READ (SPEED ); - pre_scale =get_reg_field_value ( - value, -DC_I2C_DDC1_SPEED , -DC_I2C_DDC1_PRESCALE ); +generic_reg_get ( +CTX ,REG (SPEED ), +FN (DC_I2C_DDC1_SPEED ,DC_I2C_DDC1_PRESCALE ), &pre_scale);/* [anaumov] it seems following is unnecessary */ /*ASSERT(value.bits.DC_I2C_DDC1_PRESCALE);*/ -return pre_scale ? hw_engine->reference_frequency / pre_scale : hw_engine->base.default_speed;
@@ -298,58 +198,22 @@ static void set_speed( {struct i2c_hw_engine_dce110 *hw_engine =FROM_I2C_ENGINE (i2c_engine); -if (speed) { -uint32_t value =REG_READ (SPEED ); - -set_reg_field_value ( - value, - hw_engine->reference_frequency / speed, -DC_I2C_DDC1_SPEED , -DC_I2C_DDC1_PRESCALE ); - -set_reg_field_value ( - value, -2 , -DC_I2C_DDC1_SPEED , -DC_I2C_DDC1_THRESHOLD ); - -/*DCE11, HW add 100Khz support for I2c*/ -if (speed >50 ) { -set_reg_field_value ( - value, -2 , -DC_I2C_DDC1_SPEED , -DC_I2C_DDC1_START_STOP_TIMING_CNTL ); - }else { -set_reg_field_value ( - value, -1 , -DC_I2C_DDC1_SPEED , -DC_I2C_DDC1_START_STOP_TIMING_CNTL ); - } - -REG_WRITE (SPEED , value); - } +if (speed) +REG_UPDATE_N ( +SPEED ,3 , +FN (DC_I2C_DDC1_SPEED ,DC_I2C_DDC1_PRESCALE ), hw_engine->reference_frequency / speed, +FN (DC_I2C_DDC1_SPEED ,DC_I2C_DDC1_THRESHOLD ),2 , +FN (DC_I2C_DDC1_SPEED ,DC_I2C_DDC1_START_STOP_TIMING_CNTL ), speed >50 ?2 :1 ); }static inline void reset_hw_engine (struct engine *engine) {struct i2c_hw_engine_dce110 *hw_engine =FROM_ENGINE (engine); -uint32_t value =REG_READ (DC_I2C_CONTROL ); - -set_reg_field_value ( - value, -1 , -DC_I2C_CONTROL , -DC_I2C_SOFT_RESET ); - -set_reg_field_value ( - value, -1 , -DC_I2C_CONTROL , -DC_I2C_SW_STATUS_RESET ); -REG_WRITE (DC_I2C_CONTROL , value); +REG_UPDATE_2 ( +DC_I2C_CONTROL , +DC_I2C_SW_STATUS_RESET ,1 , +DC_I2C_SW_STATUS_RESET ,1 ); }static bool is_hw_busy (struct engine *engine)
@@ -357,70 +221,34 @@ static bool is_hw_busy(struct engine *engine)struct i2c_hw_engine_dce110 *hw_engine =FROM_ENGINE (engine);uint32_t i2c_sw_status =0 ; -uint32_t value =REG_READ (DC_I2C_SW_STATUS ); - - i2c_sw_status =get_reg_field_value ( - value, -DC_I2C_SW_STATUS , -DC_I2C_SW_STATUS ); - +REG_GET (DC_I2C_SW_STATUS ,DC_I2C_SW_STATUS , &i2c_sw_status);if (i2c_sw_status ==DC_I2C_STATUS__DC_I2C_STATUS_IDLE )return false;reset_hw_engine (engine); - value =REG_READ (DC_I2C_SW_STATUS ); - - i2c_sw_status =get_reg_field_value ( - value, -DC_I2C_SW_STATUS , -DC_I2C_SW_STATUS ); - +REG_GET (DC_I2C_SW_STATUS ,DC_I2C_SW_STATUS , &i2c_sw_status);return i2c_sw_status !=DC_I2C_STATUS__DC_I2C_STATUS_IDLE ; } -/* -* @brief -* DC_GPIO_DDC MM register offsets -*/ -static uint32_t transaction_reg_read (struct i2c_hw_engine_dce110 *hw_engine, -uint32_t transaction_count) -{ -switch (transaction_count) { -case 0 : -return REG_READ (DC_I2C_TRANSACTION0 ); -case 1 : -return REG_READ (DC_I2C_TRANSACTION1 ); -case 2 : -return REG_READ (DC_I2C_TRANSACTION2 ); -case 3 : -return REG_READ (DC_I2C_TRANSACTION3 ); -default : -return 0 ; - } -} -static void transcation_reg_write (struct i2c_hw_engine_dce110 *hw_engine, -uint32_t transaction_count,uint32_t value) -{ -switch (transaction_count) { -case 0 : -REG_WRITE (DC_I2C_TRANSACTION0 , value); -break ; -case 1 : -REG_WRITE (DC_I2C_TRANSACTION1 , value); -break ; -case 2 : -REG_WRITE (DC_I2C_TRANSACTION2 , value); -break ; -case 3 : -REG_WRITE (DC_I2C_TRANSACTION3 , value); -break ; +#define STOP_TRANS_PREDICAT \ + ((hw_engine->transaction_count == 3) || \ + (request->action == I2CAUX_TRANSACTION_ACTION_I2C_WRITE) || \ + (request->action & I2CAUX_TRANSACTION_ACTION_I2C_READ)) + +#define SET_I2C_TRANSACTION (id) \ + do { \ + REG_UPDATE_N(DC_I2C_TRANSACTION##id, 5, \ + FN(DC_I2C_TRANSACTION0, DC_I2C_STOP_ON_NACK0), 1, \ + FN(DC_I2C_TRANSACTION0, DC_I2C_START0), 1, \ + FN(DC_I2C_TRANSACTION0, DC_I2C_STOP0), STOP_TRANS_PREDICAT ? 1:0, \ + FN(DC_I2C_TRANSACTION0, DC_I2C_RW0), (0 != (request->action & I2CAUX_TRANSACTION_ACTION_I2C_READ)), \ + FN(DC_I2C_TRANSACTION0, DC_I2C_COUNT0), length); \ + if (STOP_TRANS_PREDICAT) \ + last_transaction = true; \ + } while (false) -default : -break ; - } -} static bool process_transaction( struct i2c_hw_engine_dce110 *hw_engine,
@@ -430,125 +258,61 @@ static bool process_transaction(uint8_t *buffer = request->data;bool last_transaction = false; -uint32_t value =0 ;struct dc_context *ctx =NULL ; ctx = hw_engine->base.base.base.ctx; - { - value =transaction_reg_read (hw_engine, hw_engine->transaction_count); - -set_reg_field_value ( - value, -1 , -DC_I2C_TRANSACTION0 , -DC_I2C_STOP_ON_NACK0 ); - -set_reg_field_value ( - value, -1 , -DC_I2C_TRANSACTION0 , -DC_I2C_START0 ); -if ((hw_engine->transaction_count ==3 ) || - (request->action ==I2CAUX_TRANSACTION_ACTION_I2C_WRITE ) || - (request->action &I2CAUX_TRANSACTION_ACTION_I2C_READ )) { - -set_reg_field_value ( - value, -1 , -DC_I2C_TRANSACTION0 , -DC_I2C_STOP0 ); - last_transaction = true; - }else -set_reg_field_value ( - value, -0 , -DC_I2C_TRANSACTION0 , -DC_I2C_STOP0 ); - -set_reg_field_value ( - value, - (0 != (request->action & -I2CAUX_TRANSACTION_ACTION_I2C_READ )), -DC_I2C_TRANSACTION0 , -DC_I2C_RW0 ); - -set_reg_field_value ( - value, - length, -DC_I2C_TRANSACTION0 , -DC_I2C_COUNT0 ); - -transcation_reg_write (hw_engine, hw_engine->transaction_count, value); +switch (hw_engine->transaction_count) { +case 0 : +SET_I2C_TRANSACTION (0 ); +break ; +case 1 : +SET_I2C_TRANSACTION (1 ); +break ; +case 2 : +SET_I2C_TRANSACTION (2 ); +break ; +case 3 : +SET_I2C_TRANSACTION (3 ); +break ; +default : +/* TODO Warning ? */ +break ; } +/* Write the I2C address and I2C data * into the hardware circular buffer, one byte per entry. * As an example, the 7-bit I2C slave address for CRT monitor * for reading DDC/EDID information is 0b1010001. * For an I2C send operation, the LSB must be programmed to 0; * for I2C receive operation, the LSB must be programmed to 1. */ - - { - value =0 ; - -set_reg_field_value ( - value, - false, -DC_I2C_DATA , -DC_I2C_DATA_RW ); - -set_reg_field_value ( - value, - request->address, -DC_I2C_DATA , -DC_I2C_DATA ); - -if (hw_engine->transaction_count ==0 ) { -set_reg_field_value ( - value, -0 , -DC_I2C_DATA , -DC_I2C_INDEX ); - -/*enable index write*/ -set_reg_field_value ( - value, -1 , -DC_I2C_DATA , -DC_I2C_INDEX_WRITE ); - - hw_engine->buffer_used_write =0 ; - } - -REG_WRITE (DC_I2C_DATA , value); - - hw_engine->buffer_used_write++; - -if (!(request->action &I2CAUX_TRANSACTION_ACTION_I2C_READ )) { - -set_reg_field_value ( - value, -0 , -DC_I2C_DATA , -DC_I2C_INDEX_WRITE ); - -while (length) { - -set_reg_field_value ( - value, - *buffer++, -DC_I2C_DATA , -DC_I2C_DATA ); - -REG_WRITE (DC_I2C_DATA , value); - - hw_engine->buffer_used_write++; - --length; - } +if (hw_engine->transaction_count ==0 ) { +REG_SET_4 (DC_I2C_DATA ,0 , +DC_I2C_DATA_RW , false, +DC_I2C_DATA , request->address, +DC_I2C_INDEX ,0 , +DC_I2C_INDEX_WRITE ,1 ); + hw_engine->buffer_used_write =0 ; + }else +REG_SET_2 (DC_I2C_DATA ,0 , +DC_I2C_DATA_RW , false, +DC_I2C_DATA , request->address); + + hw_engine->buffer_used_write++; + +if (!(request->action &I2CAUX_TRANSACTION_ACTION_I2C_READ )) { +while (length) { + +REG_UPDATE_2 (DC_I2C_DATA , +DC_I2C_INDEX_WRITE ,0 , +DC_I2C_DATA , *buffer++); + + hw_engine->buffer_used_write++; + --length; } }
@@ -561,92 +325,23 @@ static bool process_transaction(static void execute_transaction (struct i2c_hw_engine_dce110 *hw_engine) { -uint32_t value =0 ; - - { - value =REG_READ (SETUP ); - -set_reg_field_value ( - value, -0 , -DC_I2C_DDC1_SETUP , -DC_I2C_DDC1_DATA_DRIVE_EN ); - -set_reg_field_value ( - value, -0 , -DC_I2C_DDC1_SETUP , -DC_I2C_DDC1_CLK_DRIVE_EN ); - -set_reg_field_value ( - value, -0 , -DC_I2C_DDC1_SETUP , -DC_I2C_DDC1_DATA_DRIVE_SEL ); - -set_reg_field_value ( - value, -0 , -DC_I2C_DDC1_SETUP , -DC_I2C_DDC1_INTRA_TRANSACTION_DELAY ); - -set_reg_field_value ( - value, -0 , -DC_I2C_DDC1_SETUP , -DC_I2C_DDC1_INTRA_BYTE_DELAY ); - -REG_WRITE (SETUP , value); - } - - { - value =REG_READ (DC_I2C_CONTROL ); - -set_reg_field_value ( - value, -0 , -DC_I2C_CONTROL , -DC_I2C_SOFT_RESET ); - -set_reg_field_value ( - value, -0 , -DC_I2C_CONTROL , -DC_I2C_SW_STATUS_RESET ); +REG_UPDATE_N (SETUP ,5 , +FN (DC_I2C_DDC1_SETUP ,DC_I2C_DDC1_DATA_DRIVE_EN ),0 , +FN (DC_I2C_DDC1_SETUP ,DC_I2C_DDC1_CLK_DRIVE_EN ),0 , +FN (DC_I2C_DDC1_SETUP ,DC_I2C_DDC1_DATA_DRIVE_SEL ),0 , +FN (DC_I2C_DDC1_SETUP ,DC_I2C_DDC1_INTRA_TRANSACTION_DELAY ),0 , +FN (DC_I2C_DDC1_SETUP ,DC_I2C_DDC1_INTRA_BYTE_DELAY ),0 ); -set_reg_field_value ( - value, -0 , -DC_I2C_CONTROL , -DC_I2C_SEND_RESET ); - -set_reg_field_value ( - value, -0 , -DC_I2C_CONTROL , -DC_I2C_GO ); - -set_reg_field_value ( - value, - hw_engine->transaction_count -1 , -DC_I2C_CONTROL , -DC_I2C_TRANSACTION_COUNT ); -REG_WRITE (DC_I2C_CONTROL , value); - } +REG_UPDATE_5 (DC_I2C_CONTROL , +DC_I2C_SOFT_RESET ,0 , +DC_I2C_SW_STATUS_RESET ,0 , +DC_I2C_SEND_RESET ,0 , +DC_I2C_GO ,0 , +DC_I2C_TRANSACTION_COUNT , hw_engine->transaction_count -1 );/* start I2C transfer */ - { - value =REG_READ (DC_I2C_CONTROL ); - -set_reg_field_value ( - value, -1 , -DC_I2C_CONTROL , -DC_I2C_GO ); - -REG_WRITE (DC_I2C_CONTROL , value); - } +REG_UPDATE (DC_I2C_CONTROL ,DC_I2C_GO ,1 );/* all transactions were executed and HW buffer became empty * (even though it actually happens when status becomes DONE) */
@@ -681,28 +376,11 @@ static void process_channel_reply(struct i2c_hw_engine_dce110 *hw_engine =FROM_I2C_ENGINE (engine); -uint32_t value =0 ; - -/*set index*/ -set_reg_field_value ( - value, - hw_engine->buffer_used_write, -DC_I2C_DATA , -DC_I2C_INDEX ); - -set_reg_field_value ( - value, -1 , -DC_I2C_DATA , -DC_I2C_DATA_RW ); -set_reg_field_value ( - value, -1 , -DC_I2C_DATA , -DC_I2C_INDEX_WRITE ); - -REG_WRITE (DC_I2C_DATA , value); +REG_SET_3 (DC_I2C_DATA ,0 , +DC_I2C_INDEX , hw_engine->buffer_used_write, +DC_I2C_DATA_RW ,1 , +DC_I2C_INDEX_WRITE ,1 );while (length) {/* after reading the status,
@@ -710,7 +388,7 @@ static void process_channel_reply(* (i.e. DC_I2C_STATUS_DONE = 1) then the I2C controller * should read data bytes from I2C circular data buffer */ - value =REG_READ (DC_I2C_DATA ); +uint32_t value =REG_READ (DC_I2C_DATA ); *buffer++ = get_reg_field_value( value,
@@ -727,12 +405,8 @@ static enum i2c_channel_operation_result get_channel_status( {uint32_t i2c_sw_status =0 ;struct i2c_hw_engine_dce110 *hw_engine =FROM_I2C_ENGINE (i2c_engine); -uint32_t value =REG_READ (DC_I2C_SW_STATUS ); - - i2c_sw_status =get_reg_field_value ( - value, -DC_I2C_SW_STATUS , -DC_I2C_SW_STATUS ); +uint32_t value = +REG_GET (DC_I2C_SW_STATUS ,DC_I2C_SW_STATUS , &i2c_sw_status);if (i2c_sw_status ==DC_I2C_STATUS__DC_I2C_STATUS_USED_BY_SW )return I2C_CHANNEL_OPERATION_ENGINE_BUSY ;
@@ -793,40 +467,6 @@ static void destroy( *i2c_engine =NULL ; } -/* -* @brief -* DC_I2C_DDC1_SETUP MM register offsets -* -* @note -* The indices of this offset array are DDC engine IDs -*/ -static const int32_t ddc_setup_offset[] = { - - mmDC_I2C_DDC1_SETUP - mmDC_I2C_DDC1_SETUP,/* DDC Engine 1 */ - mmDC_I2C_DDC2_SETUP - mmDC_I2C_DDC1_SETUP,/* DDC Engine 2 */ - mmDC_I2C_DDC3_SETUP - mmDC_I2C_DDC1_SETUP,/* DDC Engine 3 */ - mmDC_I2C_DDC4_SETUP - mmDC_I2C_DDC1_SETUP,/* DDC Engine 4 */ - mmDC_I2C_DDC5_SETUP - mmDC_I2C_DDC1_SETUP,/* DDC Engine 5 */ - mmDC_I2C_DDC6_SETUP - mmDC_I2C_DDC1_SETUP,/* DDC Engine 6 */ - mmDC_I2C_DDCVGA_SETUP - mmDC_I2C_DDC1_SETUP/* DDC Engine 7 */ -}; - -/* -* @brief -* DC_I2C_DDC1_SPEED MM register offsets -* -* @note -* The indices of this offset array are DDC engine IDs -*/ -static const int32_t ddc_speed_offset[] = { - mmDC_I2C_DDC1_SPEED - mmDC_I2C_DDC1_SPEED,/* DDC Engine 1 */ - mmDC_I2C_DDC2_SPEED - mmDC_I2C_DDC1_SPEED,/* DDC Engine 2 */ - mmDC_I2C_DDC3_SPEED - mmDC_I2C_DDC1_SPEED,/* DDC Engine 3 */ - mmDC_I2C_DDC4_SPEED - mmDC_I2C_DDC1_SPEED,/* DDC Engine 4 */ - mmDC_I2C_DDC5_SPEED - mmDC_I2C_DDC1_SPEED,/* DDC Engine 5 */ - mmDC_I2C_DDC6_SPEED - mmDC_I2C_DDC1_SPEED,/* DDC Engine 6 */ - mmDC_I2C_DDCVGA_SPEED - mmDC_I2C_DDC1_SPEED/* DDC Engine 7 */ -};static const struct i2c_engine_funcs i2c_engine_funcs = { .destroy = destroy,
@@ -857,14 +497,7 @@ bool i2c_hw_engine_dce110_construct( const struct i2c_hw_engine_dce110_create_arg *arg) {uint32_t xtal_ref_div =0 ; -uint32_t value =0 ; -/*ddc_setup_offset of dce80 and dce110 have the same register name -* but different offset. Do not need different array*/ -if (arg->engine_id >=sizeof (ddc_setup_offset) /sizeof (int32_t )) -return false; -if (arg->engine_id >=sizeof (ddc_speed_offset) /sizeof (int32_t )) -return false;if (!arg->reference_frequency)return false;
@@ -884,18 +517,8 @@ bool i2c_hw_engine_dce110_construct( hw_engine->transaction_count =0 ; hw_engine->engine_keep_power_up_count =1 ; -/*values which are not included by arg*/ - hw_engine->addr.DC_I2C_DDCX_SETUP = - mmDC_I2C_DDC1_SETUP + ddc_setup_offset[arg->engine_id]; - hw_engine->addr.DC_I2C_DDCX_SPEED = - mmDC_I2C_DDC1_SPEED + ddc_speed_offset[arg->engine_id]; - - value =REG_READ (MICROSECOND_TIME_BASE_DIV ); - xtal_ref_div =get_reg_field_value ( - value, -MICROSECOND_TIME_BASE_DIV , -XTAL_REF_DIV ); +REG_GET (MICROSECOND_TIME_BASE_DIV ,XTAL_REF_DIV , &xtal_ref_div);if (xtal_ref_div ==0 ) { dm_logger_write(
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 16/76 drm/amd/dal: refactor bios scratch register access
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
- offset of scratch register stored in dc_bios and assigned by resource.
- common code to set various of bits to communicate with bios.
--- drivers/gpu/drm/amd/dal/dc/bios/Makefile | 6 -- drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c | 14 +-- .../gpu/drm/amd/dal/dc/bios/bios_parser_helper.c | 65 +++++++----- .../gpu/drm/amd/dal/dc/bios/bios_parser_helper.h | 26 +---- .../gpu/drm/amd/dal/dc/bios/dce110/bios_dce110.h | 6 -- .../dal/dc/bios/dce110/bios_parser_helper_dce110.c | 118 --------------------- .../dal/dc/bios/dce110/bios_parser_helper_dce110.h | 34 ------ .../dal/dc/bios/dce112/bios_parser_helper_dce112.c | 81 -------------- .../dal/dc/bios/dce112/bios_parser_helper_dce112.h | 34 ------ .../dal/dc/bios/dce80/bios_parser_helper_dce80.c | 67 ------------ .../dal/dc/bios/dce80/bios_parser_helper_dce80.h | 33 ------ drivers/gpu/drm/amd/dal/dc/dc_bios_types.h | 5 + .../gpu/drm/amd/dal/dc/dce100/dce100_resource.c | 7 ++ .../drm/amd/dal/dc/dce110/dce110_hw_sequencer.c | 4 +- .../gpu/drm/amd/dal/dc/dce110/dce110_resource.c | 6 ++ .../gpu/drm/amd/dal/dc/dce112/dce112_resource.c | 7 ++ drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c | 7 ++ 17 files changed, 80 insertions(+), 440 deletions(-) delete mode 100644 drivers/gpu/drm/amd/dal/dc/bios/dce110/bios_dce110.h delete mode 100644 drivers/gpu/drm/amd/dal/dc/bios/dce110/bios_parser_helper_dce110.c delete mode 100644 drivers/gpu/drm/amd/dal/dc/bios/dce110/bios_parser_helper_dce110.h delete mode 100644 drivers/gpu/drm/amd/dal/dc/bios/dce112/bios_parser_helper_dce112.c delete mode 100644 drivers/gpu/drm/amd/dal/dc/bios/dce112/bios_parser_helper_dce112.h delete mode 100644 drivers/gpu/drm/amd/dal/dc/bios/dce80/bios_parser_helper_dce80.c delete mode 100644 drivers/gpu/drm/amd/dal/dc/bios/dce80/bios_parser_helper_dce80.h
drivers/gpu/drm/amd/dal/dc/bios/Makefile +0 -6
@@ -13,18 +13,12 @@ AMD_DAL_FILES += $(AMD_DAL_BIOS) ############################################################################### # All DCE8.x are derived from DCE8.0, so 8.0 MUST be defined if ANY of # DCE8.x is compiled. -AMD_DAL_FILES += $(AMDDALPATH)/dc/bios/dce80/bios_parser_helper_dce80.o - AMD_DAL_FILES += $(AMDDALPATH)/dc/bios/dce80/command_table_helper_dce80.o ############################################################################### # DCE 11x ############################################################################### -AMD_DAL_FILES += $(AMDDALPATH)/dc/bios/dce110/bios_parser_helper_dce110.o - AMD_DAL_FILES += $(AMDDALPATH)/dc/bios/dce110/command_table_helper_dce110.o ccflags-y += -DLATEST_ATOM_BIOS_SUPPORT -AMD_DAL_FILES += $(AMDDALPATH)/dc/bios/dce112/bios_parser_helper_dce112.o - AMD_DAL_FILES += $(AMDDALPATH)/dc/bios/dce112/command_table_helper_dce112.o
drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c +3 -11
@@ -37,7 +37,6 @@#include "command_table.h" #include "bios_parser_helper.h" -#include "dce110/bios_dce110.h" #include "command_table_helper.h" #include "bios_parser.h" #include "bios_parser_types_internal.h"
@@ -3667,10 +3666,7 @@ static void bios_parser_post_init(struct dc_bios *dcb,static bool bios_parser_is_accelerated_mode (struct dc_bios *dcb) { -struct bios_parser *bp =BP_FROM_DCB (dcb); - -return bp->bios_helper->is_accelerated_mode ( - bp->base.ctx); +bios_is_accelerated_mode (dcb); }/**
@@ -3686,10 +3682,7 @@ static void bios_parser_set_scratch_critical_state(struct dc_bios *dcb, bool state) { -struct bios_parser *bp =BP_FROM_DCB (dcb); - -dce110_set_scratch_critical_state ( - bp->base.ctx, state); +bios_set_scratch_critical_state (dcb ,state ); }/*
@@ -4127,7 +4120,7 @@ static const struct dc_vbios_funcs vbios_funcs = { .get_encoder_cap_info = bios_parser_get_encoder_cap_info,/* bios scratch register communication */ - .is_accelerated_mode = bios_parser_is_accelerated_mode, + .is_accelerated_mode = bios_is_accelerated_mode, .set_scratch_critical_state = bios_parser_set_scratch_critical_state,
@@ -4243,7 +4236,6 @@ static bool bios_parser_construct(else return false; -dal_bios_parser_init_bios_helper (bp, dce_version);dal_bios_parser_init_cmd_tbl (bp);dal_bios_parser_init_cmd_tbl_helper (&bp->cmd_helper, dce_version);
drivers/gpu/drm/amd/dal/dc/bios/bios_parser_helper.c +38 -27
74 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/bios/bios_parser_helper.h +5 -21
@@ -1,5 +1,5 @@/* -* Copyright 2012-15 Advanced Micro Devices, Inc. +* Copyright 2012-16 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"),
@@ -26,31 +26,15 @@#ifndef __DAL_BIOS_PARSER_HELPER_H__#define __DAL_BIOS_PARSER_HELPER_H__ -#include "dce80/bios_parser_helper_dce80.h" - -#include "dce110/bios_parser_helper_dce110.h" - -#include "dce112/bios_parser_helper_dce112.h" -struct bios_parser ; -struct bios_parser_helper { -bool (*is_accelerated_mode)( -struct dc_context *ctx); -}; - -bool dal_bios_parser_init_bios_helper ( -struct bios_parser *bp, -enum dce_version ver); - -uint8_t *get_image (struct dc_bios *bp,uint32_t offset,uint32_t size); -#define GET_IMAGE (type, offset) ((type *) get_image(&bp->base, offset, sizeof(type))) - - - +bool bios_is_accelerated_mode (struct dc_bios *bios); +void bios_set_scratch_acc_mode_change (struct dc_bios *bios); +void bios_set_scratch_critical_state (struct dc_bios *bios,bool state); +#define GET_IMAGE (type, offset) ((type *) get_image(&bp->base, offset, sizeof(type)))#endif
drivers/gpu/drm/amd/dal/dc/bios/dce110/bios_dce110.h deleted +0 -6
@@ -1,6 +0,0 @@ -#ifndef BIOS_DCE110_H -#define BIOS_DCE110_H -void dce110_set_scratch_critical_state (struct dc_context *ctx, -bool state); -void dce110_set_scratch_acc_mode_change (struct dc_context *ctx); -#endif
drivers/gpu/drm/amd/dal/dc/bios/dce110/bios_parser_helper_dce110.c deleted +0 -118
118 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/bios/dce110/bios_parser_helper_dce110.h deleted +0 -34
@@ -1,34 +0,0 @@ -/* -* Copyright 2012-15 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, sub license, -* 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 __DAL_BIOS_PARSER_HELPER_DCE110_H__ -#define __DAL_BIOS_PARSER_HELPER_DCE110_H__ - -struct bios_parser_helper ; - -/* Initialize BIOS helper functions */ -const struct bios_parser_helper *dal_bios_parser_helper_dce110_get_table (void ); - -#endif /* __DAL_BIOS_PARSER_HELPER_DCE110_H__ */
drivers/gpu/drm/amd/dal/dc/bios/dce112/bios_parser_helper_dce112.c deleted +0 -81
81 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/bios/dce112/bios_parser_helper_dce112.h deleted +0 -34
@@ -1,34 +0,0 @@ -/* -* Copyright 2012-15 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, sub license, -* 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 __DAL_BIOS_PARSER_HELPER_DCE112_H__ -#define __DAL_BIOS_PARSER_HELPER_DCE112_H__ - -struct bios_parser_helper ; - -/* Initialize BIOS helper functions */ -const struct bios_parser_helper *dal_bios_parser_helper_dce112_get_table (void ); - -#endif /* __DAL_BIOS_PARSER_HELPER_DCE110_H__ */
drivers/gpu/drm/amd/dal/dc/bios/dce80/bios_parser_helper_dce80.c deleted +0 -67
67 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/bios/dce80/bios_parser_helper_dce80.h deleted +0 -33
@@ -1,33 +0,0 @@ -/* -* Copyright 2012-15 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 __DAL_BIOS_PARSER_HELPER_DCE80_H__ -#define __DAL_BIOS_PARSER_HELPER_DCE80_H__ - -struct bios_parser_helper ; - -const struct bios_parser_helper *dal_bios_parser_helper_dce80_get_table (void ); - -#endif
drivers/gpu/drm/amd/dal/dc/dc_bios_types.h +5 -0
@@ -212,6 +212,10 @@ struct dc_vbios_funcs {void (*bios_parser_destroy)(struct dc_bios **dcb); }; +struct bios_registers { +uint32_t BIOS_SCRATCH_6; +}; +struct dc_bios {const struct dc_vbios_funcs *funcs;
@@ -221,6 +225,7 @@ struct dc_bios {uint8_t *bios_local_image;struct dc_context *ctx; + const struct bios_registers *regs; };#endif /* DC_BIOS_TYPES_H */
drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c +7 -0
@@ -66,6 +66,7 @@#ifndef mmBIOS_SCRATCH_2#define mmBIOS_SCRATCH_2 0x05CB +#define mmBIOS_SCRATCH_6 0x05CF#endif #ifndef mmDP_DPHY_BS_SR_SWAP_CNTL
@@ -358,6 +359,10 @@ static const struct dce110_opp_reg_offsets dce100_opp_reg_offsets[] = { } }; +static const struct bios_registers bios_regs = { + .BIOS_SCRATCH_6 = mmBIOS_SCRATCH_6 +}; +static const struct resource_caps res_cap = { .num_timing_generator =6 , .num_audio =6 ,
@@ -859,6 +864,8 @@ static bool construct(struct dc_bios *bp;struct dm_pp_static_clock_info static_clk_info = {0 }; + ctx->dc_bios->regs = &bios_regs; + pool->base.adapter_srv = as; pool->base.res_cap = &res_cap; pool->base.funcs = &dce100_res_pool_funcs;
drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c +2 -2
@@ -35,7 +35,7 @@#include "gpu/dce110/dc_clock_gating_dce110.h" -#include "bios/dce110/bios_dce110.h" +#include "bios/bios_parser_helper.h" #include "timing_generator.h" #include "mem_input.h" #include "opp.h"
@@ -975,7 +975,7 @@ void dce110_enable_accelerated_mode(struct core_dc *dc)power_down_all_hw_blocks (dc);disable_vga_and_power_gate_all_controllers (dc); -dce110_set_scratch_acc_mode_change (dc->ctx); +bios_set_scratch_acc_mode_change (dc->ctx->dc_bios); }/**
drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c +6 -0
@@ -69,6 +69,7 @@#ifndef mmBIOS_SCRATCH_2#define mmBIOS_SCRATCH_2 0x05CB +#define mmBIOS_SCRATCH_6 0x05CF#endif #ifndef mmDP_DPHY_BS_SR_SWAP_CNTL
@@ -325,6 +326,9 @@ static const struct dce110_clk_src_reg_offsets dce110_clk_src_reg_offsets[] = { } }; +static const struct bios_registers bios_regs = { + .BIOS_SCRATCH_6 = mmBIOS_SCRATCH_6 +};static const struct resource_caps carrizo_resource_cap = { .num_timing_generator =3 ,
@@ -1179,6 +1183,8 @@ static bool construct(struct dm_pp_static_clock_info static_clk_info = {0 };struct resource_straps straps = {0 }; + ctx->dc_bios->regs = &bios_regs; + pool->base.adapter_srv = as; pool->base.res_cap =dce110_resource_cap (&dc->asic_id); pool->base.funcs = &dce110_res_pool_funcs;
drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c +7 -0
@@ -66,6 +66,7 @@#ifndef mmBIOS_SCRATCH_2#define mmBIOS_SCRATCH_2 0x05CB +#define mmBIOS_SCRATCH_6 0x05CF#endif #ifndef mmDP_DPHY_BS_SR_SWAP_CNTL
@@ -375,6 +376,10 @@ static const struct dce112_clk_src_reg_offsets dce112_clk_src_reg_offsets[] = { } }; +static const struct bios_registers bios_regs = { + .BIOS_SCRATCH_6 = mmBIOS_SCRATCH_6 +}; +static const struct resource_caps polaris_10_resource_cap = { .num_timing_generator =6 , .num_audio =6 ,
@@ -1187,6 +1192,8 @@ static bool construct(struct dc_context *ctx = dc->ctx;struct dm_pp_static_clock_info static_clk_info = {0 }; + ctx->dc_bios->regs = &bios_regs; + pool->base.adapter_srv = adapter_serv; pool->base.res_cap =dce112_resource_cap (&dc->asic_id); pool->base.funcs = &dce112_res_pool_funcs;
drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c +7 -0
@@ -69,6 +69,7 @@#ifndef mmBIOS_SCRATCH_2#define mmBIOS_SCRATCH_2 0x05CB +#define mmBIOS_SCRATCH_6 0x05CF#endif #ifndef mmDP_DPHY_FAST_TRAINING
@@ -349,6 +350,10 @@ static const struct dce110_clk_src_reg_offsets dce80_clk_src_reg_offsets[] = { } }; +static const struct bios_registers bios_regs = { + .BIOS_SCRATCH_6 = mmBIOS_SCRATCH_6 +}; +static const struct resource_caps res_cap = { .num_timing_generator =6 , .num_audio =6 ,
@@ -853,6 +858,8 @@ static bool construct(struct dc_bios *bp;struct dm_pp_static_clock_info static_clk_info = {0 }; + ctx->dc_bios->regs = &bios_regs; + pool->base.adapter_srv = as; pool->base.res_cap = &res_cap; pool->base.funcs = &dce80_res_pool_funcs;
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 17/76 drm/amd/dal: Remove adapter service from display clock
In reply to a message not in the archiveFrom: Zeyu Fan <[email protected]>
--- .../amd/dal/dc/gpu/dce110/display_clock_dce110.c | 2 +- .../amd/dal/dc/gpu/dce112/display_clock_dce112.c | 35 ++++++++-------------- .../amd/dal/dc/gpu/dce112/display_clock_dce112.h | 3 +- .../drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c | 2 +- drivers/gpu/drm/amd/dal/dc/gpu/display_clock.c | 4 +-- drivers/gpu/drm/amd/dal/dc/gpu/display_clock.h | 3 +- 6 files changed, 18 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/dal/dc/gpu/dce110/display_clock_dce110.c +1 -1
@@ -929,7 +929,7 @@ static bool dal_display_clock_dce110_construct(if (NULL == as)return false; -if (!dal_display_clock_construct_base (dc_base, ctx, as)) +if (!dal_display_clock_construct_base (dc_base, ctx))return false; dc_base->funcs = &funcs;
drivers/gpu/drm/amd/dal/dc/gpu/dce112/display_clock_dce112.c +13 -22
@@ -644,8 +644,7 @@ uint32_t dispclk_dce112_calculate_min_clock( }static bool display_clock_integrated_info_construct ( -struct display_clock_dce112 *disp_clk, -struct adapter_service *as) +struct display_clock_dce112 *disp_clk) {struct integrated_info info;uint32_t i;
@@ -696,11 +695,6 @@ static bool display_clock_integrated_info_construct( info.disp_clk_voltage[i].max_supported_clk; } } - disp_clk->dfs_bypass_enabled = -dal_adapter_service_is_dfs_bypass_enabled (as); - disp_clk->use_max_disp_clk = -dal_adapter_service_is_feature_supported (as, -FEATURE_USE_MAX_DISPLAY_CLK );return true; }
@@ -847,23 +841,22 @@ static const struct display_clock_funcs funcs = {bool dal_display_clock_dce112_construct (struct display_clock_dce112 *dc112, -struct dc_context *ctx, -struct adapter_service *as) +struct dc_context *ctx) {struct dm_pp_static_clock_info *static_clk_info = {0 };struct display_clock *dc_base = &dc112->disp_clk_base; -if (NULL == as) -return false; +/*if (NULL == as) +return false;*/ -if (!dal_display_clock_construct_base (dc_base, ctx, as)) +if (!dal_display_clock_construct_base (dc_base, ctx))return false; dc_base->funcs = &funcs; dc112->dfs_bypass_disp_clk =0 ; -if (!display_clock_integrated_info_construct (dc112, as)) +if (!display_clock_integrated_info_construct (dc112))dm_logger_write (dc_base->ctx->logger,LOG_WARNING ,"Cannot obtain VBIOS integrated info\n" );
@@ -907,9 +900,8 @@ bool dal_display_clock_dce112_construct( {uint32_t ss_info_num = -dal_adapter_service_get_ss_info_num ( - as, -AS_SIGNAL_TYPE_GPU_PLL ); + ctx->dc_bios->funcs-> +get_ss_entry_number (ctx->dc_bios,AS_SIGNAL_TYPE_GPU_PLL );if (ss_info_num) {struct spread_spectrum_info info;
@@ -918,11 +910,10 @@ bool dal_display_clock_dce112_construct(memset (&info,0 ,sizeof (info)); result = -dal_adapter_service_get_ss_info ( - as, -AS_SIGNAL_TYPE_GPU_PLL , -0 , - &info); + (BP_RESULT_OK == ctx->dc_bios->funcs-> +get_spread_spectrum_info (ctx->dc_bios, +AS_SIGNAL_TYPE_GPU_PLL ,0 , &info)) ? true : false; +/* Based on VBIOS, VBIOS will keep entry for GPU PLL SS * even if SS not enabled and in that case
@@ -967,7 +958,7 @@ struct display_clock *dal_display_clock_dce112_create(if (dc112 ==NULL )return NULL ; -if (dal_display_clock_dce112_construct (dc112, ctx, as)) +if (dal_display_clock_dce112_construct (dc112, ctx))return &dc112->disp_clk_base;dm_free (dc112);
drivers/gpu/drm/amd/dal/dc/gpu/dce112/display_clock_dce112.h +1 -2
@@ -71,8 +71,7 @@ enum divider_range_start {bool dal_display_clock_dce112_construct (struct display_clock_dce112 *dc112, -struct dc_context *ctx, -struct adapter_service *as); +struct dc_context *ctx);void dispclk_dce112_destroy (struct display_clock **base);
drivers/gpu/drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c +1 -1
@@ -860,7 +860,7 @@ static bool display_clock_construct(if (NULL == as)return false; -if (!dal_display_clock_construct_base (dc_base, ctx, as)) +if (!dal_display_clock_construct_base (dc_base, ctx))return false; dc_base->funcs = &funcs;
drivers/gpu/drm/amd/dal/dc/gpu/display_clock.c +1 -3
@@ -56,13 +56,11 @@ uint32_t dal_display_clock_base_get_dfs_bypass_threshold(bool dal_display_clock_construct_base (struct display_clock *base, -struct dc_context *ctx, -struct adapter_service *as) +struct dc_context *ctx) { base->ctx = ctx; base->id =CLOCK_SOURCE_ID_DCPLL ; base->min_display_clk_threshold_khz =0 ; - base->as = as;/* Initially set current min clocks state to invalid since we * cannot make any assumption about PPLIB's initial state. This will be updated
drivers/gpu/drm/amd/dal/dc/gpu/display_clock.h +1 -2
@@ -78,8 +78,7 @@ void dal_display_clock_base_set_clock_state(struct display_clock *disp_clk, struct display_clock_state clk_state);bool dal_display_clock_construct_base (struct display_clock *base, -struct dc_context *ctx, -struct adapter_service *as); +struct dc_context *ctx);uint32_t dal_display_clock_get_validation_clock (struct display_clock *disp_clk);
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 18/76 drm/amd/dal: Use future proof reg access for HPD and DDC
In reply to a message not in the archive--- drivers/gpu/drm/amd/dal/dc/gpio/dce110/hw_factory_dce110.c | 14 ++++++++++---- drivers/gpu/drm/amd/dal/dc/gpio/dce80/hw_factory_dce80.c | 3 +++ drivers/gpu/drm/amd/dal/dc/gpio/ddc_regs.h | 8 ++++---- drivers/gpu/drm/amd/dal/dc/gpio/hpd_regs.h | 6 +++--- 4 files changed, 20 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/dal/dc/gpio/dce110/hw_factory_dce110.c +10 -4
@@ -27,10 +27,6 @@#include "include/gpio_types.h" #include "../hw_factory.h" -#include "../hw_gpio.h" -#include "../hw_ddc.h" -#include "../hw_hpd.h" -#include "hw_factory_dce110.h" #include "dce/dce_11_0_d.h"
@@ -40,6 +36,16 @@#define SF_HPD (reg_name, field_name, post_fix)\ .field_name = reg_name ## __ ## field_name ## post_fix +#define REG (reg_name)\ + mm ## reg_name + +#define REGI (reg_name, block, id)\ + mm ## block ## id ## _ ## reg_name + +#include "../hw_gpio.h" +#include "../hw_ddc.h" +#include "../hw_hpd.h" +#include "reg_helper.h" #include "../hpd_regs.h"
drivers/gpu/drm/amd/dal/dc/gpio/dce80/hw_factory_dce80.c +3 -0
@@ -36,6 +36,9 @@#include "dce/dce_8_0_d.h" #include "dce/dce_8_0_sh_mask.h" +#define REG (reg_name)\ + mm ## reg_name +#include "reg_helper.h" #include "../hpd_regs.h"
drivers/gpu/drm/amd/dal/dc/gpio/ddc_regs.h +4 -4
@@ -32,7 +32,7 @@/*** following in header */ #define DDC_GPIO_REG_LIST_ENTRY (type,cd,id) \ - .type ## _reg = mmDC_GPIO_DDC ## id ## _ ## type,\ + .type ## _reg = REG(DC_GPIO_DDC ## id ## _ ## type),\ .type ## _mask = DC_GPIO_DDC ## id ## _ ## type ## __DC_GPIO_DDC ## id ## cd ## _ ## type ## _MASK,\ .type ## _shift = DC_GPIO_DDC ## id ## _ ## type ## __DC_GPIO_DDC ## id ## cd ## _ ## type ## __SHIFT
@@ -46,10 +46,10 @@#define DDC_REG_LIST (cd,id) \ DDC_GPIO_REG_LIST(cd,id),\ - .ddc_setup = mmDC_I2C_DDC ## id ## _SETUP + .ddc_setup = REG(DC_I2C_DDC ## id ## _SETUP)#define DDC_GPIO_VGA_REG_LIST_ENTRY (type,cd)\ - .type ## _reg = mmDC_GPIO_DDCVGA_ ## type,\ + .type ## _reg = REG(DC_GPIO_DDCVGA_ ## type),\ .type ## _mask = DC_GPIO_DDCVGA_ ## type ## __DC_GPIO_DDCVGA ## cd ## _ ## type ## _MASK,\ .type ## _shift = DC_GPIO_DDCVGA_ ## type ## __DC_GPIO_DDCVGA ## cd ## _ ## type ## __SHIFT
@@ -66,7 +66,7 @@ .ddc_setup = mmDC_I2C_DDCVGA_SETUP#define DDC_GPIO_I2C_REG_LIST_ENTRY (type,cd) \ - .type ## _reg = mmDC_GPIO_I2CPAD_ ## type,\ + .type ## _reg = REG(DC_GPIO_I2CPAD_ ## type),\ .type ## _mask = DC_GPIO_I2CPAD_ ## type ## __DC_GPIO_ ## cd ## _ ## type ## _MASK,\ .type ## _shift = DC_GPIO_I2CPAD_ ## type ## __DC_GPIO_ ## cd ## _ ## type ## __SHIFT
drivers/gpu/drm/amd/dal/dc/gpio/hpd_regs.h +3 -3
@@ -37,7 +37,7 @@#define HPD_GPIO_REG_LIST_ENTRY (type,cd,id) \ - .type ## _reg = mmDC_GPIO_HPD_## type,\ + .type ## _reg = REG(DC_GPIO_HPD_## type),\ .type ## _mask = DC_GPIO_HPD_ ## type ## __DC_GPIO_HPD ## id ## _ ## type ## _MASK,\ .type ## _shift = DC_GPIO_HPD_ ## type ## __DC_GPIO_HPD ## id ## _ ## type ## __SHIFT
@@ -51,8 +51,8 @@#define HPD_REG_LIST (id) \ HPD_GPIO_REG_LIST(ONE_MORE_ ## id), \ - .int_status = mmHPD ## id ## _DC_HPD_INT_STATUS,\ - .toggle_filt_cntl = mmHPD ## id ## _DC_HPD_TOGGLE_FILT_CNTL + .int_status = REGI(DC_HPD_INT_STATUS, HPD, id),\ + .toggle_filt_cntl = REGI(DC_HPD_TOGGLE_FILT_CNTL, HPD, id)#define HPD_MASK_SH_LIST (mask_sh) \ SF_HPD(DC_HPD_INT_STATUS, DC_HPD_SENSE_DELAYED, mask_sh),\
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 19/76 drm/amd/dal: Remove adapter service dependency from dc_link
In reply to a message not in the archiveFrom: Yongqiang Sun <[email protected]>
--- drivers/gpu/drm/amd/dal/dc/core/dc_link.c | 14 ++++++------ drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c | 8 ++----- drivers/gpu/drm/amd/dal/dc/dc_bios_types.h | 1 + drivers/gpu/drm/amd/dal/dc/dc_types.h | 1 + drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c | 27 ++++++++++++++--------- 5 files changed, 28 insertions(+), 23 deletions(-)
drivers/gpu/drm/amd/dal/dc/core/dc_link.c +7 -7
@@ -945,6 +945,7 @@ static bool construct(struct encoder_init_data enc_init_data = {0 };struct integrated_info info = {{{0 }}};struct dc_bios *bios = init_params->dc->ctx->dc_bios; +const struct dc_vbios_funcs *bp_funcs = bios->funcs; link->public.irq_source_hpd =DC_IRQ_SOURCE_INVALID ; link->public.irq_source_hpd_rx =DC_IRQ_SOURCE_INVALID ;
@@ -1033,8 +1034,7 @@ static bool construct( enc_init_data.adapter_service = as; enc_init_data.ctx = dc_ctx; - enc_init_data.encoder =dal_adapter_service_get_src_obj ( - as, link->link_id,0 ); + bp_funcs->get_src_obj (dc_ctx->dc_bios, link->link_id,0 , &enc_init_data.encoder); enc_init_data.connector = link->link_id; enc_init_data.channel =get_ddc_line (link, as); enc_init_data.hpd_source =get_hpd_line (link, as);
@@ -1050,11 +1050,12 @@ static bool construct( link->public.link_enc_hw_inst = link->link_enc->transmitter; -dal_adapter_service_get_integrated_info (as, &info); +/* TODO: refactor dal_adapter_service_get_integrated_info(as, &info); */ +memmove (&info, dc_ctx->dc_bios->integrated_info,sizeof (struct integrated_info ));for (i =0 ; ; i++) { -if (!dal_adapter_service_get_device_tag ( - as, link->link_id, i, &link->device_tag)) { +if (BP_RESULT_OK != + bp_funcs->get_device_tag (dc_ctx->dc_bios, link->link_id, i, &link->device_tag)) {DC_ERROR ("Failed to find device tag!\n" ); goto device_tag_fail; }
@@ -1062,8 +1063,7 @@ static bool construct(/* Look for device tag that matches connector signal, * CRT for rgb, LCD for other supported signal tyes */ -if (!dal_adapter_service_is_device_id_supported ( - as, link->device_tag.dev_id)) +if (!bp_funcs->is_device_id_supported (dc_ctx->dc_bios, link->device_tag.dev_id))continue ;if (link->device_tag.dev_id.device_type ==DEVICE_TYPE_CRT && link->public.connector_signal !=SIGNAL_TYPE_RGB )
drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c +2 -6
@@ -304,13 +304,9 @@ static bool construct( ddc_service->flags.EDID_QUERY_DONE_ONCE = false; - ddc_service->flags.FORCE_READ_REPEATED_START = -dal_adapter_service_is_feature_supported (ddc_service->as, -FEATURE_DDC_READ_FORCE_REPEATED_START ); + ddc_service->flags.FORCE_READ_REPEATED_START = false; - ddc_service->flags.EDID_STRESS_READ = -dal_adapter_service_is_feature_supported (ddc_service->as, -FEATURE_EDID_STRESS_READ ); + ddc_service->flags.EDID_STRESS_READ = false; ddc_service->flags.IS_INTERNAL_DISPLAY = connector_id == CONNECTOR_ID_EDP ||
drivers/gpu/drm/amd/dal/dc/dc_bios_types.h +1 -0
@@ -226,6 +226,7 @@ struct dc_bios {struct dc_context *ctx;const struct bios_registers *regs; + struct integrated_info *integrated_info; };#endif /* DC_BIOS_TYPES_H */
drivers/gpu/drm/amd/dal/dc/dc_types.h +1 -0
@@ -76,6 +76,7 @@ struct dc_context {struct dc_bios *dc_bios;bool created_bios;struct gpio_service *gpio_service; +struct i2caux *i2caux; };/*
drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c +17 -10
@@ -1002,10 +1002,10 @@ bool dce110_link_encoder_construct(* while doing the DP sink detect */ -if (dal_adapter_service_is_feature_supported (as, +/* if (dal_adapter_service_is_feature_supported(as, FEATURE_DP_SINK_DETECT_POLL_DATA_PIN)) enc110->base.features.flags.bits. - DP_SINK_DETECT_POLL_DATA_PIN = true; +DP_SINK_DETECT_POLL_DATA_PIN = true;*/ enc110->base.output_signals = SIGNAL_TYPE_DVI_SINGLE_LINK |
@@ -1061,22 +1061,29 @@ bool dce110_link_encoder_construct( init_data->channel);/* Override features with DCE-specific values */ -if (dal_adapter_service_get_encoder_cap_info ( - enc110->base.adapter_service, - enc110->base.id, &enc_cap_info)) - enc110->base.features.flags.bits.IS_HBR2_CAPABLE = - enc_cap_info.dp_hbr2_cap; + { +struct bp_encoder_cap_info bp_cap_info = {0 }; +const struct dc_vbios_funcs *bp_funcs = enc110->base.ctx->dc_bios->funcs; +if (BP_RESULT_OK != bp_funcs->get_encoder_cap_info ( + enc110->base.ctx->dc_bios, enc110->base.id, + &bp_cap_info)) + enc110->base.features.flags.bits.IS_HBR2_CAPABLE = + bp_cap_info.DP_HBR2_CAP; + }/* test pattern 3 support */ enc110->base.features.flags.bits.IS_TPS3_CAPABLE = true; - enc110->base.features.flags.bits.IS_Y_ONLY_CAPABLE = + enc110->base.features.flags.bits.IS_Y_ONLY_CAPABLE = false; +/* dal_adapter_service_is_feature_supported(as, FEATURE_SUPPORT_DP_Y_ONLY); - - enc110->base.features.flags.bits.IS_YCBCR_CAPABLE = +*/ + enc110->base.features.flags.bits.IS_YCBCR_CAPABLE = true; +/* dal_adapter_service_is_feature_supported(as, FEATURE_SUPPORT_DP_YUV); +*/ return true; }
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 20/76 drm/amd/dal: rotation and mirror support
In reply to a message not in the archiveFrom: Vitaly Prosyak <[email protected]>
Fix rotation 90 and 270.
--- drivers/gpu/drm/amd/dal/dc/core/dc_resource.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/gpu/drm/amd/dal/dc/core/dc_resource.c +0 -5
@@ -444,11 +444,6 @@ static void calculate_recout(struct core_stream *stream = pipe_ctx->stream;struct rect clip = surface->clip_rect; -if (surface->rotation ==ROTATION_ANGLE_90 || - surface->rotation ==ROTATION_ANGLE_270 ){ -rect_swap_helper (&clip); - } - pipe_ctx->scl_data.recout.x = stream->public.dst.x;if (stream->public.src.x < clip.x) pipe_ctx->scl_data.recout.x += (clip.x
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 21/76 drm/amd/dal: remove unnessary AS dependency
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
- ddc instantiation
- default i2c speed from dc_cap.
--- .../gpu/drm/amd/dal/dc/adapter/adapter_service.c | 26 ---------------------- .../amd/dal/dc/asic_capability/asic_capability.c | 1 - .../dc/asic_capability/carrizo_asic_capability.c | 1 - .../dc/asic_capability/hawaii_asic_capability.c | 2 -- .../dc/asic_capability/polaris10_asic_capability.c | 1 - .../dal/dc/asic_capability/tonga_asic_capability.c | 1 - drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c | 4 +++- drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c | 9 +++----- .../amd/dal/include/adapter_service_interface.h | 8 ------- .../drm/amd/dal/include/asic_capability_types.h | 1 - 10 files changed, 6 insertions(+), 48 deletions(-)
drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c +0 -26
@@ -118,7 +118,6 @@ static const struct feature_source_entry feature_entry_table[] = { {FEATURE_DP_DISPLAY_FORCE_SS_ENABLE, false, true}, {FEATURE_REPORT_CE_MODE_ONLY, false, true}, {FEATURE_ALLOW_OPTIMIZED_MODE_AS_DEFAULT, false, true}, - {FEATURE_DDC_READ_FORCE_REPEATED_START, false, true}, {FEATURE_FORCE_TIMING_RESYNC, false, true}, {FEATURE_TMDS_DISABLE_DITHERING, false, true}, {FEATURE_HDMI_DISABLE_DITHERING, false, true},
@@ -136,7 +135,6 @@ static const struct feature_source_entry feature_entry_table[] = { {FEATURE_PSR_ENABLE, false, true}, {FEATURE_WIRELESS_ENABLE_COMPRESSED_AUDIO, false, true}, {FEATURE_WIRELESS_INCLUDE_UNVERIFIED_TIMINGS, true, true}, - {FEATURE_EDID_STRESS_READ, false, true}, {FEATURE_DP_FRAME_PACK_STEREO3D, false, true}, {FEATURE_DISPLAY_PREFERRED_VIEW, 0, false}, {FEATURE_ALLOW_HDMI_WITHOUT_AUDIO, false, true},
@@ -928,30 +926,6 @@ bool dal_adapter_service_is_dfs_bypass_enabled( }/* -* dal_adapter_service_get_sw_i2c_speed -* -* Get SW I2C speed -*/ -uint32_t dal_adapter_service_get_sw_i2c_speed ( -struct adapter_service *as) -{ -/* TODO: only from ASIC caps. Feature key is not implemented*/ -return as->asic_cap->data[ASIC_DATA_DEFAULT_I2C_SPEED_IN_KHZ ]; -} - -/* -* dal_adapter_service_get_hw_i2c_speed -* -* Get HW I2C speed -*/ -uint32_t dal_adapter_service_get_hw_i2c_speed ( -struct adapter_service *as) -{ -/* TODO: only from ASIC caps. Feature key is not implemented*/ -return as->asic_cap->data[ASIC_DATA_DEFAULT_I2C_SPEED_IN_KHZ ]; -} - -/* * dal_adapter_service_get_asic_vram_bit_width * * Get the video RAM bit width set on the ASIC
drivers/gpu/drm/amd/dal/dc/asic_capability/asic_capability.c +0 -1
@@ -58,7 +58,6 @@ static bool construct( cap->runtime_flags = init->runtime_flags; cap->data[ASIC_DATA_MAX_UNDERSCAN_PERCENTAGE ] =10 ; cap->data[ASIC_DATA_VIEWPORT_PIXEL_GRANULARITY ] =4 ; - cap->data[ASIC_DATA_DEFAULT_I2C_SPEED_IN_KHZ ] =25 ; cap->data[ASIC_DATA_DOWNSCALE_LIMIT ] =200 ;/* ASIC basic capability */
drivers/gpu/drm/amd/dal/dc/asic_capability/carrizo_asic_capability.c +0 -1
@@ -56,7 +56,6 @@ void carrizo_asic_capability_create(struct asic_capability *cap, cap->data[ASIC_DATA_STUTTERMODE ] =0x200A ; cap->data[ASIC_DATA_VIEWPORT_PIXEL_GRANULARITY ] =2 ; cap->data[ASIC_DATA_MEMORYTYPE_MULTIPLIER ] =2 ; - cap->data[ASIC_DATA_DEFAULT_I2C_SPEED_IN_KHZ ] =100 ; cap->data[ASIC_DATA_DOWNSCALE_LIMIT ] =150 ;/* ASIC basic capability */
drivers/gpu/drm/amd/dal/dc/asic_capability/hawaii_asic_capability.c +0 -2
@@ -69,8 +69,6 @@ void dal_hawaii_asic_capability_create(struct asic_capability *cap, cap->data[ASIC_DATA_PATH_NUM_PER_DPMST_CONNECTOR ] =4 ; cap->data[ASIC_DATA_VIEWPORT_PIXEL_GRANULARITY ] =2 ; - cap->data[ASIC_DATA_DEFAULT_I2C_SPEED_IN_KHZ ] =40 ; - mc_seq_misc0 =dm_read_reg (cap->ctx, mmMC_SEQ_MISC0);switch (mc_seq_misc0 &MC_MISC0__MEMORY_TYPE_MASK ) {
drivers/gpu/drm/amd/dal/dc/asic_capability/polaris10_asic_capability.c +0 -1
@@ -58,7 +58,6 @@ void polaris10_asic_capability_create(struct asic_capability *cap, cap->data[ASIC_DATA_VIEWPORT_PIXEL_GRANULARITY ] =2 ; cap->data[ASIC_DATA_MEMORYTYPE_MULTIPLIER ] =4 ; - cap->data[ASIC_DATA_DEFAULT_I2C_SPEED_IN_KHZ ] =100 ; cap->data[ASIC_DATA_MIN_DISPCLK_FOR_UNDERSCAN ] =300000 ;
drivers/gpu/drm/amd/dal/dc/asic_capability/tonga_asic_capability.c +0 -1
@@ -58,7 +58,6 @@ void tonga_asic_capability_create(struct asic_capability *cap, cap->data[ASIC_DATA_DCE_VERSION ] =0x100 ;/* DCE 11 */ cap->data[ASIC_DATA_MEMORYTYPE_MULTIPLIER ] =4 ; - cap->data[ASIC_DATA_DEFAULT_I2C_SPEED_IN_KHZ ] =40 ;/* ASIC basic capability */ cap->caps.IS_FUSION = true;
drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c +3 -1
@@ -44,6 +44,8 @@/* TODO remove - only needed for gpio_service */ #include "adapter/adapter_service.h" +/* TODO remove - only needed for default i2c speed */ +#include "dc.h" #define THREE_PERCENT_OF_10000 300
@@ -2940,7 +2942,7 @@ static bool i2c_read(/*Using SW engine */ cmd.engine =I2C_COMMAND_ENGINE_SW ; - cmd.speed =dal_adapter_service_get_sw_i2c_speed (as); + cmd.speed = ddc->ctx->dc->caps.i2c_speed_in_khz; {struct i2c_payload payloads[] = {
drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c +3 -6
@@ -303,9 +303,7 @@ static bool construct( } ddc_service->flags.EDID_QUERY_DONE_ONCE = false; - ddc_service->flags.FORCE_READ_REPEATED_START = false; - ddc_service->flags.EDID_STRESS_READ = false; ddc_service->flags.IS_INTERNAL_DISPLAY =
@@ -450,7 +448,7 @@ static bool i2c_read( .payloads = payloads, .number_of_payloads = 2, .engine = DDC_I2C_COMMAND_ENGINE, - .speed = dal_adapter_service_get_sw_i2c_speed(ddc->as) }; + .speed = ddc->ctx->dc->caps.i2c_speed_in_khz }; return dm_helpers_submit_i2c( ddc->ctx,
@@ -561,7 +559,7 @@ static uint8_t i2c_read_edid_block( .payloads = NULL, .number_of_payloads = 0, .engine = DDC_I2C_COMMAND_ENGINE, - .speed = dal_adapter_service_get_sw_i2c_speed(ddc->as) }; + .speed = ddc->ctx->dc->caps.i2c_speed_in_khz };struct i2c_payload payloads[3 ] = { {
@@ -943,8 +941,7 @@ bool dal_ddc_service_query_ddc_data( .payloads = dal_ddc_i2c_payloads_get(payloads), .number_of_payloads = 0, .engine = DDC_I2C_COMMAND_ENGINE, - .speed = - dal_adapter_service_get_sw_i2c_speed(ddc->as) }; + .speed = ddc->ctx->dc->caps.i2c_speed_in_khz };dal_ddc_i2c_payloads_add ( payloads, address, write_size, write_buf, true);
drivers/gpu/drm/amd/dal/include/adapter_service_interface.h +0 -8
@@ -87,7 +87,6 @@ enum adapter_feature_id {FEATURE_DP_DISPLAY_FORCE_SS_ENABLE ,FEATURE_REPORT_CE_MODE_ONLY ,FEATURE_ALLOW_OPTIMIZED_MODE_AS_DEFAULT , -FEATURE_DDC_READ_FORCE_REPEATED_START ,FEATURE_FORCE_TIMING_RESYNC ,FEATURE_TMDS_DISABLE_DITHERING , FEATURE_HDMI_DISABLE_DITHERING,
@@ -111,7 +110,6 @@ enum adapter_feature_id {FEATURE_PREFER_3D_TIMING ,FEATURE_VARI_BRIGHT_ENABLE ,FEATURE_PSR_ENABLE , -FEATURE_EDID_STRESS_READ ,FEATURE_DP_FRAME_PACK_STEREO3D ,FEATURE_ALLOW_HDMI_WITHOUT_AUDIO , FEATURE_RESTORE_USAGE_I2C_SW_ENGING,
@@ -380,12 +378,6 @@ bool dal_adapter_service_get_feature_value(struct adapter_service *as,void *data, uint32_t size); -/* Get SW I2C speed */ -uint32_t dal_adapter_service_get_sw_i2c_speed (struct adapter_service *as); - -/* Get HW I2C speed */ -uint32_t dal_adapter_service_get_hw_i2c_speed (struct adapter_service *as); -/* Get I2C information from BIOS */ bool dal_adapter_service_get_i2c_info( struct adapter_service *as,
drivers/gpu/drm/amd/dal/include/asic_capability_types.h +0 -1
@@ -97,7 +97,6 @@ enum asic_data {ASIC_DATA_MAX_UNDERSCAN_PERCENTAGE ,ASIC_DATA_VIEWPORT_PIXEL_GRANULARITY ,ASIC_DATA_MIN_DISPCLK_FOR_UNDERSCAN , -ASIC_DATA_DEFAULT_I2C_SPEED_IN_KHZ ,ASIC_DATA_DOWNSCALE_LIMIT , ASIC_DATA_MAX_NUMBER /* end of enum */ };
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 22/76 drm/amd/dal: remove AS dependency from i2c_aux
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
- remove dal_adapter_service_get_firmware_info. call bios directly
- remove dal_adapter_service_get_i2caux. get i2caux from dc_ctx
- remove FEATURE_RESTORE_USAGE_I2C_SW_ENGINE. always 0
--- .../gpu/drm/amd/dal/dc/adapter/adapter_service.c | 26 +----------------- drivers/gpu/drm/amd/dal/dc/core/dc.c | 2 +- drivers/gpu/drm/amd/dal/dc/dc_types.h | 6 ++++- .../gpu/drm/amd/dal/dc/dce100/dce100_resource.c | 2 +- .../gpu/drm/amd/dal/dc/dce110/dce110_resource.c | 2 +- drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c | 2 +- .../amd/dal/dc/gpu/dce110/display_clock_dce110.c | 3 ++- .../drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c | 3 ++- .../drm/amd/dal/dc/i2caux/dce100/i2caux_dce100.c | 2 -- .../drm/amd/dal/dc/i2caux/dce100/i2caux_dce100.h | 1 - .../drm/amd/dal/dc/i2caux/dce110/i2caux_dce110.c | 10 ++----- .../drm/amd/dal/dc/i2caux/dce110/i2caux_dce110.h | 2 -- .../drm/amd/dal/dc/i2caux/dce112/i2caux_dce112.c | 5 +--- .../drm/amd/dal/dc/i2caux/dce112/i2caux_dce112.h | 1 - .../gpu/drm/amd/dal/dc/i2caux/dce80/i2caux_dce80.c | 8 +++--- .../gpu/drm/amd/dal/dc/i2caux/dce80/i2caux_dce80.h | 1 - .../amd/dal/dc/i2caux/diagnostics/i2caux_diag.c | 6 ++--- .../amd/dal/dc/i2caux/diagnostics/i2caux_diag.h | 1 - drivers/gpu/drm/amd/dal/dc/i2caux/i2caux.c | 31 +++++++--------------- drivers/gpu/drm/amd/dal/dc/i2caux/i2caux.h | 3 +-- .../amd/dal/include/adapter_service_interface.h | 6 ----- drivers/gpu/drm/amd/dal/include/i2caux_interface.h | 1 - 22 files changed, 32 insertions(+), 92 deletions(-)
drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c +1 -25
@@ -86,16 +86,6 @@ static const struct feature_source_entry feature_entry_table[] = { {FEATURE_MAXIMIZE_URGENCY_WATERMARKS, false, true}, {FEATURE_MAXIMIZE_STUTTER_MARKS, false, true}, {FEATURE_MAXIMIZE_NBP_MARKS, false, true}, -/* -* We meet HW I2C issue when test S3 resume on KB. -* An EPR is created for debug the issue. -* Make Test has already been implemented -* with HW I2C. The work load for revert back to SW I2C in make test -* is big. Below is workaround for this issue. -* Driver uses SW I2C. -* Make Test uses HW I2C. -*/ - {FEATURE_RESTORE_USAGE_I2C_SW_ENGINE, false, true}, {FEATURE_USE_MAX_DISPLAY_CLK, false, true}, {FEATURE_ALLOW_EDP_RESOURCE_SHARING, false, true}, {FEATURE_SUPPORT_DP_YUV, false, true},
@@ -672,7 +662,7 @@ static bool adapter_service_construct( dcb = as->ctx->dc_bios;/* Create I2C AUX */ - as->i2caux =dal_i2caux_create (as, as->ctx); + as->i2caux =dal_i2caux_create (as->ctx);if (!as->i2caux) {ASSERT_CRITICAL (false);
@@ -943,20 +933,6 @@ struct dal_asic_runtime_flags dal_adapter_service_get_asic_runtime_flags( }/* -* dal_adapter_service_get_firmware_info -* -* Get firmware information from BIOS -*/ -bool dal_adapter_service_get_firmware_info ( -struct adapter_service *as, -struct firmware_info *info) -{ -struct dc_bios *dcb = as->ctx->dc_bios; - -return dcb->funcs->get_firmware_info (dcb, info) ==BP_RESULT_OK ; -} - -/* * dal_adapter_service_get_feature_value * * Get the cached value of a given feature. This value can be a boolean, int,
drivers/gpu/drm/amd/dal/dc/core/dc.c +1 -1
@@ -518,8 +518,8 @@ static bool construct(struct core_dc *dc, dc->ctx = dc_ctx; dc->ctx->dce_environment = init_params->dce_environment; - dc_version =resource_parse_asic_id (init_params->asic_id); + dc->ctx->dce_version = dc_version;/* Resource should construct all asic specific resources. * This should be the only place where we need to parse the asic id
drivers/gpu/drm/amd/dal/dc/dc_types.h +5 -1
@@ -30,7 +30,7 @@#include "irq_types.h" #include "dc_dp_types.h" #include "dc_hw_types.h" -#include "signal_types.h" +#include "dal_types.h" /* forward declarations */ struct dc_surface ;
@@ -73,6 +73,10 @@ struct dc_context {enum dce_environment dce_environment; +/* todo: below should probably move to dc. to facilitate removal +* of AS we will store these here +*/ +enum dce_version dce_version;struct dc_bios *dc_bios;bool created_bios;struct gpio_service *gpio_service;
drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c +1 -1
@@ -880,7 +880,7 @@ static bool construct( bp = ctx->dc_bios; -if (dal_adapter_service_get_firmware_info (as, &info) && +if ((bp->funcs->get_firmware_info (bp, &info) ==BP_RESULT_OK ) && info.external_clock_source_frequency_for_dp !=0 ) { pool->base.dp_clock_source =dce100_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_EXTERNAL ,NULL , true);
drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c +1 -1
@@ -1211,7 +1211,7 @@ static bool construct( bp = ctx->dc_bios; -if (dal_adapter_service_get_firmware_info (as, &info) && +if ((bp->funcs->get_firmware_info (bp, &info) ==BP_RESULT_OK ) && info.external_clock_source_frequency_for_dp !=0 ) { pool->base.dp_clock_source =dce110_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_EXTERNAL ,NULL , true);
drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c +1 -1
@@ -886,7 +886,7 @@ static bool construct( bp = ctx->dc_bios; -if (dal_adapter_service_get_firmware_info (as, &info) && +if ((bp->funcs->get_firmware_info (bp, &info) ==BP_RESULT_OK ) && info.external_clock_source_frequency_for_dp !=0 ) { pool->base.dp_clock_source =dce80_clock_source_create (ctx, bp,CLOCK_SOURCE_ID_EXTERNAL ,NULL , true);
drivers/gpu/drm/amd/dal/dc/gpu/dce110/display_clock_dce110.c +2 -1
@@ -670,6 +670,7 @@ static bool display_clock_integrated_info_construct(struct display_clock_dce110 *disp_clk, struct adapter_service *as) { + struct dc_bios *bp = disp_clk->disp_clk_base.ctx->dc_bios;struct integrated_info info;struct firmware_info fw_info;uint32_t i;
@@ -683,7 +684,7 @@ static bool display_clock_integrated_info_construct( disp_clk->dentist_vco_freq_khz = info.dentist_vco_freq;if (disp_clk->dentist_vco_freq_khz ==0 ) { -dal_adapter_service_get_firmware_info (as, &fw_info); + bp->funcs->get_firmware_info (bp, &fw_info); disp_clk->dentist_vco_freq_khz = fw_info.smu_gpu_pll_output_freq;if (disp_clk->dentist_vco_freq_khz ==0 )
drivers/gpu/drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c +2 -1
@@ -753,6 +753,7 @@ static bool display_clock_integrated_info_construct(struct display_clock_dce80 *disp_clk, struct adapter_service *as) { + struct dc_bios *bp = disp_clk->disp_clk.ctx->dc_bios;struct integrated_info info = { { {0 } } };struct firmware_info fw_info = { {0 } };uint32_t i;
@@ -761,7 +762,7 @@ static bool display_clock_integrated_info_construct( disp_clk->dentist_vco_freq_khz = info.dentist_vco_freq;if (disp_clk->dentist_vco_freq_khz ==0 ) { -dal_adapter_service_get_firmware_info (as, &fw_info); + bp->funcs->get_firmware_info (bp, &fw_info); disp_clk->dentist_vco_freq_khz = fw_info.smu_gpu_pll_output_freq;if (disp_clk->dentist_vco_freq_khz ==0 )
drivers/gpu/drm/amd/dal/dc/i2caux/dce100/i2caux_dce100.c +0 -2
@@ -77,7 +77,6 @@ static const struct dce110_i2c_hw_engine_registers dce100_hw_engine_regs[] = { };struct i2caux *dal_i2caux_dce100_create ( -struct adapter_service *as,struct dc_context *ctx) { struct i2caux_dce110 *i2caux_dce110 =
@@ -90,7 +89,6 @@ struct i2caux *dal_i2caux_dce100_create(if (dal_i2caux_dce110_construct ( i2caux_dce110, - as, ctx, dce100_aux_regs, dce100_hw_engine_regs))
drivers/gpu/drm/amd/dal/dc/i2caux/dce100/i2caux_dce100.h +0 -1
@@ -27,7 +27,6 @@#define __DAL_I2C_AUX_DCE100_H__struct i2caux *dal_i2caux_dce100_create ( -struct adapter_service *as,struct dc_context *ctx);#endif /* __DAL_I2C_AUX_DCE100_H__ */
drivers/gpu/drm/amd/dal/dc/i2caux/dce110/i2caux_dce110.c +2 -8
@@ -190,7 +190,6 @@ static const struct dce110_i2c_hw_engine_registers i2c_hw_engine_regs[] = {bool dal_i2caux_dce110_construct (struct i2caux_dce110 *i2caux_dce110, -struct adapter_service *as,struct dc_context *ctx,const struct dce110_aux_registers aux_regs[],const struct dce110_i2c_hw_engine_registers i2c_hw_engine_regs[])
@@ -204,14 +203,11 @@ bool dal_i2caux_dce110_construct(* Some BIOS setting incorrect cause this * For production, we always get value from BIOS*/ reference_frequency = -dal_i2caux_get_reference_clock (as) >>1 ; - - use_i2c_sw_engine =dal_adapter_service_is_feature_supported (as, -FEATURE_RESTORE_USAGE_I2C_SW_ENGINE ); +dal_i2caux_get_reference_clock (ctx->dc_bios) >>1 ; base = &i2caux_dce110->base; -if (!dal_i2caux_construct (base, as, ctx)) { +if (!dal_i2caux_construct (base, ctx)) {ASSERT_CRITICAL (false);return false; }
@@ -288,7 +284,6 @@ bool dal_i2caux_dce110_construct(* pointer to the base struct of DCE11 I2CAUX */ struct i2caux *dal_i2caux_dce110_create ( -struct adapter_service *as,struct dc_context *ctx) { struct i2caux_dce110 *i2caux_dce110 =
@@ -301,7 +296,6 @@ struct i2caux *dal_i2caux_dce110_create(if (dal_i2caux_dce110_construct ( i2caux_dce110, - as, ctx, dce110_aux_regs, i2c_hw_engine_regs))
drivers/gpu/drm/amd/dal/dc/i2caux/dce110/i2caux_dce110.h +0 -2
@@ -38,12 +38,10 @@ struct dce110_aux_registers;struct dce110_i2c_hw_engine_registers ;struct i2caux *dal_i2caux_dce110_create ( -struct adapter_service *as,struct dc_context *ctx);bool dal_i2caux_dce110_construct (struct i2caux_dce110 *i2caux_dce110, -struct adapter_service *as,struct dc_context *ctx,const struct dce110_aux_registers *aux_regs,const struct dce110_i2c_hw_engine_registers *i2c_hw_engine_regs);
drivers/gpu/drm/amd/dal/dc/i2caux/dce112/i2caux_dce112.c +1 -4
@@ -81,12 +81,10 @@ static const struct dce110_i2c_hw_engine_registers dce112_hw_engine_regs[] = {static bool construct (struct i2caux_dce110 *i2caux_dce110, -struct adapter_service *as,struct dc_context *ctx) {if (!dal_i2caux_dce110_construct ( i2caux_dce110, - as, ctx, dce112_aux_regs, dce112_hw_engine_regs)) {
@@ -111,7 +109,6 @@ static bool construct(* pointer to the base struct of DCE11 I2CAUX */ struct i2caux *dal_i2caux_dce112_create ( -struct adapter_service *as,struct dc_context *ctx) { struct i2caux_dce110 *i2caux_dce110 =
@@ -122,7 +119,7 @@ struct i2caux *dal_i2caux_dce112_create(return NULL ; } -if (construct (i2caux_dce110, as, ctx)) +if (construct (i2caux_dce110, ctx))return &i2caux_dce110->base;ASSERT_CRITICAL (false);
drivers/gpu/drm/amd/dal/dc/i2caux/dce112/i2caux_dce112.h +0 -1
@@ -27,7 +27,6 @@#define __DAL_I2C_AUX_DCE112_H__struct i2caux *dal_i2caux_dce112_create ( -struct adapter_service *as,struct dc_context *ctx);#endif /* __DAL_I2C_AUX_DCE112_H__ */
drivers/gpu/drm/amd/dal/dc/i2caux/dce80/i2caux_dce80.c +3 -5
@@ -189,7 +189,6 @@ static const struct i2caux_funcs i2caux_funcs = {static bool construct (struct i2caux_dce80 *i2caux_dce80, -struct adapter_service *as,struct dc_context *ctx) {/* Entire family have I2C engine reference clock frequency
@@ -198,7 +197,7 @@ static bool construct(struct i2caux *base = &i2caux_dce80->base;uint32_t reference_frequency = -dal_i2caux_get_reference_clock (as) >>1 ; +dal_i2caux_get_reference_clock (ctx->dc_bios) >>1 ;/*bool use_i2c_sw_engine = dal_adapter_service_is_feature_supported(as, FEATURE_RESTORE_USAGE_I2C_SW_ENGINE);*/
@@ -208,7 +207,7 @@ static bool construct(uint32_t i; -if (!dal_i2caux_construct (base, as, ctx)) { +if (!dal_i2caux_construct (base, ctx)) {BREAK_TO_DEBUGGER ();return false; }
@@ -275,7 +274,6 @@ static bool construct( }struct i2caux *dal_i2caux_dce80_create ( -struct adapter_service *as,struct dc_context *ctx) { struct i2caux_dce80 *i2caux_dce80 =
@@ -286,7 +284,7 @@ struct i2caux *dal_i2caux_dce80_create(return NULL ; } -if (construct (i2caux_dce80, as, ctx)) +if (construct (i2caux_dce80, ctx))return &i2caux_dce80->base;BREAK_TO_DEBUGGER ();
drivers/gpu/drm/amd/dal/dc/i2caux/dce80/i2caux_dce80.h +0 -1
@@ -33,7 +33,6 @@ struct i2caux_dce80 { };struct i2caux *dal_i2caux_dce80_create ( -struct adapter_service *as,struct dc_context *ctx);#endif
drivers/gpu/drm/amd/dal/dc/i2caux/diagnostics/i2caux_diag.c +2 -4
@@ -75,10 +75,9 @@ static const struct i2caux_funcs i2caux_funcs = {static bool construct (struct i2caux *i2caux, -struct adapter_service *as,struct dc_context *ctx) { -if (!dal_i2caux_construct (i2caux, as, ctx)) { +if (!dal_i2caux_construct (i2caux, ctx)) {ASSERT_CRITICAL (false);return false; }
@@ -89,7 +88,6 @@ static bool construct( }struct i2caux *dal_i2caux_diag_fpga_create ( -struct adapter_service *as,struct dc_context *ctx) {struct i2caux *i2caux =dm_alloc (sizeof (struct i2caux ));
@@ -99,7 +97,7 @@ struct i2caux *dal_i2caux_diag_fpga_create(return NULL ; } -if (construct (i2caux, as, ctx)) +if (construct (i2caux, ctx))return i2caux;ASSERT_CRITICAL (false);
drivers/gpu/drm/amd/dal/dc/i2caux/diagnostics/i2caux_diag.h +0 -1
@@ -27,7 +27,6 @@#define __DAL_I2C_AUX_DIAG_FPGA_H__struct i2caux *dal_i2caux_diag_fpga_create ( -struct adapter_service *as,struct dc_context *ctx);#endif /* __DAL_I2C_AUX_DIAG_FPGA_H__ */
drivers/gpu/drm/amd/dal/dc/i2caux/i2caux.c +9 -22
@@ -64,33 +64,21 @@*/ struct i2caux *dal_i2caux_create ( -struct adapter_service *as,struct dc_context *ctx) { -enum dce_version dce_version; -enum dce_environment dce_environment; - -if (!as) { -BREAK_TO_DEBUGGER (); -return NULL ; - } - - dce_version =dal_adapter_service_get_dce_version (as); - dce_environment = ctx->dce_environment; - -if (IS_FPGA_MAXIMUS_DC (dce_environment)) { -return dal_i2caux_diag_fpga_create (as, ctx); +if (IS_FPGA_MAXIMUS_DC (ctx->dce_environment)) { +return dal_i2caux_diag_fpga_create (ctx); } -switch (dce_version) { +switch (ctx->dce_version) {case DCE_VERSION_8_0 : -return dal_i2caux_dce80_create (as, ctx); +return dal_i2caux_dce80_create (ctx);case DCE_VERSION_11_2 : -return dal_i2caux_dce112_create (as, ctx); +return dal_i2caux_dce112_create (ctx);case DCE_VERSION_11_0 : -return dal_i2caux_dce110_create (as, ctx); +return dal_i2caux_dce110_create (ctx);case DCE_VERSION_10_0 : -return dal_i2caux_dce100_create (as, ctx); +return dal_i2caux_dce100_create (ctx);default :BREAK_TO_DEBUGGER ();return NULL ;
@@ -313,11 +301,11 @@ void dal_i2caux_destroy(*/ uint32_t dal_i2caux_get_reference_clock ( -struct adapter_service *as) +struct dc_bios *bios) {struct firmware_info info = { {0 } }; -if (!dal_adapter_service_get_firmware_info (as, &info)) +if (bios->funcs->get_firmware_info (bios, &info) !=BP_RESULT_OK )return 0 ;return info.pll_info.crystal_frequency;
@@ -413,7 +401,6 @@ void dal_i2caux_release_engine(bool dal_i2caux_construct (struct i2caux *i2caux, -struct adapter_service *as,struct dc_context *ctx) {uint32_t i =0 ;
drivers/gpu/drm/amd/dal/dc/i2caux/i2caux.h +1 -2
@@ -27,7 +27,7 @@#define __DAL_I2C_AUX_H__uint32_t dal_i2caux_get_reference_clock ( -struct adapter_service *as); +struct dc_bios *bios);struct i2caux ;
@@ -99,7 +99,6 @@ struct i2caux {bool dal_i2caux_construct (struct i2caux *i2caux, -struct adapter_service *as,struct dc_context *ctx); void dal_i2caux_release_engine(
drivers/gpu/drm/amd/dal/include/adapter_service_interface.h +0 -6
@@ -76,7 +76,6 @@ enum adapter_feature_id {FEATURE_MAXIMIZE_URGENCY_WATERMARKS ,FEATURE_MAXIMIZE_STUTTER_MARKS ,FEATURE_MAXIMIZE_NBP_MARKS , -FEATURE_RESTORE_USAGE_I2C_SW_ENGINE ,FEATURE_USE_MAX_DISPLAY_CLK ,FEATURE_ALLOW_EDP_RESOURCE_SHARING , FEATURE_SUPPORT_DP_YUV,
@@ -337,11 +336,6 @@ void dal_adapter_service_destroy(enum dce_version dal_adapter_service_get_dce_version (const struct adapter_service *as); -/* Get firmware information from BIOS */ -bool dal_adapter_service_get_firmware_info ( -struct adapter_service *as, -struct firmware_info *info); -/* Get number of spread spectrum entries from BIOS */ uint32_t dal_adapter_service_get_ss_info_num( struct adapter_service *as,
drivers/gpu/drm/amd/dal/include/i2caux_interface.h +0 -1
@@ -67,7 +67,6 @@ union aux_config {struct i2caux ;struct i2caux *dal_i2caux_create ( -struct adapter_service *as,struct dc_context *ctx); bool dal_i2caux_submit_i2c_command(
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 23/76 drm/amd/dal: remove dal_adapter_service_get_integrated_info
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
- cache integrated_info in bios.
- fix dGPU crash as dGPU does not have integrated_info
--- .../gpu/drm/amd/dal/dc/adapter/adapter_service.c | 32 ++++------------------ drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c | 24 ++++------------ drivers/gpu/drm/amd/dal/dc/core/dc_link.c | 6 ++-- drivers/gpu/drm/amd/dal/dc/dc_bios_types.h | 7 ----- .../amd/dal/dc/gpu/dce110/display_clock_dce110.c | 6 ++-- .../drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c | 3 +- .../amd/dal/include/adapter_service_interface.h | 7 ----- 7 files changed, 19 insertions(+), 66 deletions(-)
drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c +6 -26
@@ -599,8 +599,6 @@ static void adapter_service_destruct(dal_i2caux_destroy (&as->i2caux);dal_asic_capability_destroy (&as->asic_cap); - - dcb->funcs->destroy_integrated_info (dcb, &as->integrated_info); }/*
@@ -669,10 +667,6 @@ static bool adapter_service_construct( goto failed_to_create_i2caux; } -/* Integrated info is not provided on discrete ASIC. NULL is allowed */ -if (dcb->funcs->create_integrated_info) - as->integrated_info = dcb->funcs->create_integrated_info (dcb); - dcb->funcs->post_init (dcb, as);/* Generate backlight translation table and initializes
@@ -881,23 +875,6 @@ bool dal_adapter_service_get_ss_info( }/* -* dal_adapter_service_get_integrated_info -* -* Get integrated information on BIOS -*/ -bool dal_adapter_service_get_integrated_info ( -struct adapter_service *as, -struct integrated_info *info) -{ -if (info ==NULL || as->integrated_info ==NULL ) -return false; - -memmove (info, as->integrated_info,sizeof (struct integrated_info )); - -return true; -} - -/* * dal_adapter_service_is_dfs_bypass_enabled * * Check if DFS bypass is enabled
@@ -905,9 +882,11 @@ bool dal_adapter_service_get_integrated_info(bool dal_adapter_service_is_dfs_bypass_enabled (struct adapter_service *as) { -if (as->integrated_info ==NULL ) +struct dc_bios *bp = as->ctx->dc_bios; + +if (bp->integrated_info ==NULL )return false; -if ((as->integrated_info->gpu_cap_info &DFS_BYPASS_ENABLE ) && +if ((bp->integrated_info->gpu_cap_info &DFS_BYPASS_ENABLE ) &&dal_adapter_service_is_feature_supported (as,FEATURE_ENABLE_DFS_BYPASS ))return true;
@@ -1031,6 +1010,7 @@ bool dal_adapter_service_should_optimize( {uint32_t supported_optimization =0 ;struct dal_asic_runtime_flags flags; +struct dc_bios *bp = as->ctx->dc_bios;if (!dal_adapter_service_get_feature_value (as,FEATURE_OPTIMIZATION , &supported_optimization,sizeof (uint32_t )))
@@ -1047,7 +1027,7 @@ bool dal_adapter_service_should_optimize(break ;case OF_SKIP_RESET_OF_ALL_HW_ON_S3RESUME : -if (as->integrated_info ==NULL || +if (bp->integrated_info ==NULL || !flags.flags.bits.SKIP_POWER_DOWN_ON_RESUME)return false;break ;
drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c +5 -19
@@ -135,6 +135,9 @@ static void destruct(struct bios_parser *bp) {if (bp->base.bios_local_image)dm_free (bp->base.bios_local_image); + +if (bp->base.integrated_info) +dm_free (bp->base.integrated_info); }static void bios_parser_destroy (struct dc_bios **dcb)
@@ -4063,21 +4066,6 @@ static struct integrated_info *bios_parser_create_integrated_info(return NULL ; } -static void bios_parser_destroy_integrated_info ( -struct dc_bios *dcb, -struct integrated_info **info) -{ -if (info ==NULL ) { -ASSERT_CRITICAL (0 ); -return ; - } - -if (*info !=NULL ) { -dm_free (*info); - *info =NULL ; - } -} -/******************************************************************************/ static const struct dc_vbios_funcs vbios_funcs = {
@@ -4156,10 +4144,6 @@ static const struct dc_vbios_funcs vbios_funcs = {/* SW init and patch */ .post_init = bios_parser_post_init, /* patch vbios table for mxm module by reading i2c */ - .create_integrated_info = bios_parser_create_integrated_info, - - .destroy_integrated_info = bios_parser_destroy_integrated_info, - .bios_parser_destroy = bios_parser_destroy, };
@@ -4241,6 +4225,8 @@ static bool bios_parser_construct(dal_bios_parser_init_cmd_tbl (bp);dal_bios_parser_init_cmd_tbl_helper (&bp->cmd_helper, dce_version); + bp->base.integrated_info =bios_parser_create_integrated_info (&bp->base); +return true; }
drivers/gpu/drm/amd/dal/dc/core/dc_link.c +3 -3
@@ -1050,9 +1050,6 @@ static bool construct( link->public.link_enc_hw_inst = link->link_enc->transmitter; -/* TODO: refactor dal_adapter_service_get_integrated_info(as, &info); */ -memmove (&info, dc_ctx->dc_bios->integrated_info,sizeof (struct integrated_info )); -for (i =0 ; ; i++) {if (BP_RESULT_OK != bp_funcs->get_device_tag (dc_ctx->dc_bios, link->link_id, i, &link->device_tag)) {
@@ -1077,6 +1074,9 @@ static bool construct(break ; } +if (bios->integrated_info) + info = *bios->integrated_info; +/* Look for channel mapping corresponding to connector and device tag */ for (i =0 ; i <MAX_NUMBER_OF_EXT_DISPLAY_PATH ; i++) { struct external_display_path *path =
drivers/gpu/drm/amd/dal/dc/dc_bios_types.h +0 -7
@@ -202,13 +202,6 @@ struct dc_vbios_funcs {void (*post_init)(struct dc_bios *bios,struct adapter_service *as); -struct integrated_info *(*create_integrated_info)( -struct dc_bios *bios); - -void (*destroy_integrated_info)( -struct dc_bios *dcb, -struct integrated_info **info); -void (*bios_parser_destroy)(struct dc_bios **dcb); };
drivers/gpu/drm/amd/dal/dc/gpu/dce110/display_clock_dce110.c +3 -3
@@ -675,12 +675,12 @@ static bool display_clock_integrated_info_construct(struct firmware_info fw_info;uint32_t i;struct display_clock *base = &disp_clk->disp_clk_base; -bool res;memset (&info,0 ,sizeof (struct integrated_info ));memset (&fw_info,0 ,sizeof (struct firmware_info )); - res =dal_adapter_service_get_integrated_info (as, &info); +if (bp->integrated_info) + info = *bp->integrated_info; disp_clk->dentist_vco_freq_khz = info.dentist_vco_freq;if (disp_clk->dentist_vco_freq_khz ==0 ) {
@@ -694,7 +694,7 @@ static bool display_clock_integrated_info_construct( base->min_display_clk_threshold_khz = disp_clk->dentist_vco_freq_khz /64 ; -if (!res) +if (bp->integrated_info ==NULL )return false;/*update the maximum display clock for each power state*/
drivers/gpu/drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c +2 -1
@@ -758,7 +758,8 @@ static bool display_clock_integrated_info_construct(struct firmware_info fw_info = { {0 } };uint32_t i; -dal_adapter_service_get_integrated_info (as, &info); +if (bp->integrated_info) + info = *bp->integrated_info; disp_clk->dentist_vco_freq_khz = info.dentist_vco_freq;if (disp_clk->dentist_vco_freq_khz ==0 ) {
drivers/gpu/drm/amd/dal/include/adapter_service_interface.h +0 -7
@@ -298,7 +298,6 @@ struct adapter_service {struct asic_capability *asic_cap;enum dce_environment dce_environment;struct i2caux *i2caux; -struct integrated_info *integrated_info;uint32_t platform_methods_mask;uint32_t ac_level_percentage;uint32_t dc_level_percentage;
@@ -356,12 +355,6 @@ bool dal_adapter_service_is_dfs_bypass_enabled(struct adapter_service *as);uint32_t dal_adapter_service_get_asic_vram_bit_width (struct adapter_service *as); - -/* Get integrated information on BIOS */ -bool dal_adapter_service_get_integrated_info ( -struct adapter_service *as, -struct integrated_info *info); -/* Return if a given feature is supported by the ASIC */ bool dal_adapter_service_is_feature_supported (struct adapter_service *as,enum adapter_feature_id feature_id);
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 24/76 drm/amd/dal: instantiate i2caux outside of AS
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
- also consolidate dc create failure using destruct
--- .../gpu/drm/amd/dal/dc/adapter/adapter_service.c | 25 -------- drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c | 2 +- drivers/gpu/drm/amd/dal/dc/core/dc.c | 72 ++++++++++++++-------- drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c | 10 +-- drivers/gpu/drm/amd/dal/dc/dc_types.h | 1 + .../gpu/drm/amd/dal/dc/dce100/dce100_resource.c | 3 - .../gpu/drm/amd/dal/dc/dce110/dce110_resource.c | 4 -- .../gpu/drm/amd/dal/dc/dce112/dce112_resource.c | 4 -- drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c | 4 -- .../amd/dal/include/adapter_service_interface.h | 5 -- 10 files changed, 52 insertions(+), 78 deletions(-)
drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c +0 -25
@@ -595,9 +595,6 @@ static bool generate_feature_set(static void adapter_service_destruct (struct adapter_service *as) { -struct dc_bios *dcb = as->ctx->dc_bios; - -dal_i2caux_destroy (&as->i2caux);dal_asic_capability_destroy (&as->asic_cap); }
@@ -659,14 +656,6 @@ static bool adapter_service_construct( dcb = as->ctx->dc_bios; -/* Create I2C AUX */ - as->i2caux =dal_i2caux_create (as->ctx); - -if (!as->i2caux) { -ASSERT_CRITICAL (false); - goto failed_to_create_i2caux; - } - dcb->funcs->post_init (dcb, as);/* Generate backlight translation table and initializes
@@ -680,9 +669,6 @@ static bool adapter_service_construct(return true; failed_to_generate_features: -dal_i2caux_destroy (&as->i2caux); - -failed_to_create_i2caux:dal_asic_capability_destroy (&as->asic_cap);return false;
@@ -966,17 +952,6 @@ bool dal_adapter_service_get_feature_value(struct adapter_service *as,return true; } -/* -* dal_adapter_service_get_i2caux -* -* Get i2c aux handler -*/ -struct i2caux *dal_adapter_service_get_i2caux ( -struct adapter_service *as) -{ -return as->i2caux; -} -bool dal_adapter_service_get_embedded_panel_info (struct adapter_service *as,struct embedded_panel_info *info)
drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c +1 -1
@@ -2968,7 +2968,7 @@ static bool i2c_read(/* TODO route this through drm i2c_adapter */ result =dal_i2caux_submit_i2c_command ( -dal_adapter_service_get_i2caux (as), + ddc->ctx->i2caux, ddc, &cmd); }
drivers/gpu/drm/amd/dal/dc/core/dc.c +45 -27
112 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c +5 -5
@@ -507,7 +507,7 @@ static uint8_t aux_read_edid_block( }if (!dal_i2caux_submit_aux_command ( -dal_adapter_service_get_i2caux (ddc->as), + ddc->ctx->i2caux, ddc->ddc_pin, &cmd))/* cannot read, break*/
@@ -530,7 +530,7 @@ static uint8_t aux_read_edid_block( cmd.payloads = payloads; result =dal_i2caux_submit_aux_command ( -dal_adapter_service_get_i2caux (ddc->as), + ddc->ctx->i2caux, ddc->ddc_pin, &cmd);
@@ -927,7 +927,7 @@ bool dal_ddc_service_query_ddc_data(dal_ddc_aux_payloads_get_count (payloads); ret =dal_i2caux_submit_aux_command ( -dal_adapter_service_get_i2caux (ddc->as), + ddc->ctx->i2caux, ddc->ddc_pin, &command);
@@ -989,7 +989,7 @@ enum ddc_result dal_ddc_service_read_dpcd_data( }if (dal_i2caux_submit_aux_command ( -dal_adapter_service_get_i2caux (ddc->as), + ddc->ctx->i2caux, ddc->ddc_pin, &command))return DDC_RESULT_SUCESSFULL ;
@@ -1023,7 +1023,7 @@ enum ddc_result dal_ddc_service_write_dpcd_data( }if (dal_i2caux_submit_aux_command ( -dal_adapter_service_get_i2caux (ddc->as), + ddc->ctx->i2caux, ddc->ddc_pin, &command))return DDC_RESULT_SUCESSFULL ;
drivers/gpu/drm/amd/dal/dc/dc_types.h +1 -0
@@ -81,6 +81,7 @@ struct dc_context {bool created_bios;struct gpio_service *gpio_service;struct i2caux *i2caux; +struct adapter_service *adapter_srv; };/*
drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c +0 -3
@@ -659,9 +659,6 @@ static void destruct(struct dce110_resource_pool *pool)if (pool->base.irqs !=NULL )dal_irq_service_destroy (&pool->base.irqs); - -if (pool->base.adapter_srv !=NULL ) -dal_adapter_service_destroy (&pool->base.adapter_srv); } static enum dc_status validate_mapped_resource(
drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c +0 -4
@@ -631,10 +631,6 @@ static void destruct(struct dce110_resource_pool *pool)if (pool->base.irqs !=NULL ) {dal_irq_service_destroy (&pool->base.irqs); } - -if (pool->base.adapter_srv !=NULL ) { -dal_adapter_service_destroy (&pool->base.adapter_srv); - } }
drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c +0 -4
@@ -692,10 +692,6 @@ static void destruct(struct dce110_resource_pool *pool)if (pool->base.irqs !=NULL ) {dal_irq_service_destroy (&pool->base.irqs); } - -if (pool->base.adapter_srv !=NULL ) { -dal_adapter_service_destroy (&pool->base.adapter_srv); - } } static struct clock_source *find_matching_pll(struct resource_context *res_ctx,
drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c +0 -4
@@ -609,10 +609,6 @@ static void destruct(struct dce110_resource_pool *pool)if (pool->base.irqs !=NULL ) {dal_irq_service_destroy (&pool->base.irqs); } - -if (pool->base.adapter_srv !=NULL ) { -dal_adapter_service_destroy (&pool->base.adapter_srv); - } } static enum dc_status validate_mapped_resource(
drivers/gpu/drm/amd/dal/include/adapter_service_interface.h +0 -5
@@ -297,7 +297,6 @@ struct adapter_service {struct dc_context *ctx;struct asic_capability *asic_cap;enum dce_environment dce_environment; -struct i2caux *i2caux;uint32_t platform_methods_mask;uint32_t ac_level_percentage;uint32_t dc_level_percentage;
@@ -371,10 +370,6 @@ bool dal_adapter_service_get_i2c_info(struct graphics_object_id id, struct graphics_object_i2c_info *i2c_info); -/* Get i2c aux handler */ -struct i2caux *dal_adapter_service_get_i2caux ( -struct adapter_service *as); -struct dal_asic_runtime_flags dal_adapter_service_get_asic_runtime_flags (struct adapter_service *as);
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 25/76 drm/amd/dal: fix DDC pad mode detection logic
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
- use reg_helper macro for all register field access
- revise logic following golden CZ dal2 logic
--- drivers/gpu/drm/amd/dal/dc/dc_helper.c | 12 +++++ drivers/gpu/drm/amd/dal/dc/gpio/hw_ddc.c | 78 ++++++++++------------------- drivers/gpu/drm/amd/dal/dc/inc/reg_helper.h | 11 ++++ 3 files changed, 50 insertions(+), 51 deletions(-)
drivers/gpu/drm/amd/dal/dc/dc_helper.c +12 -0
@@ -49,6 +49,18 @@ uint32_t generic_reg_get2(const struct dc_context *ctx, uint32_t addr,return reg_val; } +uint32_t generic_reg_get3 (const struct dc_context *ctx,uint32_t addr, +uint8_t shift1,uint32_t mask1,uint32_t *field_value1, +uint8_t shift2,uint32_t mask2,uint32_t *field_value2, +uint8_t shift3,uint32_t mask3,uint32_t *field_value3) +{ +uint32_t reg_val =dm_read_reg (ctx, addr); + *field_value1 =get_reg_field_value_ex (reg_val, mask1, shift1); + *field_value2 =get_reg_field_value_ex (reg_val, mask2, shift2); + *field_value3 =get_reg_field_value_ex (reg_val, mask3, shift3); +return reg_val; +} +/* note: va version of this is pretty bad idea, since there is a output parameter pass by pointer * compiler won't be able to check for size match and is prone to stack corruption type of bugs
drivers/gpu/drm/amd/dal/dc/gpio/hw_ddc.c +27 -51
122 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/inc/reg_helper.h +11 -0
@@ -113,6 +113,12 @@ FN(reg_name, f1), v1, \ FN(reg_name, f2), v2) +#define REG_GET_3 (reg_name, f1, v1, f2, v2, f3, v3) \ + generic_reg_get3(CTX, REG(reg_name), \ + FN(reg_name, f1), v1, \ + FN(reg_name, f2), v2, \ + FN(reg_name, f3), v3) +/* macro to poll and wait for a register field to read back given value */ #define REG_WAIT (reg_name, field, val, delay, max_try) \
@@ -224,4 +230,9 @@ uint32_t generic_reg_get2(const struct dc_context *ctx, uint32_t addr, uint8_t shift1, uint32_t mask1, uint32_t *field_value1, uint8_t shift2, uint32_t mask2, uint32_t *field_value2); +uint32_t generic_reg_get3 (const struct dc_context *ctx,uint32_t addr, +uint8_t shift1,uint32_t mask1,uint32_t *field_value1, +uint8_t shift2,uint32_t mask2,uint32_t *field_value2, +uint8_t shift3,uint32_t mask3,uint32_t *field_value3); +#endif /* DRIVERS_GPU_DRM_AMD_DAL_DEV_DC_INC_REG_HELPER_H_ */
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 26/76 drm/amd/dal: Fix MST crash by skipping branch connector.
In reply to a message not in the archiveFrom: Andrey Grodzovsky <[email protected]>
--- drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_mst_types.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm_mst_types.c +4 -2
@@ -339,8 +339,10 @@ static void dm_dp_mst_hotplug(struct drm_dp_mst_topology_mgr *mgr)drm_modeset_lock_all (dev);list_for_each_entry (connector, &dev->mode_config.connector_list, head) { aconnector =to_amdgpu_connector (connector); -if (aconnector->port && aconnector->port->pdt !=DP_PEER_DEVICE_NONE - && !aconnector->dc_sink) { +if (aconnector->port && + aconnector->port->pdt !=DP_PEER_DEVICE_NONE && + aconnector->port->pdt !=DP_PEER_DEVICE_MST_BRANCHING && + !aconnector->dc_sink) {/* * This is plug in case, where port has been created but * sink hasn't been created yet
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 27/76 drm/amd/dal: Lower max link cap by reportedLinkCap
In reply to a message not in the archiveFrom: Wenjing Liu <[email protected]>
[Description]
DP Compliance failure due to the max link cap is hard coded by feature support.
Driver does not lower link cap based on receiver reported max link cap.
--- drivers/gpu/drm/amd/dal/dc/core/dc_link_dp.c | 30 +++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/dal/dc/core/dc_link_dp.c +21 -9
@@ -1076,17 +1076,31 @@ static bool exceeded_limit_link_setting( true : false); } -static enum dc_link_rate get_max_link_rate (struct core_link *link) +static struct dc_link_settings get_max_link_cap (struct core_link *link) { -enum dc_link_rate max_link_rate =LINK_RATE_HIGH ; +/* Set Default link settings */ +struct dc_link_settings max_link_cap = {LANE_COUNT_FOUR ,LINK_RATE_HIGH , +LINK_SPREAD_05_DOWNSPREAD_30KHZ }; +/* Higher link settings based on feature supported */ if (link->link_enc->features.flags.bits.IS_HBR2_CAPABLE) - max_link_rate =LINK_RATE_HIGH2 ; + max_link_cap.link_rate =LINK_RATE_HIGH2 ;if (link->link_enc->features.flags.bits.IS_HBR3_CAPABLE) - max_link_rate =LINK_RATE_HIGH3 ; - -return max_link_rate; + max_link_cap.link_rate =LINK_RATE_HIGH3 ; + +/* Lower link settings based on sink's link cap */ +if (link->public.reported_link_cap.lane_count < max_link_cap.lane_count) + max_link_cap.lane_count = + link->public.reported_link_cap.lane_count; +if (link->public.reported_link_cap.link_rate < max_link_cap.link_rate) + max_link_cap.link_rate = + link->public.reported_link_cap.link_rate; +if (link->public.reported_link_cap.link_spread < + max_link_cap.link_spread) + max_link_cap.link_spread = + link->public.reported_link_cap.link_spread; +return max_link_cap; } bool dp_hbr_verify_link_cap(
@@ -1105,9 +1119,7 @@ bool dp_hbr_verify_link_cap( success = false; skip_link_training = false; - max_link_cap.lane_count =LANE_COUNT_FOUR ; - max_link_cap.link_rate =get_max_link_rate (link); - max_link_cap.link_spread =LINK_SPREAD_05_DOWNSPREAD_30KHZ ; + max_link_cap =get_max_link_cap (link);/* TODO implement override and monitor patch later */
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 28/76 drm/amd/dal: Allow timing with req_bw equal to max_bw
In reply to a message not in the archiveFrom: Wenjing Liu <[email protected]>
[Description]
Dp compliance fails when receiver requests timing utilizing the full bandwidth of the link
We report not supported if req_bw is equal to max_bw
--- drivers/gpu/drm/amd/dal/dc/core/dc_link_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/dal/dc/core/dc_link_dp.c +1 -1
@@ -1285,7 +1285,7 @@ bool dp_validate_mode_timing( req_bw =bandwidth_in_kbps_from_timing (timing); max_bw =bandwidth_in_kbps_from_link_settings (link_setting); -if (req_bw < max_bw) { +if (req_bw <= max_bw) {/* remember the biggest mode here, during * initial link training (to get * verified_link_cap), LS sends event about
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 29/76 drm/amd/dal: Perform link training in dp_retrain_link
In reply to a message not in the archiveFrom: Wenjing Liu <[email protected]>
[Description]dp_retrain_link re-enables stream.
However dp link training is not included in enable_stream
--- drivers/gpu/drm/amd/dal/dc/core/dc_link_hwss.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/dal/dc/core/dc_link_hwss.c +5 -0
@@ -8,6 +8,7 @@#include "include/i2caux_interface.h" #include "link_hwss.h" #include "hw_sequencer.h" +#include "dc_link_dp.h" #include "dc_link_ddc.h" #include "dm_helpers.h" #include "dce/dce_link_encoder.h"
@@ -209,6 +210,10 @@ void dp_retrain_link(struct core_link *link)dm_delay_in_microseconds (link->ctx,100 ); pipes->stream_enc->funcs->dp_blank (pipes[i].stream_enc); link->dc->hwss.disable_stream (&pipes[i]); +dc_link_dp_perform_link_training ( + &link->public, + &link->public.verified_link_cap, + true); link->dc->hwss.enable_stream (&pipes[i]); link->dc->hwss.unblank_stream (&pipes[i], &link->public.verified_link_cap);
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 30/76 drm/amd/dal: Poll AUX_SW_DONE to 0 before AUX_SW_GO
In reply to a message not in the archiveFrom: Wenjing Liu <[email protected]>
[Description]
There is an intermittent issue where driver fails aux channel error DP compliance test.
The test will fail to reply aux messages and expect driver to retry. Driver misinterprets it as an Nack and doesn't retry. Driver resets AUX_SW_DONE and assumes it will take effect immediately. In some cases, the AUX_SW_DONE will not be updated
before drivers check if the current transaction is done. Driver reads the previous set done bit and thinks reply is obtained.
--- drivers/gpu/drm/amd/dal/dc/i2caux/dce110/aux_engine_dce110.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/dal/dc/i2caux/dce110/aux_engine_dce110.c +2 -1
@@ -249,7 +249,8 @@ static void submit_channel_request( }REG_UPDATE (AUX_INTERRUPT_CONTROL ,AUX_SW_DONE_ACK ,1 ); - +REG_WAIT (AUX_SW_STATUS ,AUX_SW_DONE ,0 , +10 , aux110->timeout_period/10 );REG_UPDATE (AUX_SW_CONTROL ,AUX_SW_GO ,1 ); }
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 31/76 drm/amd/dal: Fallback LT without retry in verify_link_cap
In reply to a message not in the archiveFrom: Wenjing Liu <[email protected]>
[Description]
Dp compliance test will test if LT fallback to the next lower link settings by intentionally fails link training.
Due to the retry logic in verify link cap, driver retrains link with the same settings.
--- drivers/gpu/drm/amd/dal/dc/core/dc_link_dp.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/dal/dc/core/dc_link_dp.c +4 -5
@@ -1166,11 +1166,10 @@ bool dp_hbr_verify_link_cap(if (skip_link_training) success = true;else { - success =perform_link_training_with_retries ( - link, - cur, - skip_video_pattern, -LINK_TRAINING_ATTEMPTS ); + success =dc_link_dp_perform_link_training ( + &link->public, + cur, + skip_video_pattern); }if (success)
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 32/76 drm/amd/dal: Remove adapter service dependency in power_down
In reply to a message not in the archive--- drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c +1 -1
@@ -1360,7 +1360,7 @@ void dce110_link_encoder_disable_output(struct bp_transmitter_control cntl = {0 };enum bp_result result; -if (!is_dig_enabled (enc110) && +if (!is_dig_enabled (enc110) && enc110->base.adapter_service &&dal_adapter_service_should_optimize ( enc110->base.adapter_service,OF_SKIP_POWER_DOWN_INACTIVE_ENCODER )) {
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 33/76 drm/amd/dal: remove supported_stream_engines
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
- unnecesasry. DIG always start from instance 0
--- drivers/gpu/drm/amd/dal/dc/core/dc_resource.c | 10 +++------- drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c | 7 ------- drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c | 6 ------ drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c | 7 ------- drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c | 7 ------- drivers/gpu/drm/amd/dal/dc/inc/core_types.h | 3 --- drivers/gpu/drm/amd/dal/include/grph_object_id.h | 16 ---------------- 7 files changed, 3 insertions(+), 53 deletions(-)
drivers/gpu/drm/amd/dal/dc/core/dc_resource.c +3 -7
@@ -175,13 +175,9 @@ bool resource_construct( pool->stream_enc_count =0 ;if (create_funcs->create_stream_encoder) {for (i =0 ; i < caps->num_stream_encoder; i++) { -/* TODO: rework fragile code*/ -if (pool->stream_engines.u_all &1 << i) { - pool->stream_enc[i] = create_funcs->create_stream_encoder ( - i, ctx); -if (pool->stream_enc[i] ==NULL ) -DC_ERR ("DC: failed to create stream_encoder!\n" ); - } + pool->stream_enc[i] = create_funcs->create_stream_encoder (i, ctx); +if (pool->stream_enc[i] ==NULL ) +DC_ERR ("DC: failed to create stream_encoder!\n" ); pool->stream_enc_count++; } }
drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c +0 -7
@@ -868,13 +868,6 @@ static bool construct( pool->base.funcs = &dce100_res_pool_funcs; pool->base.underlay_pipe_index =-1 ; - pool->base.stream_engines.engine.ENGINE_ID_DIGA =1 ; - pool->base.stream_engines.engine.ENGINE_ID_DIGB =1 ; - pool->base.stream_engines.engine.ENGINE_ID_DIGC =1 ; - pool->base.stream_engines.engine.ENGINE_ID_DIGD =1 ; - pool->base.stream_engines.engine.ENGINE_ID_DIGE =1 ; - pool->base.stream_engines.engine.ENGINE_ID_DIGF =1 ; - bp = ctx->dc_bios; if ((bp->funcs->get_firmware_info(bp, &info) == BP_RESULT_OK) &&
drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c +0 -6
@@ -1198,12 +1198,6 @@ static bool construct(/************************************************* * Create resources * *************************************************/ - pool->base.stream_engines.engine.ENGINE_ID_DIGA =1 ; - pool->base.stream_engines.engine.ENGINE_ID_DIGB =1 ; - pool->base.stream_engines.engine.ENGINE_ID_DIGC =1 ; - pool->base.stream_engines.engine.ENGINE_ID_DIGD =1 ; - pool->base.stream_engines.engine.ENGINE_ID_DIGE =1 ; - pool->base.stream_engines.engine.ENGINE_ID_DIGF =1 ; bp = ctx->dc_bios;
drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c +0 -7
@@ -1206,13 +1206,6 @@ static bool construct(* Create resources * *************************************************/ - pool->base.stream_engines.engine.ENGINE_ID_DIGA =1 ; - pool->base.stream_engines.engine.ENGINE_ID_DIGB =1 ; - pool->base.stream_engines.engine.ENGINE_ID_DIGC =1 ; - pool->base.stream_engines.engine.ENGINE_ID_DIGD =1 ; - pool->base.stream_engines.engine.ENGINE_ID_DIGE =1 ; - pool->base.stream_engines.engine.ENGINE_ID_DIGF =1 ; - pool->base.clock_sources[DCE112_CLK_SRC_PLL0 ] = dce112_clock_source_create( ctx, ctx->dc_bios,
drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c +0 -7
@@ -873,13 +873,6 @@ static bool construct(* Create resources * *************************************************/ - pool->base.stream_engines.engine.ENGINE_ID_DIGA =1 ; - pool->base.stream_engines.engine.ENGINE_ID_DIGB =1 ; - pool->base.stream_engines.engine.ENGINE_ID_DIGC =1 ; - pool->base.stream_engines.engine.ENGINE_ID_DIGD =1 ; - pool->base.stream_engines.engine.ENGINE_ID_DIGE =1 ; - pool->base.stream_engines.engine.ENGINE_ID_DIGF =1 ; - bp = ctx->dc_bios; if ((bp->funcs->get_firmware_info(bp, &info) == BP_RESULT_OK) &&
drivers/gpu/drm/amd/dal/dc/inc/core_types.h +0 -3
@@ -251,8 +251,6 @@ struct resource_pool {unsigned int underlay_pipe_index;unsigned int stream_enc_count; -union supported_stream_engines stream_engines; -/* * reserved clock source for DP */
@@ -306,7 +304,6 @@ struct pipe_ctx {struct resource_context {const struct resource_pool *pool;struct pipe_ctx pipe_ctx[MAX_PIPES ]; -union supported_stream_engines used_stream_engines;bool is_stream_enc_acquired[MAX_PIPES *2 ];bool is_audio_acquired[MAX_PIPES ];uint8_t clock_source_ref_count[MAX_CLOCK_SOURCES ];
drivers/gpu/drm/amd/dal/include/grph_object_id.h +0 -16
@@ -190,22 +190,6 @@ enum engine_id {ENGINE_ID_UNKNOWN = (-1L ) }; -union supported_stream_engines { -struct { -uint32_t ENGINE_ID_DIGA:1 ; -uint32_t ENGINE_ID_DIGB:1 ; -uint32_t ENGINE_ID_DIGC:1 ; -uint32_t ENGINE_ID_DIGD:1 ; -uint32_t ENGINE_ID_DIGE:1 ; -uint32_t ENGINE_ID_DIGF:1 ; -uint32_t ENGINE_ID_DIGG:1 ; -uint32_t ENGINE_ID_DACA:1 ; -uint32_t ENGINE_ID_DACB:1 ; -uint32_t ENGINE_ID_VCE:1 ; - } engine; -uint32_t u_all; -}; -enum transmitter_color_depth {TRANSMITTER_COLOR_DEPTH_24 =0 ,/* 8 bits */ TRANSMITTER_COLOR_DEPTH_30 ,/* 10 bits */
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 34/76 drm/amd/dal: Rotation and mirror support
In reply to a message not in the archiveFrom: Vitaly Prosyak <[email protected]>
When rotation is 90 and 270 ,the stream dimentions should be swaped for view port calculation
--- drivers/gpu/drm/amd/dal/dc/core/dc_resource.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/dal/dc/core/dc_resource.c +3 -3
@@ -380,7 +380,7 @@ static void calculate_viewport(const struct dc_surface *surface, struct pipe_ctx *pipe_ctx) { - const struct rect stream_src = pipe_ctx->stream->public.src; + struct rect stream_src = pipe_ctx->stream->public.src;struct rect src = surface->src_rect;struct rect dst = surface->dst_rect;struct rect surface_clip = surface->clip_rect;
@@ -388,10 +388,11 @@ static void calculate_viewport(if (surface->rotation ==ROTATION_ANGLE_90 || - surface->rotation ==ROTATION_ANGLE_270 ){ + surface->rotation ==ROTATION_ANGLE_270 ) {rect_swap_helper (&src);rect_swap_helper (&dst);rect_swap_helper (&surface_clip); +rect_swap_helper (&stream_src); }/* The actual clip is an intersection between stream
@@ -514,7 +515,6 @@ bool resource_build_scaling_params( {bool res;struct dc_crtc_timing *timing = &pipe_ctx->stream->public.timing; -/* Important: scaling ratio calculation requires pixel format, * lb depth calculation requires recout and taps require scaling ratios. */
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 35/76 drm/amd/dal: Pass in shift and mask for stream encoder.
In reply to a message not in the archiveFrom: Zeyu Fan <[email protected]>
--- .../gpu/drm/amd/dal/dc/dce/dce_stream_encoder.c | 175 ++++++----- .../gpu/drm/amd/dal/dc/dce/dce_stream_encoder.h | 330 ++++++++++++++++++++- .../gpu/drm/amd/dal/dc/dce100/dce100_resource.c | 12 +- .../gpu/drm/amd/dal/dc/dce110/dce110_resource.c | 11 +- .../gpu/drm/amd/dal/dc/dce112/dce112_resource.c | 11 +- drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c | 11 +- 6 files changed, 449 insertions(+), 101 deletions(-)
drivers/gpu/drm/amd/dal/dc/dce/dce_stream_encoder.c +85 -90
@@ -35,6 +35,10 @@#define REG (reg)\ (enc110->regs->reg) +#undef FN +#define FN (reg_name, field_name) \ + enc110->se_shift->field_name, enc110->se_mask->field_name +#define VBI_LINE_0 0#define DP_BLANK_MAX_RETRY 20#define HDMI_CLOCK_CHANNEL_RATE_MORE_340M 340000
@@ -102,11 +106,14 @@ static void dce110_update_generic_info_packet( }/* force double-buffered packet update */ - { +if (enc110->se_mask->AFMT_GENERIC0_UPDATE && + enc110->se_mask->AFMT_GENERIC2_UPDATE) {REG_UPDATE_2 (AFMT_VBI_PACKET_CONTROL ,AFMT_GENERIC0_UPDATE , (packet_index ==0 ),AFMT_GENERIC2_UPDATE , (packet_index ==2 )); - + }else { +ASSERT (enc110->se_mask->AFMT_GENERIC0_UPDATE); +ASSERT (enc110->se_mask->AFMT_GENERIC2_UPDATE); } }
@@ -234,12 +241,15 @@ static void dce110_stream_encoder_dp_set_stream_attribute( }/* set dynamic range and YCbCr range */ - -REG_UPDATE_2 ( -DP_PIXEL_FORMAT , -DP_DYN_RANGE ,0 , -DP_YCBCR_RANGE ,0 ); - +if (enc110->se_mask->DP_DYN_RANGE && enc110->se_mask->DP_YCBCR_RANGE) { +REG_UPDATE_2 ( +DP_PIXEL_FORMAT , +DP_DYN_RANGE ,0 , +DP_YCBCR_RANGE ,0 ); + }else { +ASSERT (enc110->se_mask->DP_DYN_RANGE); +ASSERT (enc110->se_mask->DP_YCBCR_RANGE); + } }
@@ -294,13 +304,12 @@ static void dce110_stream_encoder_hdmi_set_stream_attribute(dce110_stream_encoder_set_stream_attribute_helper (enc110, crtc_timing); -/* setup HDMI engine */ -REG_UPDATE_5 (HDMI_CONTROL , -HDMI_PACKET_GEN_VERSION ,1 , -HDMI_KEEPOUT_MODE ,1 , -HDMI_DEEP_COLOR_ENABLE ,0 , -HDMI_DATA_SCRAMBLE_EN ,0 , -HDMI_CLOCK_CHANNEL_RATE ,0 ); +if (enc110->regs->DIG_FE_CNTL) { +REG_UPDATE_3 (HDMI_CONTROL , +HDMI_PACKET_GEN_VERSION ,1 , +HDMI_KEEPOUT_MODE ,1 , +HDMI_DEEP_COLOR_ENABLE ,0 ); + }switch (crtc_timing->display_color_depth) {case COLOR_DEPTH_888 :
@@ -325,28 +334,6 @@ static void dce110_stream_encoder_hdmi_set_stream_attribute(break ; } -if (actual_pix_clk_khz >=HDMI_CLOCK_CHANNEL_RATE_MORE_340M ) { -/* enable HDMI data scrambler -* HDMI_CLOCK_CHANNEL_RATE_MORE_340M -* Clock channel frequency is 1/4 of character rate. -*/ -REG_UPDATE_2 (HDMI_CONTROL , -HDMI_DATA_SCRAMBLE_EN ,1 , -HDMI_CLOCK_CHANNEL_RATE ,1 ); - }else if (crtc_timing->flags.LTE_340MCSC_SCRAMBLE) { - -/* TODO: New feature for DCE11, still need to implement */ - -/* enable HDMI data scrambler -* HDMI_CLOCK_CHANNEL_FREQ_EQUAL_TO_CHAR_RATE -* Clock channel frequency is the same -* as character rate -*/ -REG_UPDATE_2 (HDMI_CONTROL , -HDMI_DATA_SCRAMBLE_EN ,1 , -HDMI_CLOCK_CHANNEL_RATE ,0 ); - } - REG_UPDATE_3(HDMI_VBI_PACKET_CONTROL, HDMI_GC_CONT, 1, HDMI_GC_SEND, 1,
@@ -396,9 +383,6 @@ static void dce110_stream_encoder_set_mst_bandwidth( {struct dce110_stream_encoder *enc110 =DCE110STRENC_FROM_STRENC (enc);struct dc_context *ctx = enc110->base.ctx; -uint32_t addr; -uint32_t field; -uint32_t value;uint32_t retries =0 ;uint32_t x =dal_fixed31_32_floor ( avg_time_slots_per_mtp);
@@ -418,26 +402,9 @@ static void dce110_stream_encoder_set_mst_bandwidth(/* wait for update to be completed on the link */ /* i.e. DP_MSE_RATE_UPDATE_PENDING field (read only) */ /* is reset to 0 (not pending) */ - { - addr =REG (DP_MSE_RATE_UPDATE ); - -do { - value =dm_read_reg (ctx, addr); - - field =get_reg_field_value ( - value, -DP_MSE_RATE_UPDATE , -DP_MSE_RATE_UPDATE_PENDING ); - -if (!(field & -DP_MSE_RATE_UPDATE__DP_MSE_RATE_UPDATE_PENDING_MASK )) -break ; - -udelay (10 ); - - ++retries; - }while (retries <DP_MST_UPDATE_MAX_RETRY ); - } +REG_WAIT (DP_MSE_RATE_UPDATE ,DP_MSE_RATE_UPDATE_PENDING , + enc110->se_mask->DP_MSE_RATE_UPDATE_PENDING, +10 ,DP_MST_UPDATE_MAX_RETRY ); } static void dce110_stream_encoder_update_hdmi_info_packets(
@@ -446,33 +413,40 @@ static void dce110_stream_encoder_update_hdmi_info_packets( {struct dce110_stream_encoder *enc110 =DCE110STRENC_FROM_STRENC (enc); -if (info_frame->avi.valid) { -const uint32_t *content = - (const uint32_t *) &info_frame->avi.sb[0 ]; +if (enc110->se_mask->HDMI_AVI_INFO_CONT && + enc110->se_mask->HDMI_AVI_INFO_SEND) { +if (info_frame->avi.valid) { +const uint32_t *content = + (const uint32_t *) &info_frame->avi.sb[0 ]; -REG_WRITE (AFMT_AVI_INFO0 , content[0 ]); +REG_WRITE (AFMT_AVI_INFO0 , content[0 ]); -REG_WRITE (AFMT_AVI_INFO1 , content[1 ]); +REG_WRITE (AFMT_AVI_INFO1 , content[1 ]); -REG_WRITE (AFMT_AVI_INFO2 , content[2 ]); +REG_WRITE (AFMT_AVI_INFO2 , content[2 ]); -REG_WRITE (AFMT_AVI_INFO3 , content[3 ]); +REG_WRITE (AFMT_AVI_INFO3 , content[3 ]); -REG_UPDATE (AFMT_AVI_INFO3 ,AFMT_AVI_INFO_VERSION , - info_frame->avi.hb1); +REG_UPDATE (AFMT_AVI_INFO3 ,AFMT_AVI_INFO_VERSION , + info_frame->avi.hb1); -REG_UPDATE_2 (HDMI_INFOFRAME_CONTROL0 , -HDMI_AVI_INFO_SEND ,1 , -HDMI_AVI_INFO_CONT ,1 ); +REG_UPDATE_2 (HDMI_INFOFRAME_CONTROL0 , +HDMI_AVI_INFO_SEND ,1 , +HDMI_AVI_INFO_CONT ,1 ); -REG_UPDATE (HDMI_INFOFRAME_CONTROL1 ,HDMI_AVI_INFO_LINE , -VBI_LINE_0 +2 ); +REG_UPDATE (HDMI_INFOFRAME_CONTROL1 ,HDMI_AVI_INFO_LINE , +VBI_LINE_0 +2 ); + }else { +REG_UPDATE_2 (HDMI_INFOFRAME_CONTROL0 , +HDMI_AVI_INFO_SEND ,0 , +HDMI_AVI_INFO_CONT ,0 ); + } }else { -REG_UPDATE_2 (HDMI_INFOFRAME_CONTROL0 , -HDMI_AVI_INFO_SEND ,0 , -HDMI_AVI_INFO_CONT ,0 ); +ASSERT (enc110->se_mask->HDMI_AVI_INFO_SEND); +ASSERT (enc110->se_mask->HDMI_AVI_INFO_CONT); +ASSERT (enc110->se_mask->HDMI_AVI_INFO_LINE); }dce110_update_hdmi_info_packet (enc110,0 , &info_frame->vendor);
@@ -504,9 +478,16 @@ static void dce110_stream_encoder_stop_hdmi_info_packets( HDMI_GENERIC3_SEND, 0);/* stop AVI packet on HDMI */ -REG_UPDATE_2 (HDMI_INFOFRAME_CONTROL0 , -HDMI_AVI_INFO_SEND ,0 , -HDMI_AVI_INFO_CONT ,0 ); +if (enc110->se_mask->HDMI_AVI_INFO_CONT && + enc110->se_mask->HDMI_AVI_INFO_SEND) { + +REG_UPDATE_2 (HDMI_INFOFRAME_CONTROL0 , +HDMI_AVI_INFO_SEND ,0 , +HDMI_AVI_INFO_CONT ,0 ); + }else { +ASSERT (enc110->se_mask->HDMI_AVI_INFO_SEND); +ASSERT (enc110->se_mask->HDMI_AVI_INFO_CONT); + } } static void dce110_stream_encoder_update_dp_info_packets(
@@ -545,15 +526,25 @@ static void dce110_stream_encoder_stop_dp_info_packets(struct dce110_stream_encoder *enc110 =DCE110STRENC_FROM_STRENC (enc);uint32_t value =REG_READ (DP_SEC_CNTL ); -REG_SET_7 (DP_SEC_CNTL ,0 , -DP_SEC_GSP0_ENABLE ,0 , -DP_SEC_GSP1_ENABLE ,0 , -DP_SEC_GSP2_ENABLE ,0 , -DP_SEC_GSP3_ENABLE ,0 , -DP_SEC_AVI_ENABLE ,0 , -DP_SEC_MPG_ENABLE ,0 , -DP_SEC_STREAM_ENABLE ,0 ); - +if (enc110->se_mask->DP_SEC_AVI_ENABLE) { +REG_SET_7 (DP_SEC_CNTL ,0 , +DP_SEC_GSP0_ENABLE ,0 , +DP_SEC_GSP1_ENABLE ,0 , +DP_SEC_GSP2_ENABLE ,0 , +DP_SEC_GSP3_ENABLE ,0 , +DP_SEC_AVI_ENABLE ,0 , +DP_SEC_MPG_ENABLE ,0 , +DP_SEC_STREAM_ENABLE ,0 ); + }else { +ASSERT (enc110->se_mask->DP_SEC_AVI_ENABLE); +REG_SET_6 (DP_SEC_CNTL ,0 , +DP_SEC_GSP0_ENABLE ,0 , +DP_SEC_GSP1_ENABLE ,0 , +DP_SEC_GSP2_ENABLE ,0 , +DP_SEC_GSP3_ENABLE ,0 , +DP_SEC_MPG_ENABLE ,0 , +DP_SEC_STREAM_ENABLE ,0 ); + }/* this register shared with audio info frame. * therefore we need to keep master enabled * if at least one of the fields is not 0 */
@@ -1252,7 +1243,9 @@ bool dce110_stream_encoder_construct( struct dc_context *ctx, struct dc_bios *bp, enum engine_id eng_id, - const struct dce110_stream_enc_registers *regs) + const struct dce110_stream_enc_registers *regs, + const struct dce_stream_encoder_shift *se_shift, + const struct dce_stream_encoder_mask *se_mask) { if (!enc110) return false;
@@ -1264,6 +1257,8 @@ bool dce110_stream_encoder_construct( enc110->base.id = eng_id; enc110->base.bp = bp; enc110->regs = regs; + enc110->se_shift = se_shift; + enc110->se_mask = se_mask;return true; }
drivers/gpu/drm/amd/dal/dc/dce/dce_stream_encoder.h +324 -6
356 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c +10 -2
@@ -291,7 +291,6 @@ static const struct dce110_link_enc_registers link_enc_regs[] = { [id] = {\SE_COMMON_REG_LIST_DCE_BASE (id),\ .AFMT_CNTL =0 ,\ - .TMDS_CNTL =0 ,\ } static const struct dce110_stream_enc_registers stream_enc_regs[] = {
@@ -304,6 +303,14 @@ static const struct dce110_stream_enc_registers stream_enc_regs[] = {stream_enc_regs (6 ) }; +static const struct dce_stream_encoder_shift se_shift = { +SE_COMMON_MASK_SH_LIST_DCE80_100 (__SHIFT) +}; + +static const struct dce_stream_encoder_mask se_mask = { +SE_COMMON_MASK_SH_LIST_DCE80_100 (_MASK) +}; +#define audio_regs (id)\ [id] = {\ AUD_COMMON_REG_LIST(id)\
@@ -431,7 +438,8 @@ static struct stream_encoder *dce100_stream_encoder_create(return NULL ;if (dce110_stream_encoder_construct ( - enc110, ctx, ctx->dc_bios, eng_id, &stream_enc_regs[eng_id])) + enc110, ctx, ctx->dc_bios, eng_id, + &stream_enc_regs[eng_id], &se_shift, &se_mask))return &enc110->base;BREAK_TO_DEBUGGER ();
drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c +10 -1
@@ -258,6 +258,14 @@ static const struct dce110_stream_enc_registers stream_enc_regs[] = {stream_enc_regs (2 ) }; +static const struct dce_stream_encoder_shift se_shift = { +SE_COMMON_MASK_SH_LIST_DCE110 (__SHIFT) +}; + +static const struct dce_stream_encoder_mask se_mask = { +SE_COMMON_MASK_SH_LIST_DCE110 (_MASK) +}; +#define audio_regs (id)\ [id] = {\ AUD_COMMON_REG_LIST(id)\
@@ -406,7 +414,8 @@ static struct stream_encoder *dce110_stream_encoder_create(return NULL ;if (dce110_stream_encoder_construct ( - enc110, ctx, ctx->dc_bios, eng_id, &stream_enc_regs[eng_id])) + enc110, ctx, ctx->dc_bios, eng_id, + &stream_enc_regs[eng_id], &se_shift, &se_mask))return &enc110->base;BREAK_TO_DEBUGGER ();
drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c +10 -1
@@ -297,6 +297,14 @@ static const struct dce110_stream_enc_registers stream_enc_regs[] = {stream_enc_regs (5 ) }; +static const struct dce_stream_encoder_shift se_shift = { +SE_COMMON_MASK_SH_LIST_DCE110 (__SHIFT) +}; + +static const struct dce_stream_encoder_mask se_mask = { +SE_COMMON_MASK_SH_LIST_DCE110 (_MASK) +}; +#define audio_regs (id)\ [id] = {\ AUD_COMMON_REG_LIST(id)\
@@ -455,7 +463,8 @@ static struct stream_encoder *dce112_stream_encoder_create(return NULL ;if (dce110_stream_encoder_construct ( - enc110, ctx, ctx->dc_bios, eng_id, &stream_enc_regs[eng_id])) + enc110, ctx, ctx->dc_bios, eng_id, + &stream_enc_regs[eng_id], &se_shift, &se_mask))return &enc110->base;BREAK_TO_DEBUGGER ();
drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c +10 -1
@@ -312,6 +312,14 @@ static const struct dce110_stream_enc_registers stream_enc_regs[] = {stream_enc_regs (5 ) }; +static const struct dce_stream_encoder_shift se_shift = { +SE_COMMON_MASK_SH_LIST_DCE80_100 (__SHIFT) +}; + +static const struct dce_stream_encoder_mask se_mask = { +SE_COMMON_MASK_SH_LIST_DCE80_100 (_MASK) +}; +#define audio_regs (id)\ [id] = {\ AUD_COMMON_REG_LIST(id)\
@@ -421,7 +429,8 @@ static struct stream_encoder *dce80_stream_encoder_create(return NULL ;if (dce110_stream_encoder_construct ( - enc110, ctx, ctx->dc_bios, eng_id, &stream_enc_regs[eng_id])) + enc110, ctx, ctx->dc_bios, eng_id, + &stream_enc_regs[eng_id], &se_shift, &se_mask))return &enc110->base;BREAK_TO_DEBUGGER ();
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 36/76 drm/amd/dal: Fixed wrong return value check condition.
In reply to a message not in the archiveFrom: Yongqiang Sun <[email protected]>
--- drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c +1 -1
@@ -1065,7 +1065,7 @@ bool dce110_link_encoder_construct(struct bp_encoder_cap_info bp_cap_info = {0 };const struct dc_vbios_funcs *bp_funcs = enc110->base.ctx->dc_bios->funcs; -if (BP_RESULT_OK != bp_funcs->get_encoder_cap_info ( +if (BP_RESULT_OK == bp_funcs->get_encoder_cap_info ( enc110->base.ctx->dc_bios, enc110->base.id, &bp_cap_info)) enc110->base.features.flags.bits.IS_HBR2_CAPABLE =
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 37/76 drm/amd/dal: Make set_overscan_blank_color optional
In reply to a message not in the archive--- drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c +4 -3
@@ -756,9 +756,10 @@ static void program_scaler(const struct core_dc *dc, pipe_ctx->scl_data.lb_bpp, &pipe_ctx->stream->bit_depth_params); - pipe_ctx->tg->funcs->set_overscan_blank_color ( - pipe_ctx->tg, - &color); +if (pipe_ctx->tg->funcs->set_overscan_blank_color) + pipe_ctx->tg->funcs->set_overscan_blank_color ( + pipe_ctx->tg, + &color); pipe_ctx->xfm->funcs->transform_set_scaler (pipe_ctx->xfm, &pipe_ctx->scl_data);
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 38/76 drm/amd/dal: Hard-coded LB_MEMORY_SIZE
In reply to a message not in the archiveFrom: Wesley Chalmers <[email protected]>
--- drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c | 4 +++- drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.c | 2 ++ drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_bit_depth.c | 6 +++--- drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c | 2 +- drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c | 4 +++- drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.c | 2 ++ drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_bit_depth.c | 2 +- drivers/gpu/drm/amd/dal/dc/inc/hw/transform.h | 1 + 8 files changed, 16 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c +3 -1
@@ -491,8 +491,10 @@ static struct transform *dce100_transform_create(if (!transform)return NULL ; -if (dce110_transform_construct (transform, ctx, inst, offsets)) +if (dce110_transform_construct (transform, ctx, inst, offsets)) { + transform->base.lb_memory_size =0x6B0 ;/*1712*/ return &transform->base; + }BREAK_TO_DEBUGGER ();dm_free (transform);
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform.c +2 -0
@@ -116,6 +116,8 @@ bool dce110_transform_construct( xfm110->base.lb_bits_per_entry =LB_BITS_PER_ENTRY ; xfm110->base.lb_total_entries_num =LB_TOTAL_NUMBER_OF_ENTRIES ; + xfm110->base.lb_memory_size =0x6B0 ;/*1712*/ +return true; }
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_bit_depth.c +3 -3
@@ -26,8 +26,8 @@#include "dm_services.h" /* include DCE11 register header files */ -#include "dce/dce_11_0_d.h" -#include "dce/dce_11_0_sh_mask.h" +#include "dce/dce_11_2_d.h" +#include "dce/dce_11_2_sh_mask.h" #include "dce110_transform.h" #include "dce110_transform_v.h"
@@ -786,7 +786,7 @@ bool dce110_transform_power_up_line_buffer(struct transform *xfm)/*Use all three pieces of memory always*/ set_reg_field_value (value,0 ,LB_MEMORY_CTRL ,LB_MEMORY_CONFIG );/*hard coded number DCE11 1712(0x6B0) Partitions: 720/960/1712*/ -set_reg_field_value (value,LB_TOTAL_NUMBER_OF_ENTRIES ,LB_MEMORY_CTRL , +set_reg_field_value (value, xfm110->base.lb_memory_size,LB_MEMORY_CTRL ,LB_MEMORY_SIZE );dm_write_reg (xfm110->base.ctx,LB_REG (mmLB_MEMORY_CTRL), value);
drivers/gpu/drm/amd/dal/dc/dce110/dce110_transform_v.c +1 -1
@@ -800,7 +800,7 @@ static bool dce110_transform_v_power_up_line_buffer(struct transform *xfm)/*Use all three pieces of memory always*/ set_reg_field_value (value,0 ,LBV_MEMORY_CTRL ,LB_MEMORY_CONFIG );/*hard coded number DCE11 1712(0x6B0) Partitions: 720/960/1712*/ -set_reg_field_value (value,LB_TOTAL_NUMBER_OF_ENTRIES ,LBV_MEMORY_CTRL , +set_reg_field_value (value, xfm110->base.lb_memory_size,LBV_MEMORY_CTRL ,LB_MEMORY_SIZE );dm_write_reg (xfm110->base.ctx, mmLBV_MEMORY_CTRL, value);
drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c +3 -1
@@ -516,8 +516,10 @@ static struct transform *dce112_transform_create(if (!transform)return NULL ; -if (dce110_transform_construct (transform, ctx, inst, offsets)) +if (dce110_transform_construct (transform, ctx, inst, offsets)) { + transform->base.lb_memory_size =0x1404 ;/*5124*/ return &transform->base; + }BREAK_TO_DEBUGGER ();dm_free (transform);
drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform.c +2 -0
@@ -105,6 +105,8 @@ bool dce80_transform_construct( xfm80->base.lb_bits_per_entry =LB_BITS_PER_ENTRY ; xfm80->base.lb_total_entries_num =LB_TOTAL_NUMBER_OF_ENTRIES ; + xfm80->base.lb_memory_size =0x6B0 ;/*1712*/ +return true; }
drivers/gpu/drm/amd/dal/dc/dce80/dce80_transform_bit_depth.c +1 -1
@@ -732,7 +732,7 @@ bool dce80_transform_power_up_line_buffer(struct transform *xfm)/*Use all three pieces of memory always*/ set_reg_field_value (value,0 ,LB_MEMORY_CTRL ,LB_MEMORY_CONFIG );/*hard coded number DCE8 1712(0x6B0) Partitions: 720/960/1712*/ -set_reg_field_value (value,LB_TOTAL_NUMBER_OF_ENTRIES ,LB_MEMORY_CTRL , +set_reg_field_value (value, xfm80->base.lb_memory_size,LB_MEMORY_CTRL ,LB_MEMORY_SIZE );dm_write_reg (xfm80->base.ctx,LB_REG (mmLB_MEMORY_CTRL), value);
drivers/gpu/drm/amd/dal/dc/inc/hw/transform.h +1 -0
@@ -40,6 +40,7 @@ struct transform {int lb_total_entries_num;int lb_bits_per_entry; +unsigned int lb_memory_size; };enum lb_pixel_depth {
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 39/76 drm/amd/dal: Rotation and mirror support
In reply to a message not in the archiveFrom: Vitaly Prosyak <[email protected]>
Add hardware programming for horizontal mirror.
--- drivers/gpu/drm/amd/dal/dc/core/dc.c | 3 +++ drivers/gpu/drm/amd/dal/dc/dc.h | 1 + drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c | 4 +++- drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c | 3 ++- drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.h | 3 ++- drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.c | 3 ++- drivers/gpu/drm/amd/dal/dc/inc/hw/mem_input.h | 3 ++- 7 files changed, 15 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/dal/dc/core/dc.c +3 -0
@@ -1354,6 +1354,7 @@ bool dc_commit_surfaces_to_target( plane_info[i].format = new_surfaces[i]->format; plane_info[i].plane_size = new_surfaces[i]->plane_size; plane_info[i].rotation = new_surfaces[i]->rotation; + plane_info[i].horizontal_mirror = new_surfaces[i]->horizontal_mirror; plane_info[i].stereo_format = new_surfaces[i]->stereo_format; plane_info[i].tiling_info = new_surfaces[i]->tiling_info; plane_info[i].visible = new_surfaces[i]->visible;
@@ -1456,6 +1457,8 @@ void dc_update_surfaces_for_target(struct dc *dc, struct dc_surface_update *upda updates[i].plane_info->plane_size; surface->public.rotation = updates[i].plane_info->rotation; + surface->public.horizontal_mirror = + updates[i].plane_info->horizontal_mirror; surface->public.stereo_format = updates[i].plane_info->stereo_format; surface->public.tiling_info =
drivers/gpu/drm/amd/dal/dc/dc.h +1 -0
@@ -238,6 +238,7 @@ struct dc_plane_info {union dc_tiling_info tiling_info;enum surface_pixel_format format;enum dc_rotation_angle rotation; +bool horizontal_mirror;enum plane_stereo_format stereo_format;enum dc_color_space color_space;/*todo: wrong place, fits in scaling info*/ bool visible;
drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c +3 -1
@@ -1677,7 +1677,8 @@ static void set_plane_config( &surface->public.tiling_info, &surface->public.plane_size, surface->public.rotation, - NULL); +NULL , + false);if (dc->public.config.gpu_vm_support) mi->funcs->mem_input_program_pte_vm(
@@ -2019,6 +2020,7 @@ static void dce110_program_front_end_for_pipe( &surface->public.tiling_info, &surface->public.plane_size, surface->public.rotation, + false, false);if (dc->public.config.gpu_vm_support)
drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c +2 -1
@@ -525,7 +525,8 @@ bool dce110_mem_input_program_surface_config(union dc_tiling_info *tiling_info, union plane_size *plane_size, enum dc_rotation_angle rotation, - struct dc_plane_dcc_param *dcc) + struct dc_plane_dcc_param *dcc, + bool horizotal_mirror) { struct dce110_mem_input *mem_input110 = TO_DCE110_MEM_INPUT(mem_input);
drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.h +2 -1
@@ -128,7 +128,8 @@ bool dce110_mem_input_program_surface_config(union dc_tiling_info *tiling_info, union plane_size *plane_size, enum dc_rotation_angle rotation, - struct dc_plane_dcc_param *dcc); + struct dc_plane_dcc_param *dcc, + bool horizontal_mirror);/* * dce110_mem_input_program_pte_vm
drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.c +2 -1
@@ -666,7 +666,8 @@ bool dce110_mem_input_v_program_surface_config(union dc_tiling_info *tiling_info, union plane_size *plane_size, enum dc_rotation_angle rotation, - struct dc_plane_dcc_param *dcc) + struct dc_plane_dcc_param *dcc, + bool horizotal_mirror) { struct dce110_mem_input *mem_input110 = TO_DCE110_MEM_INPUT(mem_input);
drivers/gpu/drm/amd/dal/dc/inc/hw/mem_input.h +2 -1
@@ -80,7 +80,8 @@ struct mem_input_funcs {union dc_tiling_info *tiling_info, union plane_size *plane_size, enum dc_rotation_angle rotation, - struct dc_plane_dcc_param *dcc); + struct dc_plane_dcc_param *dcc, + bool horizontal_mirror);bool (*mem_input_is_flip_pending)(struct mem_input *mem_input); };
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 40/76 drm/amd/dal: remove unnessary adapter service functions
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
- call bios directly
--- .../gpu/drm/amd/dal/dc/adapter/adapter_service.c | 168 +-------------------- .../gpu/drm/amd/dal/dc/dce110/dce110_compressor.c | 5 +- .../gpu/drm/amd/dal/dc/dce112/dce112_compressor.c | 5 +- .../gpu/drm/amd/dal/dc/dce80/dce80_compressor.c | 5 +- .../amd/dal/dc/gpu/dce110/display_clock_dce110.c | 13 +- .../drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c | 9 +- .../amd/dal/include/adapter_service_interface.h | 41 ----- 7 files changed, 21 insertions(+), 225 deletions(-)
drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c +1 -167
@@ -608,7 +608,6 @@ static bool adapter_service_construct( struct as_init_data *init_data) {struct dc_bios *dcb; -enum dce_version dce_version;uint32_t i;if (!init_data)
@@ -631,7 +630,7 @@ static bool adapter_service_construct( as->default_values[id] = feature_entry_table[i].default_value; } -if (dal_adapter_service_get_dce_version (as) ==DCE_VERSION_11_0 ) { +if (as->ctx->dce_version ==DCE_VERSION_11_0 ) {uint32_t i;for (i =0 ; i <ARRAY_SIZE (feature_entry_table); i++) {
@@ -652,7 +651,6 @@ static bool adapter_service_construct( } as->dce_environment = init_data->dce_environment; - dce_version =dal_adapter_service_get_dce_version (as); dcb = as->ctx->dc_bios;
@@ -731,87 +729,6 @@ void dal_adapter_service_destroy( }/* -* dal_adapter_service_get_dce_version -* -* Get the DCE version of current ASIC -*/ -enum dce_version dal_adapter_service_get_dce_version ( -const struct adapter_service *as) -{ -uint32_t version = as->asic_cap->data[ASIC_DATA_DCE_VERSION ]; - -switch (version) { -case 0x80 : -/* CI Bonaire */ -return DCE_VERSION_8_0 ; -case 0x100 : -return DCE_VERSION_10_0 ; -case 0x110 : -return DCE_VERSION_11_0 ; -case 0x112 : -return DCE_VERSION_11_2 ; -default : -ASSERT_CRITICAL (false); -return DCE_VERSION_UNKNOWN ; - } -} - -/** -* Get the source objects of an object -* -* \param [in] id The graphics object id -* \param [in] index Enumerating index which starts at 0 -* -* \return If enumerating successfully, return the VALID source object id, -* otherwise, returns "zeroed out" object id. -* Client should call dal_graphics_object_id_is_valid() to check -* weather the id is valid. -*/ -struct graphics_object_id dal_adapter_service_get_src_obj ( -struct adapter_service *as, -struct graphics_object_id id, -uint32_t index) -{ -struct graphics_object_id src_object_id; -struct dc_bios *dcb = as->ctx->dc_bios; - -if (BP_RESULT_OK != dcb->funcs->get_src_obj (dcb, id, index, - &src_object_id)) { - src_object_id = -dal_graphics_object_id_init ( -0 , -ENUM_ID_UNKNOWN , -OBJECT_TYPE_UNKNOWN ); - } - -return src_object_id; -} - -bool dal_adapter_service_get_device_tag ( -struct adapter_service *as, -struct graphics_object_id connector_object_id, -uint32_t device_tag_index, -struct connector_device_tag_info *info) -{ -struct dc_bios *dcb = as->ctx->dc_bios; - -if (BP_RESULT_OK == dcb->funcs->get_device_tag (dcb, - connector_object_id, device_tag_index, info)) -return true; -else -return false; -} - -/* Check if DeviceId is supported by ATOM_OBJECT_HEADER support info */ -bool dal_adapter_service_is_device_id_supported (struct adapter_service *as, -struct device_id id) -{ -struct dc_bios *dcb = as->ctx->dc_bios; - -return dcb->funcs->is_device_id_supported (dcb, id); -} - -/* * dal_adapter_service_is_feature_supported * * Return if a given feature is supported by the ASIC. The feature has to be
@@ -828,39 +745,6 @@ bool dal_adapter_service_is_feature_supported(struct adapter_service *as, }/* -* dal_adapter_service_get_ss_info_num -* -* Get number of spread spectrum entries from BIOS -*/ -uint32_t dal_adapter_service_get_ss_info_num ( -struct adapter_service *as, -enum as_signal_type signal) -{ -struct dc_bios *dcb = as->ctx->dc_bios; - -return dcb->funcs->get_ss_entry_number (dcb, signal); -} - -/* -* dal_adapter_service_get_ss_info -* -* Get spread spectrum info from BIOS -*/ -bool dal_adapter_service_get_ss_info ( -struct adapter_service *as, -enum as_signal_type signal, -uint32_t idx, -struct spread_spectrum_info *info) -{ -struct dc_bios *dcb = as->ctx->dc_bios; - -enum bp_result bp_result = dcb->funcs->get_spread_spectrum_info (dcb, - signal, idx, info); - -return BP_RESULT_OK == bp_result; -} - -/* * dal_adapter_service_is_dfs_bypass_enabled * * Check if DFS bypass is enabled
@@ -952,22 +836,6 @@ bool dal_adapter_service_get_feature_value(struct adapter_service *as,return true; } -bool dal_adapter_service_get_embedded_panel_info ( -struct adapter_service *as, -struct embedded_panel_info *info) -{ -enum bp_result result; -struct dc_bios *dcb = as->ctx->dc_bios; - -if (info ==NULL ) -/*TODO: add DALASSERT_MSG here*/ -return false; - - result = dcb->funcs->get_embedded_panel_info (dcb, info); - -return result ==BP_RESULT_OK ; -} -/* * dal_adapter_service_should_optimize *
@@ -1018,37 +886,3 @@ bool dal_adapter_service_should_optimize(return (supported_optimization & feature) !=0 ; } -bool dal_adapter_service_get_encoder_cap_info ( -struct adapter_service *as, -struct graphics_object_id id, -struct graphics_object_encoder_cap_info *info) -{ -struct bp_encoder_cap_info bp_cap_info = {0 }; -enum bp_result result; -struct dc_bios *dcb = as->ctx->dc_bios; - -if (NULL == info) { -ASSERT_CRITICAL (false); -return false; - } - -/* -* Retrieve Encoder Capability Information from VBIOS and store the -* call result (success or fail) -* Info from VBIOS about HBR2 has two fields: -* -* - dpHbr2Cap: indicates supported/not supported by HW Encoder -* - dpHbr2En : indicates DP spec compliant/not compliant -*/ - result = dcb->funcs->get_encoder_cap_info (dcb, id, &bp_cap_info); - -/* Set dp_hbr2_validated flag (it's equal to Enable) */ - info->dp_hbr2_validated = bp_cap_info.DP_HBR2_EN; - -if (result ==BP_RESULT_OK ) { - info->dp_hbr2_cap = bp_cap_info.DP_HBR2_CAP; -return true; - } - -return false; -}
drivers/gpu/drm/amd/dal/dc/dce110/dce110_compressor.c +3 -2
@@ -795,6 +795,7 @@ void dce110_compressor_set_fbc_invalidation_triggers(bool dce110_compressor_construct (struct dce110_compressor *compressor,struct dc_context *ctx,struct adapter_service *as) { +struct dc_bios *bp = ctx->dc_bios;struct embedded_panel_info panel_info; compressor->base.options.bits.FBC_SUPPORT = true;
@@ -833,8 +834,8 @@ bool dce110_compressor_construct(struct dce110_compressor *compressor, compressor->base.attached_inst =0 ; compressor->base.is_enabled = false; -if (dal_adapter_service_get_embedded_panel_info (as, - &panel_info)) { +if (BP_RESULT_OK == + bp->funcs->get_embedded_panel_info (bp, &panel_info)) { compressor->base.embedded_panel_h_size = panel_info.lcd_timing.horizontal_addressable; compressor->base.embedded_panel_v_size =
drivers/gpu/drm/amd/dal/dc/dce112/dce112_compressor.c +3 -2
@@ -795,6 +795,7 @@ void dce112_compressor_set_fbc_invalidation_triggers(bool dce112_compressor_construct (struct dce112_compressor *compressor,struct dc_context *ctx,struct adapter_service *as) { +struct dc_bios *bp = ctx->dc_bios;struct embedded_panel_info panel_info; compressor->base.options.bits.FBC_SUPPORT = true;
@@ -833,8 +834,8 @@ bool dce112_compressor_construct(struct dce112_compressor *compressor, compressor->base.attached_inst =0 ; compressor->base.is_enabled = false; -if (dal_adapter_service_get_embedded_panel_info (as, - &panel_info)) { +if (BP_RESULT_OK == + bp->funcs->get_embedded_panel_info (bp, &panel_info)) { compressor->base.embedded_panel_h_size = panel_info.lcd_timing.horizontal_addressable; compressor->base.embedded_panel_v_size =
drivers/gpu/drm/amd/dal/dc/dce80/dce80_compressor.c +3 -2
@@ -776,6 +776,7 @@ void dce80_compressor_set_fbc_invalidation_triggers(bool dce80_compressor_construct (struct dce80_compressor *compressor,struct dc_context *ctx,struct adapter_service *as) { +struct dc_bios *bp = ctx->dc_bios;struct embedded_panel_info panel_info; compressor->base.options.bits.FBC_SUPPORT = true;
@@ -814,8 +815,8 @@ bool dce80_compressor_construct(struct dce80_compressor *compressor, compressor->base.attached_inst =0 ; compressor->base.is_enabled = false; -if (dal_adapter_service_get_embedded_panel_info (as, - &panel_info)) { +if (BP_RESULT_OK == + bp->funcs->get_embedded_panel_info (bp, &panel_info)) { compressor->base.embedded_panel_h_size = panel_info.lcd_timing.horizontal_addressable; compressor->base.embedded_panel_v_size =
drivers/gpu/drm/amd/dal/dc/gpu/dce110/display_clock_dce110.c +6 -7
@@ -926,6 +926,7 @@ static bool dal_display_clock_dce110_construct( struct adapter_service *as) {struct display_clock *dc_base = &dc110->disp_clk_base; +struct dc_bios *bp = dc110->disp_clk_base.ctx->dc_bios;if (NULL == as)return false;
@@ -973,19 +974,16 @@ static bool dal_display_clock_dce110_construct( {uint32_t ss_info_num = -dal_adapter_service_get_ss_info_num ( - as, + bp->funcs->get_ss_entry_number (bp,AS_SIGNAL_TYPE_GPU_PLL );if (ss_info_num) {struct spread_spectrum_info info; -bool result; +enum bp_result result;memset (&info,0 ,sizeof (info)); - result = -dal_adapter_service_get_ss_info ( - as, + result = bp->funcs->get_spread_spectrum_info (bp,AS_SIGNAL_TYPE_GPU_PLL ,0 , &info);
@@ -995,7 +993,8 @@ static bool dal_display_clock_dce110_construct(* SSInfo.spreadSpectrumPercentage !=0 would be sign * that SS is enabled */ -if (result && info.spread_spectrum_percentage !=0 ) { +if (result ==BP_RESULT_OK && + info.spread_spectrum_percentage !=0 ) { dc110->ss_on_gpu_pll = true; dc110->gpu_pll_ss_divider = info.spread_percentage_divider;
drivers/gpu/drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c +5 -4
@@ -719,24 +719,25 @@ static void display_clock_ss_construct(struct display_clock_dce80 *disp_clk, struct adapter_service *as) { - uint32_t ss_entry_num = dal_adapter_service_get_ss_info_num(as, + struct dc_bios *bp = disp_clk->disp_clk.ctx->dc_bios; +uint32_t ss_entry_num = bp->funcs->get_ss_entry_number (bp,AS_SIGNAL_TYPE_GPU_PLL );/*Read SS Info from VBIOS SS Info table for DP Reference Clock spread.*/ if (ss_entry_num >0 ) {/* Should be only one entry */ struct spread_spectrum_info ss_info; -bool res; +enum bp_result res;memset (&ss_info,0 ,sizeof (struct spread_spectrum_info )); - res =dal_adapter_service_get_ss_info (as, + res = bp->funcs->get_spread_spectrum_info (bp,AS_SIGNAL_TYPE_GPU_PLL ,0 , &ss_info);/* Based on VBIOS, VBIOS will keep entry for GPU PLL SS even if * SS not enabled and in that case * SSInfo.spreadSpectrumPercentage !=0 would be * sign that SS is enabled*/ -if (res && ss_info.spread_spectrum_percentage !=0 ) { +if (res ==BP_RESULT_OK && ss_info.spread_spectrum_percentage !=0 ) { disp_clk->ss_on_gpu_pll = true; disp_clk->gpu_pll_ss_divider = ss_info.spread_percentage_divider;
drivers/gpu/drm/amd/dal/include/adapter_service_interface.h +0 -41
55 lines not on this page · raw message
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 41/76 drm/amd/dal: remove dal_override_parameters
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
- overrride param added in 65c31cba
- looks like was quick workaround for amdsoc to support persistence issue
- simplify by removing indirections
- DAL_PARAM_ENABLE_GPU_SCALING enabled on all platforms and not used. remove
- DAL_PARAM_DISABLE_CLOCK_SHARING still needed. replace with disable_disp_pll_sharing in dc_config.
* note: behavior change: fix DP + HDMI timing sync in case of disable_disp_pll_sharing = 1
--- drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c | 17 ---- .../gpu/drm/amd/dal/dc/adapter/adapter_service.c | 110 ++------------------- drivers/gpu/drm/amd/dal/dc/core/dc.c | 3 +- drivers/gpu/drm/amd/dal/dc/core/dc_resource.c | 18 ++-- drivers/gpu/drm/amd/dal/dc/dc.h | 2 +- drivers/gpu/drm/amd/dal/dc/dc_types.h | 44 --------- .../amd/dal/include/adapter_service_interface.h | 3 - 7 files changed, 20 insertions(+), 177 deletions(-)
drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c +0 -17
@@ -54,15 +54,6 @@#include "modules/inc/mod_freesync.h" -/* Define variables here -* These values will be passed to DAL for feature enable purpose -* Disable ALL for HDMI light up -* TODO: follow up if need this mechanism*/ -struct dal_override_parameters display_param = { - .bool_param_enable_mask =0 , - .bool_param_values =0 , -}; -/* Debug facilities */ #define AMDGPU_DM_NOT_IMPL (fmt, ...) \ DRM_INFO("DM_NOT_IMPL: " fmt, ##__VA_ARGS__)
@@ -280,8 +271,6 @@ int amdgpu_dm_init(struct amdgpu_device *adev) goto error; } - init_data.display_param = display_param; - init_data.asic_id.chip_family = adev->family; init_data.asic_id.pci_revision_id = adev->rev_id;
@@ -310,12 +299,6 @@ int amdgpu_dm_init(struct amdgpu_device *adev) adev->dm.dal =NULL ; -/* enable gpu scaling in DAL */ - init_data.display_param.bool_param_enable_mask |= -1 <<DAL_PARAM_ENABLE_GPU_SCALING ; - init_data.display_param.bool_param_values |= -1 <<DAL_PARAM_ENABLE_GPU_SCALING ; - init_data.dce_environment =DCE_ENV_PRODUCTION_DRV ;/* Display Core create. */
drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c +10 -100
146 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/core/dc.c +1 -2
@@ -185,7 +185,6 @@ static struct adapter_service *create_as( init_data.hw_init_data.vram_width = init->asic_id.vram_width; init_data.hw_init_data.vram_type = init->asic_id.vram_type; - init_data.display_param = &init->display_param; init_data.vbios_override = init->vbios_override; init_data.dce_environment = init->dce_environment;
@@ -689,7 +688,7 @@ struct dc *dc_create(const struct dc_init_data *init_params) core_dc->public.caps.max_links = core_dc->link_count; core_dc->public.caps.max_audios = core_dc->res_pool->audio_count; - core_dc->public.config.gpu_vm_support = init_params->flags.gpu_vm_support; + core_dc->public.config = init_params->flags;dm_logger_write (core_dc->ctx->logger,LOG_DC ,"Display Core initialized\n" );
drivers/gpu/drm/amd/dal/dc/core/dc_resource.c +8 -10
@@ -301,15 +301,11 @@ struct clock_source *resource_find_used_clk_src_for_sharing(struct resource_context *res_ctx, struct pipe_ctx *pipe_ctx) { -if (!dal_adapter_service_is_feature_supported ( - res_ctx->pool->adapter_srv, -FEATURE_DISABLE_CLOCK_SHARING )) { -int i; - -for (i =0 ; i <MAX_PIPES ; i++) { -if (is_sharable_clk_src (&res_ctx->pipe_ctx[i], pipe_ctx)) -return res_ctx->pipe_ctx[i].clock_source; - } + int i; + +for (i =0 ; i <MAX_PIPES ; i++) { +if (is_sharable_clk_src (&res_ctx->pipe_ctx[i], pipe_ctx)) +return res_ctx->pipe_ctx[i].clock_source; }return NULL ;
@@ -1869,7 +1865,9 @@ enum dc_status resource_map_clock_resources( pipe_ctx->clock_source = context->res_ctx.pool->dp_clock_source; else { - pipe_ctx->clock_source = + pipe_ctx->clock_source =NULL ; + +if (!dc->public.config.disable_disp_pll_sharing)resource_find_used_clk_src_for_sharing ( &context->res_ctx, pipe_ctx);
drivers/gpu/drm/amd/dal/dc/dc.h +1 -1
@@ -132,6 +132,7 @@ struct dc_link_funcs {/* Structure to hold configuration flags set by dm at dc creation. */ struct dc_config {bool gpu_vm_support; +bool disable_disp_pll_sharing; };struct dc_debug {
@@ -151,7 +152,6 @@ struct dc {struct dc_init_data {struct hw_asic_id asic_id; -struct dal_override_parameters display_param;void *driver;/* ctx */ struct cgs_device *cgs_device;
drivers/gpu/drm/amd/dal/dc/dc_types.h +0 -44
50 lines not on this page · raw message
drivers/gpu/drm/amd/dal/include/adapter_service_interface.h +0 -3
@@ -115,7 +115,6 @@ enum adapter_feature_id {FEATURE_ABM_2_0 ,FEATURE_SUPPORT_MIRABILIS ,FEATURE_LOAD_DMCU_FIRMWARE ,/* 20th */ -FEATURE_ENABLE_GPU_SCALING ,FEATURE_DONGLE_SINK_COUNT_CHECK ,FEATURE_INSTANT_UP_SCALE_DOWN_SCALE , FEATURE_TILED_DISPLAY,
@@ -126,7 +125,6 @@ enum adapter_feature_id {FEATURE_SUPPORT_SMOOTH_BRIGHTNESS ,FEATURE_ALLOW_DIRECT_MEMORY_ACCESS_TRIG ,/* 30th */ FEATURE_POWER_GATING_LB_PORTION , -FEATURE_DISABLE_CLOCK_SHARING ,/* 32nd. Set Done. */ FEATURE_SET_02_END = FEATURE_SET_02_START + 31,/* UInt set, 1 entry: DCP Bit Depth Reduction Mode */
@@ -317,7 +315,6 @@ enum as_drr_support {struct as_init_data {struct hw_asic_id hw_init_data;struct dc_context *ctx; -const struct dal_override_parameters *display_param;struct dc_bios *vbios_override;enum dce_environment dce_environment; };
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 42/76 drm/amd/dal: remove unnessary adapter service functions
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
- remove ASIC_DATA_VRAM_BITWIDTH. use asic_id directly
- remove FEATURE_NO_HPD_LOW_POLLING_VCC_OFF. = 1 on all supported asic
- remove FEATURE_DUMMY_FBC_BACKEND. = 0 on all asic
- remove FEATURE_DISABLE_LPT_SUPPORT. = 0 on all asic
- remove FEATURE_DISABLE_FBC_COMP_CLK_GATE. = 0 on all asic
--- .../gpu/drm/amd/dal/dc/adapter/adapter_service.c | 20 ---------- .../amd/dal/dc/asic_capability/asic_capability.c | 2 - .../dc/asic_capability/carrizo_asic_capability.c | 1 - .../dc/asic_capability/hawaii_asic_capability.c | 1 - .../dc/asic_capability/polaris10_asic_capability.c | 1 - .../dal/dc/asic_capability/tonga_asic_capability.c | 1 - drivers/gpu/drm/amd/dal/dc/core/dc.c | 3 +- drivers/gpu/drm/amd/dal/dc/dc_types.h | 45 +++++++++++----------- drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c | 3 +- .../gpu/drm/amd/dal/dc/dce110/dce110_compressor.c | 15 ++------ .../gpu/drm/amd/dal/dc/dce110/dce110_resource.c | 2 +- .../gpu/drm/amd/dal/dc/dce112/dce112_compressor.c | 15 ++------ .../gpu/drm/amd/dal/dc/dce112/dce112_resource.c | 2 +- .../gpu/drm/amd/dal/dc/dce80/dce80_compressor.c | 15 ++------ drivers/gpu/drm/amd/dal/dc/inc/core_dc.h | 1 - .../amd/dal/include/adapter_service_interface.h | 16 +------- .../drm/amd/dal/include/asic_capability_types.h | 2 - 17 files changed, 40 insertions(+), 105 deletions(-)
drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c +0 -20
@@ -94,13 +94,11 @@ static const struct feature_source_entry feature_entry_table[] = { {FEATURE_DCP_BIT_DEPTH_REDUCTION_MODE, 0, false}, {FEATURE_DCP_DITHER_MODE, 0, false}, {FEATURE_DCP_PROGRAMMING_WA, 0, false}, - {FEATURE_NO_HPD_LOW_POLLING_VCC_OFF, false, true}, {FEATURE_ENABLE_DFS_BYPASS, false, true}, {FEATURE_WIRELESS_FULL_TIMING_ADJUSTMENT, false, true}, {FEATURE_WIRELESS_LIMIT_720P, false, true}, {FEATURE_MODIFY_TIMINGS_FOR_WIRELESS, false, true}, {FEATURE_DETECT_REQUIRE_HPD_HIGH, false, true}, - {FEATURE_NO_HPD_LOW_POLLING_VCC_OFF, false, true}, {FEATURE_LB_HIGH_RESOLUTION, false, true}, {FEATURE_MAX_CONTROLLER_NUM, 0, false}, {FEATURE_DRR_SUPPORT, AS_DRR_SUPPORT_ENABLED, false},
@@ -154,10 +152,7 @@ static const struct feature_source_entry feature_entry_table[] = { {FEATURE_ALLOW_DIRECT_MEMORY_ACCESS_TRIG, false, true}, {FEATURE_FORCE_STATIC_SCREEN_EVENT_TRIGGERS, 0, false}, {FEATURE_USE_PPLIB, true, true}, - {FEATURE_DISABLE_LPT_SUPPORT, false, true}, - {FEATURE_DUMMY_FBC_BACKEND, false, true}, {FEATURE_DPMS_AUDIO_ENDPOINT_CONTROL, true, true}, - {FEATURE_DISABLE_FBC_COMP_CLK_GATE, false, true}, {FEATURE_PIXEL_PERFECT_OUTPUT, false, true}, {FEATURE_8BPP_SUPPORTED, false, true}, };
@@ -367,10 +362,6 @@ static bool get_feature_value_from_data_sources( *data = as->asic_cap->caps.HPD_CHECK_FOR_EDID;break ; -case FEATURE_NO_HPD_LOW_POLLING_VCC_OFF : - *data = as->asic_cap->caps.NO_VCC_OFF_HPD_POLLING; -break ; -case FEATURE_STUTTER_MODE : *data = as->asic_cap->data[ASIC_DATA_STUTTERMODE ];break ;
@@ -674,17 +665,6 @@ bool dal_adapter_service_is_dfs_bypass_enabled(return false; } -/* -* dal_adapter_service_get_asic_vram_bit_width -* -* Get the video RAM bit width set on the ASIC -*/ -uint32_t dal_adapter_service_get_asic_vram_bit_width ( -struct adapter_service *as) -{ -return as->asic_cap->data[ASIC_DATA_VRAM_BITWIDTH ]; -} -struct dal_asic_runtime_flags dal_adapter_service_get_asic_runtime_flags (struct adapter_service *as) {
drivers/gpu/drm/amd/dal/dc/asic_capability/asic_capability.c +0 -2
@@ -54,7 +54,6 @@ static bool construct(memset (cap->data,0 ,sizeof (cap->data));/* ASIC data */ - cap->data[ASIC_DATA_VRAM_BITWIDTH ] = init->vram_width; cap->runtime_flags = init->runtime_flags; cap->data[ASIC_DATA_MAX_UNDERSCAN_PERCENTAGE ] =10 ; cap->data[ASIC_DATA_VIEWPORT_PIXEL_GRANULARITY ] =4 ;
@@ -71,7 +70,6 @@ static bool construct( cap->caps.WIRELESS_COMPRESSED_AUDIO = false; cap->caps.VCE_SUPPORTED = false; cap->caps.HPD_CHECK_FOR_EDID = false; - cap->caps.NO_VCC_OFF_HPD_POLLING = false; cap->caps.NEED_MC_TUNING = false; cap->caps.SUPPORT_8BPP = true;
drivers/gpu/drm/amd/dal/dc/asic_capability/carrizo_asic_capability.c +0 -1
@@ -63,7 +63,6 @@ void carrizo_asic_capability_create(struct asic_capability *cap, cap->caps.DP_MST_SUPPORTED = true; cap->caps.PANEL_SELF_REFRESH_SUPPORTED = true; cap->caps.MIRABILIS_SUPPORTED = true; - cap->caps.NO_VCC_OFF_HPD_POLLING = true; cap->caps.VCE_SUPPORTED = true; cap->caps.HPD_CHECK_FOR_EDID = true; cap->caps.DFSBYPASS_DYNAMIC_SUPPORT = true;
drivers/gpu/drm/amd/dal/dc/asic_capability/hawaii_asic_capability.c +0 -1
@@ -111,7 +111,6 @@ void dal_hawaii_asic_capability_create(struct asic_capability *cap, cap->caps.HEADLESS_NO_OPM_SUPPORTED = true; cap->caps.HPD_CHECK_FOR_EDID = true; - cap->caps.NO_VCC_OFF_HPD_POLLING = true;/* true will hang the system! */ cap->caps.DFSBYPASS_DYNAMIC_SUPPORT = false;
drivers/gpu/drm/amd/dal/dc/asic_capability/polaris10_asic_capability.c +0 -1
@@ -66,7 +66,6 @@ void polaris10_asic_capability_create(struct asic_capability *cap, cap->caps.DP_MST_SUPPORTED = true; cap->caps.PANEL_SELF_REFRESH_SUPPORTED = true; cap->caps.MIRABILIS_SUPPORTED = true; - cap->caps.NO_VCC_OFF_HPD_POLLING = true; cap->caps.VCE_SUPPORTED = true; cap->caps.HPD_CHECK_FOR_EDID = true; cap->caps.DFSBYPASS_DYNAMIC_SUPPORT = true;
drivers/gpu/drm/amd/dal/dc/asic_capability/tonga_asic_capability.c +0 -1
@@ -64,7 +64,6 @@ void tonga_asic_capability_create(struct asic_capability *cap, cap->caps.DP_MST_SUPPORTED = true; cap->caps.PANEL_SELF_REFRESH_SUPPORTED = true; cap->caps.MIRABILIS_SUPPORTED = true; - cap->caps.NO_VCC_OFF_HPD_POLLING = true; cap->caps.VCE_SUPPORTED = true; cap->caps.HPD_CHECK_FOR_EDID = true; cap->caps.DFSBYPASS_DYNAMIC_SUPPORT = true;
drivers/gpu/drm/amd/dal/dc/core/dc.c +1 -2
@@ -535,8 +535,7 @@ static bool construct(struct core_dc *dc, dc_ctx->cgs_device = init_params->cgs_device; dc_ctx->driver_context = init_params->driver; dc_ctx->dc = &dc->public; - - dc->asic_id = init_params->asic_id; + dc_ctx->asic_id = init_params->asic_id;/* Create logger */ logger =dal_logger_create (dc_ctx);
drivers/gpu/drm/amd/dal/dc/dc_types.h +23 -22
57 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c +1 -2
@@ -610,8 +610,7 @@ static void link_encoder_edp_wait_for_hpd_ready(return ; } -if (!power_up &&dal_adapter_service_is_feature_supported (as, -FEATURE_NO_HPD_LOW_POLLING_VCC_OFF )) +if (!power_up)/* from KV, we will not HPD low after turning off VCC - * instead, we will check the SW timer in power_up(). */ return ;
drivers/gpu/drm/amd/dal/dc/dce110/dce110_compressor.c +4 -11
@@ -799,29 +799,22 @@ bool dce110_compressor_construct(struct dce110_compressor *compressor,struct embedded_panel_info panel_info; compressor->base.options.bits.FBC_SUPPORT = true; -if (!(dal_adapter_service_is_feature_supported (as, -FEATURE_DISABLE_LPT_SUPPORT ))) - compressor->base.options.bits.LPT_SUPPORT = true; + compressor->base.options.bits.LPT_SUPPORT = true;/* For DCE 11 always use one DRAM channel for LPT */ compressor->base.lpt_channels_num =1 ; - -if (dal_adapter_service_is_feature_supported (as,FEATURE_DUMMY_FBC_BACKEND )) - compressor->base.options.bits.DUMMY_BACKEND = true; + compressor->base.options.bits.DUMMY_BACKEND = false;/* Check if this system has more than 1 DRAM channel; if only 1 then LPT * should not be supported */ if (compressor->base.memory_bus_width ==64 ) compressor->base.options.bits.LPT_SUPPORT = false; -if (dal_adapter_service_is_feature_supported (as, -FEATURE_DISABLE_FBC_COMP_CLK_GATE )) - compressor->base.options.bits.CLK_GATING_DISABLED = true; + compressor->base.options.bits.CLK_GATING_DISABLED = false; compressor->base.ctx = ctx; compressor->base.embedded_panel_h_size =0 ; compressor->base.embedded_panel_v_size =0 ; - compressor->base.memory_bus_width = -dal_adapter_service_get_asic_vram_bit_width (as); + compressor->base.memory_bus_width = ctx->asic_id.vram_width; compressor->base.allocated_size =0 ; compressor->base.preferred_requested_size =0 ; compressor->base.min_compress_ratio =FBC_COMPRESS_RATIO_INVALID ;
drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c +1 -1
@@ -1191,7 +1191,7 @@ static bool construct( ctx->dc_bios->regs = &bios_regs; pool->base.adapter_srv = as; - pool->base.res_cap =dce110_resource_cap (&dc->asic_id); + pool->base.res_cap =dce110_resource_cap (&ctx->asic_id); pool->base.funcs = &dce110_res_pool_funcs;/*************************************************
drivers/gpu/drm/amd/dal/dc/dce112/dce112_compressor.c +4 -11
@@ -799,29 +799,22 @@ bool dce112_compressor_construct(struct dce112_compressor *compressor,struct embedded_panel_info panel_info; compressor->base.options.bits.FBC_SUPPORT = true; -if (!(dal_adapter_service_is_feature_supported (as, -FEATURE_DISABLE_LPT_SUPPORT ))) - compressor->base.options.bits.LPT_SUPPORT = true; + compressor->base.options.bits.LPT_SUPPORT = true;/* For DCE 11 always use one DRAM channel for LPT */ compressor->base.lpt_channels_num =1 ; - -if (dal_adapter_service_is_feature_supported (as,FEATURE_DUMMY_FBC_BACKEND )) - compressor->base.options.bits.DUMMY_BACKEND = true; + compressor->base.options.bits.DUMMY_BACKEND = false;/* Check if this system has more than 1 DRAM channel; if only 1 then LPT * should not be supported */ if (compressor->base.memory_bus_width ==64 ) compressor->base.options.bits.LPT_SUPPORT = false; -if (dal_adapter_service_is_feature_supported (as, -FEATURE_DISABLE_FBC_COMP_CLK_GATE )) - compressor->base.options.bits.CLK_GATING_DISABLED = true; + compressor->base.options.bits.CLK_GATING_DISABLED = false; compressor->base.ctx = ctx; compressor->base.embedded_panel_h_size =0 ; compressor->base.embedded_panel_v_size =0 ; - compressor->base.memory_bus_width = -dal_adapter_service_get_asic_vram_bit_width (as); + compressor->base.memory_bus_width = ctx->asic_id.vram_width; compressor->base.allocated_size =0 ; compressor->base.preferred_requested_size =0 ; compressor->base.min_compress_ratio =FBC_COMPRESS_RATIO_INVALID ;
drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c +1 -1
@@ -1202,7 +1202,7 @@ static bool construct( ctx->dc_bios->regs = &bios_regs; pool->base.adapter_srv = adapter_serv; - pool->base.res_cap =dce112_resource_cap (&dc->asic_id); + pool->base.res_cap =dce112_resource_cap (&ctx->asic_id); pool->base.funcs = &dce112_res_pool_funcs;/*************************************************
drivers/gpu/drm/amd/dal/dc/dce80/dce80_compressor.c +4 -11
@@ -780,29 +780,22 @@ bool dce80_compressor_construct(struct dce80_compressor *compressor,struct embedded_panel_info panel_info; compressor->base.options.bits.FBC_SUPPORT = true; -if (!(dal_adapter_service_is_feature_supported (as, -FEATURE_DISABLE_LPT_SUPPORT ))) - compressor->base.options.bits.LPT_SUPPORT = true; + compressor->base.options.bits.LPT_SUPPORT = true;/* For DCE 11 always use one DRAM channel for LPT */ compressor->base.lpt_channels_num =1 ; - -if (dal_adapter_service_is_feature_supported (as,FEATURE_DUMMY_FBC_BACKEND )) - compressor->base.options.bits.DUMMY_BACKEND = true; + compressor->base.options.bits.DUMMY_BACKEND = false;/* Check if this system has more than 1 DRAM channel; if only 1 then LPT * should not be supported */ if (compressor->base.memory_bus_width ==64 ) compressor->base.options.bits.LPT_SUPPORT = false; -if (dal_adapter_service_is_feature_supported (as, -FEATURE_DISABLE_FBC_COMP_CLK_GATE )) - compressor->base.options.bits.CLK_GATING_DISABLED = true; + compressor->base.options.bits.CLK_GATING_DISABLED = false; compressor->base.ctx = ctx; compressor->base.embedded_panel_h_size =0 ; compressor->base.embedded_panel_v_size =0 ; - compressor->base.memory_bus_width = -dal_adapter_service_get_asic_vram_bit_width (as); + compressor->base.memory_bus_width = ctx->asic_id.vram_width; compressor->base.allocated_size =0 ; compressor->base.preferred_requested_size =0 ; compressor->base.min_compress_ratio =FBC_COMPRESS_RATIO_INVALID ;
drivers/gpu/drm/amd/dal/dc/inc/core_dc.h +0 -1
@@ -17,7 +17,6 @@struct core_dc {struct dc public;struct dc_context *ctx; -struct hw_asic_id asic_id;uint8_t link_count;struct core_link *links[MAX_PIPES *2 ];
drivers/gpu/drm/amd/dal/include/adapter_service_interface.h +1 -15
@@ -80,7 +80,6 @@ enum adapter_feature_id {FEATURE_ALLOW_EDP_RESOURCE_SHARING ,FEATURE_SUPPORT_DP_YUV ,FEATURE_SUPPORT_DP_Y_ONLY , -FEATURE_NO_HPD_LOW_POLLING_VCC_OFF ,/* 20th */ FEATURE_ENABLE_DFS_BYPASS ,FEATURE_LB_HIGH_RESOLUTION , FEATURE_DP_DISPLAY_FORCE_SS_ENABLE,
@@ -166,9 +165,6 @@ enum adapter_feature_id {FEATURE_POWER_GATING_PIPE_IN_TILE =FEATURE_SET_12_END +1 ,FEATURE_SET_13_START =FEATURE_POWER_GATING_PIPE_IN_TILE ,FEATURE_USE_PPLIB , -FEATURE_DISABLE_LPT_SUPPORT , -FEATURE_DUMMY_FBC_BACKEND , -FEATURE_DISABLE_FBC_COMP_CLK_GATE ,FEATURE_DPMS_AUDIO_ENDPOINT_CONTROL ,FEATURE_PIXEL_PERFECT_OUTPUT , FEATURE_8BPP_SUPPORTED,
@@ -315,6 +311,7 @@ enum as_drr_support {struct as_init_data {struct hw_asic_id hw_init_data;struct dc_context *ctx; +const struct dal_override_parameters *display_param;struct dc_bios *vbios_override;enum dce_environment dce_environment; };
@@ -330,11 +327,6 @@ void dal_adapter_service_destroy(/* Check if DFS bypass is enabled */ bool dal_adapter_service_is_dfs_bypass_enabled (struct adapter_service *as); - -/* Get the video RAM bit width set on the ASIC */ -uint32_t dal_adapter_service_get_asic_vram_bit_width ( -struct adapter_service *as); -/* Return if a given feature is supported by the ASIC */ bool dal_adapter_service_is_feature_supported (struct adapter_service *as,enum adapter_feature_id feature_id);
@@ -345,12 +337,6 @@ bool dal_adapter_service_get_feature_value(struct adapter_service *as,void *data, uint32_t size); -/* Get I2C information from BIOS */ -bool dal_adapter_service_get_i2c_info ( -struct adapter_service *as, -struct graphics_object_id id, -struct graphics_object_i2c_info *i2c_info); -struct dal_asic_runtime_flags dal_adapter_service_get_asic_runtime_flags (struct adapter_service *as);
drivers/gpu/drm/amd/dal/include/asic_capability_types.h +0 -2
@@ -48,7 +48,6 @@ struct asic_caps { bool WIRELESS_COMPRESSED_AUDIO:1; bool VCE_SUPPORTED:1; bool HPD_CHECK_FOR_EDID:1; - bool NO_VCC_OFF_HPD_POLLING:1; bool NEED_MC_TUNING:1; bool SKIP_PSR_WAIT_FOR_PLL_LOCK_BIT:1; bool DFSBYPASS_DYNAMIC_SUPPORT:1;
@@ -86,7 +85,6 @@ enum asic_data {ASIC_DATA_FIRST =0 ,ASIC_DATA_DCE_VERSION =ASIC_DATA_FIRST ,ASIC_DATA_DCE_VERSION_MINOR , -ASIC_DATA_VRAM_BITWIDTH ,ASIC_DATA_LINEBUFFER_SIZE ,ASIC_DATA_DRAM_BANDWIDTH_EFFICIENCY , ASIC_DATA_MC_LATENCY,
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 43/76 drm/amd/dal: remove unnessary adapter service functions
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
- remove FEATURE_USE_MAX_DISPLAY_CLK. move to dc_debug option
- DFS bypass query bios directly. add debug option
--- .../gpu/drm/amd/dal/dc/adapter/adapter_service.c | 38 ---------------------- drivers/gpu/drm/amd/dal/dc/core/dc.c | 4 +++ drivers/gpu/drm/amd/dal/dc/dc.h | 2 ++ .../amd/dal/dc/gpu/dce110/display_clock_dce110.c | 14 +++++--- .../drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c | 15 +++++---- .../amd/dal/include/adapter_service_interface.h | 9 ----- 6 files changed, 23 insertions(+), 59 deletions(-)
drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c +0 -38
@@ -86,7 +86,6 @@ static const struct feature_source_entry feature_entry_table[] = { {FEATURE_MAXIMIZE_URGENCY_WATERMARKS, false, true}, {FEATURE_MAXIMIZE_STUTTER_MARKS, false, true}, {FEATURE_MAXIMIZE_NBP_MARKS, false, true}, - {FEATURE_USE_MAX_DISPLAY_CLK, false, true}, {FEATURE_ALLOW_EDP_RESOURCE_SHARING, false, true}, {FEATURE_SUPPORT_DP_YUV, false, true}, {FEATURE_SUPPORT_DP_Y_ONLY, false, true},
@@ -94,7 +93,6 @@ static const struct feature_source_entry feature_entry_table[] = { {FEATURE_DCP_BIT_DEPTH_REDUCTION_MODE, 0, false}, {FEATURE_DCP_DITHER_MODE, 0, false}, {FEATURE_DCP_PROGRAMMING_WA, 0, false}, - {FEATURE_ENABLE_DFS_BYPASS, false, true}, {FEATURE_WIRELESS_FULL_TIMING_ADJUSTMENT, false, true}, {FEATURE_WIRELESS_LIMIT_720P, false, true}, {FEATURE_MODIFY_TIMINGS_FOR_WIRELESS, false, true},
@@ -629,42 +627,6 @@ void dal_adapter_service_destroy( *as =NULL ; } -/* -* dal_adapter_service_is_feature_supported -* -* Return if a given feature is supported by the ASIC. The feature has to be -* a boolean type. -*/ -bool dal_adapter_service_is_feature_supported (struct adapter_service *as, -enum adapter_feature_id feature_id) -{ -bool data =0 ; - -dal_adapter_service_get_feature_value (as, feature_id, &data,sizeof (bool )); - -return data; -} - -/* -* dal_adapter_service_is_dfs_bypass_enabled -* -* Check if DFS bypass is enabled -*/ -bool dal_adapter_service_is_dfs_bypass_enabled ( -struct adapter_service *as) -{ -struct dc_bios *bp = as->ctx->dc_bios; - -if (bp->integrated_info ==NULL ) -return false; -if ((bp->integrated_info->gpu_cap_info &DFS_BYPASS_ENABLE ) && -dal_adapter_service_is_feature_supported (as, -FEATURE_ENABLE_DFS_BYPASS )) -return true; -else -return false; -} -struct dal_asic_runtime_flags dal_adapter_service_get_asic_runtime_flags (struct adapter_service *as) {
drivers/gpu/drm/amd/dal/dc/core/dc.c +4 -0
@@ -692,6 +692,10 @@ struct dc *dc_create(const struct dc_init_data *init_params)dm_logger_write (core_dc->ctx->logger,LOG_DC ,"Display Core initialized\n" ); + +/* TODO: missing feature to be enabled */ + core_dc->public.debug.disalbe_dfs_bypass = true; +return &core_dc->public; construct_fail:
drivers/gpu/drm/amd/dal/dc/dc.h +2 -0
@@ -139,6 +139,8 @@ struct dc_debug {bool surface_visual_confirm;bool disable_stutter;bool disable_dcc; +bool disalbe_dfs_bypass; +bool max_disp_clk; };struct dc {
drivers/gpu/drm/amd/dal/dc/gpu/dce110/display_clock_dce110.c +9 -5
@@ -36,6 +36,7 @@#include "../divider_range.h" #include "display_clock_dce110.h" +#include "dc.h" #define FROM_DISPLAY_CLOCK (base) \ container_of(base, struct display_clock_dce110, disp_clk_base)
@@ -670,6 +671,7 @@ static bool display_clock_integrated_info_construct(struct display_clock_dce110 *disp_clk, struct adapter_service *as) { + struct dc_debug *debug = &disp_clk->disp_clk_base.ctx->dc->debug;struct dc_bios *bp = disp_clk->disp_clk_base.ctx->dc_bios;struct integrated_info info;struct firmware_info fw_info;
@@ -730,11 +732,13 @@ static bool display_clock_integrated_info_construct( info.disp_clk_voltage[i].max_supported_clk; } } - disp_clk->dfs_bypass_enabled = -dal_adapter_service_is_dfs_bypass_enabled (as); - disp_clk->use_max_disp_clk = -dal_adapter_service_is_feature_supported (as, -FEATURE_USE_MAX_DISPLAY_CLK ); + + disp_clk->dfs_bypass_enabled = false; +if (!debug->disalbe_dfs_bypass) +if (bp->integrated_info->gpu_cap_info &DFS_BYPASS_ENABLE ) + disp_clk->dfs_bypass_enabled = true; + + disp_clk->use_max_disp_clk = debug->max_disp_clk;return true; }
drivers/gpu/drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c +8 -7
@@ -35,6 +35,7 @@#include "../divider_range.h" #include "display_clock_dce80.h" +#include "dc.h" #define DCE80_DFS_BYPASS_THRESHOLD_KHZ 100000
@@ -754,6 +755,7 @@ static bool display_clock_integrated_info_construct(struct display_clock_dce80 *disp_clk, struct adapter_service *as) { + struct dc_debug *debug = &disp_clk->disp_clk.ctx->dc->debug;struct dc_bios *bp = disp_clk->disp_clk.ctx->dc_bios;struct integrated_info info = { { {0 } } };struct firmware_info fw_info = { {0 } };
@@ -809,14 +811,13 @@ static bool display_clock_integrated_info_construct( } } - disp_clk->dfs_bypass_enabled = -dal_adapter_service_is_dfs_bypass_enabled (as) && -dal_adapter_service_is_feature_supported (as, -FEATURE_ENABLE_DFS_BYPASS ); + disp_clk->dfs_bypass_enabled = false; +if (!debug->disalbe_dfs_bypass) +if (bp->integrated_info->gpu_cap_info &DFS_BYPASS_ENABLE ) + disp_clk->dfs_bypass_enabled = true; + + disp_clk->use_max_disp_clk = debug->max_disp_clk; - disp_clk->use_max_disp_clk = -dal_adapter_service_is_feature_supported (as, -FEATURE_USE_MAX_DISPLAY_CLK );return true; }
drivers/gpu/drm/amd/dal/include/adapter_service_interface.h +0 -9
@@ -76,11 +76,9 @@ enum adapter_feature_id {FEATURE_MAXIMIZE_URGENCY_WATERMARKS ,FEATURE_MAXIMIZE_STUTTER_MARKS ,FEATURE_MAXIMIZE_NBP_MARKS , -FEATURE_USE_MAX_DISPLAY_CLK ,FEATURE_ALLOW_EDP_RESOURCE_SHARING ,FEATURE_SUPPORT_DP_YUV ,FEATURE_SUPPORT_DP_Y_ONLY , -FEATURE_ENABLE_DFS_BYPASS ,FEATURE_LB_HIGH_RESOLUTION ,FEATURE_DP_DISPLAY_FORCE_SS_ENABLE , FEATURE_REPORT_CE_MODE_ONLY,
@@ -324,13 +322,6 @@ struct adapter_service *dal_adapter_service_create(void dal_adapter_service_destroy (struct adapter_service **as); -/* Check if DFS bypass is enabled */ -bool dal_adapter_service_is_dfs_bypass_enabled (struct adapter_service *as); - -/* Return if a given feature is supported by the ASIC */ -bool dal_adapter_service_is_feature_supported (struct adapter_service *as, -enum adapter_feature_id feature_id); -/* Get the cached value of a given feature */ bool dal_adapter_service_get_feature_value(struct adapter_service *as, const enum adapter_feature_id feature_id,
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 44/76 drm/amd/dal: Fix null pointer missed in earlier refactor
In reply to a message not in the archive--- drivers/gpu/drm/amd/dal/dc/gpu/dce110/display_clock_dce110.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/dal/dc/gpu/dce110/display_clock_dce110.c +1 -1
@@ -930,7 +930,7 @@ static bool dal_display_clock_dce110_construct( struct adapter_service *as) {struct display_clock *dc_base = &dc110->disp_clk_base; -struct dc_bios *bp = dc110->disp_clk_base.ctx->dc_bios; +struct dc_bios *bp = ctx->dc_bios;if (NULL == as)return false;
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 45/76 drm/amd/dal: fix typo disalbe_dfs_bypass
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
--- drivers/gpu/drm/amd/dal/dc/core/dc.c | 2 +- drivers/gpu/drm/amd/dal/dc/dc.h | 2 +- drivers/gpu/drm/amd/dal/dc/gpu/dce110/display_clock_dce110.c | 2 +- drivers/gpu/drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/dal/dc/core/dc.c +1 -1
@@ -694,7 +694,7 @@ struct dc *dc_create(const struct dc_init_data *init_params)/* TODO: missing feature to be enabled */ - core_dc->public.debug.disalbe_dfs_bypass = true; + core_dc->public.debug.disable_dfs_bypass = true;return &core_dc->public;
drivers/gpu/drm/amd/dal/dc/dc.h +1 -1
@@ -139,7 +139,7 @@ struct dc_debug {bool surface_visual_confirm;bool disable_stutter;bool disable_dcc; -bool disalbe_dfs_bypass; +bool disable_dfs_bypass;bool max_disp_clk; };
drivers/gpu/drm/amd/dal/dc/gpu/dce110/display_clock_dce110.c +1 -1
@@ -734,7 +734,7 @@ static bool display_clock_integrated_info_construct( } disp_clk->dfs_bypass_enabled = false; -if (!debug->disalbe_dfs_bypass) +if (!debug->disable_dfs_bypass)if (bp->integrated_info->gpu_cap_info &DFS_BYPASS_ENABLE ) disp_clk->dfs_bypass_enabled = true;
drivers/gpu/drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c +1 -1
@@ -812,7 +812,7 @@ static bool display_clock_integrated_info_construct( } disp_clk->dfs_bypass_enabled = false; -if (!debug->disalbe_dfs_bypass) +if (!debug->disable_dfs_bypass)if (bp->integrated_info->gpu_cap_info &DFS_BYPASS_ENABLE ) disp_clk->dfs_bypass_enabled = true;
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 46/76 drm/amd/dal: Remove unused function from dc
In reply to a message not in the archiveFrom: Ding Wang <[email protected]>
--- drivers/gpu/drm/amd/dal/dc/core/dc.c | 8 -------- drivers/gpu/drm/amd/dal/dc/dm_services.h | 3 --- 2 files changed, 11 deletions(-)
drivers/gpu/drm/amd/dal/dc/core/dc.c +0 -8
@@ -902,12 +902,6 @@ static bool targets_changed(return false; } -void pplib_apply_safe_state ( -const struct core_dc *dc) -{ -dm_pp_apply_safe_state (dc->ctx); -} -static void fill_display_configs (const struct validate_context *context,struct dm_pp_display_configuration *pp_display_cfg)
@@ -1110,8 +1104,6 @@ bool dc_commit_targets( goto fail; } -pplib_apply_safe_state (core_dc); -if (!dcb->funcs->is_accelerated_mode (dcb)) { core_dc->hwss.enable_accelerated_mode (core_dc); }
drivers/gpu/drm/amd/dal/dc/dm_services.h +0 -3
@@ -215,9 +215,6 @@ bool dm_pp_notify_wm_clock_changes(const struct dc_context *ctx, struct dm_pp_wm_sets_with_clock_ranges *wm_with_clock_ranges); -bool dm_pp_apply_safe_state ( -const struct dc_context *ctx); -/* DAL calls this function to notify PP about completion of Mode Set. * For PP it means that current DCE clocks are those which were returned * by dc_service_pp_pre_dce_clock_change(), in the 'output' parameter.
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 47/76 drm/amd/dal: remove dal_adapter_service_should_optimize
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
- remove runtime_flags. only flag used is SKIP_POWER_DOWN_ON_RESUME and = 1 for all platform
- remove optimization_feature. optimization are default behavior
--- drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c | 5 -- .../gpu/drm/amd/dal/dc/adapter/adapter_service.c | 56 ---------------------- .../amd/dal/dc/asic_capability/asic_capability.c | 1 - drivers/gpu/drm/amd/dal/dc/core/dc.c | 1 - drivers/gpu/drm/amd/dal/dc/dc_types.h | 26 ---------- drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c | 6 +-- .../amd/dal/include/adapter_service_interface.h | 3 -- .../amd/dal/include/asic_capability_interface.h | 1 - .../drm/amd/dal/include/grph_object_ctrl_defs.h | 30 ------------ 9 files changed, 2 insertions(+), 127 deletions(-)
drivers/gpu/drm/amd/dal/amdgpu_dm/amdgpu_dm.c +0 -5
@@ -280,11 +280,6 @@ int amdgpu_dm_init(struct amdgpu_device *adev)/* TODO: initialize init_data.asic_id.vram_type here!!!! */ init_data.asic_id.atombios_base_address = adev->mode_info.atom_context->bios; - init_data.asic_id.runtime_flags.flags.bits.SKIP_POWER_DOWN_ON_RESUME =1 ; - -if ((adev->asic_type ==CHIP_CARRIZO ) || - (adev->asic_type ==CHIP_STONEY )) - init_data.asic_id.runtime_flags.flags.bits.GNB_WAKEUP_SUPPORTED =1 ; init_data.driver = adev;
drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c +0 -56
65 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/asic_capability/asic_capability.c +0 -1
@@ -54,7 +54,6 @@ static bool construct(memset (cap->data,0 ,sizeof (cap->data));/* ASIC data */ - cap->runtime_flags = init->runtime_flags; cap->data[ASIC_DATA_MAX_UNDERSCAN_PERCENTAGE ] =10 ; cap->data[ASIC_DATA_VIEWPORT_PIXEL_GRANULARITY ] =4 ; cap->data[ASIC_DATA_DOWNSCALE_LIMIT ] =200 ;
drivers/gpu/drm/amd/dal/dc/core/dc.c +0 -1
@@ -181,7 +181,6 @@ static struct adapter_service *create_as( init_data.hw_init_data.fake_paths_num = init->asic_id.fake_paths_num; init_data.hw_init_data.feature_flags = init->asic_id.feature_flags; init_data.hw_init_data.hw_internal_rev = init->asic_id.hw_internal_rev; - init_data.hw_init_data.runtime_flags = init->asic_id.runtime_flags; init_data.hw_init_data.vram_width = init->asic_id.vram_width; init_data.hw_init_data.vram_type = init->asic_id.vram_type;
drivers/gpu/drm/amd/dal/dc/dc_types.h +0 -26
@@ -61,31 +61,6 @@ enum dce_environment {#define IS_DIAG_DC (dce_environment) \ (IS_FPGA_MAXIMUS_DC(dce_environment) || (dce_environment == DCE_ENV_DIAG)) -/********************************/ -/* -* ASIC Runtime Flags -*/ -struct dal_asic_runtime_flags { -union { -uint32_t raw; -struct { -uint32_t EMULATE_REPLUG_ON_CAP_CHANGE:1 ; -uint32_t SUPPORT_XRBIAS:1 ; -uint32_t SKIP_POWER_DOWN_ON_RESUME:1 ; -uint32_t FULL_DETECT_ON_RESUME:1 ; -uint32_t GSL_FRAMELOCK:1 ; -uint32_t NO_LOW_BPP_MODES:1 ; -uint32_t BLOCK_ON_INITIAL_DETECTION:1 ; -uint32_t OPTIMIZED_DISPLAY_PROGRAMMING_ON_BOOT:1 ; -uint32_t DRIVER_CONTROLLED_BRIGHTNESS:1 ; -uint32_t MODIFIABLE_FRAME_DURATION:1 ; -uint32_t MIRACAST_SUPPORTED:1 ; -uint32_t CONNECTED_STANDBY_SUPPORTED:1 ; -uint32_t GNB_WAKEUP_SUPPORTED:1 ; - } bits; - } flags; -}; -struct hw_asic_id {uint32_t chip_id;uint32_t chip_family;
@@ -94,7 +69,6 @@ struct hw_asic_id {uint32_t vram_type;uint32_t vram_width;uint32_t feature_flags; -struct dal_asic_runtime_flags runtime_flags;uint32_t fake_paths_num;void *atombios_base_address; };
drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c +2 -4
@@ -1359,10 +1359,8 @@ void dce110_link_encoder_disable_output(struct bp_transmitter_control cntl = {0 };enum bp_result result; -if (!is_dig_enabled (enc110) && enc110->base.adapter_service && -dal_adapter_service_should_optimize ( - enc110->base.adapter_service, -OF_SKIP_POWER_DOWN_INACTIVE_ENCODER )) { +if (!is_dig_enabled (enc110)) { +/* OF_SKIP_POWER_DOWN_INACTIVE_ENCODER */ return ; }/* Power-down RX and disable GPU PHY should be paired.
drivers/gpu/drm/amd/dal/include/adapter_service_interface.h +0 -3
@@ -328,9 +328,6 @@ bool dal_adapter_service_get_feature_value(struct adapter_service *as,void *data, uint32_t size); -struct dal_asic_runtime_flags dal_adapter_service_get_asic_runtime_flags ( -struct adapter_service *as); -/* Reports whether driver settings allow requested optimization */ bool dal_adapter_service_should_optimize (struct adapter_service *as,enum optimization_feature feature);
drivers/gpu/drm/amd/dal/include/asic_capability_interface.h +0 -1
@@ -38,7 +38,6 @@ struct asic_capability {struct asic_caps caps;struct asic_stereo_3d_caps stereo_3d_caps;struct asic_bugs bugs; -struct dal_asic_runtime_flags runtime_flags;uint32_t data[ASIC_DATA_MAX_NUMBER ]; };
drivers/gpu/drm/amd/dal/include/grph_object_ctrl_defs.h +0 -30
@@ -381,36 +381,6 @@ struct bios_event_info {bool backlight_changed; }; -/* Bitvector and bitfields of possible optimizations -#IMPORTANT# Keep bitfields match bitvector! */ -enum optimization_feature { -/* Don't do HW programming on panels that were enabled by VBIOS */ -OF_SKIP_HW_PROGRAMMING_ON_ENABLED_EMBEDDED_DISPLAY =0x1 , -OF_SKIP_RESET_OF_ALL_HW_ON_S3RESUME =0x2 , -OF_SKIP_HW_RESET_OF_EMBEDDED_DISPLAY_ON_S3RESUME =0x4 , -OF_SKIP_POWER_UP_VBIOS_ENABLED_ENCODER =0x8 , -/* Do not turn off VCC while powering down on boot or resume */ -OF_KEEP_VCC_DURING_POWER_DOWN_ON_BOOT_OR_RESUME =0x10 , -/* Do not turn off VCC while performing SetMode */ -OF_KEEP_VCC_DURING_SET_MODE =0x20 , -OF_DO_NOT_WAIT_FOR_HPD_LOW =0x40 , -OF_SKIP_POWER_DOWN_INACTIVE_ENCODER =0x80 -}; - -/* Bitvector and bitfields of performance measurements -#IMPORTANT# Keep bitfields match bitvector! */ - -enum { -PERF_MEASURE_POWERCODE_OFFSET =0x0 , -PERF_MEASURE_POWER_CODE_MASK =0xFF , -PERF_MEASURE_POWER_STATE_OFFSET =8 , -PERF_MEASURE_POWER_STATE_MASK =0x000FF00 , -PERF_MEASURE_PREV_POWER_STATE_OFFSET =16 , -PERF_MEASURE_PREV_POWER_STATE_MASK =0x00FF0000 , -PERF_MEASURE_DISPLAY_INDEX_OFFSET =24 , -PERF_MEASURE_DISPLAY_INDEX_MASK =0xFF000000 -}; -enum {HDMI_PIXEL_CLOCK_IN_KHZ_297 =297000 ,TMDS_PIXEL_CLOCK_IN_KHZ_165 =165000
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 48/76 drm/amd/dal: remove dal_adapter_service_get_feature_value
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
- STUTTER_MODE_NO_DMIF_BUFFER_ALLOCATION always = 0.
-- this is a debug option when dmif first got introduced. no need to keep it. always allocate DMIF
--- .../gpu/drm/amd/dal/dc/adapter/adapter_service.c | 59 ---------------------- .../dc/asic_capability/carrizo_asic_capability.c | 1 - .../dc/asic_capability/hawaii_asic_capability.c | 3 -- .../dc/asic_capability/polaris10_asic_capability.c | 1 - .../dal/dc/asic_capability/tonga_asic_capability.c | 1 - .../gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c | 26 ++++------ .../gpu/drm/amd/dal/dc/dce110/dce110_mem_input.h | 23 --------- .../gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.c | 5 -- drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.c | 14 ++--- drivers/gpu/drm/amd/dal/dc/inc/hw/mem_input.h | 7 +++ .../amd/dal/include/adapter_service_interface.h | 17 +------ .../drm/amd/dal/include/asic_capability_types.h | 1 - 12 files changed, 21 insertions(+), 137 deletions(-)
drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c +0 -59
@@ -100,7 +100,6 @@ static const struct feature_source_entry feature_entry_table[] = { {FEATURE_LB_HIGH_RESOLUTION, false, true}, {FEATURE_MAX_CONTROLLER_NUM, 0, false}, {FEATURE_DRR_SUPPORT, AS_DRR_SUPPORT_ENABLED, false}, - {FEATURE_STUTTER_MODE, 15, false}, {FEATURE_DP_DISPLAY_FORCE_SS_ENABLE, false, true}, {FEATURE_REPORT_CE_MODE_ONLY, false, true}, {FEATURE_ALLOW_OPTIMIZED_MODE_AS_DEFAULT, false, true},
@@ -360,10 +359,6 @@ static bool get_feature_value_from_data_sources( *data = as->asic_cap->caps.HPD_CHECK_FOR_EDID;break ; -case FEATURE_STUTTER_MODE : - *data = as->asic_cap->data[ASIC_DATA_STUTTERMODE ]; -break ; -case FEATURE_8BPP_SUPPORTED : *data = as->asic_cap->caps.SUPPORT_8BPP;break ;
@@ -627,58 +622,4 @@ void dal_adapter_service_destroy( *as =NULL ; } -/* -* dal_adapter_service_get_feature_value -* -* Get the cached value of a given feature. This value can be a boolean, int, -* or characters. -*/ -bool dal_adapter_service_get_feature_value (struct adapter_service *as, -const enum adapter_feature_id feature_id, -void *data, -uint32_t size) -{ -uint32_t entry_idx =0 ; -uint32_t set_idx =0 ; -uint32_t set_internal_idx =0 ; - -if (feature_id >=FEATURE_MAXIMUM || feature_id <=FEATURE_UNKNOWN ) { -ASSERT_CRITICAL (false); -return false; - } - -if (data ==NULL ) { -ASSERT_CRITICAL (false); -return false; - } - - entry_idx =lookup_feature_entry (as, feature_id); - set_idx = (uint32_t )((feature_id -1 )/32 ); - set_internal_idx = (uint32_t )((feature_id -1 ) %32 ); - -if (entry_idx >=get_feature_entries_num ()) { -/* Cannot find this entry */ -ASSERT_CRITICAL (false); -return false; - } - -if (feature_entry_table[entry_idx].is_boolean_type) { -if (size !=sizeof (bool )) { -ASSERT_CRITICAL (false); -return false; - } - - *(bool *)data =get_bool_value (as->adapter_feature_set[set_idx], - set_internal_idx); - }else { -if (size !=sizeof (uint32_t )) { -ASSERT_CRITICAL (false); -return false; - } - - *(uint32_t *)data = as->adapter_feature_set[set_idx]; - } - -return true; -}
drivers/gpu/drm/amd/dal/dc/asic_capability/carrizo_asic_capability.c +0 -1
@@ -53,7 +53,6 @@ void carrizo_asic_capability_create(struct asic_capability *cap, cap->data[ASIC_DATA_LINEBUFFER_SIZE ] =1712 *144 ; cap->data[ASIC_DATA_DRAM_BANDWIDTH_EFFICIENCY ] =45 ; cap->data[ASIC_DATA_MC_LATENCY ] =5000 ; - cap->data[ASIC_DATA_STUTTERMODE ] =0x200A ; cap->data[ASIC_DATA_VIEWPORT_PIXEL_GRANULARITY ] =2 ; cap->data[ASIC_DATA_MEMORYTYPE_MULTIPLIER ] =2 ; cap->data[ASIC_DATA_DOWNSCALE_LIMIT ] =150 ;
drivers/gpu/drm/amd/dal/dc/asic_capability/hawaii_asic_capability.c +0 -3
@@ -63,9 +63,6 @@ void dal_hawaii_asic_capability_create(struct asic_capability *cap, cap->data[ASIC_DATA_LINEBUFFER_SIZE ] =1712 *144 ; cap->data[ASIC_DATA_DRAM_BANDWIDTH_EFFICIENCY ] =70 ; cap->data[ASIC_DATA_MC_LATENCY ] =5000 ;/* units of ns */ - -/* StutterModeEnhanced; Quad DMIF Buffer */ - cap->data[ASIC_DATA_STUTTERMODE ] =0x2002 ; cap->data[ASIC_DATA_PATH_NUM_PER_DPMST_CONNECTOR ] =4 ; cap->data[ASIC_DATA_VIEWPORT_PIXEL_GRANULARITY ] =2 ;
drivers/gpu/drm/amd/dal/dc/asic_capability/polaris10_asic_capability.c +0 -1
@@ -54,7 +54,6 @@ void polaris10_asic_capability_create(struct asic_capability *cap, cap->data[ASIC_DATA_DRAM_BANDWIDTH_EFFICIENCY ] =70 ; cap->data[ASIC_DATA_MC_LATENCY ] =3000 ; - cap->data[ASIC_DATA_STUTTERMODE ] =0x200A ; cap->data[ASIC_DATA_VIEWPORT_PIXEL_GRANULARITY ] =2 ; cap->data[ASIC_DATA_MEMORYTYPE_MULTIPLIER ] =4 ;
drivers/gpu/drm/amd/dal/dc/asic_capability/tonga_asic_capability.c +0 -1
@@ -50,7 +50,6 @@ void tonga_asic_capability_create(struct asic_capability *cap, cap->data[ASIC_DATA_LINEBUFFER_SIZE ] =1712 *144 ; cap->data[ASIC_DATA_DRAM_BANDWIDTH_EFFICIENCY ] =70 ; cap->data[ASIC_DATA_MC_LATENCY ] =5000 ; - cap->data[ASIC_DATA_STUTTERMODE ] =0x2002 ; cap->data[ASIC_DATA_PATH_NUM_PER_DPMST_CONNECTOR ] =4 ; cap->data[ASIC_DATA_VIEWPORT_PIXEL_GRANULARITY ] =2 ; cap->data[ASIC_DATA_MIN_DISPCLK_FOR_UNDERSCAN ] =300000 ;
drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c +9 -17
@@ -836,10 +836,6 @@ void dce110_allocate_mem_input(uint32_t field;uint32_t pix_dur; -if (bm110->supported_stutter_mode - &STUTTER_MODE_NO_DMIF_BUFFER_ALLOCATION ) - goto register_underflow_int; -/*Allocate DMIF buffer*/ value =dm_read_reg (mi->ctx, addr); field = get_reg_field_value(
@@ -950,14 +946,10 @@ void dce110_free_mem_input(struct dce110_mem_input *bm_dce110 =TO_DCE110_MEM_INPUT (mi);uint32_t value; -if (!(bm_dce110->supported_stutter_mode & -STUTTER_MODE_NO_DMIF_BUFFER_ALLOCATION )) { - -/* De-allocate DMIF buffer first */ -if (mmPIPE0_DMIF_BUFFER_CONTROL + bm_dce110->offsets.pipe !=0 ) -deallocate_dmif_buffer_helper ( - mi->ctx, bm_dce110->offsets.pipe); - } +/* De-allocate DMIF buffer first */ +if (mmPIPE0_DMIF_BUFFER_CONTROL + bm_dce110->offsets.pipe !=0 ) +deallocate_dmif_buffer_helper ( + mi->ctx, bm_dce110->offsets.pipe);/* TODO: unregister underflow interrupt unregisterInterrupt();
@@ -1005,6 +997,11 @@ bool dce110_mem_input_construct(uint32_t inst, const struct dce110_mem_input_reg_offsets *offsets) { +/* supported stutter method +* STUTTER_MODE_ENHANCED +* STUTTER_MODE_QUAD_DMIF_BUFFER +* STUTTER_MODE_WATERMARK_NBP_STATE +*/ mem_input110->base.funcs = &dce110_mem_input_funcs; mem_input110->base.ctx = ctx;
@@ -1012,10 +1009,5 @@ bool dce110_mem_input_construct( mem_input110->offsets = *offsets; - mem_input110->supported_stutter_mode =0 ; -dal_adapter_service_get_feature_value (as,FEATURE_STUTTER_MODE , - &(mem_input110->supported_stutter_mode), -sizeof (mem_input110->supported_stutter_mode)); -return true; }
drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.h +0 -23
@@ -36,32 +36,9 @@ struct dce110_mem_input_reg_offsets {uint32_t pipe; }; -enum stutter_mode_type { -/* TODO: Clean up these enums, right now only one is being used -* STUTTER_MODE_LEGACY = 0X00000001, -* STUTTER_MODE_ENHANCED = 0X00000002, -* STUTTER_MODE_FID_NBP_STATE = 0X00000004, -* STUTTER_MODE_WATERMARK_NBP_STATE = 0X00000008, -* STUTTER_MODE_SINGLE_DISPLAY_MODEL = 0X00000010, -* STUTTER_MODE_MIXED_DISPLAY_MODEL = 0X00000020, -* STUTTER_MODE_DUAL_DMIF_BUFFER = 0X00000040, -*/ -STUTTER_MODE_NO_DMIF_BUFFER_ALLOCATION =0X00000080 , -/* -* STUTTER_MODE_NO_ADVANCED_REQUEST = 0X00000100, -* STUTTER_MODE_NO_LB_RESET = 0X00000200, -* STUTTER_MODE_DISABLED = 0X00000400, -* STUTTER_MODE_AGGRESSIVE_MARKS = 0X00000800, -* STUTTER_MODE_URGENCY = 0X00001000, -* STUTTER_MODE_QUAD_DMIF_BUFFER = 0X00002000, -* STUTTER_MODE_NOT_USED = 0X00008000 -*/ -}; -struct dce110_mem_input {struct mem_input base;struct dce110_mem_input_reg_offsets offsets; -uint32_t supported_stutter_mode; }; bool dce110_mem_input_construct(
drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.c +0 -5
@@ -1071,11 +1071,6 @@ bool dce110_mem_input_v_construct( mem_input110->offsets = dce110_mi_v_reg_offsets[0 ]; - mem_input110->supported_stutter_mode =0 ; -dal_adapter_service_get_feature_value (as,FEATURE_STUTTER_MODE , - &(mem_input110->supported_stutter_mode), -sizeof (mem_input110->supported_stutter_mode)); -return true; }
drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.c +4 -10
@@ -108,10 +108,6 @@ static void allocate_mem_input(uint32_t value;uint32_t field; -if (bm80->supported_stutter_mode - &STUTTER_MODE_NO_DMIF_BUFFER_ALLOCATION ) - goto register_underflow_int; -/*Allocate DMIF buffer*/ value =dm_read_reg (mi->ctx, addr); field = get_reg_field_value(
@@ -194,7 +190,10 @@ bool dce80_mem_input_construct(uint32_t inst, const struct dce110_mem_input_reg_offsets *offsets) { - +/* supported stutter method +* STUTTER_MODE_ENHANCED +* STUTTER_MODE_QUAD_DMIF_BUFFER +*/ mem_input80->base.funcs = &dce80_mem_input_funcs; mem_input80->base.ctx = ctx;
@@ -202,11 +201,6 @@ bool dce80_mem_input_construct( mem_input80->offsets = *offsets; - mem_input80->supported_stutter_mode =0 ; -dal_adapter_service_get_feature_value (as,FEATURE_STUTTER_MODE , - &(mem_input80->supported_stutter_mode), -sizeof (mem_input80->supported_stutter_mode)); -return true; }
drivers/gpu/drm/amd/dal/dc/inc/hw/mem_input.h +7 -0
@@ -29,12 +29,19 @@#include "include/grph_object_id.h" #include "inc/bandwidth_calcs.h" +struct stutter_modes { +bool enhanced; +bool quad_dmif_buffer; +bool watermark_nb_pstate; +}; +struct mem_input {struct mem_input_funcs *funcs;struct dc_context *ctx;struct dc_plane_address request_address;struct dc_plane_address current_address;uint32_t inst; +struct stutter_modes stutter_mode; };struct mem_input_funcs {
drivers/gpu/drm/amd/dal/include/adapter_service_interface.h +1 -16
@@ -149,13 +149,8 @@ enum adapter_feature_id {FEATURE_SET_10_START =FEATURE_DRR_SUPPORT ,FEATURE_SET_10_END =FEATURE_SET_10_START +31 , -/* UInt set, 1 entry: Stutter mode support */ -FEATURE_STUTTER_MODE =FEATURE_SET_10_END +1 , -FEATURE_SET_11_START =FEATURE_STUTTER_MODE , -FEATURE_SET_11_END =FEATURE_SET_11_START +31 , -/* UInt set, 1 entry: Measure PSR setup time */ -FEATURE_PSR_SETUP_TIME_TEST =FEATURE_SET_11_END +1 , +FEATURE_PSR_SETUP_TIME_TEST =FEATURE_SET_10_END +1 ,FEATURE_SET_12_START =FEATURE_PSR_SETUP_TIME_TEST , FEATURE_SET_12_END = FEATURE_SET_12_START + 31,
@@ -322,14 +317,4 @@ struct adapter_service *dal_adapter_service_create(void dal_adapter_service_destroy (struct adapter_service **as); -/* Get the cached value of a given feature */ -bool dal_adapter_service_get_feature_value (struct adapter_service *as, -const enum adapter_feature_id feature_id, -void *data, -uint32_t size); - -/* Reports whether driver settings allow requested optimization */ -bool dal_adapter_service_should_optimize ( -struct adapter_service *as,enum optimization_feature feature); -#endif /* __DAL_ADAPTER_SERVICE_INTERFACE_H__ */
drivers/gpu/drm/amd/dal/include/asic_capability_types.h +0 -1
@@ -90,7 +90,6 @@ enum asic_data {ASIC_DATA_MC_LATENCY ,ASIC_DATA_MC_LATENCY_SLOW ,ASIC_DATA_MEMORYTYPE_MULTIPLIER , -ASIC_DATA_STUTTERMODE ,ASIC_DATA_PATH_NUM_PER_DPMST_CONNECTOR ,ASIC_DATA_MAX_UNDERSCAN_PERCENTAGE , ASIC_DATA_VIEWPORT_PIXEL_GRANULARITY,
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 49/76 drm/amd/dal: remove adapter_service from
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
- bios, clock source. compressor, mem_input, timing_generator, link_encoder
--- .../gpu/drm/amd/dal/dc/adapter/adapter_service.c | 2 +- drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c | 22 +++++++++------------- drivers/gpu/drm/amd/dal/dc/core/dc.c | 1 - drivers/gpu/drm/amd/dal/dc/core/dc_link.c | 1 - drivers/gpu/drm/amd/dal/dc/dc_bios_types.h | 3 +-- drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c | 4 ---- .../gpu/drm/amd/dal/dc/dce100/dce100_resource.c | 9 ++++----- .../drm/amd/dal/dc/dce110/dce110_clock_source.c | 1 - .../gpu/drm/amd/dal/dc/dce110/dce110_compressor.c | 8 +++----- .../gpu/drm/amd/dal/dc/dce110/dce110_compressor.h | 5 ++--- .../gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c | 2 -- .../gpu/drm/amd/dal/dc/dce110/dce110_mem_input.h | 1 - .../gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.c | 3 +-- .../gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.h | 3 +-- .../gpu/drm/amd/dal/dc/dce110/dce110_resource.c | 13 ++++++------- .../amd/dal/dc/dce110/dce110_timing_generator.c | 4 ---- .../amd/dal/dc/dce110/dce110_timing_generator.h | 1 - .../amd/dal/dc/dce110/dce110_timing_generator_v.c | 4 ---- .../amd/dal/dc/dce110/dce110_timing_generator_v.h | 1 - .../gpu/drm/amd/dal/dc/dce112/dce112_compressor.c | 7 +++---- .../gpu/drm/amd/dal/dc/dce112/dce112_compressor.h | 5 ++--- .../gpu/drm/amd/dal/dc/dce112/dce112_mem_input.c | 3 +-- .../gpu/drm/amd/dal/dc/dce112/dce112_mem_input.h | 1 - .../gpu/drm/amd/dal/dc/dce112/dce112_resource.c | 6 +++--- .../gpu/drm/amd/dal/dc/dce80/dce80_compressor.c | 9 +++------ .../gpu/drm/amd/dal/dc/dce80/dce80_compressor.h | 5 ++--- drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.c | 1 - drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.h | 1 - drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c | 9 ++++----- .../drm/amd/dal/dc/dce80/dce80_timing_generator.c | 5 ----- .../drm/amd/dal/dc/dce80/dce80_timing_generator.h | 1 - .../amd/dal/dc/gpu/dce110/display_clock_dce110.c | 16 +++++----------- .../amd/dal/dc/gpu/dce112/display_clock_dce112.c | 3 +-- .../drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c | 21 +++++++-------------- .../drm/amd/dal/dc/gpu/dce80/display_clock_dce80.h | 3 +-- drivers/gpu/drm/amd/dal/dc/gpu/display_clock.c | 2 -- drivers/gpu/drm/amd/dal/dc/gpu/display_clock.h | 1 - drivers/gpu/drm/amd/dal/dc/inc/compressor.h | 1 + drivers/gpu/drm/amd/dal/dc/inc/hw/link_encoder.h | 1 - .../drm/amd/dal/dc/virtual/virtual_link_encoder.c | 2 -- .../drm/amd/dal/include/bios_parser_interface.h | 1 - .../drm/amd/dal/include/display_clock_interface.h | 9 +++------ 42 files changed, 64 insertions(+), 137 deletions(-)
drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c +1 -1
@@ -548,7 +548,7 @@ static bool adapter_service_construct( dcb = as->ctx->dc_bios; - dcb->funcs->post_init (dcb, as); + dcb->funcs->post_init (dcb);/* Generate backlight translation table and initializes other brightness properties */
drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c +9 -13
@@ -2923,7 +2923,7 @@ static uint32_t get_support_mask_for_device_id(struct device_id device_id)*/ static bool i2c_read ( -struct adapter_service *as, +struct bios_parser *bp,struct graphics_object_i2c_info *i2c_info,uint8_t *buffer,uint32_t length)
@@ -2936,7 +2936,7 @@ static bool i2c_read( i2c_info->i2c_hw_assist, i2c_info->i2c_line }; - ddc =dal_gpio_create_ddc (as->ctx->gpio_service, + ddc =dal_gpio_create_ddc (bp->base.ctx->gpio_service, i2c_info->gpio_info.clk_a_register_index, (1 << i2c_info->gpio_info.clk_a_shift), &hw_info);
@@ -2986,7 +2986,6 @@ static bool i2c_read(*/ static enum bp_result get_ext_display_connection_info (struct bios_parser *bp, -struct adapter_service *as,ATOM_OBJECT *opm_object,ATOM_EXTERNAL_DISPLAY_CONNECTION_INFO *ext_display_connection_info_tbl) {
@@ -3013,7 +3012,7 @@ static enum bp_result get_ext_display_connection_info( BP_RESULT_OK)return BP_RESULT_BADBIOSTABLE ; -if (i2c_read (as, +if (i2c_read (bp, &i2c_info, (uint8_t *)ext_display_connection_info_tbl,sizeof (ATOM_EXTERNAL_DISPLAY_CONNECTION_INFO ))) {
@@ -3333,8 +3332,7 @@ static ATOM_CONNECTOR_HPDPIN_LUT_RECORD *get_ext_connector_hpd_pin_lut_record(* */ static enum bp_result patch_bios_image_from_ext_display_connection_info ( -struct bios_parser *bp, -struct adapter_service *as) +struct bios_parser *bp) {ATOM_OBJECT_TABLE *connector_tbl;uint32_t connector_tbl_offset;
@@ -3374,7 +3372,7 @@ static enum bp_result patch_bios_image_from_ext_display_connection_info( connector_tbl =GET_IMAGE (ATOM_OBJECT_TABLE , connector_tbl_offset);/* Read Connector info table from EEPROM through i2c */ -if (get_ext_display_connection_info (bp, as, +if (get_ext_display_connection_info (bp, opm_object, &ext_display_connection_info_tbl) !=BP_RESULT_OK ) {
@@ -3570,8 +3568,7 @@ static enum bp_result patch_bios_image_from_ext_display_connection_info(* */ -static void process_ext_display_connection_info (struct bios_parser *bp, -struct adapter_service *as) +static void process_ext_display_connection_info (struct bios_parser *bp) {ATOM_OBJECT_TABLE *connector_tbl;uint32_t connector_tbl_offset;
@@ -3626,7 +3623,7 @@ static void process_ext_display_connection_info(struct bios_parser *bp,/* Step 2: (only if MXM connector found) Patch BIOS image with * info from external module */ if (mxm_connector_found && -patch_bios_image_from_ext_display_connection_info (bp, as) != +patch_bios_image_from_ext_display_connection_info (bp) !=BP_RESULT_OK ) {/* Patching the bios image has failed. We will copy * again original image provided and afterwards
@@ -3660,12 +3657,11 @@ static void process_ext_display_connection_info(struct bios_parser *bp, } } -static void bios_parser_post_init (struct dc_bios *dcb, -struct adapter_service *as) +static void bios_parser_post_init (struct dc_bios *dcb) {struct bios_parser *bp =BP_FROM_DCB (dcb); -process_ext_display_connection_info (bp, as); +process_ext_display_connection_info (bp); } static bool bios_parser_is_accelerated_mode(
drivers/gpu/drm/amd/dal/dc/core/dc.c +0 -1
@@ -139,7 +139,6 @@ static bool create_links( link->link_id.enum_id =ENUM_ID_1 ; link->link_enc =dm_alloc (sizeof (*link->link_enc)); - enc_init.adapter_service = as; enc_init.ctx = dc->ctx; enc_init.channel =CHANNEL_ID_UNKNOWN ; enc_init.hpd_source =HPD_SOURCEID_UNKNOWN ;
drivers/gpu/drm/amd/dal/dc/core/dc_link.c +0 -1
@@ -1032,7 +1032,6 @@ static bool construct(dal_ddc_get_line (dal_ddc_service_get_ddc_pin (link->ddc)); - enc_init_data.adapter_service = as; enc_init_data.ctx = dc_ctx; bp_funcs->get_src_obj (dc_ctx->dc_bios, link->link_id,0 , &enc_init_data.encoder); enc_init_data.connector = link->link_id;
drivers/gpu/drm/amd/dal/dc/dc_bios_types.h +1 -2
@@ -199,8 +199,7 @@ struct dc_vbios_funcs {enum controller_id controller_id, enum bp_pipe_control_action action); -void (*post_init)(struct dc_bios *bios, -struct adapter_service *as); +void (*post_init)(struct dc_bios *bios);void (*bios_parser_destroy)(struct dc_bios **dcb); };
drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c +0 -4
@@ -596,7 +596,6 @@ static void link_encoder_edp_wait_for_hpd_ready( bool power_up) {struct dc_context *ctx = enc110->base.ctx; -struct adapter_service *as = enc110->base.adapter_service;struct graphics_object_id connector = enc110->base.connector;struct gpio *hpd;bool edp_hpd_high = false;
@@ -971,7 +970,6 @@ bool dce110_link_encoder_construct( const struct dce110_link_enc_hpd_registers *hpd_regs) {struct graphics_object_encoder_cap_info enc_cap_info = {0 }; -struct adapter_service *as = init_data->adapter_service; enc110->base.funcs = &dce110_lnk_enc_funcs; enc110->base.ctx = init_data->ctx;
@@ -981,8 +979,6 @@ bool dce110_link_encoder_construct( enc110->base.connector = init_data->connector; enc110->base.input_signals =SIGNAL_TYPE_ALL ; - enc110->base.adapter_service = as; - enc110->base.preferred_engine =ENGINE_ID_UNKNOWN ; enc110->base.features.flags.raw =0 ;
drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c +4 -5
@@ -418,7 +418,7 @@ static struct timing_generator *dce100_timing_generator_create(if (!tg110)return NULL ; -if (dce110_timing_generator_construct (tg110, as, ctx, instance, +if (dce110_timing_generator_construct (tg110, ctx, instance, offsets))return &tg110->base;
@@ -455,7 +455,6 @@ static const struct resource_create_funcs res_create_funcs = {static struct mem_input *dce100_mem_input_create (struct dc_context *ctx, -struct adapter_service *as,uint32_t inst,const struct dce110_mem_input_reg_offsets *offset) {
@@ -466,7 +465,7 @@ static struct mem_input *dce100_mem_input_create(return NULL ;if (dce110_mem_input_construct (mem_input110, - ctx, as, inst, offset)) + ctx, inst, offset))return &mem_input110->base;BREAK_TO_DEBUGGER ();
@@ -918,7 +917,7 @@ static bool construct( } } - pool->base.display_clock =dal_display_clock_dce110_create (ctx, as); + pool->base.display_clock =dal_display_clock_dce110_create (ctx);if (pool->base.display_clock ==NULL ) {dm_error ("DC: failed to create display clock!\n" );BREAK_TO_DEBUGGER ();
@@ -973,7 +972,7 @@ static bool construct( goto res_create_fail; } - pool->base.mis[i] =dce100_mem_input_create (ctx, as, i, + pool->base.mis[i] =dce100_mem_input_create (ctx, i, &dce100_mi_reg_offsets[i]);if (pool->base.mis[i] ==NULL ) {BREAK_TO_DEBUGGER ();
drivers/gpu/drm/amd/dal/dc/dce110/dce110_clock_source.c +0 -1
@@ -36,7 +36,6 @@#include "include/logger_interface.h" #include "dce110_clock_source.h" -#include "adapter_service_interface.h" #define FRACT_FB_DIVIDER_DEC_POINTS_MAX_NUM 6#define CALC_PLL_CLK_SRC_ERR_TOLERANCE 1
drivers/gpu/drm/amd/dal/dc/dce110/dce110_compressor.c +3 -5
@@ -31,7 +31,6 @@#include "gmc/gmc_8_2_d.h" #include "include/logger_interface.h" -#include "include/adapter_service_interface.h" #include "dce110_compressor.h"
@@ -793,7 +792,7 @@ void dce110_compressor_set_fbc_invalidation_triggers( }bool dce110_compressor_construct (struct dce110_compressor *compressor, -struct dc_context *ctx,struct adapter_service *as) +struct dc_context *ctx) {struct dc_bios *bp = ctx->dc_bios;struct embedded_panel_info panel_info;
@@ -837,8 +836,7 @@ bool dce110_compressor_construct(struct dce110_compressor *compressor,return true; } -struct compressor *dce110_compressor_create (struct dc_context *ctx, -struct adapter_service *as) +struct compressor *dce110_compressor_create (struct dc_context *ctx) {struct dce110_compressor *cp110 =dm_alloc (sizeof (struct dce110_compressor ));
@@ -846,7 +844,7 @@ struct compressor *dce110_compressor_create(struct dc_context *ctx,if (!cp110)return NULL ; -if (dce110_compressor_construct (cp110, ctx, as)) +if (dce110_compressor_construct (cp110, ctx))return &cp110->base;BREAK_TO_DEBUGGER ();
drivers/gpu/drm/amd/dal/dc/dce110/dce110_compressor.h +2 -3
@@ -40,11 +40,10 @@ struct dce110_compressor {struct dce110_compressor_reg_offsets offsets; }; -struct compressor *dce110_compressor_create (struct dc_context *ctx, -struct adapter_service *as); +struct compressor *dce110_compressor_create (struct dc_context *ctx);bool dce110_compressor_construct (struct dce110_compressor *cp110, -struct dc_context *ctx,struct adapter_service *as); +struct dc_context *ctx);void dce110_compressor_destroy (struct compressor **cp);
drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.c +0 -2
@@ -31,7 +31,6 @@#include "gmc/gmc_8_2_sh_mask.h" #include "include/logger_interface.h" -#include "adapter_service_interface.h" #include "dce110_mem_input.h"
@@ -993,7 +992,6 @@ static struct mem_input_funcs dce110_mem_input_funcs = {bool dce110_mem_input_construct (struct dce110_mem_input *mem_input110,struct dc_context *ctx, -struct adapter_service *as,uint32_t inst,const struct dce110_mem_input_reg_offsets *offsets) {
drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input.h +0 -1
@@ -44,7 +44,6 @@ struct dce110_mem_input {bool dce110_mem_input_construct (struct dce110_mem_input *mem_input110,struct dc_context *ctx, -struct adapter_service *as,uint32_t inst,const struct dce110_mem_input_reg_offsets *offsets);
drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.c +1 -2
@@ -1061,8 +1061,7 @@ static struct mem_input_funcs dce110_mem_input_v_funcs = {bool dce110_mem_input_v_construct (struct dce110_mem_input *mem_input110, -struct dc_context *ctx, -struct adapter_service *as) +struct dc_context *ctx) { mem_input110->base.funcs = &dce110_mem_input_v_funcs; mem_input110->base.ctx = ctx;
drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.h +1 -2
@@ -30,8 +30,7 @@bool dce110_mem_input_v_construct (struct dce110_mem_input *mem_input110, -struct dc_context *ctx, -struct adapter_service *as); +struct dc_context *ctx);/* * This function will program nbp stutter and urgency watermarks to minimum
drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c +6 -7
@@ -395,7 +395,7 @@ static struct timing_generator *dce110_timing_generator_create(if (!tg110)return NULL ; -if (dce110_timing_generator_construct (tg110, as, ctx, instance, offsets)) +if (dce110_timing_generator_construct (tg110, ctx, instance, offsets))return &tg110->base;BREAK_TO_DEBUGGER ();
@@ -432,7 +432,6 @@ static const struct resource_create_funcs res_create_funcs = {static struct mem_input *dce110_mem_input_create (struct dc_context *ctx, -struct adapter_service *as,uint32_t inst,const struct dce110_mem_input_reg_offsets *offset) {
@@ -443,7 +442,7 @@ static struct mem_input *dce110_mem_input_create(return NULL ;if (dce110_mem_input_construct (mem_input110, - ctx, as, inst, offset)) + ctx, inst, offset))return &mem_input110->base;BREAK_TO_DEBUGGER ();
@@ -1049,8 +1048,8 @@ static void underlay_create(struct dc_context *ctx, struct resource_pool *pool)struct dce110_opp *dce110_oppv =dm_alloc (sizeof (*dce110_oppv));dce110_opp_v_construct (dce110_oppv, ctx); -dce110_timing_generator_v_construct (dce110_tgv, pool->adapter_srv, ctx); -dce110_mem_input_v_construct (dce110_miv, ctx, pool->adapter_srv); +dce110_timing_generator_v_construct (dce110_tgv, ctx); +dce110_mem_input_v_construct (dce110_miv, ctx);dce110_transform_v_construct (dce110_xfmv, ctx); pool->opps[pool->pipe_count] = &dce110_oppv->base;
@@ -1239,7 +1238,7 @@ static bool construct( } } - pool->base.display_clock =dal_display_clock_dce110_create (ctx, as); + pool->base.display_clock =dal_display_clock_dce110_create (ctx);if (pool->base.display_clock ==NULL ) {dm_error ("DC: failed to create display clock!\n" );BREAK_TO_DEBUGGER ();
@@ -1282,7 +1281,7 @@ static bool construct( goto res_create_fail; } - pool->base.mis[i] =dce110_mem_input_create (ctx, as, i, + pool->base.mis[i] =dce110_mem_input_create (ctx, i, &dce110_mi_reg_offsets[i]);if (pool->base.mis[i] ==NULL ) {BREAK_TO_DEBUGGER ();
drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator.c +0 -4
@@ -1926,7 +1926,6 @@ static const struct timing_generator_funcs dce110_tg_funcs = {bool dce110_timing_generator_construct (struct dce110_timing_generator *tg110, -struct adapter_service *as,struct dc_context *ctx,uint32_t instance,const struct dce110_timing_generator_offsets *offsets)
@@ -1934,9 +1933,6 @@ bool dce110_timing_generator_construct(if (!tg110)return false; -if (!as) -return false; - tg110->controller_id =CONTROLLER_ID_D0 + instance; tg110->base.inst = instance;
drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator.h +0 -1
@@ -119,7 +119,6 @@ struct dce110_timing_generator {bool dce110_timing_generator_construct (struct dce110_timing_generator *tg, -struct adapter_service *as,struct dc_context *ctx,uint32_t instance,const struct dce110_timing_generator_offsets *offsets);
drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator_v.c +0 -4
@@ -721,15 +721,11 @@ static const struct timing_generator_funcs dce110_tg_v_funcs = {bool dce110_timing_generator_v_construct (struct dce110_timing_generator *tg110, -struct adapter_service *as,struct dc_context *ctx) {if (!tg110)return false; -if (!as) -return false; - tg110->controller_id =CONTROLLER_ID_UNDERLAY0 ; tg110->base.funcs = &dce110_tg_v_funcs;
drivers/gpu/drm/amd/dal/dc/dce110/dce110_timing_generator_v.h +0 -1
@@ -28,7 +28,6 @@bool dce110_timing_generator_v_construct (struct dce110_timing_generator *tg110, -struct adapter_service *as,struct dc_context *ctx);#endif /* __DC_TIMING_GENERATOR_V_DCE110_H__ */
drivers/gpu/drm/amd/dal/dc/dce112/dce112_compressor.c +3 -4
@@ -793,7 +793,7 @@ void dce112_compressor_set_fbc_invalidation_triggers( }bool dce112_compressor_construct (struct dce112_compressor *compressor, -struct dc_context *ctx,struct adapter_service *as) +struct dc_context *ctx) {struct dc_bios *bp = ctx->dc_bios;struct embedded_panel_info panel_info;
@@ -837,8 +837,7 @@ bool dce112_compressor_construct(struct dce112_compressor *compressor,return true; } -struct compressor *dce112_compressor_create (struct dc_context *ctx, -struct adapter_service *as) +struct compressor *dce112_compressor_create (struct dc_context *ctx) {struct dce112_compressor *cp110 =dm_alloc (sizeof (struct dce112_compressor ));
@@ -846,7 +845,7 @@ struct compressor *dce112_compressor_create(struct dc_context *ctx,if (!cp110)return NULL ; -if (dce112_compressor_construct (cp110, ctx, as)) +if (dce112_compressor_construct (cp110, ctx))return &cp110->base;BREAK_TO_DEBUGGER ();
drivers/gpu/drm/amd/dal/dc/dce112/dce112_compressor.h +2 -3
@@ -40,11 +40,10 @@ struct dce112_compressor {struct dce112_compressor_reg_offsets offsets; }; -struct compressor *dce112_compressor_create (struct dc_context *ctx, -struct adapter_service *as); +struct compressor *dce112_compressor_create (struct dc_context *ctx);bool dce112_compressor_construct (struct dce112_compressor *cp110, -struct dc_context *ctx,struct adapter_service *as); +struct dc_context *ctx);void dce112_compressor_destroy (struct compressor **cp);
drivers/gpu/drm/amd/dal/dc/dce112/dce112_mem_input.c +1 -2
@@ -423,11 +423,10 @@ static void dce112_mem_input_program_display_marks(bool dce112_mem_input_construct (struct dce110_mem_input *mem_input110,struct dc_context *ctx, -struct adapter_service *as,uint32_t inst,const struct dce110_mem_input_reg_offsets *offsets) { -if (!dce110_mem_input_construct (mem_input110, ctx, as, inst, offsets)) +if (!dce110_mem_input_construct (mem_input110, ctx, inst, offsets))return false; mem_input110->base.funcs->mem_input_program_display_marks =
drivers/gpu/drm/amd/dal/dc/dce112/dce112_mem_input.h +0 -1
@@ -31,7 +31,6 @@bool dce112_mem_input_construct (struct dce110_mem_input *mem_input110,struct dc_context *ctx, -struct adapter_service *as,uint32_t inst,const struct dce110_mem_input_reg_offsets *offsets);
drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c +3 -3
@@ -444,7 +444,7 @@ static struct timing_generator *dce112_timing_generator_create(if (!tg110)return NULL ; -if (dce110_timing_generator_construct (tg110, as, ctx, instance, offsets)) +if (dce110_timing_generator_construct (tg110, ctx, instance, offsets))return &tg110->base;BREAK_TO_DEBUGGER ();
@@ -491,7 +491,7 @@ static struct mem_input *dce112_mem_input_create(return NULL ;if (dce112_mem_input_construct (mem_input110, - ctx, as, inst, offset)) + ctx, inst, offset))return &mem_input110->base;BREAK_TO_DEBUGGER ();
@@ -1263,7 +1263,7 @@ static bool construct( } pool->base.display_clock =dal_display_clock_dce112_create ( - ctx, adapter_serv); + ctx);if (pool->base.display_clock ==NULL ) {dm_error ("DC: failed to create display clock!\n" );
drivers/gpu/drm/amd/dal/dc/dce80/dce80_compressor.c +3 -6
@@ -31,8 +31,6 @@#include "gmc/gmc_7_1_d.h" #include "include/logger_interface.h" -#include "include/adapter_service_interface.h" -#include "dce80_compressor.h" #define DCP_REG (reg)\
@@ -774,7 +772,7 @@ void dce80_compressor_set_fbc_invalidation_triggers( }bool dce80_compressor_construct (struct dce80_compressor *compressor, -struct dc_context *ctx,struct adapter_service *as) +struct dc_context *ctx) {struct dc_bios *bp = ctx->dc_bios;struct embedded_panel_info panel_info;
@@ -818,8 +816,7 @@ bool dce80_compressor_construct(struct dce80_compressor *compressor,return true; } -struct compressor *dce80_compressor_create (struct dc_context *ctx, -struct adapter_service *as) +struct compressor *dce80_compressor_create (struct dc_context *ctx) {struct dce80_compressor *cp80 =dm_alloc (sizeof (struct dce80_compressor ));
@@ -827,7 +824,7 @@ struct compressor *dce80_compressor_create(struct dc_context *ctx,if (!cp80)return NULL ; -if (dce80_compressor_construct (cp80, ctx, as)) +if (dce80_compressor_construct (cp80, ctx))return &cp80->base;BREAK_TO_DEBUGGER ();
drivers/gpu/drm/amd/dal/dc/dce80/dce80_compressor.h +2 -3
@@ -40,11 +40,10 @@ struct dce80_compressor {struct dce80_compressor_reg_offsets offsets; }; -struct compressor *dce80_compressor_create (struct dc_context *ctx, -struct adapter_service *as); +struct compressor *dce80_compressor_create (struct dc_context *ctx);bool dce80_compressor_construct (struct dce80_compressor *cp80, -struct dc_context *ctx,struct adapter_service *as); +struct dc_context *ctx);void dce80_compressor_destroy (struct compressor **cp);
drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.c +0 -1
@@ -186,7 +186,6 @@ static struct mem_input_funcs dce80_mem_input_funcs = {bool dce80_mem_input_construct (struct dce110_mem_input *mem_input80,struct dc_context *ctx, -struct adapter_service *as,uint32_t inst,const struct dce110_mem_input_reg_offsets *offsets) {
drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.h +0 -1
@@ -30,7 +30,6 @@bool dce80_mem_input_construct (struct dce110_mem_input *mem_input80,struct dc_context *ctx, -struct adapter_service *as,uint32_t inst,const struct dce110_mem_input_reg_offsets *offsets);
drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c +4 -5
@@ -410,7 +410,7 @@ static struct timing_generator *dce80_timing_generator_create(if (!tg110)return NULL ; -if (dce80_timing_generator_construct (tg110, as, ctx, instance, offsets)) +if (dce80_timing_generator_construct (tg110, ctx, instance, offsets))return &tg110->base;BREAK_TO_DEBUGGER ();
@@ -446,7 +446,6 @@ static const struct resource_create_funcs res_create_funcs = {static struct mem_input *dce80_mem_input_create (struct dc_context *ctx, -struct adapter_service *as,uint32_t inst,const struct dce110_mem_input_reg_offsets *offsets) {
@@ -457,7 +456,7 @@ static struct mem_input *dce80_mem_input_create(return NULL ;if (dce80_mem_input_construct (mem_input80, - ctx, as, inst, offsets)) + ctx, inst, offsets))return &mem_input80->base;BREAK_TO_DEBUGGER ();
@@ -922,7 +921,7 @@ static bool construct( } } - pool->base.display_clock =dal_display_clock_dce80_create (ctx, as); + pool->base.display_clock =dal_display_clock_dce80_create (ctx);if (pool->base.display_clock ==NULL ) {dm_error ("DC: failed to create display clock!\n" );BREAK_TO_DEBUGGER ();
@@ -963,7 +962,7 @@ static bool construct( goto res_create_fail; } - pool->base.mis[i] =dce80_mem_input_create (ctx, as, i, + pool->base.mis[i] =dce80_mem_input_create (ctx, i, &dce80_mi_reg_offsets[i]);if (pool->base.mis[i] ==NULL ) {BREAK_TO_DEBUGGER ();
drivers/gpu/drm/amd/dal/dc/dce80/dce80_timing_generator.c +0 -5
@@ -32,7 +32,6 @@#include "dc_types.h" #include "include/grph_object_id.h" -#include "include/adapter_service_interface.h" #include "include/logger_interface.h" #include "../dce110/dce110_timing_generator.h" #include "dce80_timing_generator.h"
@@ -152,7 +151,6 @@ static const struct timing_generator_funcs dce80_tg_funcs = {bool dce80_timing_generator_construct (struct dce110_timing_generator *tg110, -struct adapter_service *as,struct dc_context *ctx,uint32_t instance,const struct dce110_timing_generator_offsets *offsets)
@@ -160,9 +158,6 @@ bool dce80_timing_generator_construct(if (!tg110)return false; -if (!as) -return false; - tg110->controller_id =CONTROLLER_ID_D0 + instance; tg110->base.inst = instance; tg110->offsets = *offsets;
drivers/gpu/drm/amd/dal/dc/dce80/dce80_timing_generator.h +0 -1
@@ -32,7 +32,6 @@/* DCE8.0 implementation inherits from DCE11.0 */ bool dce80_timing_generator_construct (struct dce110_timing_generator *tg, -struct adapter_service *as,struct dc_context *ctx,uint32_t instance,const struct dce110_timing_generator_offsets *offsets);
drivers/gpu/drm/amd/dal/dc/gpu/dce110/display_clock_dce110.c +5 -11
@@ -668,8 +668,7 @@ static uint32_t calculate_min_clock( }static bool display_clock_integrated_info_construct ( -struct display_clock_dce110 *disp_clk, -struct adapter_service *as) +struct display_clock_dce110 *disp_clk) {struct dc_debug *debug = &disp_clk->disp_clk_base.ctx->dc->debug;struct dc_bios *bp = disp_clk->disp_clk_base.ctx->dc_bios;
@@ -926,15 +925,11 @@ static const struct display_clock_funcs funcs = {static bool dal_display_clock_dce110_construct (struct display_clock_dce110 *dc110, -struct dc_context *ctx, -struct adapter_service *as) +struct dc_context *ctx) {struct display_clock *dc_base = &dc110->disp_clk_base;struct dc_bios *bp = ctx->dc_bios; -if (NULL == as) -return false; -if (!dal_display_clock_construct_base (dc_base, ctx))return false;
@@ -942,7 +937,7 @@ static bool dal_display_clock_dce110_construct( dc110->dfs_bypass_disp_clk =0 ; -if (!display_clock_integrated_info_construct (dc110, as)) +if (!display_clock_integrated_info_construct (dc110))dm_logger_write (dc_base->ctx->logger,LOG_WARNING ,"Cannot obtain VBIOS integrated info\n" );
@@ -1023,8 +1018,7 @@ static bool dal_display_clock_dce110_construct(*****************************************************************************/ struct display_clock *dal_display_clock_dce110_create ( -struct dc_context *ctx, -struct adapter_service *as) +struct dc_context *ctx) {struct display_clock_dce110 *dc110;
@@ -1033,7 +1027,7 @@ struct display_clock *dal_display_clock_dce110_create(if (dc110 ==NULL )return NULL ; -if (dal_display_clock_dce110_construct (dc110, ctx, as)) +if (dal_display_clock_dce110_construct (dc110, ctx))return &dc110->disp_clk_base;dm_free (dc110);
drivers/gpu/drm/amd/dal/dc/gpu/dce112/display_clock_dce112.c +1 -2
@@ -948,8 +948,7 @@ bool dal_display_clock_dce112_construct(*****************************************************************************/ struct display_clock *dal_display_clock_dce112_create ( -struct dc_context *ctx, -struct adapter_service *as) +struct dc_context *ctx) {struct display_clock_dce112 *dc112;
drivers/gpu/drm/amd/dal/dc/gpu/dce80/display_clock_dce80.c +7 -14
@@ -717,8 +717,7 @@ static void store_max_clocks_state( }static void display_clock_ss_construct ( -struct display_clock_dce80 *disp_clk, -struct adapter_service *as) +struct display_clock_dce80 *disp_clk) {struct dc_bios *bp = disp_clk->disp_clk.ctx->dc_bios; uint32_t ss_entry_num = bp->funcs->get_ss_entry_number(bp,
@@ -752,8 +751,7 @@ static void display_clock_ss_construct( }static bool display_clock_integrated_info_construct ( -struct display_clock_dce80 *disp_clk, -struct adapter_service *as) +struct display_clock_dce80 *disp_clk) {struct dc_debug *debug = &disp_clk->disp_clk.ctx->dc->debug;struct dc_bios *bp = disp_clk->disp_clk.ctx->dc_bios;
@@ -856,14 +854,10 @@ static const struct display_clock_funcs funcs = {static bool display_clock_construct (struct dc_context *ctx, -struct display_clock_dce80 *disp_clk, -struct adapter_service *as) +struct display_clock_dce80 *disp_clk) {struct display_clock *dc_base = &disp_clk->disp_clk; -if (NULL == as) -return false; -if (!dal_display_clock_construct_base (dc_base, ctx))return false;
@@ -894,9 +888,9 @@ static bool display_clock_construct(* state dependent clocks.*/ disp_clk->cur_min_clks_state =CLOCKS_STATE_INVALID ; -display_clock_ss_construct (disp_clk, as); +display_clock_ss_construct (disp_clk); -if (!display_clock_integrated_info_construct (disp_clk, as)) { +if (!display_clock_integrated_info_construct (disp_clk)) {dm_logger_write (dc_base->ctx->logger,LOG_WARNING ,"Cannot obtain VBIOS integrated info" ); }
@@ -923,8 +917,7 @@ static bool display_clock_construct( }struct display_clock *dal_display_clock_dce80_create ( -struct dc_context *ctx, -struct adapter_service *as) +struct dc_context *ctx) {struct display_clock_dce80 *disp_clk;
@@ -933,7 +926,7 @@ struct display_clock *dal_display_clock_dce80_create(if (disp_clk ==NULL )return NULL ; -if (display_clock_construct (ctx, disp_clk, as)) +if (display_clock_construct (ctx, disp_clk))return &disp_clk->disp_clk;dm_free (disp_clk);
drivers/gpu/drm/amd/dal/dc/gpu/dce80/display_clock_dce80.h +1 -2
@@ -52,7 +52,6 @@ struct display_clock_dce80 { };struct display_clock *dal_display_clock_dce80_create ( -struct dc_context *ctx, -struct adapter_service *as); +struct dc_context *ctx);#endif /* __DAL_DISPLAY_CLOCK_DCE80_H__ */
drivers/gpu/drm/amd/dal/dc/gpu/display_clock.c +0 -2
@@ -26,8 +26,6 @@#include "dm_services.h" #include "display_clock.h" -#include "adapter_service_interface.h" -void dal_display_clock_base_set_dp_ref_clock_source (struct display_clock *disp_clk,enum clock_source_id clk_src)
drivers/gpu/drm/amd/dal/dc/gpu/display_clock.h +0 -1
@@ -63,7 +63,6 @@ struct display_clock {const struct display_clock_funcs *funcs;uint32_t min_display_clk_threshold_khz;enum clock_source_id id; -struct adapter_service *as;enum clocks_state cur_min_clks_state; };
drivers/gpu/drm/amd/dal/dc/inc/compressor.h +1 -0
@@ -27,6 +27,7 @@#define __DAL_COMPRESSOR_H__#include "include/grph_object_id.h" +#include "bios_parser_interface.h" enum fbc_compress_ratio {FBC_COMPRESS_RATIO_INVALID =0 ,
drivers/gpu/drm/amd/dal/dc/inc/hw/link_encoder.h +0 -1
@@ -22,7 +22,6 @@ struct core_stream;struct pipe_ctx ;struct encoder_init_data { -struct adapter_service *adapter_service;enum channel_id channel;struct graphics_object_id connector;enum hpd_source_id hpd_source;
drivers/gpu/drm/amd/dal/dc/virtual/virtual_link_encoder.c +0 -2
@@ -136,8 +136,6 @@ bool virtual_link_encoder_construct( enc->hpd_source = init_data->hpd_source; enc->connector = init_data->connector; - enc->adapter_service = init_data->adapter_service; - enc->transmitter = init_data->transmitter; enc->features.max_pixel_clock =VIRTUAL_MAX_PIXEL_CLK_IN_KHZ ;
drivers/gpu/drm/amd/dal/include/bios_parser_interface.h +0 -1
@@ -28,7 +28,6 @@#include "dc_bios_types.h" -struct adapter_service ;struct bios_parser ;struct bp_init_data {
drivers/gpu/drm/amd/dal/include/display_clock_interface.h +3 -6
@@ -118,16 +118,13 @@ struct display_clock_state {struct display_clock ;struct display_clock *dal_display_clock_dce112_create ( -struct dc_context *ctx, -struct adapter_service *as); +struct dc_context *ctx);struct display_clock *dal_display_clock_dce110_create ( -struct dc_context *ctx, -struct adapter_service *as); +struct dc_context *ctx);struct display_clock *dal_display_clock_dce80_create ( -struct dc_context *ctx, -struct adapter_service *as); +struct dc_context *ctx);void dal_display_clock_destroy (struct display_clock **to_destroy); bool dal_display_clock_validate(
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 50/76 drm/amd/dal: remove adapter_service dependency
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
--- drivers/gpu/drm/amd/dal/dc/core/dc.c | 6 +----- drivers/gpu/drm/amd/dal/dc/core/dc_link.c | 14 +++++--------- drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c | 1 - drivers/gpu/drm/amd/dal/dc/core/dc_resource.c | 10 +++++----- drivers/gpu/drm/amd/dal/dc/dc_ddc_types.h | 1 - drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c | 7 +------ drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.h | 2 -- drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.h | 1 - drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.c | 1 - drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c | 9 ++------- drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.h | 2 -- drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c | 9 +-------- drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.h | 2 -- drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.c | 1 - drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c | 8 ++------ drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.h | 2 -- drivers/gpu/drm/amd/dal/dc/i2caux/i2caux.c | 1 + drivers/gpu/drm/amd/dal/dc/inc/core_types.h | 3 --- drivers/gpu/drm/amd/dal/dc/inc/dc_link_ddc.h | 2 -- drivers/gpu/drm/amd/dal/dc/inc/hw/link_encoder.h | 2 -- drivers/gpu/drm/amd/dal/dc/inc/resource.h | 2 +- drivers/gpu/drm/amd/dal/include/i2caux_interface.h | 1 - drivers/gpu/drm/amd/dal/include/link_service_types.h | 1 - 23 files changed, 19 insertions(+), 69 deletions(-)
drivers/gpu/drm/amd/dal/dc/core/dc.c +1 -5
@@ -72,7 +72,6 @@ static void destroy_links(struct core_dc *dc)static bool create_links (struct core_dc *dc, -struct adapter_service *as,uint32_t num_virtual_links) {int i;
@@ -106,7 +105,6 @@ static bool create_links(struct core_link *link; link_init_params.ctx = dc->ctx; - link_init_params.adapter_srv = as; link_init_params.connector_index = i; link_init_params.link_index = dc->link_count; link_init_params.dc = dc;
@@ -130,7 +128,6 @@ static bool create_links( goto failed_alloc; } - link->adapter_srv = as; link->ctx = dc->ctx; link->dc = dc; link->public.connector_signal =SIGNAL_TYPE_VIRTUAL ;
@@ -604,7 +601,6 @@ static bool construct(struct core_dc *dc, } dc->res_pool = dc_create_resource_pool( - as, dc, init_params->num_virtual_links, dc_version,
@@ -612,7 +608,7 @@ static bool construct(struct core_dc *dc,if (!dc->res_pool) goto create_resource_fail; -if (!create_links (dc, as, init_params->num_virtual_links)) +if (!create_links (dc, init_params->num_virtual_links)) goto create_links_fail;allocate_dc_stream_funcs (dc);
drivers/gpu/drm/amd/dal/dc/core/dc_link.c +5 -9
@@ -787,8 +787,7 @@ bool dc_link_detect(const struct dc_link *dc_link, bool boot) }static enum hpd_source_id get_hpd_line ( -struct core_link *link, -struct adapter_service *as) +struct core_link *link) {struct gpio *hpd;enum hpd_source_id hpd_id =HPD_SOURCEID_UNKNOWN ;
@@ -826,7 +825,7 @@ static enum hpd_source_id get_hpd_line(return hpd_id; } -static enum channel_id get_ddc_line (struct core_link *link,struct adapter_service *as) +static enum channel_id get_ddc_line (struct core_link *link) {struct ddc *ddc;enum channel_id channel =CHANNEL_ID_UNKNOWN ;
@@ -938,7 +937,6 @@ static bool construct( const struct link_init_data *init_params) {uint8_t i; -struct adapter_service *as = init_params->adapter_srv;struct gpio *hpd_gpio =NULL ;struct ddc_service_init_data ddc_service_init_data = {0 };struct dc_context *dc_ctx = init_params->ctx;
@@ -953,7 +951,6 @@ static bool construct( link->link_status.dpcd_caps = &link->dpcd_caps; link->dc = init_params->dc; - link->adapter_srv = as; link->ctx = dc_ctx; link->public.link_index = init_params->link_index;
@@ -1017,7 +1014,6 @@ static bool construct( init_params->connector_index, link->public.connector_signal); - ddc_service_init_data.as = as; ddc_service_init_data.ctx = link->ctx; ddc_service_init_data.id = link->link_id; ddc_service_init_data.link = link;
@@ -1035,8 +1031,8 @@ static bool construct( enc_init_data.ctx = dc_ctx; bp_funcs->get_src_obj (dc_ctx->dc_bios, link->link_id,0 , &enc_init_data.encoder); enc_init_data.connector = link->link_id; - enc_init_data.channel =get_ddc_line (link, as); - enc_init_data.hpd_source =get_hpd_line (link, as); + enc_init_data.channel =get_ddc_line (link); + enc_init_data.hpd_source =get_hpd_line (link); enc_init_data.transmitter =translate_encoder_to_transmitter (enc_init_data.encoder); link->link_enc = link->dc->res_pool->funcs->link_enc_create(
@@ -1562,7 +1558,7 @@ bool dc_link_setup_psr(const struct dc_link *dc_link, dc_link->psr_caps.psr_frame_capture_indication_req; psr_context.skipPsrWaitForPllLock = - link->link_enc->adapter_service-> + ctx->adapter_srv-> asic_cap->caps.SKIP_PSR_WAIT_FOR_PLL_LOCK_BIT; psr_context.numberOfControllers =
drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c +0 -1
@@ -287,7 +287,6 @@ static bool construct( ddc_service->link = init_data->link; ddc_service->ctx = init_data->ctx; - ddc_service->as = init_data->as;if (BP_RESULT_OK != dcb->funcs->get_i2c_info (dcb, init_data->id, &i2c_info)) { ddc_service->ddc_pin =NULL ;
drivers/gpu/drm/amd/dal/dc/core/dc_resource.c +5 -5
@@ -72,7 +72,7 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id)return dc_version; } -struct resource_pool *dc_create_resource_pool(struct adapter_service *adapter_serv, +struct resource_pool *dc_create_resource_pool( struct core_dc *dc, int num_virtual_links, enum dce_version dc_version,
@@ -82,16 +82,16 @@ struct resource_pool *dc_create_resource_pool(struct adapter_service *adapter_seswitch (dc_version) {case DCE_VERSION_8_0 :return dce80_create_resource_pool ( - adapter_serv, num_virtual_links, dc); + num_virtual_links, dc);case DCE_VERSION_10_0 :return dce100_create_resource_pool ( - adapter_serv, num_virtual_links, dc); + num_virtual_links, dc);case DCE_VERSION_11_0 :return dce110_create_resource_pool ( - adapter_serv, num_virtual_links, dc, asic_id); + num_virtual_links, dc, asic_id);case DCE_VERSION_11_2 :return dce112_create_resource_pool ( - adapter_serv, num_virtual_links, dc); + num_virtual_links, dc);default :break ; }
drivers/gpu/drm/amd/dal/dc/dc_ddc_types.h +0 -1
@@ -104,7 +104,6 @@ struct ddc_service {union ddc_wa wa;enum ddc_transaction_type transaction_type;enum display_dongle_type dongle_type; -struct adapter_service *as;struct dc_context *ctx;struct core_link *link;
drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.c +1 -6
@@ -407,7 +407,6 @@ static struct audio *create_audio( }static struct timing_generator *dce100_timing_generator_create ( -struct adapter_service *as,struct dc_context *ctx,uint32_t instance,const struct dce110_timing_generator_offsets *offsets)
@@ -859,7 +858,6 @@ static const struct resource_funcs dce100_res_pool_funcs = { };static bool construct ( -struct adapter_service *as,uint8_t num_virtual_links,struct core_dc *dc,struct dce110_resource_pool *pool)
@@ -872,7 +870,6 @@ static bool construct( ctx->dc_bios->regs = &bios_regs; - pool->base.adapter_srv = as; pool->base.res_cap = &res_cap; pool->base.funcs = &dce100_res_pool_funcs; pool->base.underlay_pipe_index =-1 ;
@@ -962,7 +959,6 @@ static bool construct(for (i =0 ; i < pool->base.pipe_count; i++) { pool->base.timing_generators[i] =dce100_timing_generator_create ( - as, ctx, i, &dce100_tg_offsets[i]);
@@ -1028,7 +1024,6 @@ res_create_fail: }struct resource_pool *dce100_create_resource_pool ( -struct adapter_service *as,uint8_t num_virtual_links,struct core_dc *dc) {
@@ -1038,7 +1033,7 @@ struct resource_pool *dce100_create_resource_pool(if (!pool)return NULL ; -if (construct (as, num_virtual_links, dc, pool)) +if (construct (num_virtual_links, dc, pool))return &pool->base;BREAK_TO_DEBUGGER ();
drivers/gpu/drm/amd/dal/dc/dce100/dce100_resource.h +0 -2
@@ -8,13 +8,11 @@#ifndef DCE100_RESOURCE_H_ #define DCE100_RESOURCE_H_ -struct adapter_service ;struct core_dc ;struct resource_pool ;struct dc_validation_set ;struct resource_pool *dce100_create_resource_pool ( -struct adapter_service *as,uint8_t num_virtual_links,struct core_dc *dc);
drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.h +0 -1
@@ -27,7 +27,6 @@#define __DC_HWSS_DCE110_H__#include "core_types.h" -#include "adapter_service_interface.h" #define GAMMA_HW_POINTS_NUM 256struct core_dc ;
drivers/gpu/drm/amd/dal/dc/dce110/dce110_mem_input_v.c +0 -1
@@ -31,7 +31,6 @@#include "gmc/gmc_8_2_sh_mask.h" #include "include/logger_interface.h" -#include "adapter_service_interface.h" #include "inc/bandwidth_calcs.h" #include "dce110_mem_input.h"
drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.c +2 -7
@@ -47,7 +47,6 @@#include "dce110/dce110_opp_v.h" #include "dce110/dce110_clock_source.h" #include "dce110/dce110_hw_sequencer.h" -#include "adapter_service_interface.h" #include "reg_helper.h"
@@ -384,7 +383,6 @@ static struct audio *create_audio( }static struct timing_generator *dce110_timing_generator_create ( -struct adapter_service *as,struct dc_context *ctx,uint32_t instance,const struct dce110_timing_generator_offsets *offsets)
@@ -1174,7 +1172,6 @@ const struct resource_caps *dce110_resource_cap( } static bool construct( - struct adapter_service *as, uint8_t num_virtual_links, struct core_dc *dc, struct dce110_resource_pool *pool,
@@ -1189,7 +1186,6 @@ static bool construct( ctx->dc_bios->regs = &bios_regs; - pool->base.adapter_srv = as; pool->base.res_cap =dce110_resource_cap (&ctx->asic_id); pool->base.funcs = &dce110_res_pool_funcs;
@@ -1274,7 +1270,7 @@ static bool construct(for (i =0 ; i < pool->base.pipe_count; i++) { pool->base.timing_generators[i] =dce110_timing_generator_create ( - as, ctx, i, &dce110_tg_offsets[i]); + ctx, i, &dce110_tg_offsets[i]);if (pool->base.timing_generators[i] ==NULL ) {BREAK_TO_DEBUGGER ();dm_error ("DC: failed to create tg!\n" );
@@ -1341,7 +1337,6 @@ res_create_fail: }struct resource_pool *dce110_create_resource_pool ( -struct adapter_service *as,uint8_t num_virtual_links,struct core_dc *dc,struct hw_asic_id asic_id)
@@ -1352,7 +1347,7 @@ struct resource_pool *dce110_create_resource_pool(if (!pool)return NULL ; -if (construct (as, num_virtual_links, dc, pool, asic_id)) +if (construct (num_virtual_links, dc, pool, asic_id))return &pool->base;BREAK_TO_DEBUGGER ();
drivers/gpu/drm/amd/dal/dc/dce110/dce110_resource.h +0 -2
@@ -28,7 +28,6 @@#include "core_types.h" -struct adapter_service ;struct core_dc ;struct resource_pool ;
@@ -49,7 +48,6 @@ void dce110_resource_build_bit_depth_reduction_params( struct bit_depth_reduction_params *fmt_bit_depth);struct resource_pool *dce110_create_resource_pool ( -struct adapter_service *as,uint8_t num_virtual_links,struct core_dc *dc,struct hw_asic_id asic_id);
drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.c +1 -8
@@ -433,7 +433,6 @@ static struct audio *create_audio(static struct timing_generator *dce112_timing_generator_create ( -struct adapter_service *as,struct dc_context *ctx,uint32_t instance,const struct dce110_timing_generator_offsets *offsets)
@@ -480,7 +479,6 @@ static const struct resource_create_funcs res_create_funcs = {static struct mem_input *dce112_mem_input_create (struct dc_context *ctx, -struct adapter_service *as,uint32_t inst,const struct dce110_mem_input_reg_offsets *offset) {
@@ -1190,7 +1188,6 @@ const struct resource_caps *dce112_resource_cap( }static bool construct ( -struct adapter_service *adapter_serv,uint8_t num_virtual_links,struct core_dc *dc,struct dce110_resource_pool *pool)
@@ -1201,7 +1198,6 @@ static bool construct( ctx->dc_bios->regs = &bios_regs; - pool->base.adapter_srv = adapter_serv; pool->base.res_cap =dce112_resource_cap (&ctx->asic_id); pool->base.funcs = &dce112_res_pool_funcs;
@@ -1302,7 +1298,6 @@ static bool construct(for (i =0 ; i < pool->base.pipe_count; i++) { pool->base.timing_generators[i] =dce112_timing_generator_create ( - adapter_serv, ctx, i, &dce112_tg_offsets[i]);
@@ -1314,7 +1309,6 @@ static bool construct( pool->base.mis[i] =dce112_mem_input_create ( ctx, - adapter_serv, i, &dce112_mi_reg_offsets[i]);if (pool->base.mis[i] ==NULL ) {
@@ -1381,7 +1375,6 @@ res_create_fail: }struct resource_pool *dce112_create_resource_pool ( -struct adapter_service *as,uint8_t num_virtual_links,struct core_dc *dc) {
@@ -1391,7 +1384,7 @@ struct resource_pool *dce112_create_resource_pool(if (!pool)return NULL ; -if (construct (as, num_virtual_links, dc, pool)) +if (construct (num_virtual_links, dc, pool))return &pool->base;BREAK_TO_DEBUGGER ();
drivers/gpu/drm/amd/dal/dc/dce112/dce112_resource.h +0 -2
@@ -28,12 +28,10 @@#include "core_types.h" -struct adapter_service ;struct core_dc ;struct resource_pool ;struct resource_pool *dce112_create_resource_pool ( -struct adapter_service *as,uint8_t num_virtual_links,struct core_dc *dc);
drivers/gpu/drm/amd/dal/dc/dce80/dce80_mem_input.c +0 -1
@@ -31,7 +31,6 @@#include "gmc/gmc_7_1_sh_mask.h" #include "include/logger_interface.h" -#include "adapter_service_interface.h" #include "inc/bandwidth_calcs.h" #include "../dce110/dce110_mem_input.h"
drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.c +2 -6
@@ -399,7 +399,6 @@ static struct audio *create_audio( }static struct timing_generator *dce80_timing_generator_create ( -struct adapter_service *as,struct dc_context *ctx,uint32_t instance,const struct dce110_timing_generator_offsets *offsets)
@@ -851,7 +850,6 @@ static enum clocks_state dce80_resource_convert_clock_state_pp_to_dc( }static bool construct ( -struct adapter_service *as,uint8_t num_virtual_links,struct core_dc *dc,struct dce110_resource_pool *pool)
@@ -864,7 +862,6 @@ static bool construct( ctx->dc_bios->regs = &bios_regs; - pool->base.adapter_srv = as; pool->base.res_cap = &res_cap; pool->base.funcs = &dce80_res_pool_funcs;
@@ -955,7 +952,7 @@ static bool construct(for (i =0 ; i < pool->base.pipe_count; i++) { pool->base.timing_generators[i] =dce80_timing_generator_create ( - as, ctx, i, &dce80_tg_offsets[i]); + ctx, i, &dce80_tg_offsets[i]);if (pool->base.timing_generators[i] ==NULL ) {BREAK_TO_DEBUGGER ();dm_error ("DC: failed to create tg!\n" );
@@ -1012,7 +1009,6 @@ res_create_fail: }struct resource_pool *dce80_create_resource_pool ( -struct adapter_service *as,uint8_t num_virtual_links,struct core_dc *dc) {
@@ -1022,7 +1018,7 @@ struct resource_pool *dce80_create_resource_pool(if (!pool)return NULL ; -if (construct (as, num_virtual_links, dc, pool)) +if (construct (num_virtual_links, dc, pool))return &pool->base;BREAK_TO_DEBUGGER ();
drivers/gpu/drm/amd/dal/dc/dce80/dce80_resource.h +0 -2
@@ -28,12 +28,10 @@#include "core_types.h" -struct adapter_service ;struct core_dc ;struct resource_pool ;struct resource_pool *dce80_create_resource_pool ( -struct adapter_service *as,uint8_t num_virtual_links,struct core_dc *dc);
drivers/gpu/drm/amd/dal/dc/i2caux/i2caux.c +1 -0
@@ -29,6 +29,7 @@* Pre-requisites: headers required by header of this unit */ #include "include/i2caux_interface.h" +#include "dc_bios_types.h" /* * Header of this unit
drivers/gpu/drm/amd/dal/dc/inc/core_types.h +0 -3
@@ -127,7 +127,6 @@ struct link_init_data {uint32_t connector_index;/* this will be mapped to the HPD pins */ uint32_t link_index;/* this is mapped to DAL display_index TODO: remove it when DC is complete. */ -struct adapter_service *adapter_srv; };/* DP MST stream allocation (payload bandwidth number) */
@@ -155,7 +154,6 @@ struct core_link {struct dc_context *ctx;/* TODO: AUTO remove 'dal' when DC is complete*/ -struct adapter_service *adapter_srv;struct link_encoder *link_enc;struct ddc_service *ddc;struct graphics_object_id link_id;
@@ -264,7 +262,6 @@ struct resource_pool {struct audio_support audio_support;struct display_clock *display_clock; -struct adapter_service *adapter_srv;struct irq_service *irqs;const struct resource_funcs *funcs;
drivers/gpu/drm/amd/dal/dc/inc/dc_link_ddc.h +0 -2
@@ -32,7 +32,6 @@#define EDID_SEGMENT_SIZE 256struct ddc_service ; -struct adapter_service ;struct graphics_object_id ;enum ddc_result ;struct av_sync_data ;
@@ -66,7 +65,6 @@ void dal_ddc_aux_payloads_add( bool write);struct ddc_service_init_data { -struct adapter_service *as;struct graphics_object_id id;struct dc_context *ctx;struct core_link *link;
drivers/gpu/drm/amd/dal/dc/inc/hw/link_encoder.h +0 -2
@@ -13,7 +13,6 @@#include "dc_types.h" struct dc_context ; -struct adapter_service ;struct encoder_set_dp_phy_pattern_param ;struct link_mst_stream_allocation_table ;struct dc_link_settings ;
@@ -201,7 +200,6 @@ struct psr_dmcu_context {struct link_encoder {const struct link_encoder_funcs *funcs; -struct adapter_service *adapter_service;int32_t aux_channel_offset;struct dc_context *ctx;struct graphics_object_id id;
drivers/gpu/drm/amd/dal/dc/inc/resource.h +1 -1
@@ -69,7 +69,7 @@ bool resource_construct(struct resource_pool *pool, const struct resource_create_funcs *create_funcs); -struct resource_pool *dc_create_resource_pool(struct adapter_service *adapter_serv, +struct resource_pool *dc_create_resource_pool( struct core_dc *dc, int num_virtual_links, enum dce_version dc_version,
drivers/gpu/drm/amd/dal/include/i2caux_interface.h +0 -1
@@ -26,7 +26,6 @@#ifndef __DAL_I2CAUX_INTERFACE_H__#define __DAL_I2CAUX_INTERFACE_H__ -#include "adapter_service_interface.h" #include "gpio_service_interface.h"
drivers/gpu/drm/amd/dal/include/link_service_types.h +0 -1
@@ -162,7 +162,6 @@ struct link_service_init_data {struct link_service_init_options init_options;uint32_t connector_enum_id;struct graphics_object_id connector_id; -struct adapter_service *adapter_service;struct dc_context *ctx;struct topology_mgr *tm; };
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 51/76 drm/amd/dal: remove SKIP_PSR_WAIT_FOR_PLL_LOCK_BIT
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
- always 0 except KV, which is not supported
--- drivers/gpu/drm/amd/dal/dc/core/dc_link.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/amd/dal/dc/core/dc_link.c +1 -3
@@ -1557,9 +1557,7 @@ bool dc_link_setup_psr(const struct dc_link *dc_link, psr_context.psrFrameCaptureIndicationReq = dc_link->psr_caps.psr_frame_capture_indication_req; - psr_context.skipPsrWaitForPllLock = - ctx->adapter_srv-> - asic_cap->caps.SKIP_PSR_WAIT_FOR_PLL_LOCK_BIT; + psr_context.skipPsrWaitForPllLock =0 ;/* only = 1 in KV */ psr_context.numberOfControllers = link->dc->res_pool->res_cap->num_timing_generator;
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 52/76 drm/amd/dal: remove adapter_service and asic_capability
In reply to a message not in the archiveFrom: Tony Cheng <[email protected]>
Yay!!!!
--- drivers/gpu/drm/amd/dal/dc/Makefile | 2 +- drivers/gpu/drm/amd/dal/dc/adapter/Makefile | 10 - .../gpu/drm/amd/dal/dc/adapter/adapter_service.c | 625 --------------------- .../gpu/drm/amd/dal/dc/adapter/adapter_service.h | 34 -- .../gpu/drm/amd/dal/dc/asic_capability/Makefile | 50 -- .../amd/dal/dc/asic_capability/asic_capability.c | 181 ------ .../dc/asic_capability/carrizo_asic_capability.c | 133 ----- .../dc/asic_capability/carrizo_asic_capability.h | 36 -- .../dc/asic_capability/hawaii_asic_capability.c | 132 ----- .../dc/asic_capability/hawaii_asic_capability.h | 37 -- .../dc/asic_capability/polaris10_asic_capability.c | 125 ----- .../dc/asic_capability/polaris10_asic_capability.h | 36 -- .../dal/dc/asic_capability/tonga_asic_capability.c | 132 ----- .../dal/dc/asic_capability/tonga_asic_capability.h | 18 - drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c | 2 - drivers/gpu/drm/amd/dal/dc/core/dc.c | 48 -- drivers/gpu/drm/amd/dal/dc/core/dc_link.c | 5 - drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c | 3 - drivers/gpu/drm/amd/dal/dc/dc_types.h | 1 - drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c | 3 - 20 files changed, 1 insertion(+), 1612 deletions(-) delete mode 100644 drivers/gpu/drm/amd/dal/dc/adapter/Makefile delete mode 100644 drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c delete mode 100644 drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.h delete mode 100644 drivers/gpu/drm/amd/dal/dc/asic_capability/Makefile delete mode 100644 drivers/gpu/drm/amd/dal/dc/asic_capability/asic_capability.c delete mode 100644 drivers/gpu/drm/amd/dal/dc/asic_capability/carrizo_asic_capability.c delete mode 100644 drivers/gpu/drm/amd/dal/dc/asic_capability/carrizo_asic_capability.h delete mode 100644 drivers/gpu/drm/amd/dal/dc/asic_capability/hawaii_asic_capability.c delete mode 100644 drivers/gpu/drm/amd/dal/dc/asic_capability/hawaii_asic_capability.h delete mode 100644 drivers/gpu/drm/amd/dal/dc/asic_capability/polaris10_asic_capability.c delete mode 100644 drivers/gpu/drm/amd/dal/dc/asic_capability/polaris10_asic_capability.h delete mode 100644 drivers/gpu/drm/amd/dal/dc/asic_capability/tonga_asic_capability.c delete mode 100644 drivers/gpu/drm/amd/dal/dc/asic_capability/tonga_asic_capability.h
drivers/gpu/drm/amd/dal/dc/Makefile +1 -1
@@ -2,7 +2,7 @@ # Makefile for Display Core (dc) component. # -DC_LIBS = adapter asic_capability basics bios calcs dce \ +DC_LIBS = basics bios calcs dce \ gpio gpu i2caux irq virtual DC_LIBS += dce112
drivers/gpu/drm/amd/dal/dc/adapter/Makefile deleted +0 -10
@@ -1,10 +0,0 @@ -# -# Makefile for the 'adapter' sub-component of DAL. -# It provides the control and status of HW adapter. - -ADAPTER = adapter_service.o - -AMD_DAL_ADAPTER = $(addprefix $(AMDDALPATH)/dc/adapter/,$(ADAPTER)) - -AMD_DAL_FILES += $(AMD_DAL_ADAPTER) -
drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.c deleted +0 -625
625 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/adapter/adapter_service.h deleted +0 -34
@@ -1,34 +0,0 @@ -/* -* Copyright 2012-15 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 __DAL_ADAPTER_SERVICE_H__ -#define __DAL_ADAPTER_SERVICE_H__ - -/* Include */ -#include "dc_bios_types.h" -#include "include/adapter_service_interface.h" - - -#endif /* __DAL_ADAPTER_SERVICE_H__ */
drivers/gpu/drm/amd/dal/dc/asic_capability/Makefile deleted +0 -50
50 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/asic_capability/asic_capability.c deleted +0 -181
181 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/asic_capability/carrizo_asic_capability.c deleted +0 -133
133 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/asic_capability/carrizo_asic_capability.h deleted +0 -36
@@ -1,36 +0,0 @@ -/* -* Copyright 2012-15 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 __DAL_CARRIZO_ASIC_CAPABILITY_H__ -#define __DAL_CARRIZO_ASIC_CAPABILITY_H__ - -/* Forward declaration */ -struct asic_capability ; - -/* Create and initialize Carrizo data */ -void carrizo_asic_capability_create (struct asic_capability *cap, -struct hw_asic_id *init); - -#endif /* __DAL_CARRIZO_ASIC_CAPABILITY_H__ */
drivers/gpu/drm/amd/dal/dc/asic_capability/hawaii_asic_capability.c deleted +0 -132
132 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/asic_capability/hawaii_asic_capability.h deleted +0 -37
@@ -1,37 +0,0 @@ -/* -* Copyright 2012-15 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 __DAL_BONAIRE_CAPABILITY_H__ -#define __DAL_BONAIRE_CAPABILITY_H__ - -/* Forward declaration */ -struct asic_capability ; -struct hw_asic_id ; - -/* Create and initialise Bonaire data */ -void dal_hawaii_asic_capability_create (struct asic_capability *cap, -struct hw_asic_id *init); - -#endif /* __DAL_BONAIRE_CAPABILITY_H__ */
drivers/gpu/drm/amd/dal/dc/asic_capability/polaris10_asic_capability.c deleted +0 -125
125 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/asic_capability/polaris10_asic_capability.h deleted +0 -36
@@ -1,36 +0,0 @@ -/* -* Copyright 2012-15 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 __DAL_POLARIS10_ASIC_CAPABILITY_H__ -#define __DAL_POLARIS10_ASIC_CAPABILITY_H__ - -/* Forward declaration */ -struct asic_capability ; - -/* Create and initialize Polaris10 data */ -void polaris10_asic_capability_create (struct asic_capability *cap, -struct hw_asic_id *init); - -#endif /* __DAL_POLARIS10_ASIC_CAPABILITY_H__ */
drivers/gpu/drm/amd/dal/dc/asic_capability/tonga_asic_capability.c deleted +0 -132
132 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/asic_capability/tonga_asic_capability.h deleted +0 -18
@@ -1,18 +0,0 @@ -/* -* tonga_asic_capability.h -* -* Created on: 2016-01-18 -* Author: qyang -*/ - -#ifndef TONGA_ASIC_CAPABILITY_H_ -#define TONGA_ASIC_CAPABILITY_H_ - -/* Forward declaration */ -struct asic_capability ; - -/* Create and initialize Carrizo data */ -void tonga_asic_capability_create (struct asic_capability *cap, -struct hw_asic_id *init); - -#endif /* TONGA_ASIC_CAPABILITY_H_ */
drivers/gpu/drm/amd/dal/dc/bios/bios_parser.c +0 -2
@@ -42,8 +42,6 @@#include "bios_parser_types_internal.h" #include "bios_parser_interface.h" -/* TODO remove - only needed for gpio_service */ -#include "adapter/adapter_service.h" /* TODO remove - only needed for default i2c speed */ #include "dc.h"
drivers/gpu/drm/amd/dal/dc/core/dc.c +0 -48
78 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/core/dc_link.c +0 -5
@@ -39,13 +39,8 @@#include "hw_sequencer.h" #include "resource.h" #include "fixed31_32.h" -#include "adapter/adapter_service.h" #include "include/asic_capability_interface.h" - -/* TODO remove - only needed for gpio_service */ -#include "adapter/adapter_service.h" -#include "dce/dce_11_0_d.h" #include "dce/dce_11_0_enum.h" #include "dce/dce_11_0_sh_mask.h"
drivers/gpu/drm/amd/dal/dc/core/dc_link_ddc.c +0 -3
@@ -35,9 +35,6 @@#include "core_types.h" #include "dc_link_ddc.h" -/* TODO remove - only needed for gpio_service */ -#include "adapter/adapter_service.h" -#define AUX_POWER_UP_WA_DELAY 500#define I2C_OVER_AUX_DEFER_WA_DELAY 70
drivers/gpu/drm/amd/dal/dc/dc_types.h +0 -1
@@ -92,7 +92,6 @@ struct dc_context {bool created_bios;struct gpio_service *gpio_service;struct i2caux *i2caux; -struct adapter_service *adapter_srv; };
drivers/gpu/drm/amd/dal/dc/dce/dce_link_encoder.c +0 -3
@@ -35,9 +35,6 @@#include "gpio_service_interface.h" -/* TODO remove - only needed for gpio_service */ -#include "adapter/adapter_service.h" -#include "dce/dce_11_0_d.h" #include "dce/dce_11_0_sh_mask.h" #include "dce/dce_11_0_enum.h"
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 53/76 drm/amd/dal: Update stream_encoder programming sequence
In reply to a message not in the archiveFrom: Zeyu Fan <[email protected]>
--- .../gpu/drm/amd/dal/dc/dce/dce_stream_encoder.c | 152 +++++++++++---------- .../gpu/drm/amd/dal/dc/dce/dce_stream_encoder.h | 102 +++++++++++--- .../drm/amd/dal/dc/dce110/dce110_hw_sequencer.c | 3 +- drivers/gpu/drm/amd/dal/dc/inc/hw/stream_encoder.h | 3 +- drivers/gpu/drm/amd/dal/dc/inc/reg_helper.h | 83 +++++++---- .../amd/dal/dc/virtual/virtual_stream_encoder.c | 3 +- 6 files changed, 223 insertions(+), 123 deletions(-)
drivers/gpu/drm/amd/dal/dc/dce/dce_stream_encoder.c +80 -72
@@ -71,6 +71,31 @@ static void dce110_update_generic_info_packet( const struct encoder_info_packet *info_packet) {uint32_t regval; +/* TODOFPGA Figure out a proper number for max_retries polling for lock +* use 50 for now. +*/ +uint32_t max_retries =50 ; + +if (REG (AFMT_VBI_PACKET_CONTROL1 )) { +if (packet_index >=8 ) +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 , +1 ,10 , max_retries); + +/* check if HW reading GSP memory */ +REG_WAIT (AFMT_VBI_PACKET_CONTROL ,AFMT_GENERIC_CONFLICT , +1 ,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 (AFMT_VBI_PACKET_CONTROL ,AFMT_GENERIC_CONFLICT_CLR ,1 ); + }/* choose which generic packet to use */ { regval =REG_READ (AFMT_VBI_PACKET_CONTROL );
@@ -105,15 +130,11 @@ static void dce110_update_generic_info_packet(REG_WRITE (AFMT_GENERIC_7 ,0 ); } -/* force double-buffered packet update */ -if (enc110->se_mask->AFMT_GENERIC0_UPDATE && - enc110->se_mask->AFMT_GENERIC2_UPDATE) { +if (!REG (AFMT_VBI_PACKET_CONTROL1 )) { +/* force double-buffered packet update */ REG_UPDATE_2 (AFMT_VBI_PACKET_CONTROL ,AFMT_GENERIC0_UPDATE , (packet_index ==0 ),AFMT_GENERIC2_UPDATE , (packet_index ==2 )); - }else { -ASSERT (enc110->se_mask->AFMT_GENERIC0_UPDATE); -ASSERT (enc110->se_mask->AFMT_GENERIC2_UPDATE); } }
@@ -160,15 +181,15 @@ static void dce110_update_hdmi_info_packet(break ;case 2 :REG_UPDATE_3 (HDMI_GENERIC_PACKET_CONTROL1 , -HDMI_GENERIC2_CONT , cont, -HDMI_GENERIC2_SEND , send, -HDMI_GENERIC2_LINE , line); +HDMI_GENERIC0_CONT , cont, +HDMI_GENERIC0_SEND , send, +HDMI_GENERIC0_LINE , line);break ;case 3 :REG_UPDATE_3 (HDMI_GENERIC_PACKET_CONTROL1 , -HDMI_GENERIC3_CONT , cont, -HDMI_GENERIC3_SEND , send, -HDMI_GENERIC3_LINE , line); +HDMI_GENERIC1_CONT , cont, +HDMI_GENERIC1_SEND , send, +HDMI_GENERIC1_LINE , line);break ;default :/* invalid HW packet index */
@@ -183,10 +204,20 @@ static void dce110_update_hdmi_info_packet(/* setup stream encoder in dp mode */ static void dce110_stream_encoder_dp_set_stream_attribute (struct stream_encoder *enc, -struct dc_crtc_timing *crtc_timing) +struct dc_crtc_timing *crtc_timing, +enum dc_color_space output_color_space) { +uint32_t h_active_start; +uint32_t v_active_start; +uint32_t misc0; +uint32_t misc1; +uint32_t h_blank; +uint32_t h_back_porch;struct dce110_stream_encoder *enc110 =DCE110STRENC_FROM_STRENC (enc); +/* for bring up, disable dp double TODO */ +REG_UPDATE (DP_DB_CNTL ,DP_DB_DISABLE ,1 ); +/* set pixel encoding */ switch (crtc_timing->pixel_encoding) {case PIXEL_ENCODING_YCBCR422 :
@@ -219,39 +250,46 @@ static void dce110_stream_encoder_dp_set_stream_attribute(break ; } + misc1 =REG_READ (DP_MSA_MISC );/* set color depth */ switch (crtc_timing->display_color_depth) { +case COLOR_DEPTH_666 : +REG_UPDATE (DP_PIXEL_FORMAT ,DP_COMPONENT_DEPTH , +0 ); + misc0 =0 ; +break ;case COLOR_DEPTH_888 :REG_UPDATE (DP_PIXEL_FORMAT ,DP_COMPONENT_DEPTH ,DP_COMPONENT_DEPTH_8BPC ); + misc0 =1 ;break ;case COLOR_DEPTH_101010 :REG_UPDATE (DP_PIXEL_FORMAT ,DP_COMPONENT_DEPTH ,DP_COMPONENT_DEPTH_10BPC ); + + misc0 =2 ;break ;case COLOR_DEPTH_121212 :REG_UPDATE (DP_PIXEL_FORMAT ,DP_COMPONENT_DEPTH ,DP_COMPONENT_DEPTH_12BPC ); + misc0 =3 ;break ;default :REG_UPDATE (DP_PIXEL_FORMAT ,DP_COMPONENT_DEPTH ,DP_COMPONENT_DEPTH_6BPC ); + misc0 =0 ;break ; }/* set dynamic range and YCbCr range */ -if (enc110->se_mask->DP_DYN_RANGE && enc110->se_mask->DP_YCBCR_RANGE) { +if (enc110->se_mask->DP_DYN_RANGE && enc110->se_mask->DP_YCBCR_RANGE)REG_UPDATE_2 ( -DP_PIXEL_FORMAT , -DP_DYN_RANGE ,0 , -DP_YCBCR_RANGE ,0 ); - }else { -ASSERT (enc110->se_mask->DP_DYN_RANGE); -ASSERT (enc110->se_mask->DP_YCBCR_RANGE); - } -} +DP_PIXEL_FORMAT , +DP_DYN_RANGE ,0 , +DP_YCBCR_RANGE ,0 ); +} static void dce110_stream_encoder_set_stream_attribute_helper( struct dce110_stream_encoder *enc110,
@@ -403,7 +441,7 @@ static void dce110_stream_encoder_set_mst_bandwidth(/* i.e. DP_MSE_RATE_UPDATE_PENDING field (read only) */ /* is reset to 0 (not pending) */ REG_WAIT (DP_MSE_RATE_UPDATE ,DP_MSE_RATE_UPDATE_PENDING , - enc110->se_mask->DP_MSE_RATE_UPDATE_PENDING, +1 ,10 ,DP_MST_UPDATE_MAX_RETRY ); }
@@ -443,15 +481,15 @@ static void dce110_stream_encoder_update_hdmi_info_packets(HDMI_AVI_INFO_SEND ,0 , HDMI_AVI_INFO_CONT, 0); } - }else { -ASSERT (enc110->se_mask->HDMI_AVI_INFO_SEND); -ASSERT (enc110->se_mask->HDMI_AVI_INFO_CONT); -ASSERT (enc110->se_mask->HDMI_AVI_INFO_LINE); } -dce110_update_hdmi_info_packet (enc110,0 , &info_frame->vendor); -dce110_update_hdmi_info_packet (enc110,1 , &info_frame->gamut); -dce110_update_hdmi_info_packet (enc110,2 , &info_frame->spd); +if (enc110->se_mask->HDMI_AVI_INFO_CONT && + enc110->se_mask->HDMI_AVI_INFO_SEND) { +dce110_update_hdmi_info_packet (enc110,0 , &info_frame->vendor); +dce110_update_hdmi_info_packet (enc110,1 , &info_frame->gamut); +dce110_update_hdmi_info_packet (enc110,2 , &info_frame->spd); + } + } static void dce110_stream_encoder_stop_hdmi_info_packets(
@@ -470,24 +508,13 @@ static void dce110_stream_encoder_stop_hdmi_info_packets(/* stop generic packets 2 & 3 on HDMI */ REG_SET_6 (HDMI_GENERIC_PACKET_CONTROL1 ,0 , -HDMI_GENERIC2_CONT ,0 , -HDMI_GENERIC2_LINE ,0 , -HDMI_GENERIC2_SEND ,0 , -HDMI_GENERIC3_CONT ,0 , -HDMI_GENERIC3_LINE ,0 , -HDMI_GENERIC3_SEND ,0 ); - -/* stop AVI packet on HDMI */ -if (enc110->se_mask->HDMI_AVI_INFO_CONT && - enc110->se_mask->HDMI_AVI_INFO_SEND) { +HDMI_GENERIC0_CONT ,0 , +HDMI_GENERIC0_LINE ,0 , +HDMI_GENERIC0_SEND ,0 , +HDMI_GENERIC1_CONT ,0 , +HDMI_GENERIC1_LINE ,0 , +HDMI_GENERIC1_SEND ,0 ); -REG_UPDATE_2 (HDMI_INFOFRAME_CONTROL0 , -HDMI_AVI_INFO_SEND ,0 , -HDMI_AVI_INFO_CONT ,0 ); - }else { -ASSERT (enc110->se_mask->HDMI_AVI_INFO_SEND); -ASSERT (enc110->se_mask->HDMI_AVI_INFO_CONT); - } } static void dce110_stream_encoder_update_dp_info_packets(
@@ -500,14 +527,14 @@ static void dce110_stream_encoder_update_dp_info_packets(if (info_frame->vsc.valid)dce110_update_generic_info_packet ( enc110, -0 , +0 ,/* packetIndex */ &info_frame->vsc);/* enable/disable transmission of packet(s). * If enabled, packet transmission begins on the next frame */ +REG_UPDATE (DP_SEC_CNTL ,DP_SEC_GSP0_ENABLE , info_frame->vsc.valid); -REG_UPDATE (DP_SEC_CNTL ,DP_SEC_GSP0_ENABLE , info_frame->vsc.valid);/* This bit is the master enable bit. * When enabling secondary stream engine, * this master bit must also be set.
@@ -535,16 +562,8 @@ static void dce110_stream_encoder_stop_dp_info_packets(DP_SEC_AVI_ENABLE ,0 ,DP_SEC_MPG_ENABLE ,0 , DP_SEC_STREAM_ENABLE, 0); - }else { -ASSERT (enc110->se_mask->DP_SEC_AVI_ENABLE); -REG_SET_6 (DP_SEC_CNTL ,0 , -DP_SEC_GSP0_ENABLE ,0 , -DP_SEC_GSP1_ENABLE ,0 , -DP_SEC_GSP2_ENABLE ,0 , -DP_SEC_GSP3_ENABLE ,0 , -DP_SEC_MPG_ENABLE ,0 , -DP_SEC_STREAM_ENABLE ,0 ); } +/* this register shared with audio info frame. * therefore we need to keep master enabled * if at least one of the fields is not 0 */
@@ -558,7 +577,6 @@ static void dce110_stream_encoder_dp_blank( struct stream_encoder *enc) {struct dce110_stream_encoder *enc110 =DCE110STRENC_FROM_STRENC (enc); -uint32_t value;uint32_t retries =0 ;uint32_t max_retries =DP_BLANK_MAX_RETRY *10 ;
@@ -586,19 +604,9 @@ static void dce110_stream_encoder_dp_blank(* Poll for DP_VID_STREAM_STATUS == 0 */ -do { - value =REG_READ (DP_VID_STREAM_CNTL ); - -if (!get_reg_field_value ( - value, -DP_VID_STREAM_CNTL , -DP_VID_STREAM_STATUS )) -break ; - -udelay (10 ); - - ++retries; - }while (retries < max_retries); +REG_WAIT (DP_VID_STREAM_CNTL ,DP_VID_STREAM_STATUS , +1 , +10 , max_retries);ASSERT (retries <= max_retries);
drivers/gpu/drm/amd/dal/dc/dce/dce_stream_encoder.h +83 -19
180 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/dce110/dce110_hw_sequencer.c +2 -1
@@ -855,7 +855,8 @@ static enum dc_status apply_single_controller_ctx_to_hw(if (dc_is_dp_signal (pipe_ctx->stream->signal)) pipe_ctx->stream_enc->funcs->dp_set_stream_attribute ( pipe_ctx->stream_enc, - &stream->public.timing); + &stream->public.timing, + stream->public.output_color_space);if (dc_is_hdmi_signal (pipe_ctx->stream->signal)) pipe_ctx->stream_enc->funcs->hdmi_set_stream_attribute(
drivers/gpu/drm/amd/dal/dc/inc/hw/stream_encoder.h +2 -1
@@ -55,7 +55,8 @@ struct stream_encoder {struct stream_encoder_funcs {void (*dp_set_stream_attribute)(struct stream_encoder *enc, -struct dc_crtc_timing *crtc_timing); +struct dc_crtc_timing *crtc_timing, +enum dc_color_space output_color_space); void (*hdmi_set_stream_attribute)( struct stream_encoder *enc,
drivers/gpu/drm/amd/dal/dc/inc/reg_helper.h +54 -29
107 lines not on this page · raw message
drivers/gpu/drm/amd/dal/dc/virtual/virtual_stream_encoder.c +2 -1
@@ -28,7 +28,8 @@static void virtual_stream_encoder_dp_set_stream_attribute (struct stream_encoder *enc, -struct dc_crtc_timing *crtc_timing) {} +struct dc_crtc_timing *crtc_timing, +enum dc_color_space output_color_space) {} static void virtual_stream_encoder_hdmi_set_stream_attribute( struct stream_encoder *enc,
Signature · 6 lines
2.10.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx