Re: [PATCH 07/14] drm/amd/display: Delete disp_clk_voltage from integrated info

["Timur Kristóf" <timur.kristof@gmail.com>]

On 2026. április 29., szerda 22:35:16 közép-európai nyári idő Melissa Wen 
wrote:
> On 23/04/2026 16:15, Timur Kristóf wrote:
> > Only DCE 11.0 relies on this information and even that
> > didn't use this field, because it queries the information
> > from the pplib. It also filled the field incorrectly on
> > that version.
> > 
> > On newer GPUs, the VIOS integrated info no longer contains
> > display clock voltage dependencies, so we don't need it.
> > 
> > Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
> > ---
> > 
> >   .../gpu/drm/amd/display/dc/bios/bios_parser.c | 36 -------------------
> >   .../drm/amd/display/dc/bios/bios_parser2.c    |  9 -----
> >   .../display/include/grph_object_ctrl_defs.h   |  9 -----
> >   3 files changed, 54 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
> > b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c index
> > 25c94962e1415..298a70852c1a8 100644
> > --- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
> > +++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
> > @@ -2348,15 +2348,6 @@ static enum bp_result get_integrated_info_v8(
> > 
> >   	info->dentist_vco_freq = le32_to_cpu(info_v8->ulDentistVCOFreq) * 
10;
> >   	info->boot_up_uma_clock = le32_to_cpu(info_v8->ulBootUpUMAClock) 
* 10;
> > 
> > -	for (i = 0; i < NUMBER_OF_DISP_CLK_VOLTAGE; ++i) {
> > -		/* Convert [10KHz] into [KHz] */
> > -		info->disp_clk_voltage[i].max_supported_clk =
> > -			le32_to_cpu(info_v8->sDISPCLK_Voltage[i].
> > -				    ulMaximumSupportedCLK) * 10;
> > -		info->disp_clk_voltage[i].voltage_index =
> > -			le32_to_cpu(info_v8-
>sDISPCLK_Voltage[i].ulVoltageIndex);
> > -	}
> > -
> > 
> >   	info->boot_up_req_display_vector =
> >   	
> >   		le32_to_cpu(info_v8->ulBootUpReqDisplayVector);
> >   	
> >   	info->gpu_cap_info =
> > 
> > @@ -2499,14 +2490,6 @@ static enum bp_result get_integrated_info_v9(
> > 
> >   	info->dentist_vco_freq = le32_to_cpu(info_v9->ulDentistVCOFreq) * 
10;
> >   	info->boot_up_uma_clock = le32_to_cpu(info_v9->ulBootUpUMAClock) 
* 10;
> > 
> > -	for (i = 0; i < NUMBER_OF_DISP_CLK_VOLTAGE; ++i) {
> > -		/* Convert [10KHz] into [KHz] */
> > -		info->disp_clk_voltage[i].max_supported_clk =
> > -			le32_to_cpu(info_v9-
>sDISPCLK_Voltage[i].ulMaximumSupportedCLK) * 10;
> > -		info->disp_clk_voltage[i].voltage_index =
> > -			le32_to_cpu(info_v9-
>sDISPCLK_Voltage[i].ulVoltageIndex);
> > -	}
> > -
> > 
> >   	info->boot_up_req_display_vector =
> >   	
> >   		le32_to_cpu(info_v9->ulBootUpReqDisplayVector);
> >   	
> >   	info->gpu_cap_info = le32_to_cpu(info_v9->ulGPUCapInfo);
> > 
> > @@ -2648,25 +2631,6 @@ static enum bp_result construct_integrated_info(
> > 
> >   		}
> >   	
> >   	}
> > 
> > -	/* Sort voltage table from low to high*/
> > -	if (result == BP_RESULT_OK) {
> > -		int32_t i;
> > -		int32_t j;
> > -
> > -		for (i = 1; i < NUMBER_OF_DISP_CLK_VOLTAGE; ++i) {
> > -			for (j = i; j > 0; --j) {
> > -				if (
> > -						info-
>disp_clk_voltage[j].max_supported_clk <
> > -						info-
>disp_clk_voltage[j-1].max_supported_clk) {
> > -					/* swap j and j - 1*/
> > -					swap(info-
>disp_clk_voltage[j - 1],
> > -					     info-
>disp_clk_voltage[j]);
> > -				}
> > -			}
> > -		}
> > -
> > -	}
> > -
> > 
> >   	return result;
> >   
> >   }
> > 
> > diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
> > b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c index
> > b4dd8219b8f09..0e7250f1d3f73 100644
> > --- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
> > +++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
> > @@ -3023,7 +3023,6 @@ static enum bp_result construct_integrated_info(
> > 
> >   	struct atom_data_revision revision;
> >   	
> >   	int32_t i;
> > 
> > -	int32_t j;
> > 
> >   	if (!info)
> >   	
> >   		return result;
> > 
> > @@ -3125,14 +3124,6 @@ static enum bp_result construct_integrated_info(
> > 
> >   			DC_LOG_BIOS("driver forced fixdpvoltageswing 
= %d\n",
> >   			info-
>ext_disp_conn_info.fixdpvoltageswing);>   		
> >   		}
> >   	
> >   	}
> > 
> > -	/* Sort voltage table from low to high*/
> > -	for (i = 1; i < NUMBER_OF_DISP_CLK_VOLTAGE; ++i) {
> > -		for (j = i; j > 0; --j) {
> > -			if (info-
>disp_clk_voltage[j].max_supported_clk <
> > -			    info-
>disp_clk_voltage[j-1].max_supported_clk)
> > -				swap(info->disp_clk_voltage[j-1], 
info->disp_clk_voltage[j]);
> > -		}
> > -	}
> 
> I see in `get_integrated_info_v11()` a big portion of very old unused
> code guarded by a `#if 0` that uses `NUMBER_OF_DISP_CLK_VOLTAGE` but
> probably doesn't make sense anymore.
> How about removing it too?

