mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 22:26:55 +00:00
drm/amd/display: Fixed EdidUtility build errors
[HOW] Added #ifdefs and refactored various parts of dc to allow dc_link to be built by AMD EDID UTILITY [WHY] dc_dsc was refactored moving some of the code that AMD EDID UTILITY needed to dc_link, so now dc_link needs to be included by AMD EDID UTILITY Squash in DCN config fix (Alex) Reviewed-by: Leung Martin <Martin.Leung@amd.com> Acked-by: Solomon Chiu <solomon.chiu@amd.com> Signed-off-by: Mark Morra <MarkAlbert.Morra@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Mark Morra
Alex Deucher
parent
b30eda8d41
commit
91a9ead069
4 changed files with 382 additions and 320 deletions
|
|
@ -3517,61 +3517,6 @@ void dc_link_enable_hpd_filter(struct dc_link *link, bool enable)
|
|||
}
|
||||
}
|
||||
|
||||
uint32_t dc_bandwidth_in_kbps_from_timing(
|
||||
const struct dc_crtc_timing *timing)
|
||||
{
|
||||
uint32_t bits_per_channel = 0;
|
||||
uint32_t kbps;
|
||||
|
||||
#if defined(CONFIG_DRM_AMD_DC_DCN)
|
||||
if (timing->flags.DSC)
|
||||
return dc_dsc_stream_bandwidth_in_kbps(timing,
|
||||
timing->dsc_cfg.bits_per_pixel,
|
||||
timing->dsc_cfg.num_slices_h,
|
||||
timing->dsc_cfg.is_dp);
|
||||
#endif
|
||||
|
||||
switch (timing->display_color_depth) {
|
||||
case COLOR_DEPTH_666:
|
||||
bits_per_channel = 6;
|
||||
break;
|
||||
case COLOR_DEPTH_888:
|
||||
bits_per_channel = 8;
|
||||
break;
|
||||
case COLOR_DEPTH_101010:
|
||||
bits_per_channel = 10;
|
||||
break;
|
||||
case COLOR_DEPTH_121212:
|
||||
bits_per_channel = 12;
|
||||
break;
|
||||
case COLOR_DEPTH_141414:
|
||||
bits_per_channel = 14;
|
||||
break;
|
||||
case COLOR_DEPTH_161616:
|
||||
bits_per_channel = 16;
|
||||
break;
|
||||
default:
|
||||
ASSERT(bits_per_channel != 0);
|
||||
bits_per_channel = 8;
|
||||
break;
|
||||
}
|
||||
|
||||
kbps = timing->pix_clk_100hz / 10;
|
||||
kbps *= bits_per_channel;
|
||||
|
||||
if (timing->flags.Y_ONLY != 1) {
|
||||
/*Only YOnly make reduce bandwidth by 1/3 compares to RGB*/
|
||||
kbps *= 3;
|
||||
if (timing->pixel_encoding == PIXEL_ENCODING_YCBCR420)
|
||||
kbps /= 2;
|
||||
else if (timing->pixel_encoding == PIXEL_ENCODING_YCBCR422)
|
||||
kbps = kbps * 2 / 3;
|
||||
}
|
||||
|
||||
return kbps;
|
||||
|
||||
}
|
||||
|
||||
void dc_link_set_drive_settings(struct dc *dc,
|
||||
struct link_training_settings *lt_settings,
|
||||
const struct dc_link *link)
|
||||
|
|
@ -3777,3 +3722,58 @@ bool dc_link_should_enable_fec(const struct dc_link *link)
|
|||
|
||||
return ret;
|
||||
}
|
||||
|
||||
uint32_t dc_bandwidth_in_kbps_from_timing(
|
||||
const struct dc_crtc_timing *timing)
|
||||
{
|
||||
uint32_t bits_per_channel = 0;
|
||||
uint32_t kbps;
|
||||
|
||||
#if defined(CONFIG_DRM_AMD_DC_DCN)
|
||||
if (timing->flags.DSC)
|
||||
return dc_dsc_stream_bandwidth_in_kbps(timing,
|
||||
timing->dsc_cfg.bits_per_pixel,
|
||||
timing->dsc_cfg.num_slices_h,
|
||||
timing->dsc_cfg.is_dp);
|
||||
#endif
|
||||
|
||||
switch (timing->display_color_depth) {
|
||||
case COLOR_DEPTH_666:
|
||||
bits_per_channel = 6;
|
||||
break;
|
||||
case COLOR_DEPTH_888:
|
||||
bits_per_channel = 8;
|
||||
break;
|
||||
case COLOR_DEPTH_101010:
|
||||
bits_per_channel = 10;
|
||||
break;
|
||||
case COLOR_DEPTH_121212:
|
||||
bits_per_channel = 12;
|
||||
break;
|
||||
case COLOR_DEPTH_141414:
|
||||
bits_per_channel = 14;
|
||||
break;
|
||||
case COLOR_DEPTH_161616:
|
||||
bits_per_channel = 16;
|
||||
break;
|
||||
default:
|
||||
ASSERT(bits_per_channel != 0);
|
||||
bits_per_channel = 8;
|
||||
break;
|
||||
}
|
||||
|
||||
kbps = timing->pix_clk_100hz / 10;
|
||||
kbps *= bits_per_channel;
|
||||
|
||||
if (timing->flags.Y_ONLY != 1) {
|
||||
/*Only YOnly make reduce bandwidth by 1/3 compares to RGB*/
|
||||
kbps *= 3;
|
||||
if (timing->pixel_encoding == PIXEL_ENCODING_YCBCR420)
|
||||
kbps /= 2;
|
||||
else if (timing->pixel_encoding == PIXEL_ENCODING_YCBCR422)
|
||||
kbps = kbps * 2 / 3;
|
||||
}
|
||||
|
||||
return kbps;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -458,7 +458,65 @@ union mem_low_power_enable_options {
|
|||
uint32_t u32All;
|
||||
};
|
||||
|
||||
struct dc_debug_data {
|
||||
uint32_t ltFailCount;
|
||||
uint32_t i2cErrorCount;
|
||||
uint32_t auxErrorCount;
|
||||
};
|
||||
|
||||
struct dc_phy_addr_space_config {
|
||||
struct {
|
||||
uint64_t start_addr;
|
||||
uint64_t end_addr;
|
||||
uint64_t fb_top;
|
||||
uint64_t fb_offset;
|
||||
uint64_t fb_base;
|
||||
uint64_t agp_top;
|
||||
uint64_t agp_bot;
|
||||
uint64_t agp_base;
|
||||
} system_aperture;
|
||||
|
||||
struct {
|
||||
uint64_t page_table_start_addr;
|
||||
uint64_t page_table_end_addr;
|
||||
uint64_t page_table_base_addr;
|
||||
bool base_addr_is_mc_addr;
|
||||
} gart_config;
|
||||
|
||||
bool valid;
|
||||
bool is_hvm_enabled;
|
||||
uint64_t page_table_default_page_addr;
|
||||
};
|
||||
|
||||
struct dc_virtual_addr_space_config {
|
||||
uint64_t page_table_base_addr;
|
||||
uint64_t page_table_start_addr;
|
||||
uint64_t page_table_end_addr;
|
||||
uint32_t page_table_block_size_in_bytes;
|
||||
uint8_t page_table_depth; // 1 = 1 level, 2 = 2 level, etc. 0 = invalid
|
||||
};
|
||||
|
||||
struct dc_bounding_box_overrides {
|
||||
int sr_exit_time_ns;
|
||||
int sr_enter_plus_exit_time_ns;
|
||||
int urgent_latency_ns;
|
||||
int percent_of_ideal_drambw;
|
||||
int dram_clock_change_latency_ns;
|
||||
int dummy_clock_change_latency_ns;
|
||||
/* This forces a hard min on the DCFCLK we use
|
||||
* for DML. Unlike the debug option for forcing
|
||||
* DCFCLK, this override affects watermark calculations
|
||||
*/
|
||||
int min_dcfclk_mhz;
|
||||
};
|
||||
|
||||
struct dc_state;
|
||||
struct resource_pool;
|
||||
struct dce_hwseq;
|
||||
|
||||
struct dc_debug_options {
|
||||
bool native422_support;
|
||||
bool disable_dsc;
|
||||
enum visual_confirm visual_confirm;
|
||||
bool sanity_checks;
|
||||
bool max_disp_clk;
|
||||
|
|
@ -484,7 +542,6 @@ struct dc_debug_options {
|
|||
bool disable_dsc_power_gate;
|
||||
int dsc_min_slice_height_override;
|
||||
int dsc_bpp_increment_div;
|
||||
bool native422_support;
|
||||
bool disable_pplib_wm_range;
|
||||
enum wm_report_mode pplib_wm_report_mode;
|
||||
unsigned int min_disp_clk_khz;
|
||||
|
|
@ -554,7 +611,6 @@ struct dc_debug_options {
|
|||
bool validate_dml_output;
|
||||
bool enable_dmcub_surface_flip;
|
||||
bool usbc_combo_phy_reset_wa;
|
||||
bool disable_dsc;
|
||||
bool enable_dram_clock_change_one_display_vactive;
|
||||
union mem_low_power_enable_options enable_mem_low_power;
|
||||
bool force_vblank_alignment;
|
||||
|
|
@ -572,69 +628,13 @@ struct dc_debug_options {
|
|||
#endif
|
||||
};
|
||||
|
||||
struct dc_debug_data {
|
||||
uint32_t ltFailCount;
|
||||
uint32_t i2cErrorCount;
|
||||
uint32_t auxErrorCount;
|
||||
};
|
||||
|
||||
struct dc_phy_addr_space_config {
|
||||
struct {
|
||||
uint64_t start_addr;
|
||||
uint64_t end_addr;
|
||||
uint64_t fb_top;
|
||||
uint64_t fb_offset;
|
||||
uint64_t fb_base;
|
||||
uint64_t agp_top;
|
||||
uint64_t agp_bot;
|
||||
uint64_t agp_base;
|
||||
} system_aperture;
|
||||
|
||||
struct {
|
||||
uint64_t page_table_start_addr;
|
||||
uint64_t page_table_end_addr;
|
||||
uint64_t page_table_base_addr;
|
||||
#if defined(CONFIG_DRM_AMD_DC_DCN)
|
||||
bool base_addr_is_mc_addr;
|
||||
#endif
|
||||
} gart_config;
|
||||
|
||||
bool valid;
|
||||
bool is_hvm_enabled;
|
||||
uint64_t page_table_default_page_addr;
|
||||
};
|
||||
|
||||
struct dc_virtual_addr_space_config {
|
||||
uint64_t page_table_base_addr;
|
||||
uint64_t page_table_start_addr;
|
||||
uint64_t page_table_end_addr;
|
||||
uint32_t page_table_block_size_in_bytes;
|
||||
uint8_t page_table_depth; // 1 = 1 level, 2 = 2 level, etc. 0 = invalid
|
||||
};
|
||||
|
||||
struct dc_bounding_box_overrides {
|
||||
int sr_exit_time_ns;
|
||||
int sr_enter_plus_exit_time_ns;
|
||||
int urgent_latency_ns;
|
||||
int percent_of_ideal_drambw;
|
||||
int dram_clock_change_latency_ns;
|
||||
int dummy_clock_change_latency_ns;
|
||||
/* This forces a hard min on the DCFCLK we use
|
||||
* for DML. Unlike the debug option for forcing
|
||||
* DCFCLK, this override affects watermark calculations
|
||||
*/
|
||||
int min_dcfclk_mhz;
|
||||
};
|
||||
|
||||
struct resource_pool;
|
||||
struct dce_hwseq;
|
||||
struct gpu_info_soc_bounding_box_v1_0;
|
||||
struct dc {
|
||||
struct dc_debug_options debug;
|
||||
struct dc_versions versions;
|
||||
struct dc_caps caps;
|
||||
struct dc_cap_funcs cap_funcs;
|
||||
struct dc_config config;
|
||||
struct dc_debug_options debug;
|
||||
struct dc_bounding_box_overrides bb_overrides;
|
||||
struct dc_bug_wa work_arounds;
|
||||
struct dc_context *ctx;
|
||||
|
|
|
|||
|
|
@ -75,18 +75,6 @@ enum dce_environment {
|
|||
#define IS_DIAG_DC(dce_environment) \
|
||||
(IS_FPGA_MAXIMUS_DC(dce_environment) || (dce_environment == DCE_ENV_DIAG))
|
||||
|
||||
struct hw_asic_id {
|
||||
uint32_t chip_id;
|
||||
uint32_t chip_family;
|
||||
uint32_t pci_revision_id;
|
||||
uint32_t hw_internal_rev;
|
||||
uint32_t vram_type;
|
||||
uint32_t vram_width;
|
||||
uint32_t feature_flags;
|
||||
uint32_t fake_paths_num;
|
||||
void *atombios_base_address;
|
||||
};
|
||||
|
||||
struct dc_perf_trace {
|
||||
unsigned long read_count;
|
||||
unsigned long write_count;
|
||||
|
|
@ -94,35 +82,6 @@ struct dc_perf_trace {
|
|||
unsigned long last_entry_write;
|
||||
};
|
||||
|
||||
struct dc_context {
|
||||
struct dc *dc;
|
||||
|
||||
void *driver_context; /* e.g. amdgpu_device */
|
||||
struct dc_perf_trace *perf_trace;
|
||||
void *cgs_device;
|
||||
|
||||
enum dce_environment dce_environment;
|
||||
struct hw_asic_id asic_id;
|
||||
|
||||
/* 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;
|
||||
uint32_t dc_sink_id_count;
|
||||
uint32_t dc_stream_id_count;
|
||||
uint32_t dc_edp_id_count;
|
||||
uint64_t fbc_gpu_addr;
|
||||
struct dc_dmub_srv *dmub_srv;
|
||||
|
||||
#ifdef CONFIG_DRM_AMD_DC_HDCP
|
||||
struct cp_psp cp_psp;
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
#define DC_MAX_EDID_BUFFER_SIZE 2048
|
||||
#define DC_EDID_BLOCK_SIZE 128
|
||||
#define MAX_SURFACE_NUM 4
|
||||
|
|
@ -836,6 +795,46 @@ struct dc_clock_config {
|
|||
uint32_t current_clock_khz;/*current clock in use*/
|
||||
};
|
||||
|
||||
struct hw_asic_id {
|
||||
uint32_t chip_id;
|
||||
uint32_t chip_family;
|
||||
uint32_t pci_revision_id;
|
||||
uint32_t hw_internal_rev;
|
||||
uint32_t vram_type;
|
||||
uint32_t vram_width;
|
||||
uint32_t feature_flags;
|
||||
uint32_t fake_paths_num;
|
||||
void *atombios_base_address;
|
||||
};
|
||||
|
||||
struct dc_context {
|
||||
struct dc *dc;
|
||||
|
||||
void *driver_context; /* e.g. amdgpu_device */
|
||||
struct dc_perf_trace *perf_trace;
|
||||
void *cgs_device;
|
||||
|
||||
enum dce_environment dce_environment;
|
||||
struct hw_asic_id asic_id;
|
||||
|
||||
/* 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;
|
||||
uint32_t dc_sink_id_count;
|
||||
uint32_t dc_stream_id_count;
|
||||
uint32_t dc_edp_id_count;
|
||||
uint64_t fbc_gpu_addr;
|
||||
struct dc_dmub_srv *dmub_srv;
|
||||
#ifdef CONFIG_DRM_AMD_DC_HDCP
|
||||
struct cp_psp cp_psp;
|
||||
#endif
|
||||
|
||||
};
|
||||
|
||||
/* DSC DPCD capabilities */
|
||||
union dsc_slice_caps1 {
|
||||
struct {
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
#include <drm/drm_dp_helper.h>
|
||||
#include "dc.h"
|
||||
#include "rc_calc.h"
|
||||
#include "fixed31_32.h"
|
||||
|
||||
/* This module's internal functions */
|
||||
|
||||
|
|
@ -39,6 +40,47 @@ static bool dsc_policy_enable_dsc_when_not_needed;
|
|||
|
||||
static bool dsc_policy_disable_dsc_stream_overhead;
|
||||
|
||||
/* Forward Declerations */
|
||||
static void get_dsc_bandwidth_range(
|
||||
const uint32_t min_bpp_x16,
|
||||
const uint32_t max_bpp_x16,
|
||||
const uint32_t num_slices_h,
|
||||
const struct dsc_enc_caps *dsc_caps,
|
||||
const struct dc_crtc_timing *timing,
|
||||
struct dc_dsc_bw_range *range);
|
||||
|
||||
static uint32_t compute_bpp_x16_from_target_bandwidth(
|
||||
const uint32_t bandwidth_in_kbps,
|
||||
const struct dc_crtc_timing *timing,
|
||||
const uint32_t num_slices_h,
|
||||
const uint32_t bpp_increment_div,
|
||||
const bool is_dp);
|
||||
|
||||
static void get_dsc_enc_caps(
|
||||
const struct display_stream_compressor *dsc,
|
||||
struct dsc_enc_caps *dsc_enc_caps,
|
||||
int pixel_clock_100Hz);
|
||||
|
||||
static bool intersect_dsc_caps(
|
||||
const struct dsc_dec_dpcd_caps *dsc_sink_caps,
|
||||
const struct dsc_enc_caps *dsc_enc_caps,
|
||||
enum dc_pixel_encoding pixel_encoding,
|
||||
struct dsc_enc_caps *dsc_common_caps);
|
||||
|
||||
static bool setup_dsc_config(
|
||||
const struct dsc_dec_dpcd_caps *dsc_sink_caps,
|
||||
const struct dsc_enc_caps *dsc_enc_caps,
|
||||
int target_bandwidth_kbps,
|
||||
const struct dc_crtc_timing *timing,
|
||||
int min_slice_height_override,
|
||||
int max_dsc_target_bpp_limit_override_x16,
|
||||
struct dc_dsc_config *dsc_cfg);
|
||||
|
||||
static struct fixed31_32 compute_dsc_max_bandwidth_overhead(
|
||||
const struct dc_crtc_timing *timing,
|
||||
const int num_slices_h,
|
||||
const bool is_dp);
|
||||
|
||||
static bool dsc_buff_block_size_from_dpcd(int dpcd_buff_block_size, int *buff_block_size)
|
||||
{
|
||||
|
||||
|
|
@ -171,10 +213,164 @@ static bool dsc_bpp_increment_div_from_dpcd(uint8_t bpp_increment_dpcd, uint32_t
|
|||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
bool dc_dsc_parse_dsc_dpcd(const struct dc *dc,
|
||||
const uint8_t *dpcd_dsc_basic_data,
|
||||
const uint8_t *dpcd_dsc_branch_decoder_caps,
|
||||
struct dsc_dec_dpcd_caps *dsc_sink_caps)
|
||||
{
|
||||
if (!dpcd_dsc_basic_data)
|
||||
return false;
|
||||
|
||||
dsc_sink_caps->is_dsc_supported =
|
||||
(dpcd_dsc_basic_data[DP_DSC_SUPPORT - DP_DSC_SUPPORT] & DP_DSC_DECOMPRESSION_IS_SUPPORTED) != 0;
|
||||
if (!dsc_sink_caps->is_dsc_supported)
|
||||
return false;
|
||||
|
||||
dsc_sink_caps->dsc_version = dpcd_dsc_basic_data[DP_DSC_REV - DP_DSC_SUPPORT];
|
||||
|
||||
{
|
||||
int buff_block_size;
|
||||
int buff_size;
|
||||
|
||||
if (!dsc_buff_block_size_from_dpcd(dpcd_dsc_basic_data[DP_DSC_RC_BUF_BLK_SIZE - DP_DSC_SUPPORT],
|
||||
&buff_block_size))
|
||||
return false;
|
||||
|
||||
buff_size = dpcd_dsc_basic_data[DP_DSC_RC_BUF_SIZE - DP_DSC_SUPPORT] + 1;
|
||||
dsc_sink_caps->rc_buffer_size = buff_size * buff_block_size;
|
||||
}
|
||||
|
||||
dsc_sink_caps->slice_caps1.raw = dpcd_dsc_basic_data[DP_DSC_SLICE_CAP_1 - DP_DSC_SUPPORT];
|
||||
if (!dsc_line_buff_depth_from_dpcd(dpcd_dsc_basic_data[DP_DSC_LINE_BUF_BIT_DEPTH - DP_DSC_SUPPORT],
|
||||
&dsc_sink_caps->lb_bit_depth))
|
||||
return false;
|
||||
|
||||
dsc_sink_caps->is_block_pred_supported =
|
||||
(dpcd_dsc_basic_data[DP_DSC_BLK_PREDICTION_SUPPORT - DP_DSC_SUPPORT] &
|
||||
DP_DSC_BLK_PREDICTION_IS_SUPPORTED) != 0;
|
||||
|
||||
dsc_sink_caps->edp_max_bits_per_pixel =
|
||||
dpcd_dsc_basic_data[DP_DSC_MAX_BITS_PER_PIXEL_LOW - DP_DSC_SUPPORT] |
|
||||
dpcd_dsc_basic_data[DP_DSC_MAX_BITS_PER_PIXEL_HI - DP_DSC_SUPPORT] << 8;
|
||||
|
||||
dsc_sink_caps->color_formats.raw = dpcd_dsc_basic_data[DP_DSC_DEC_COLOR_FORMAT_CAP - DP_DSC_SUPPORT];
|
||||
dsc_sink_caps->color_depth.raw = dpcd_dsc_basic_data[DP_DSC_DEC_COLOR_DEPTH_CAP - DP_DSC_SUPPORT];
|
||||
|
||||
{
|
||||
int dpcd_throughput = dpcd_dsc_basic_data[DP_DSC_PEAK_THROUGHPUT - DP_DSC_SUPPORT];
|
||||
|
||||
if (!dsc_throughput_from_dpcd(dpcd_throughput & DP_DSC_THROUGHPUT_MODE_0_MASK,
|
||||
&dsc_sink_caps->throughput_mode_0_mps))
|
||||
return false;
|
||||
|
||||
dpcd_throughput = (dpcd_throughput & DP_DSC_THROUGHPUT_MODE_1_MASK) >> DP_DSC_THROUGHPUT_MODE_1_SHIFT;
|
||||
if (!dsc_throughput_from_dpcd(dpcd_throughput, &dsc_sink_caps->throughput_mode_1_mps))
|
||||
return false;
|
||||
}
|
||||
|
||||
dsc_sink_caps->max_slice_width = dpcd_dsc_basic_data[DP_DSC_MAX_SLICE_WIDTH - DP_DSC_SUPPORT] * 320;
|
||||
dsc_sink_caps->slice_caps2.raw = dpcd_dsc_basic_data[DP_DSC_SLICE_CAP_2 - DP_DSC_SUPPORT];
|
||||
|
||||
if (!dsc_bpp_increment_div_from_dpcd(dpcd_dsc_basic_data[DP_DSC_BITS_PER_PIXEL_INC - DP_DSC_SUPPORT],
|
||||
&dsc_sink_caps->bpp_increment_div))
|
||||
return false;
|
||||
|
||||
if (dc->debug.dsc_bpp_increment_div) {
|
||||
/* dsc_bpp_increment_div should onl be 1, 2, 4, 8 or 16, but rather than rejecting invalid values,
|
||||
* we'll accept all and get it into range. This also makes the above check against 0 redundant,
|
||||
* but that one stresses out the override will be only used if it's not 0.
|
||||
*/
|
||||
if (dc->debug.dsc_bpp_increment_div >= 1)
|
||||
dsc_sink_caps->bpp_increment_div = 1;
|
||||
if (dc->debug.dsc_bpp_increment_div >= 2)
|
||||
dsc_sink_caps->bpp_increment_div = 2;
|
||||
if (dc->debug.dsc_bpp_increment_div >= 4)
|
||||
dsc_sink_caps->bpp_increment_div = 4;
|
||||
if (dc->debug.dsc_bpp_increment_div >= 8)
|
||||
dsc_sink_caps->bpp_increment_div = 8;
|
||||
if (dc->debug.dsc_bpp_increment_div >= 16)
|
||||
dsc_sink_caps->bpp_increment_div = 16;
|
||||
}
|
||||
|
||||
/* Extended caps */
|
||||
if (dpcd_dsc_branch_decoder_caps == NULL) { // branch decoder DPCD DSC data can be null for non branch device
|
||||
dsc_sink_caps->branch_overall_throughput_0_mps = 0;
|
||||
dsc_sink_caps->branch_overall_throughput_1_mps = 0;
|
||||
dsc_sink_caps->branch_max_line_width = 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
dsc_sink_caps->branch_overall_throughput_0_mps =
|
||||
dpcd_dsc_branch_decoder_caps[DP_DSC_BRANCH_OVERALL_THROUGHPUT_0 - DP_DSC_BRANCH_OVERALL_THROUGHPUT_0];
|
||||
if (dsc_sink_caps->branch_overall_throughput_0_mps == 0)
|
||||
dsc_sink_caps->branch_overall_throughput_0_mps = 0;
|
||||
else if (dsc_sink_caps->branch_overall_throughput_0_mps == 1)
|
||||
dsc_sink_caps->branch_overall_throughput_0_mps = 680;
|
||||
else {
|
||||
dsc_sink_caps->branch_overall_throughput_0_mps *= 50;
|
||||
dsc_sink_caps->branch_overall_throughput_0_mps += 600;
|
||||
}
|
||||
|
||||
dsc_sink_caps->branch_overall_throughput_1_mps =
|
||||
dpcd_dsc_branch_decoder_caps[DP_DSC_BRANCH_OVERALL_THROUGHPUT_1 - DP_DSC_BRANCH_OVERALL_THROUGHPUT_0];
|
||||
if (dsc_sink_caps->branch_overall_throughput_1_mps == 0)
|
||||
dsc_sink_caps->branch_overall_throughput_1_mps = 0;
|
||||
else if (dsc_sink_caps->branch_overall_throughput_1_mps == 1)
|
||||
dsc_sink_caps->branch_overall_throughput_1_mps = 680;
|
||||
else {
|
||||
dsc_sink_caps->branch_overall_throughput_1_mps *= 50;
|
||||
dsc_sink_caps->branch_overall_throughput_1_mps += 600;
|
||||
}
|
||||
|
||||
dsc_sink_caps->branch_max_line_width =
|
||||
dpcd_dsc_branch_decoder_caps[DP_DSC_BRANCH_MAX_LINE_WIDTH - DP_DSC_BRANCH_OVERALL_THROUGHPUT_0] * 320;
|
||||
ASSERT(dsc_sink_caps->branch_max_line_width == 0 || dsc_sink_caps->branch_max_line_width >= 5120);
|
||||
|
||||
dsc_sink_caps->is_dp = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/* If DSC is possbile, get DSC bandwidth range based on [min_bpp, max_bpp] target bitrate range and
|
||||
* timing's pixel clock and uncompressed bandwidth.
|
||||
* If DSC is not possible, leave '*range' untouched.
|
||||
*/
|
||||
bool dc_dsc_compute_bandwidth_range(
|
||||
const struct display_stream_compressor *dsc,
|
||||
uint32_t dsc_min_slice_height_override,
|
||||
uint32_t min_bpp_x16,
|
||||
uint32_t max_bpp_x16,
|
||||
const struct dsc_dec_dpcd_caps *dsc_sink_caps,
|
||||
const struct dc_crtc_timing *timing,
|
||||
struct dc_dsc_bw_range *range)
|
||||
{
|
||||
bool is_dsc_possible = false;
|
||||
struct dsc_enc_caps dsc_enc_caps;
|
||||
struct dsc_enc_caps dsc_common_caps;
|
||||
struct dc_dsc_config config;
|
||||
|
||||
get_dsc_enc_caps(dsc, &dsc_enc_caps, timing->pix_clk_100hz);
|
||||
|
||||
is_dsc_possible = intersect_dsc_caps(dsc_sink_caps, &dsc_enc_caps,
|
||||
timing->pixel_encoding, &dsc_common_caps);
|
||||
|
||||
if (is_dsc_possible)
|
||||
is_dsc_possible = setup_dsc_config(dsc_sink_caps, &dsc_enc_caps, 0, timing,
|
||||
dsc_min_slice_height_override, max_bpp_x16, &config);
|
||||
|
||||
if (is_dsc_possible)
|
||||
get_dsc_bandwidth_range(min_bpp_x16, max_bpp_x16,
|
||||
config.num_slices_h, &dsc_common_caps, timing, range);
|
||||
|
||||
return is_dsc_possible;
|
||||
}
|
||||
|
||||
static void get_dsc_enc_caps(
|
||||
const struct display_stream_compressor *dsc,
|
||||
struct dsc_enc_caps *dsc_enc_caps,
|
||||
int pixel_clock_100Hz)
|
||||
const struct display_stream_compressor *dsc,
|
||||
struct dsc_enc_caps *dsc_enc_caps,
|
||||
int pixel_clock_100Hz)
|
||||
{
|
||||
// This is a static HW query, so we can use any DSC
|
||||
|
||||
|
|
@ -187,14 +383,14 @@ static void get_dsc_enc_caps(
|
|||
}
|
||||
}
|
||||
|
||||
/* Returns 'false' if no intersection was found for at least one capablity.
|
||||
/* Returns 'false' if no intersection was found for at least one capability.
|
||||
* It also implicitly validates some sink caps against invalid value of zero.
|
||||
*/
|
||||
static bool intersect_dsc_caps(
|
||||
const struct dsc_dec_dpcd_caps *dsc_sink_caps,
|
||||
const struct dsc_enc_caps *dsc_enc_caps,
|
||||
enum dc_pixel_encoding pixel_encoding,
|
||||
struct dsc_enc_caps *dsc_common_caps)
|
||||
const struct dsc_dec_dpcd_caps *dsc_sink_caps,
|
||||
const struct dsc_enc_caps *dsc_enc_caps,
|
||||
enum dc_pixel_encoding pixel_encoding,
|
||||
struct dsc_enc_caps *dsc_common_caps)
|
||||
{
|
||||
int32_t max_slices;
|
||||
int32_t total_sink_throughput;
|
||||
|
|
@ -205,10 +401,14 @@ static bool intersect_dsc_caps(
|
|||
if (!dsc_common_caps->dsc_version)
|
||||
return false;
|
||||
|
||||
dsc_common_caps->slice_caps.bits.NUM_SLICES_1 = dsc_sink_caps->slice_caps1.bits.NUM_SLICES_1 && dsc_enc_caps->slice_caps.bits.NUM_SLICES_1;
|
||||
dsc_common_caps->slice_caps.bits.NUM_SLICES_2 = dsc_sink_caps->slice_caps1.bits.NUM_SLICES_2 && dsc_enc_caps->slice_caps.bits.NUM_SLICES_2;
|
||||
dsc_common_caps->slice_caps.bits.NUM_SLICES_4 = dsc_sink_caps->slice_caps1.bits.NUM_SLICES_4 && dsc_enc_caps->slice_caps.bits.NUM_SLICES_4;
|
||||
dsc_common_caps->slice_caps.bits.NUM_SLICES_8 = dsc_sink_caps->slice_caps1.bits.NUM_SLICES_8 && dsc_enc_caps->slice_caps.bits.NUM_SLICES_8;
|
||||
dsc_common_caps->slice_caps.bits.NUM_SLICES_1 =
|
||||
dsc_sink_caps->slice_caps1.bits.NUM_SLICES_1 && dsc_enc_caps->slice_caps.bits.NUM_SLICES_1;
|
||||
dsc_common_caps->slice_caps.bits.NUM_SLICES_2 =
|
||||
dsc_sink_caps->slice_caps1.bits.NUM_SLICES_2 && dsc_enc_caps->slice_caps.bits.NUM_SLICES_2;
|
||||
dsc_common_caps->slice_caps.bits.NUM_SLICES_4 =
|
||||
dsc_sink_caps->slice_caps1.bits.NUM_SLICES_4 && dsc_enc_caps->slice_caps.bits.NUM_SLICES_4;
|
||||
dsc_common_caps->slice_caps.bits.NUM_SLICES_8 =
|
||||
dsc_sink_caps->slice_caps1.bits.NUM_SLICES_8 && dsc_enc_caps->slice_caps.bits.NUM_SLICES_8;
|
||||
if (!dsc_common_caps->slice_caps.raw)
|
||||
return false;
|
||||
|
||||
|
|
@ -216,7 +416,8 @@ static bool intersect_dsc_caps(
|
|||
if (!dsc_common_caps->lb_bit_depth)
|
||||
return false;
|
||||
|
||||
dsc_common_caps->is_block_pred_supported = dsc_sink_caps->is_block_pred_supported && dsc_enc_caps->is_block_pred_supported;
|
||||
dsc_common_caps->is_block_pred_supported =
|
||||
dsc_sink_caps->is_block_pred_supported && dsc_enc_caps->is_block_pred_supported;
|
||||
|
||||
dsc_common_caps->color_formats.raw = dsc_sink_caps->color_formats.raw & dsc_enc_caps->color_formats.raw;
|
||||
if (!dsc_common_caps->color_formats.raw)
|
||||
|
|
@ -288,11 +489,11 @@ static struct fixed31_32 compute_dsc_max_bandwidth_overhead(
|
|||
}
|
||||
|
||||
static uint32_t compute_bpp_x16_from_target_bandwidth(
|
||||
const uint32_t bandwidth_in_kbps,
|
||||
const struct dc_crtc_timing *timing,
|
||||
const uint32_t num_slices_h,
|
||||
const uint32_t bpp_increment_div,
|
||||
const bool is_dp)
|
||||
const uint32_t bandwidth_in_kbps,
|
||||
const struct dc_crtc_timing *timing,
|
||||
const uint32_t num_slices_h,
|
||||
const uint32_t bpp_increment_div,
|
||||
const bool is_dp)
|
||||
{
|
||||
struct fixed31_32 overhead_in_kbps;
|
||||
struct fixed31_32 effective_bandwidth_in_kbps;
|
||||
|
|
@ -769,146 +970,6 @@ static bool setup_dsc_config(
|
|||
return is_dsc_possible;
|
||||
}
|
||||
|
||||
bool dc_dsc_parse_dsc_dpcd(const struct dc *dc, const uint8_t *dpcd_dsc_basic_data, const uint8_t *dpcd_dsc_branch_decoder_caps, struct dsc_dec_dpcd_caps *dsc_sink_caps)
|
||||
{
|
||||
if (!dpcd_dsc_basic_data)
|
||||
return false;
|
||||
|
||||
dsc_sink_caps->is_dsc_supported = (dpcd_dsc_basic_data[DP_DSC_SUPPORT - DP_DSC_SUPPORT] & DP_DSC_DECOMPRESSION_IS_SUPPORTED) != 0;
|
||||
if (!dsc_sink_caps->is_dsc_supported)
|
||||
return false;
|
||||
|
||||
dsc_sink_caps->dsc_version = dpcd_dsc_basic_data[DP_DSC_REV - DP_DSC_SUPPORT];
|
||||
|
||||
{
|
||||
int buff_block_size;
|
||||
int buff_size;
|
||||
|
||||
if (!dsc_buff_block_size_from_dpcd(dpcd_dsc_basic_data[DP_DSC_RC_BUF_BLK_SIZE - DP_DSC_SUPPORT], &buff_block_size))
|
||||
return false;
|
||||
|
||||
buff_size = dpcd_dsc_basic_data[DP_DSC_RC_BUF_SIZE - DP_DSC_SUPPORT] + 1;
|
||||
dsc_sink_caps->rc_buffer_size = buff_size * buff_block_size;
|
||||
}
|
||||
|
||||
dsc_sink_caps->slice_caps1.raw = dpcd_dsc_basic_data[DP_DSC_SLICE_CAP_1 - DP_DSC_SUPPORT];
|
||||
if (!dsc_line_buff_depth_from_dpcd(dpcd_dsc_basic_data[DP_DSC_LINE_BUF_BIT_DEPTH - DP_DSC_SUPPORT], &dsc_sink_caps->lb_bit_depth))
|
||||
return false;
|
||||
|
||||
dsc_sink_caps->is_block_pred_supported =
|
||||
(dpcd_dsc_basic_data[DP_DSC_BLK_PREDICTION_SUPPORT - DP_DSC_SUPPORT] & DP_DSC_BLK_PREDICTION_IS_SUPPORTED) != 0;
|
||||
|
||||
dsc_sink_caps->edp_max_bits_per_pixel =
|
||||
dpcd_dsc_basic_data[DP_DSC_MAX_BITS_PER_PIXEL_LOW - DP_DSC_SUPPORT] |
|
||||
dpcd_dsc_basic_data[DP_DSC_MAX_BITS_PER_PIXEL_HI - DP_DSC_SUPPORT] << 8;
|
||||
|
||||
dsc_sink_caps->color_formats.raw = dpcd_dsc_basic_data[DP_DSC_DEC_COLOR_FORMAT_CAP - DP_DSC_SUPPORT];
|
||||
dsc_sink_caps->color_depth.raw = dpcd_dsc_basic_data[DP_DSC_DEC_COLOR_DEPTH_CAP - DP_DSC_SUPPORT];
|
||||
|
||||
{
|
||||
int dpcd_throughput = dpcd_dsc_basic_data[DP_DSC_PEAK_THROUGHPUT - DP_DSC_SUPPORT];
|
||||
|
||||
if (!dsc_throughput_from_dpcd(dpcd_throughput & DP_DSC_THROUGHPUT_MODE_0_MASK, &dsc_sink_caps->throughput_mode_0_mps))
|
||||
return false;
|
||||
|
||||
dpcd_throughput = (dpcd_throughput & DP_DSC_THROUGHPUT_MODE_1_MASK) >> DP_DSC_THROUGHPUT_MODE_1_SHIFT;
|
||||
if (!dsc_throughput_from_dpcd(dpcd_throughput, &dsc_sink_caps->throughput_mode_1_mps))
|
||||
return false;
|
||||
}
|
||||
|
||||
dsc_sink_caps->max_slice_width = dpcd_dsc_basic_data[DP_DSC_MAX_SLICE_WIDTH - DP_DSC_SUPPORT] * 320;
|
||||
dsc_sink_caps->slice_caps2.raw = dpcd_dsc_basic_data[DP_DSC_SLICE_CAP_2 - DP_DSC_SUPPORT];
|
||||
|
||||
if (!dsc_bpp_increment_div_from_dpcd(dpcd_dsc_basic_data[DP_DSC_BITS_PER_PIXEL_INC - DP_DSC_SUPPORT], &dsc_sink_caps->bpp_increment_div))
|
||||
return false;
|
||||
|
||||
if (dc->debug.dsc_bpp_increment_div) {
|
||||
/* dsc_bpp_increment_div should onl be 1, 2, 4, 8 or 16, but rather than rejecting invalid values,
|
||||
* we'll accept all and get it into range. This also makes the above check against 0 redundant,
|
||||
* but that one stresses out the override will be only used if it's not 0.
|
||||
*/
|
||||
if (dc->debug.dsc_bpp_increment_div >= 1)
|
||||
dsc_sink_caps->bpp_increment_div = 1;
|
||||
if (dc->debug.dsc_bpp_increment_div >= 2)
|
||||
dsc_sink_caps->bpp_increment_div = 2;
|
||||
if (dc->debug.dsc_bpp_increment_div >= 4)
|
||||
dsc_sink_caps->bpp_increment_div = 4;
|
||||
if (dc->debug.dsc_bpp_increment_div >= 8)
|
||||
dsc_sink_caps->bpp_increment_div = 8;
|
||||
if (dc->debug.dsc_bpp_increment_div >= 16)
|
||||
dsc_sink_caps->bpp_increment_div = 16;
|
||||
}
|
||||
|
||||
/* Extended caps */
|
||||
if (dpcd_dsc_branch_decoder_caps == NULL) { // branch decoder DPCD DSC data can be null for non branch device
|
||||
dsc_sink_caps->branch_overall_throughput_0_mps = 0;
|
||||
dsc_sink_caps->branch_overall_throughput_1_mps = 0;
|
||||
dsc_sink_caps->branch_max_line_width = 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
dsc_sink_caps->branch_overall_throughput_0_mps = dpcd_dsc_branch_decoder_caps[DP_DSC_BRANCH_OVERALL_THROUGHPUT_0 - DP_DSC_BRANCH_OVERALL_THROUGHPUT_0];
|
||||
if (dsc_sink_caps->branch_overall_throughput_0_mps == 0)
|
||||
dsc_sink_caps->branch_overall_throughput_0_mps = 0;
|
||||
else if (dsc_sink_caps->branch_overall_throughput_0_mps == 1)
|
||||
dsc_sink_caps->branch_overall_throughput_0_mps = 680;
|
||||
else {
|
||||
dsc_sink_caps->branch_overall_throughput_0_mps *= 50;
|
||||
dsc_sink_caps->branch_overall_throughput_0_mps += 600;
|
||||
}
|
||||
|
||||
dsc_sink_caps->branch_overall_throughput_1_mps = dpcd_dsc_branch_decoder_caps[DP_DSC_BRANCH_OVERALL_THROUGHPUT_1 - DP_DSC_BRANCH_OVERALL_THROUGHPUT_0];
|
||||
if (dsc_sink_caps->branch_overall_throughput_1_mps == 0)
|
||||
dsc_sink_caps->branch_overall_throughput_1_mps = 0;
|
||||
else if (dsc_sink_caps->branch_overall_throughput_1_mps == 1)
|
||||
dsc_sink_caps->branch_overall_throughput_1_mps = 680;
|
||||
else {
|
||||
dsc_sink_caps->branch_overall_throughput_1_mps *= 50;
|
||||
dsc_sink_caps->branch_overall_throughput_1_mps += 600;
|
||||
}
|
||||
|
||||
dsc_sink_caps->branch_max_line_width = dpcd_dsc_branch_decoder_caps[DP_DSC_BRANCH_MAX_LINE_WIDTH - DP_DSC_BRANCH_OVERALL_THROUGHPUT_0] * 320;
|
||||
ASSERT(dsc_sink_caps->branch_max_line_width == 0 || dsc_sink_caps->branch_max_line_width >= 5120);
|
||||
|
||||
dsc_sink_caps->is_dp = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/* If DSC is possbile, get DSC bandwidth range based on [min_bpp, max_bpp] target bitrate range and
|
||||
* timing's pixel clock and uncompressed bandwidth.
|
||||
* If DSC is not possible, leave '*range' untouched.
|
||||
*/
|
||||
bool dc_dsc_compute_bandwidth_range(
|
||||
const struct display_stream_compressor *dsc,
|
||||
uint32_t dsc_min_slice_height_override,
|
||||
uint32_t min_bpp_x16,
|
||||
uint32_t max_bpp_x16,
|
||||
const struct dsc_dec_dpcd_caps *dsc_sink_caps,
|
||||
const struct dc_crtc_timing *timing,
|
||||
struct dc_dsc_bw_range *range)
|
||||
{
|
||||
bool is_dsc_possible = false;
|
||||
struct dsc_enc_caps dsc_enc_caps;
|
||||
struct dsc_enc_caps dsc_common_caps;
|
||||
struct dc_dsc_config config;
|
||||
|
||||
get_dsc_enc_caps(dsc, &dsc_enc_caps, timing->pix_clk_100hz);
|
||||
|
||||
is_dsc_possible = intersect_dsc_caps(dsc_sink_caps, &dsc_enc_caps,
|
||||
timing->pixel_encoding, &dsc_common_caps);
|
||||
|
||||
if (is_dsc_possible)
|
||||
is_dsc_possible = setup_dsc_config(dsc_sink_caps, &dsc_enc_caps, 0, timing,
|
||||
dsc_min_slice_height_override, max_bpp_x16, &config);
|
||||
|
||||
if (is_dsc_possible)
|
||||
get_dsc_bandwidth_range(min_bpp_x16, max_bpp_x16,
|
||||
config.num_slices_h, &dsc_common_caps, timing, range);
|
||||
|
||||
return is_dsc_possible;
|
||||
}
|
||||
|
||||
bool dc_dsc_compute_config(
|
||||
const struct display_stream_compressor *dsc,
|
||||
const struct dsc_dec_dpcd_caps *dsc_sink_caps,
|
||||
|
|
@ -923,22 +984,22 @@ bool dc_dsc_compute_config(
|
|||
|
||||
get_dsc_enc_caps(dsc, &dsc_enc_caps, timing->pix_clk_100hz);
|
||||
is_dsc_possible = setup_dsc_config(dsc_sink_caps,
|
||||
&dsc_enc_caps,
|
||||
target_bandwidth_kbps,
|
||||
timing, dsc_min_slice_height_override,
|
||||
max_target_bpp_limit_override * 16, dsc_cfg);
|
||||
&dsc_enc_caps,
|
||||
target_bandwidth_kbps,
|
||||
timing, dsc_min_slice_height_override,
|
||||
max_target_bpp_limit_override * 16, dsc_cfg);
|
||||
return is_dsc_possible;
|
||||
}
|
||||
|
||||
uint32_t dc_dsc_stream_bandwidth_in_kbps(const struct dc_crtc_timing *timing,
|
||||
uint32_t bpp_x16, uint32_t num_slices_h, bool is_dp)
|
||||
uint32_t bpp_x16, uint32_t num_slices_h, bool is_dp)
|
||||
{
|
||||
struct fixed31_32 overhead_in_kbps;
|
||||
struct fixed31_32 bpp;
|
||||
struct fixed31_32 actual_bandwidth_in_kbps;
|
||||
|
||||
overhead_in_kbps = compute_dsc_max_bandwidth_overhead(
|
||||
timing, num_slices_h, is_dp);
|
||||
timing, num_slices_h, is_dp);
|
||||
bpp = dc_fixpt_from_fraction(bpp_x16, 16);
|
||||
actual_bandwidth_in_kbps = dc_fixpt_from_fraction(timing->pix_clk_100hz, 10);
|
||||
actual_bandwidth_in_kbps = dc_fixpt_mul(actual_bandwidth_in_kbps, bpp);
|
||||
|
|
@ -946,7 +1007,9 @@ uint32_t dc_dsc_stream_bandwidth_in_kbps(const struct dc_crtc_timing *timing,
|
|||
return dc_fixpt_ceil(actual_bandwidth_in_kbps);
|
||||
}
|
||||
|
||||
void dc_dsc_get_policy_for_timing(const struct dc_crtc_timing *timing, uint32_t max_target_bpp_limit_override_x16, struct dc_dsc_policy *policy)
|
||||
void dc_dsc_get_policy_for_timing(const struct dc_crtc_timing *timing,
|
||||
uint32_t max_target_bpp_limit_override_x16,
|
||||
struct dc_dsc_policy *policy)
|
||||
{
|
||||
uint32_t bpc = 0;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue