github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 15:12:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert "drm/amd/display: Refactor SubVP cursor limiting logic"

Browse Source 
This reverts commit 19e743f0fb ("drm/amd/display: Refactor SubVP cursor limiting logic")

Reason for revert: Corruption

Reviewed-by: Alvin Lee <alvin.lee2@amd.com>
Signed-off-by: Ryan Seto <ryanseto@amd.com>
Signed-off-by: Ray Wu <ray.wu@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Ryan Seto 2025-04-15 11:30:52 -04:00 committed by Alex Deucher
parent 2f2c97089d
commit 6f23163365
39 changed files with 129 additions and 400 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/gpu/drm/amd/display/dc/core/dc.c
View File

@ -37,7 +37,6 @@
#include "dc_state.h"
#include "dc_state_priv.h"
#include "dc_plane_priv.h"
#include "dc_stream_priv.h"
#include "gpio_service_interface.h"
#include "clk_mgr.h"
@ -2887,7 +2886,7 @@ static enum surface_update_type check_update_surfaces_for_stream(
int i;
enum surface_update_type overall_type = UPDATE_TYPE_FAST;
if (dc->idle_optimizations_allowed || dc_can_clear_cursor_limit(dc))
if (dc->idle_optimizations_allowed)
overall_type = UPDATE_TYPE_FULL;
if (stream_status == NULL || stream_status->plane_count != surface_count)
@ -3291,7 +3290,7 @@ static void copy_stream_update_to_stream(struct dc *dc,
if (dsc_validate_context) {
stream->timing.dsc_cfg = *update->dsc_config;
stream->timing.flags.DSC = enable_dsc;
if (dc->res_pool->funcs->validate_bandwidth(dc, dsc_validate_context, true) != DC_OK) {
if (!dc->res_pool->funcs->validate_bandwidth(dc, dsc_validate_context, true)) {
stream->timing.dsc_cfg = old_dsc_cfg;
stream->timing.flags.DSC = old_dsc_enabled;
update->dsc_config = NULL;
@ -4609,7 +4608,7 @@ static struct dc_state *create_minimal_transition_state(struct dc *dc,
backup_and_set_minimal_pipe_split_policy(dc, base_context, policy);
/* commit minimal state */
if (dc->res_pool->funcs->validate_bandwidth(dc, minimal_transition_context, false) == DC_OK) {
if (dc->res_pool->funcs->validate_bandwidth(dc, minimal_transition_context, false)) {
/* prevent underflow and corruption when reconfiguring pipes */
force_vsync_flip_in_minimal_transition_context(minimal_transition_context);
} else {
@ -5129,7 +5128,7 @@ static bool update_planes_and_stream_v1(struct dc *dc,
copy_stream_update_to_stream(dc, context, stream, stream_update);
if (update_type >= UPDATE_TYPE_FULL) {
if (dc->res_pool->funcs->validate_bandwidth(dc, context, false) != DC_OK) {
if (!dc->res_pool->funcs->validate_bandwidth(dc, context, false)) {
DC_ERROR("Mode validation failed for stream update!\n");
dc_state_release(context);
return false;
@ -6273,22 +6272,15 @@ bool dc_abm_save_restore(
void dc_query_current_properties(struct dc *dc, struct dc_current_properties *properties)
{
unsigned int i;
unsigned int max_cursor_size = dc->caps.max_cursor_size;
unsigned int stream_cursor_size;
bool subvp_sw_cursor_req = false;
if (dc->debug.allow_sw_cursor_fallback && dc->res_pool->funcs->get_max_hw_cursor_size) {
for (i = 0; i < dc->current_state->stream_count; i++) {
stream_cursor_size = dc->res_pool->funcs->get_max_hw_cursor_size(dc,
dc->current_state,
dc->current_state->streams[i]);
if (stream_cursor_size < max_cursor_size) {
max_cursor_size = stream_cursor_size;
}
for (i = 0; i < dc->current_state->stream_count; i++) {
if (check_subvp_sw_cursor_fallback_req(dc, dc->current_state->streams[i]) && !dc->current_state->streams[i]->hw_cursor_req) {
subvp_sw_cursor_req = true;
break;
}
}
properties->cursor_size_limit = max_cursor_size;
properties->cursor_size_limit = subvp_sw_cursor_req ? 64 : dc->caps.max_cursor_size;
}
/**
@ -6354,27 +6346,3 @@ unsigned int dc_get_det_buffer_size_from_state(const struct dc_state *context)
else
return 0;
}
bool dc_is_cursor_limit_pending(struct dc *dc)
{
uint32_t i;
for (i = 0; i < dc->current_state->stream_count; i++) {
if (dc_stream_is_cursor_limit_pending(dc, dc->current_state->streams[i]))
return true;
}
return false;
}
bool dc_can_clear_cursor_limit(struct dc *dc)
{
uint32_t i;
for (i = 0; i < dc->current_state->stream_count; i++) {
if (dc_state_can_clear_stream_cursor_subvp_limit(dc->current_state->streams[i], dc->current_state))
return true;
}
return false;
}

2
drivers/gpu/drm/amd/display/dc/core/dc_debug.c
View File

@ -266,8 +266,6 @@ char *dc_status_to_str(enum dc_status status)
return "Fail dp payload allocation";
case DC_FAIL_DP_LINK_BANDWIDTH:
return "Insufficient DP link bandwidth";
case DC_FAIL_HW_CURSOR_SUPPORT:
return "HW Cursor not supported";
case DC_ERROR_UNEXPECTED:
return "Unexpected error";
}

48
drivers/gpu/drm/amd/display/dc/core/dc_resource.c
View File

@ -1342,6 +1342,32 @@ static void calculate_inits_and_viewports(struct pipe_ctx *pipe_ctx)
data->viewport_c.y += src.y / vpc_div;
}
static bool is_subvp_high_refresh_candidate(struct dc_stream_state *stream)
{
uint32_t refresh_rate;
struct dc *dc = stream->ctx->dc;
refresh_rate = (stream->timing.pix_clk_100hz * (uint64_t)100 +
stream->timing.v_total * stream->timing.h_total - (uint64_t)1);
refresh_rate = div_u64(refresh_rate, stream->timing.v_total);
refresh_rate = div_u64(refresh_rate, stream->timing.h_total);
/* If there's any stream that fits the SubVP high refresh criteria,
* we must return true. This is because cursor updates are asynchronous
* with full updates, so we could transition into a SubVP config and
* remain in HW cursor mode if there's no cursor update which will
* then cause corruption.
*/
if ((refresh_rate >= 120 && refresh_rate <= 175 &&
stream->timing.v_addressable >= 1080 &&
stream->timing.v_addressable <= 2160) &&
(dc->current_state->stream_count > 1 ||
(dc->current_state->stream_count == 1 && !stream->allow_freesync)))
return true;
return false;
}
static enum controller_dp_test_pattern convert_dp_to_controller_test_pattern(
enum dp_test_pattern test_pattern)
{
@ -4233,11 +4259,6 @@ enum dc_status dc_validate_with_context(struct dc *dc,
}
}
/* clear subvp cursor limitations */
for (i = 0; i < context->stream_count; i++) {
dc_state_set_stream_subvp_cursor_limit(context->streams[i], context, false);
}
res = dc_validate_global_state(dc, context, fast_validate);
/* calculate pixel rate divider after deciding pxiel clock & odm combine */
@ -4364,7 +4385,8 @@ enum dc_status dc_validate_global_state(
result = resource_build_scaling_params_for_context(dc, new_ctx);
if (result == DC_OK)
result = dc->res_pool->funcs->validate_bandwidth(dc, new_ctx, fast_validate);
if (!dc->res_pool->funcs->validate_bandwidth(dc, new_ctx, fast_validate))
result = DC_FAIL_BANDWIDTH_VALIDATE;
return result;
}
@ -5516,6 +5538,20 @@ enum dc_status update_dp_encoder_resources_for_test_harness(const struct dc *dc,
return DC_OK;
}
bool check_subvp_sw_cursor_fallback_req(const struct dc *dc, struct dc_stream_state *stream)
{
if (!dc->debug.disable_subvp_high_refresh && is_subvp_high_refresh_candidate(stream))
return true;
if (dc->current_state->stream_count == 1 && stream->timing.v_addressable >= 2880 &&
((stream->timing.pix_clk_100hz * 100) / stream->timing.v_total / stream->timing.h_total) < 120)
return true;
else if (dc->current_state->stream_count > 1 && stream->timing.v_addressable >= 1080 &&
((stream->timing.pix_clk_100hz * 100) / stream->timing.v_total / stream->timing.h_total) < 120)
return true;
return false;
}
struct dscl_prog_data *resource_get_dscl_prog_data(struct pipe_ctx *pipe_ctx)
{
return &pipe_ctx->plane_res.scl_data.dscl_prog_data;

96
drivers/gpu/drm/amd/display/dc/core/dc_state.c
View File

@ -22,7 +22,6 @@
* Authors: AMD
*
*/
#include "dc_types.h"
#include "core_types.h"
#include "core_status.h"
#include "dc_state.h"
@ -813,12 +812,8 @@ enum dc_status dc_state_add_phantom_stream(const struct dc *dc,
if (phantom_stream_status) {
phantom_stream_status->mall_stream_config.type = SUBVP_PHANTOM;
phantom_stream_status->mall_stream_config.paired_stream = main_stream;
phantom_stream_status->mall_stream_config.subvp_limit_cursor_size = false;
phantom_stream_status->mall_stream_config.cursor_size_limit_subvp = false;
}
dc_state_set_stream_subvp_cursor_limit(main_stream, state, true);
return res;
}
@ -982,94 +977,3 @@ bool dc_state_is_fams2_in_use(
return is_fams2_in_use;
}
void dc_state_set_stream_subvp_cursor_limit(const struct dc_stream_state *stream,
struct dc_state *state,
bool limit)
{
struct dc_stream_status *stream_status;
stream_status = dc_state_get_stream_status(state, stream);
if (stream_status) {
stream_status->mall_stream_config.subvp_limit_cursor_size = limit;
}
}
bool dc_state_get_stream_subvp_cursor_limit(const struct dc_stream_state *stream,
struct dc_state *state)
{
bool limit = false;
struct dc_stream_status *stream_status;
stream_status = dc_state_get_stream_status(state, stream);
if (stream_status) {
limit = stream_status->mall_stream_config.subvp_limit_cursor_size;
}
return limit;
}
void dc_state_set_stream_cursor_subvp_limit(const struct dc_stream_state *stream,
struct dc_state *state,
bool limit)
{
struct dc_stream_status *stream_status;
stream_status = dc_state_get_stream_status(state, stream);
if (stream_status) {
stream_status->mall_stream_config.cursor_size_limit_subvp = limit;
}
}
bool dc_state_get_stream_cursor_subvp_limit(const struct dc_stream_state *stream,
struct dc_state *state)
{
bool limit = false;
struct dc_stream_status *stream_status;
stream_status = dc_state_get_stream_status(state, stream);
if (stream_status) {
limit = stream_status->mall_stream_config.cursor_size_limit_subvp;
}
return limit;
}
bool dc_state_can_clear_stream_cursor_subvp_limit(const struct dc_stream_state *stream,
struct dc_state *state)
{
bool can_clear_limit = false;
struct dc_stream_status *stream_status;
stream_status = dc_state_get_stream_status(state, stream);
if (stream_status) {
can_clear_limit = dc_state_get_stream_cursor_subvp_limit(stream, state) &&
(stream_status->mall_stream_config.type == SUBVP_PHANTOM ||
stream->hw_cursor_req ||
!stream_status->mall_stream_config.subvp_limit_cursor_size ||
!stream->cursor_position.enable ||
dc_stream_check_cursor_attributes(stream, state, &stream->cursor_attributes));
}
return can_clear_limit;
}
bool dc_state_is_subvp_in_use(struct dc_state *state)
{
uint32_t i;
for (i = 0; i < state->stream_count; i++) {
if (dc_state_get_stream_subvp_type(state, state->streams[i]) != SUBVP_NONE)
return true;
}
return false;
}

70
drivers/gpu/drm/amd/display/dc/core/dc_stream.c
View File

@ -265,16 +265,13 @@ void program_cursor_attributes(
}
/*
* dc_stream_check_cursor_attributes() - Check validitity of cursor attributes and surface address
* dc_stream_set_cursor_attributes() - Update cursor attributes and set cursor surface address
*/
bool dc_stream_check_cursor_attributes(
const struct dc_stream_state *stream,
struct dc_state *state,
bool dc_stream_set_cursor_attributes(
struct dc_stream_state *stream,
const struct dc_cursor_attributes *attributes)
{
const struct dc *dc;
unsigned int max_cursor_size;
struct dc *dc;
if (NULL == stream) {
dm_error("DC: dc_stream is NULL!\n");
@ -292,38 +289,24 @@ bool dc_stream_check_cursor_attributes(
dc = stream->ctx->dc;
/* SubVP is not compatible with HW cursor larger than what can fit in cursor SRAM.
* Therefore, if cursor is greater than this, fallback to SW cursor.
/* SubVP is not compatible with HW cursor larger than 64 x 64 x 4.
* Therefore, if cursor is greater than 64 x 64 x 4, fallback to SW cursor in the following case:
* 1. If the config is a candidate for SubVP high refresh (both single an dual display configs)
* 2. If not subvp high refresh, for single display cases, if resolution is >= 5K and refresh rate < 120hz
* 3. If not subvp high refresh, for multi display cases, if resolution is >= 4K and refresh rate < 120hz
*/
if (dc->debug.allow_sw_cursor_fallback && dc->res_pool->funcs->get_max_hw_cursor_size) {
max_cursor_size = dc->res_pool->funcs->get_max_hw_cursor_size(dc, state, stream);
max_cursor_size = max_cursor_size * max_cursor_size * 4;
if (attributes->height * attributes->width * 4 > max_cursor_size) {
if (dc->debug.allow_sw_cursor_fallback &&
attributes->height * attributes->width * 4 > 16384 &&
!stream->hw_cursor_req) {
if (check_subvp_sw_cursor_fallback_req(dc, stream))
return false;
}
}
stream->cursor_attributes = *attributes;
return true;
}
/*
* dc_stream_set_cursor_attributes() - Update cursor attributes and set cursor surface address
*/
bool dc_stream_set_cursor_attributes(
struct dc_stream_state *stream,
const struct dc_cursor_attributes *attributes)
{
bool result = false;
if (dc_stream_check_cursor_attributes(stream, stream->ctx->dc->current_state, attributes)) {
stream->cursor_attributes = *attributes;
result = true;
}
return result;
}
bool dc_stream_program_cursor_attributes(
struct dc_stream_state *stream,
const struct dc_cursor_attributes *attributes)
@ -1126,26 +1109,3 @@ unsigned int dc_stream_get_max_flickerless_instant_vtotal_increase(struct dc_str
return dc_stream_get_max_flickerless_instant_vtotal_delta(stream, is_gaming, false);
}
bool dc_stream_is_cursor_limit_pending(struct dc *dc, struct dc_stream_state *stream)
{
bool is_limit_pending = false;
if (dc->current_state)
is_limit_pending = dc_state_get_stream_cursor_subvp_limit(stream, dc->current_state);
return is_limit_pending;
}
bool dc_stream_can_clear_cursor_limit(struct dc *dc, struct dc_stream_state *stream)
{
bool can_clear_limit = false;
if (dc->current_state)
can_clear_limit = dc_state_get_stream_cursor_subvp_limit(stream, dc->current_state) &&
(stream->hw_cursor_req ||
!stream->cursor_position.enable ||
dc_stream_check_cursor_attributes(stream, dc->current_state, &stream->cursor_attributes));
return can_clear_limit;
}

4
drivers/gpu/drm/amd/display/dc/dc.h
View File

@ -249,7 +249,6 @@ struct dc_caps {
uint32_t i2c_speed_in_khz_hdcp;
uint32_t dmdata_alloc_size;
unsigned int max_cursor_size;
unsigned int max_buffered_cursor_size;
unsigned int max_video_width;
/*
* max video plane width that can be safely assumed to be always
@ -2608,7 +2607,4 @@ void dc_disable_accelerated_mode(struct dc *dc);
bool dc_is_timing_changed(struct dc_stream_state *cur_stream,
struct dc_stream_state *new_stream);
bool dc_is_cursor_limit_pending(struct dc *dc);
bool dc_can_clear_cursor_limit(struct dc *dc);
#endif /* DC_INTERFACE_H_ */

20
drivers/gpu/drm/amd/display/dc/dc_state_priv.h
View File

@ -105,24 +105,4 @@ bool dc_state_is_fams2_in_use(
const struct dc *dc,
const struct dc_state *state);
void dc_state_set_stream_subvp_cursor_limit(const struct dc_stream_state *stream,
struct dc_state *state,
bool limit);
bool dc_state_get_stream_subvp_cursor_limit(const struct dc_stream_state *stream,
struct dc_state *state);
void dc_state_set_stream_cursor_subvp_limit(const struct dc_stream_state *stream,
struct dc_state *state,
bool limit);
bool dc_state_get_stream_cursor_subvp_limit(const struct dc_stream_state *stream,
struct dc_state *state);
bool dc_state_can_clear_stream_cursor_subvp_limit(const struct dc_stream_state *stream,
struct dc_state *state);
bool dc_state_is_subvp_in_use(struct dc_state *state);
#endif /* _DC_STATE_PRIV_H_ */

10
drivers/gpu/drm/amd/display/dc/dc_stream.h
View File

@ -44,8 +44,6 @@ struct mall_stream_config {
*/
enum mall_stream_type type;
struct dc_stream_state *paired_stream; // master / slave stream
bool subvp_limit_cursor_size; /* stream has/is using subvp limiting hw cursor support */
bool cursor_size_limit_subvp; /* stream is using hw cursor config preventing subvp */
};
struct dc_stream_status {
@ -505,11 +503,6 @@ void program_cursor_position(
struct dc *dc,
struct dc_stream_state *stream);
bool dc_stream_check_cursor_attributes(
const struct dc_stream_state *stream,
struct dc_state *state,
const struct dc_cursor_attributes *attributes);
bool dc_stream_set_cursor_attributes(
struct dc_stream_state *stream,
const struct dc_cursor_attributes *attributes);
@ -587,7 +580,4 @@ void dc_dmub_update_dirty_rect(struct dc *dc,
struct dc_surface_update *srf_updates,
struct dc_state *context);
bool dc_stream_is_cursor_limit_pending(struct dc *dc, struct dc_stream_state *stream);
bool dc_stream_can_clear_cursor_limit(struct dc *dc, struct dc_stream_state *stream);
#endif /* DC_STREAM_H_ */

1
drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c
View File

@ -627,7 +627,6 @@ static bool dcn32_assign_subvp_pipe(struct dc *dc,
*/
if (pipe->plane_state && !pipe->top_pipe && !pipe->prev_odm_pipe && !dcn32_is_center_timing(pipe) &&
!pipe->stream->hw_cursor_req &&
!dc_state_get_stream_cursor_subvp_limit(pipe->stream, context) &&
!(pipe->stream->timing.pix_clk_100hz / 10000 > DCN3_2_MAX_SUBVP_PIXEL_RATE_MHZ) &&
(!dcn32_is_psr_capable(pipe) || (context->stream_count == 1 && dc->caps.dmub_caps.subvp_psr)) &&
dc_state_get_pipe_subvp_type(context, pipe) == SUBVP_NONE &&

9
drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c
View File

@ -526,8 +526,7 @@ static void populate_dml21_output_config_from_stream_state(struct dml2_link_outp
static void populate_dml21_stream_overrides_from_stream_state(
struct dml2_stream_parameters *stream_desc,
struct dc_stream_state *stream,
struct dc_stream_status *stream_status)
struct dc_stream_state *stream)
{
switch (stream->debug.force_odm_combine_segments) {
case 0:
@ -552,9 +551,7 @@ static void populate_dml21_stream_overrides_from_stream_state(
if (!stream->ctx->dc->debug.enable_single_display_2to1_odm_policy ||
stream->debug.force_odm_combine_segments > 0)
stream_desc->overrides.disable_dynamic_odm = true;
stream_desc->overrides.disable_subvp = stream->ctx->dc->debug.force_disable_subvp ||
stream->hw_cursor_req ||
stream_status->mall_stream_config.cursor_size_limit_subvp;
stream_desc->overrides.disable_subvp = stream->ctx->dc->debug.force_disable_subvp || stream->hw_cursor_req;
}
static enum dml2_swizzle_mode gfx_addr3_to_dml2_swizzle_mode(enum swizzle_mode_addr3_values addr3_mode)
@ -1027,7 +1024,7 @@ bool dml21_map_dc_state_into_dml_display_cfg(const struct dc *in_dc, struct dc_s
populate_dml21_timing_config_from_stream_state(&dml_dispcfg->stream_descriptors[disp_cfg_stream_location].timing, context->streams[stream_index], dml_ctx);
adjust_dml21_hblank_timing_config_from_pipe_ctx(&dml_dispcfg->stream_descriptors[disp_cfg_stream_location].timing, &context->res_ctx.pipe_ctx[stream_index]);
populate_dml21_output_config_from_stream_state(&dml_dispcfg->stream_descriptors[disp_cfg_stream_location].output, context->streams[stream_index], &context->res_ctx.pipe_ctx[stream_index]);
populate_dml21_stream_overrides_from_stream_state(&dml_dispcfg->stream_descriptors[disp_cfg_stream_location], context->streams[stream_index], &context->stream_status[stream_index]);
populate_dml21_stream_overrides_from_stream_state(&dml_dispcfg->stream_descriptors[disp_cfg_stream_location], context->streams[stream_index]);
dml_dispcfg->stream_descriptors[disp_cfg_stream_location].overrides.hw.twait_budgeting.fclk_pstate = dml2_twait_budgeting_setting_if_needed;
dml_dispcfg->stream_descriptors[disp_cfg_stream_location].overrides.hw.twait_budgeting.uclk_pstate = dml2_twait_budgeting_setting_if_needed;

2
drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c
View File

@ -2482,7 +2482,7 @@ bool dcn20_update_bandwidth(
struct dce_hwseq *hws = dc->hwseq;
/* recalculate DML parameters */
if (dc->res_pool->funcs->validate_bandwidth(dc, context, false) != DC_OK)
if (!dc->res_pool->funcs->validate_bandwidth(dc, context, false))
return false;
/* apply updated bandwidth parameters */

2
drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c
View File

@ -2651,7 +2651,7 @@ bool dcn401_update_bandwidth(
struct dce_hwseq *hws = dc->hwseq;
/* recalculate DML parameters */
if (dc->res_pool->funcs->validate_bandwidth(dc, context, false) != DC_OK)
if (!dc->res_pool->funcs->validate_bandwidth(dc, context, false))
return false;
/* apply updated bandwidth parameters */

3
drivers/gpu/drm/amd/display/dc/inc/core_status.h
View File

@ -26,8 +26,6 @@
#ifndef _CORE_STATUS_H_
#define _CORE_STATUS_H_
#include "dc_hw_types.h"
enum dc_status {
DC_OK = 1,
@ -58,7 +56,6 @@ enum dc_status {
DC_NO_LINK_ENC_RESOURCE = 26,
DC_FAIL_DP_PAYLOAD_ALLOCATION = 27,
DC_FAIL_DP_LINK_BANDWIDTH = 28,
DC_FAIL_HW_CURSOR_SUPPORT = 29,
DC_ERROR_UNEXPECTED = -1
};

6
drivers/gpu/drm/amd/display/dc/inc/core_types.h
View File

@ -78,8 +78,7 @@ struct resource_funcs {
/* Create a minimal link encoder object with no dc_link object
* associated with it. */
struct link_encoder *(*link_enc_create_minimal)(struct dc_context *ctx, enum engine_id eng_id);
enum dc_status (*validate_bandwidth)(
bool (*validate_bandwidth)(
struct dc *dc,
struct dc_state *context,
bool fast_validate);
@ -218,9 +217,6 @@ struct resource_funcs {
int (*get_power_profile)(const struct dc_state *context);
unsigned int (*get_det_buffer_size)(const struct dc_state *context);
unsigned int (*get_vstartup_for_pipe)(struct pipe_ctx *pipe_ctx);
unsigned int (*get_max_hw_cursor_size)(const struct dc *dc,
struct dc_state *state,
const struct dc_stream_state *stream);
};
struct audio_support{

2
drivers/gpu/drm/amd/display/dc/inc/resource.h
View File

@ -628,6 +628,8 @@ enum dc_status update_dp_encoder_resources_for_test_harness(const struct dc *dc,
struct dc_state *context,
struct pipe_ctx *pipe_ctx);
bool check_subvp_sw_cursor_fallback_req(const struct dc *dc, struct dc_stream_state *stream);
/* Get hw programming parameters container from pipe context
* @pipe_ctx: pipe context
* @dscl_prog_data: struct to hold programmable hw reg values

4
drivers/gpu/drm/amd/display/dc/resource/dce100/dce100_resource.c
View File

@ -836,7 +836,7 @@ static enum dc_status build_mapped_resource(
return DC_OK;
}
static enum dc_status dce100_validate_bandwidth(
static bool dce100_validate_bandwidth(
struct dc *dc,
struct dc_state *context,
bool fast_validate)
@ -858,7 +858,7 @@ static enum dc_status dce100_validate_bandwidth(
context->bw_ctx.bw.dce.yclk_khz = 0;
}
return DC_OK;
return true;
}
static bool dce100_validate_surface_sets(

4
drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.c
View File

@ -960,7 +960,7 @@ static enum dc_status build_mapped_resource(
return DC_OK;
}
static enum dc_status dce110_validate_bandwidth(
static bool dce110_validate_bandwidth(
struct dc *dc,
struct dc_state *context,
bool fast_validate)
@ -1031,7 +1031,7 @@ static enum dc_status dce110_validate_bandwidth(
context->bw_ctx.bw.dce.yclk_khz,
context->bw_ctx.bw.dce.blackout_recovery_time_us);
}
return result ? DC_OK : DC_FAIL_BANDWIDTH_VALIDATE;
return result;
}
static enum dc_status dce110_validate_plane(const struct dc_plane_state *plane_state,

4
drivers/gpu/drm/amd/display/dc/resource/dce112/dce112_resource.c
View File

@ -883,7 +883,7 @@ static enum dc_status build_mapped_resource(
return DC_OK;
}
enum dc_status dce112_validate_bandwidth(
bool dce112_validate_bandwidth(
struct dc *dc,
struct dc_state *context,
bool fast_validate)
@ -952,7 +952,7 @@ enum dc_status dce112_validate_bandwidth(
context->bw_ctx.bw.dce.yclk_khz,
context->bw_ctx.bw.dce.blackout_recovery_time_us);
}
return result ? DC_OK : DC_FAIL_BANDWIDTH_VALIDATE;
return result;
}
enum dc_status resource_map_phy_clock_resources(

2
drivers/gpu/drm/amd/display/dc/resource/dce112/dce112_resource.h
View File

@ -42,7 +42,7 @@ enum dc_status dce112_validate_with_context(
struct dc_state *context,
struct dc_state *old_context);
enum dc_status dce112_validate_bandwidth(
bool dce112_validate_bandwidth(
struct dc *dc,
struct dc_state *context,
bool fast_validate);

4
drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c
View File

@ -863,7 +863,7 @@ static void dce60_resource_destruct(struct dce110_resource_pool *pool)
}
}
static enum dc_status dce60_validate_bandwidth(
static bool dce60_validate_bandwidth(
struct dc *dc,
struct dc_state *context,
bool fast_validate)
@ -885,7 +885,7 @@ static enum dc_status dce60_validate_bandwidth(
context->bw_ctx.bw.dce.yclk_khz = 0;
}
return DC_OK;
return true;
}
static bool dce60_validate_surface_sets(

4
drivers/gpu/drm/amd/display/dc/resource/dce80/dce80_resource.c
View File

@ -869,7 +869,7 @@ static void dce80_resource_destruct(struct dce110_resource_pool *pool)
}
}
static enum dc_status dce80_validate_bandwidth(
static bool dce80_validate_bandwidth(
struct dc *dc,
struct dc_state *context,
bool fast_validate)
@ -891,7 +891,7 @@ static enum dc_status dce80_validate_bandwidth(
context->bw_ctx.bw.dce.yclk_khz = 0;
}
return DC_OK;
return true;
}
static bool dce80_validate_surface_sets(

5
drivers/gpu/drm/amd/display/dc/resource/dcn10/dcn10_resource.c
View File

@ -23,7 +23,6 @@
*
*/
#include "core_status.h"
#include "dm_services.h"
#include "dc.h"
@ -1126,7 +1125,7 @@ static void dcn10_destroy_resource_pool(struct resource_pool **pool)
*pool = NULL;
}
static enum dc_status dcn10_validate_bandwidth(
static bool dcn10_validate_bandwidth(
struct dc *dc,
struct dc_state *context,
bool fast_validate)
@ -1137,7 +1136,7 @@ static enum dc_status dcn10_validate_bandwidth(
voltage_supported = dcn_validate_bandwidth(dc, context, fast_validate);
DC_FP_END();
return voltage_supported ? DC_OK : DC_FAIL_BANDWIDTH_VALIDATE;
return voltage_supported;
}
static enum dc_status dcn10_validate_plane(const struct dc_plane_state *plane_state, struct dc_caps *caps)

6
drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c
View File

@ -2124,7 +2124,7 @@ bool dcn20_fast_validate_bw(
return out;
}
enum dc_status dcn20_validate_bandwidth(struct dc *dc, struct dc_state *context,
bool dcn20_validate_bandwidth(struct dc *dc, struct dc_state *context,
bool fast_validate)
{
bool voltage_supported;
@ -2132,14 +2132,14 @@ enum dc_status dcn20_validate_bandwidth(struct dc *dc, struct dc_state *context,
pipes = kcalloc(dc->res_pool->pipe_count, sizeof(display_e2e_pipe_params_st), GFP_KERNEL);
if (!pipes)
return DC_FAIL_BANDWIDTH_VALIDATE;
return false;
DC_FP_START();
voltage_supported = dcn20_validate_bandwidth_fp(dc, context, fast_validate, pipes);
DC_FP_END();
kfree(pipes);
return voltage_supported ? DC_OK : DC_FAIL_BANDWIDTH_VALIDATE;
return voltage_supported;
}
struct pipe_ctx *dcn20_acquire_free_pipe_for_layer(

2
drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.h
View File

@ -119,7 +119,7 @@ void dcn20_set_mcif_arb_params(
struct dc_state *context,
display_e2e_pipe_params_st *pipes,
int pipe_cnt);
enum dc_status dcn20_validate_bandwidth(struct dc *dc, struct dc_state *context, bool fast_validate);
bool dcn20_validate_bandwidth(struct dc *dc, struct dc_state *context, bool fast_validate);
void dcn20_merge_pipes_for_validate(
struct dc *dc,
struct dc_state *context);

6
drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c
View File

@ -923,7 +923,7 @@ bool dcn21_fast_validate_bw(struct dc *dc,
* with DC_FP_START()/DC_FP_END(). Use the same approach as for
* dcn20_validate_bandwidth in dcn20_resource.c.
*/
static enum dc_status dcn21_validate_bandwidth(struct dc *dc, struct dc_state *context,
static bool dcn21_validate_bandwidth(struct dc *dc, struct dc_state *context,
bool fast_validate)
{
bool voltage_supported;
@ -931,14 +931,14 @@ static enum dc_status dcn21_validate_bandwidth(struct dc *dc, struct dc_state *c
pipes = kcalloc(dc->res_pool->pipe_count, sizeof(display_e2e_pipe_params_st), GFP_KERNEL);
if (!pipes)
return DC_FAIL_BANDWIDTH_VALIDATE;
return false;
DC_FP_START();
voltage_supported = dcn21_validate_bandwidth_fp(dc, context, fast_validate, pipes);
DC_FP_END();
kfree(pipes);
return voltage_supported ? DC_OK : DC_NOT_SUPPORTED;
return voltage_supported;
}
static void dcn21_destroy_resource_pool(struct resource_pool **pool)

4
drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.c
View File

@ -2035,7 +2035,7 @@ void dcn30_calculate_wm_and_dlg(
DC_FP_END();
}
enum dc_status dcn30_validate_bandwidth(struct dc *dc,
bool dcn30_validate_bandwidth(struct dc *dc,
struct dc_state *context,
bool fast_validate)
{
@ -2092,7 +2092,7 @@ enum dc_status dcn30_validate_bandwidth(struct dc *dc,
BW_VAL_TRACE_FINISH();
return out ? DC_OK : DC_FAIL_BANDWIDTH_VALIDATE;
return out;
}
void dcn30_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params)

2
drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.h
View File

@ -56,7 +56,7 @@ unsigned int dcn30_calc_max_scaled_time(
enum mmhubbub_wbif_mode mode,
unsigned int urgent_watermark);
enum dc_status dcn30_validate_bandwidth(struct dc *dc, struct dc_state *context,
bool dcn30_validate_bandwidth(struct dc *dc, struct dc_state *context,
bool fast_validate);
bool dcn30_internal_validate_bw(
struct dc *dc,

4
drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c
View File

@ -1758,7 +1758,7 @@ dcn31_set_mcif_arb_params(struct dc *dc,
DC_FP_END();
}
enum dc_status dcn31_validate_bandwidth(struct dc *dc,
bool dcn31_validate_bandwidth(struct dc *dc,
struct dc_state *context,
bool fast_validate)
{
@ -1813,7 +1813,7 @@ enum dc_status dcn31_validate_bandwidth(struct dc *dc,
BW_VAL_TRACE_FINISH();
return out ? DC_OK : DC_FAIL_BANDWIDTH_VALIDATE;
return out;
}
static void dcn31_get_panel_config_defaults(struct dc_panel_config *panel_config)

2
drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.h
View File

@ -37,7 +37,7 @@ struct dcn31_resource_pool {
struct resource_pool base;
};
enum dc_status dcn31_validate_bandwidth(struct dc *dc,
bool dcn31_validate_bandwidth(struct dc *dc,
struct dc_state *context,
bool fast_validate);
void dcn31_calculate_wm_and_dlg(

4
drivers/gpu/drm/amd/display/dc/resource/dcn314/dcn314_resource.c
View File

@ -1694,7 +1694,7 @@ static void dcn314_get_panel_config_defaults(struct dc_panel_config *panel_confi
*panel_config = panel_config_defaults;
}
enum dc_status dcn314_validate_bandwidth(struct dc *dc,
bool dcn314_validate_bandwidth(struct dc *dc,
struct dc_state *context,
bool fast_validate)
{
@ -1750,7 +1750,7 @@ enum dc_status dcn314_validate_bandwidth(struct dc *dc,
BW_VAL_TRACE_FINISH();
return out ? DC_OK : DC_FAIL_BANDWIDTH_VALIDATE;
return out;
}
static struct resource_funcs dcn314_res_pool_funcs = {

2
drivers/gpu/drm/amd/display/dc/resource/dcn314/dcn314_resource.h
View File

@ -39,7 +39,7 @@ struct dcn314_resource_pool {
struct resource_pool base;
};
enum dc_status dcn314_validate_bandwidth(struct dc *dc,
bool dcn314_validate_bandwidth(struct dc *dc,
struct dc_state *context,
bool fast_validate);

65
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c
View File

@ -24,7 +24,6 @@
*
*/
#include "dc_types.h"
#include "dm_services.h"
#include "dc.h"
@ -1807,56 +1806,19 @@ static bool dml1_validate(struct dc *dc, struct dc_state *context, bool fast_val
return out;
}
enum dc_status dcn32_validate_bandwidth(struct dc *dc,
bool dcn32_validate_bandwidth(struct dc *dc,
struct dc_state *context,
bool fast_validate)
{
unsigned int i;
enum dc_status status;
const struct dc_stream_state *stream;
/* reset cursor limitations on subvp */
for (i = 0; i < context->stream_count; i++) {
stream = context->streams[i];
if (dc_state_can_clear_stream_cursor_subvp_limit(stream, context)) {
dc_state_set_stream_cursor_subvp_limit(stream, context, false);
}
}
bool out = false;
if (dc->debug.using_dml2)
status = dml2_validate(dc, context,
out = dml2_validate(dc, context,
context->power_source == DC_POWER_SOURCE_DC ? context->bw_ctx.dml2_dc_power_source : context->bw_ctx.dml2,
fast_validate) ? DC_OK : DC_FAIL_BANDWIDTH_VALIDATE;
fast_validate);
else
status = dml1_validate(dc, context, fast_validate) ? DC_OK : DC_FAIL_BANDWIDTH_VALIDATE;
if (!fast_validate && status == DC_OK && dc_state_is_subvp_in_use(context)) {
/* check new stream configuration still supports cursor if subvp used */
for (i = 0; i < context->stream_count; i++) {
stream = context->streams[i];
if (dc_state_get_stream_subvp_type(context, stream) != SUBVP_PHANTOM &&
stream->cursor_position.enable &&
!dc_stream_check_cursor_attributes(stream, context, &stream->cursor_attributes)) {
/* hw cursor cannot be supported with subvp active, so disable subvp for now */
dc_state_set_stream_cursor_subvp_limit(stream, context, true);
status = DC_FAIL_HW_CURSOR_SUPPORT;
}
};
}
if (!fast_validate && status == DC_FAIL_HW_CURSOR_SUPPORT) {
/* attempt to validate again with subvp disabled due to cursor */
if (dc->debug.using_dml2)
status = dml2_validate(dc, context,
context->power_source == DC_POWER_SOURCE_DC ? context->bw_ctx.dml2_dc_power_source : context->bw_ctx.dml2,
fast_validate) ? DC_OK : DC_FAIL_BANDWIDTH_VALIDATE;
else
status = dml1_validate(dc, context, fast_validate) ? DC_OK : DC_FAIL_BANDWIDTH_VALIDATE;
}
return status;
out = dml1_validate(dc, context, fast_validate);
return out;
}
int dcn32_populate_dml_pipes_from_context(
@ -2080,18 +2042,6 @@ static void dcn32_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw
DC_FP_END();
}
unsigned int dcn32_get_max_hw_cursor_size(const struct dc *dc,
struct dc_state *state,
const struct dc_stream_state *stream)
{
bool limit_cur_to_buf;
limit_cur_to_buf = dc_state_get_stream_subvp_cursor_limit(stream, state) &&
!stream->hw_cursor_req;
return limit_cur_to_buf ? dc->caps.max_buffered_cursor_size : dc->caps.max_cursor_size;
}
static struct resource_funcs dcn32_res_pool_funcs = {
.destroy = dcn32_destroy_resource_pool,
.link_enc_create = dcn32_link_encoder_create,
@ -2117,8 +2067,7 @@ static struct resource_funcs dcn32_res_pool_funcs = {
.add_phantom_pipes = dcn32_add_phantom_pipes,
.build_pipe_pix_clk_params = dcn20_build_pipe_pix_clk_params,
.calculate_mall_ways_from_bytes = dcn32_calculate_mall_ways_from_bytes,
.get_vstartup_for_pipe = dcn10_get_vstartup_for_pipe,
.get_max_hw_cursor_size = dcn32_get_max_hw_cursor_size,
.get_vstartup_for_pipe = dcn10_get_vstartup_for_pipe
};
static uint32_t read_pipe_fuses(struct dc_context *ctx)

6
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.h
View File

@ -98,7 +98,7 @@ void dcn32_add_phantom_pipes(struct dc *dc,
unsigned int pipe_cnt,
unsigned int index);
enum dc_status dcn32_validate_bandwidth(struct dc *dc,
bool dcn32_validate_bandwidth(struct dc *dc,
struct dc_state *context,
bool fast_validate);
@ -188,10 +188,6 @@ void dcn32_override_min_req_dcfclk(struct dc *dc, struct dc_state *context);
unsigned int dcn32_calculate_mall_ways_from_bytes(const struct dc *dc, unsigned int total_size_in_mall_bytes);
unsigned int dcn32_get_max_hw_cursor_size(const struct dc *dc,
struct dc_state *state,
const struct dc_stream_state *stream);
/* definitions for run time init of reg offsets */
/* CLK SRC */

3
drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c
View File

@ -1624,8 +1624,7 @@ static struct resource_funcs dcn321_res_pool_funcs = {
.add_phantom_pipes = dcn32_add_phantom_pipes,
.build_pipe_pix_clk_params = dcn20_build_pipe_pix_clk_params,
.calculate_mall_ways_from_bytes = dcn32_calculate_mall_ways_from_bytes,
.get_vstartup_for_pipe = dcn10_get_vstartup_for_pipe,
.get_max_hw_cursor_size = dcn32_get_max_hw_cursor_size,
.get_vstartup_for_pipe = dcn10_get_vstartup_for_pipe
};
static uint32_t read_pipe_fuses(struct dc_context *ctx)

6
drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c
View File

@ -1732,7 +1732,7 @@ static void dcn35_get_panel_config_defaults(struct dc_panel_config *panel_config
}
static enum dc_status dcn35_validate_bandwidth(struct dc *dc,
static bool dcn35_validate_bandwidth(struct dc *dc,
struct dc_state *context,
bool fast_validate)
{
@ -1743,13 +1743,13 @@ static enum dc_status dcn35_validate_bandwidth(struct dc *dc,
fast_validate);
if (fast_validate)
return out ? DC_OK : DC_FAIL_BANDWIDTH_VALIDATE;
return out;
DC_FP_START();
dcn35_decide_zstate_support(dc, context);
DC_FP_END();
return out ? DC_OK : DC_FAIL_BANDWIDTH_VALIDATE;
return out;
}
enum dc_status dcn35_patch_unknown_plane_state(struct dc_plane_state *plane_state)

6
drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c
View File

@ -1712,7 +1712,7 @@ static void dcn35_get_panel_config_defaults(struct dc_panel_config *panel_config
}
static enum dc_status dcn351_validate_bandwidth(struct dc *dc,
static bool dcn351_validate_bandwidth(struct dc *dc,
struct dc_state *context,
bool fast_validate)
{
@ -1723,13 +1723,13 @@ static enum dc_status dcn351_validate_bandwidth(struct dc *dc,
fast_validate);
if (fast_validate)
return out ? DC_OK : DC_FAIL_BANDWIDTH_VALIDATE;
return out;
DC_FP_START();
dcn35_decide_zstate_support(dc, context);
DC_FP_END();
return out ? DC_OK : DC_FAIL_BANDWIDTH_VALIDATE;
return out;
}
static struct resource_funcs dcn351_res_pool_funcs = {

6
drivers/gpu/drm/amd/display/dc/resource/dcn36/dcn36_resource.c
View File

@ -1713,7 +1713,7 @@ static void dcn35_get_panel_config_defaults(struct dc_panel_config *panel_config
}
static enum dc_status dcn35_validate_bandwidth(struct dc *dc,
static bool dcn35_validate_bandwidth(struct dc *dc,
struct dc_state *context,
bool fast_validate)
{
@ -1724,13 +1724,13 @@ static enum dc_status dcn35_validate_bandwidth(struct dc *dc,
fast_validate);
if (fast_validate)
return out ? DC_OK : DC_FAIL_BANDWIDTH_VALIDATE;
return out;
DC_FP_START();
dcn35_decide_zstate_support(dc, context);
DC_FP_END();
return out ? DC_OK : DC_FAIL_BANDWIDTH_VALIDATE;
return out;
}

49
drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c
View File

@ -1642,52 +1642,16 @@ enum dc_status dcn401_patch_unknown_plane_state(struct dc_plane_state *plane_sta
return DC_OK;
}
enum dc_status dcn401_validate_bandwidth(struct dc *dc,
bool dcn401_validate_bandwidth(struct dc *dc,
struct dc_state *context,
bool fast_validate)
{
unsigned int i;
enum dc_status status = DC_OK;
const struct dc_stream_state *stream;
/* reset cursor limitations on subvp */
for (i = 0; i < context->stream_count; i++) {
stream = context->streams[i];
if (dc_state_can_clear_stream_cursor_subvp_limit(stream, context)) {
dc_state_set_stream_cursor_subvp_limit(stream, context, false);
}
}
bool out = false;
if (dc->debug.using_dml2)
status = dml2_validate(dc, context,
out = dml2_validate(dc, context,
context->power_source == DC_POWER_SOURCE_DC ? context->bw_ctx.dml2_dc_power_source : context->bw_ctx.dml2,
fast_validate) ? DC_OK : DC_FAIL_BANDWIDTH_VALIDATE;
if (!fast_validate && status == DC_OK && dc_state_is_subvp_in_use(context)) {
/* check new stream configuration still supports cursor if subvp used */
for (i = 0; i < context->stream_count; i++) {
stream = context->streams[i];
if (dc_state_get_stream_subvp_type(context, stream) != SUBVP_PHANTOM &&
stream->cursor_position.enable &&
!dc_stream_check_cursor_attributes(stream, context, &stream->cursor_attributes)) {
/* hw cursor cannot be supported with subvp active, so disable subvp for now */
dc_state_set_stream_cursor_subvp_limit(stream, context, true);
status = DC_FAIL_HW_CURSOR_SUPPORT;
}
};
}
if (!fast_validate && status == DC_FAIL_HW_CURSOR_SUPPORT) {
/* attempt to validate again with subvp disabled due to cursor */
if (dc->debug.using_dml2)
status = dml2_validate(dc, context,
context->power_source == DC_POWER_SOURCE_DC ? context->bw_ctx.dml2_dc_power_source : context->bw_ctx.dml2,
fast_validate) ? DC_OK : DC_FAIL_BANDWIDTH_VALIDATE;
}
return status;
fast_validate);
return out;
}
void dcn401_prepare_mcache_programming(struct dc *dc,
@ -1806,8 +1770,7 @@ static struct resource_funcs dcn401_res_pool_funcs = {
.build_pipe_pix_clk_params = dcn401_build_pipe_pix_clk_params,
.calculate_mall_ways_from_bytes = dcn32_calculate_mall_ways_from_bytes,
.get_power_profile = dcn401_get_power_profile,
.get_vstartup_for_pipe = dcn401_get_vstartup_for_pipe,
.get_max_hw_cursor_size = dcn32_get_max_hw_cursor_size
.get_vstartup_for_pipe = dcn401_get_vstartup_for_pipe
};
static uint32_t read_pipe_fuses(struct dc_context *ctx)

2
drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.h
View File

@ -22,7 +22,7 @@ struct resource_pool *dcn401_create_resource_pool(
enum dc_status dcn401_patch_unknown_plane_state(struct dc_plane_state *plane_state);
enum dc_status dcn401_validate_bandwidth(struct dc *dc,
bool dcn401_validate_bandwidth(struct dc *dc,
struct dc_state *context,
bool fast_validate);