summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>2020-10-15 10:50:18 -0400
committerAlex Deucher <alexander.deucher@amd.com>2020-10-16 15:11:17 -0400
commit26d94a4687708fbb1622fa9edab52c35aa90698a (patch)
tree32a7844f4025b16520cb1adbd519f97b00dbdb87
parentf5213f827c8748b99741406342d75d8d6641ddcc (diff)
drm/amd/display: Use amdgpu_socbb.h instead of redefining structs
Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c58
1 files changed, 1 insertions, 57 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c b/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c
index b8b3152ec613..38e807f22060 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c
@@ -65,66 +65,10 @@
#include "dcn/dpcs_3_0_0_offset.h"
#include "dcn/dpcs_3_0_0_sh_mask.h"
#include "nbio/nbio_7_4_offset.h"
+#include "amdgpu_socbb.h"
#define DC_LOGGER_INIT(logger)
-struct gpu_info_voltage_scaling_v1_0 {
- int state;
- uint32_t dscclk_mhz;
- uint32_t dcfclk_mhz;
- uint32_t socclk_mhz;
- uint32_t dram_speed_mts;
- uint32_t fabricclk_mhz;
- uint32_t dispclk_mhz;
- uint32_t phyclk_mhz;
- uint32_t dppclk_mhz;
-};
-
-struct gpu_info_soc_bounding_box_v1_0 {
- uint32_t sr_exit_time_us;
- uint32_t sr_enter_plus_exit_time_us;
- uint32_t urgent_latency_us;
- uint32_t urgent_latency_pixel_data_only_us;
- uint32_t urgent_latency_pixel_mixed_with_vm_data_us;
- uint32_t urgent_latency_vm_data_only_us;
- uint32_t writeback_latency_us;
- uint32_t ideal_dram_bw_after_urgent_percent;
- // PercentOfIdealDRAMFabricAndSDPPortBWReceivedAfterUrgLatencyPixelDataOnly
- uint32_t pct_ideal_dram_sdp_bw_after_urgent_pixel_only;
- uint32_t pct_ideal_dram_sdp_bw_after_urgent_pixel_and_vm;
- uint32_t pct_ideal_dram_sdp_bw_after_urgent_vm_only;
- uint32_t max_avg_sdp_bw_use_normal_percent;
- uint32_t max_avg_dram_bw_use_normal_percent;
- unsigned int max_request_size_bytes;
- uint32_t downspread_percent;
- uint32_t dram_page_open_time_ns;
- uint32_t dram_rw_turnaround_time_ns;
- uint32_t dram_return_buffer_per_channel_bytes;
- uint32_t dram_channel_width_bytes;
- uint32_t fabric_datapath_to_dcn_data_return_bytes;
- uint32_t dcn_downspread_percent;
- uint32_t dispclk_dppclk_vco_speed_mhz;
- uint32_t dfs_vco_period_ps;
- unsigned int urgent_out_of_order_return_per_channel_pixel_only_bytes;
- unsigned int urgent_out_of_order_return_per_channel_pixel_and_vm_bytes;
- unsigned int urgent_out_of_order_return_per_channel_vm_only_bytes;
- unsigned int round_trip_ping_latency_dcfclk_cycles;
- unsigned int urgent_out_of_order_return_per_channel_bytes;
- unsigned int channel_interleave_bytes;
- unsigned int num_banks;
- unsigned int num_chans;
- unsigned int vmm_page_size_bytes;
- uint32_t dram_clock_change_latency_us;
- uint32_t writeback_dram_clock_change_latency_us;
- unsigned int return_bus_width_bytes;
- unsigned int voltage_override;
- uint32_t xfc_bus_transport_time_us;
- uint32_t xfc_xbuf_latency_tolerance_us;
- int use_urgent_burst_bw;
- unsigned int num_states;
- struct gpu_info_voltage_scaling_v1_0 clock_limits[8];
-};
-
struct _vcs_dpi_ip_params_st dcn3_02_ip = {
.use_min_dcfclk = 0,
.clamp_min_dcfclk = 0,