As far as I understand, the VBIOS on newer GPUs doesn't have this information 
in the integrated info. I don't know what was the intention of that "#if 0".
I can remove it if there are no objections from anyone here.

> 
> >   	return result;
> >   
> >   }
> > 
> > diff --git a/drivers/gpu/drm/amd/display/include/grph_object_ctrl_defs.h
> > b/drivers/gpu/drm/amd/display/include/grph_object_ctrl_defs.h index
> > 38a77fa9b4afd..130d377f4f1d2 100644
> > --- a/drivers/gpu/drm/amd/display/include/grph_object_ctrl_defs.h
> > +++ b/drivers/gpu/drm/amd/display/include/grph_object_ctrl_defs.h
> > @@ -269,7 +269,6 @@ struct transmitter_configuration {
> > 
> >   #define NUMBER_OF_UCHAR_FOR_GUID 16
> >   #define MAX_NUMBER_OF_EXT_DISPLAY_PATH 7
> >   #define NUMBER_OF_CSR_M3_ARB 10
> > 
> > -#define NUMBER_OF_DISP_CLK_VOLTAGE 4
> > 
> >   #define NUMBER_OF_AVAILABLE_SCLK 5
> >   
> >   struct i2c_reg_info {
> > 
> > @@ -298,14 +297,6 @@ struct edp_info {
> > 
> >   /* V6 */
> >   struct integrated_info {
> > 
> > -	struct clock_voltage_caps {
> > -		/* The Voltage Index indicated by FUSE, same voltage 
index
> > -		shared with SCLK DPM fuse table */
> > -		uint32_t voltage_index;
> > -		/* Maximum clock supported with specified voltage index 
*/
> > -		uint32_t max_supported_clk; /* in KHz */
> > -	} disp_clk_voltage[NUMBER_OF_DISP_CLK_VOLTAGE];
> > -
> > 
> >   	struct display_connection_info {
> >   	
> >   		struct external_display_path {
> >   		
> >   			/* A bit vector to show what devices are 
supported */