Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b6dc93a authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/display: remove VEGAM config option 



Leftover from bringup.  No need to keep it around for
upstream.

Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 563e1e66

drivers/gpu/drm/amd/display/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -34,13 +34,6 @@ config DEBUG_KERNEL_DC 
	  if you want to hit

	  kdgb_break in assert.



config DRM_AMD_DC_VEGAM

        bool "VEGAM support"

        depends on DRM_AMD_DC

        help

         Choose this option if you want to have

         VEGAM support for display engine



config DRM_AMD_DC_VG20

	bool "Vega20 support"

	depends on DRM_AMD_DC

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+0 −4
Original line number Diff line number Diff line
@@ -1514,9 +1514,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 
	case CHIP_POLARIS11:

	case CHIP_POLARIS10:

	case CHIP_POLARIS12:

#if defined(CONFIG_DRM_AMD_DC_VEGAM)

	case CHIP_VEGAM:

#endif

	case CHIP_VEGA10:

	case CHIP_VEGA12:

	case CHIP_VEGA20:
@@ -1710,9 +1708,7 @@ static int dm_early_init(void *handle) 
		adev->mode_info.plane_type = dm_plane_type_default;

		break;

	case CHIP_POLARIS10:

#if defined(CONFIG_DRM_AMD_DC_VEGAM)

	case CHIP_VEGAM:

#endif

		adev->mode_info.num_crtc = 6;

		adev->mode_info.num_hpd = 6;

		adev->mode_info.num_dig = 6;

drivers/gpu/drm/amd/display/dc/bios/command_table_helper.c

+0 −2
Original line number Diff line number Diff line
@@ -51,9 +51,7 @@ bool dal_bios_parser_init_cmd_tbl_helper( 
		return true;



	case DCE_VERSION_11_2:

#if defined(CONFIG_DRM_AMD_DC_VEGAM)

	case DCE_VERSION_11_22:

#endif

		*h = dal_cmd_tbl_helper_dce112_get_table();

		return true;

drivers/gpu/drm/amd/display/dc/bios/command_table_helper2.c

+0 −2
Original line number Diff line number Diff line
@@ -52,9 +52,7 @@ bool dal_bios_parser_init_cmd_tbl_helper2( 
		return true;



	case DCE_VERSION_11_2:

#if defined(CONFIG_DRM_AMD_DC_VEGAM)

	case DCE_VERSION_11_22:

#endif

		*h = dal_cmd_tbl_helper_dce112_get_table2();

		return true;

#if defined(CONFIG_DRM_AMD_DC_DCN1_0)

drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c

+0 −4
Original line number Diff line number Diff line
@@ -59,10 +59,8 @@ static enum bw_calcs_version bw_calcs_version_from_asic_id(struct hw_asic_id asi 
			return BW_CALCS_VERSION_POLARIS10;

		if (ASIC_REV_IS_POLARIS11_M(asic_id.hw_internal_rev))

			return BW_CALCS_VERSION_POLARIS11;

#if defined(CONFIG_DRM_AMD_DC_VEGAM)

		if (ASIC_REV_IS_VEGAM(asic_id.hw_internal_rev))

			return BW_CALCS_VERSION_VEGAM;

#endif

		return BW_CALCS_VERSION_INVALID;



	case FAMILY_AI:
@@ -2151,11 +2149,9 @@ void bw_calcs_init(struct bw_calcs_dceip *bw_dceip, 
		dceip.mcifwr_all_surfaces_burst_time = bw_int_to_fixed(0); /* todo: this is a bug*/

		break;

	case BW_CALCS_VERSION_POLARIS10:

#if defined(CONFIG_DRM_AMD_DC_VEGAM)

		/* TODO: Treat VEGAM the same as P10 for now

		 * Need to tune the para for VEGAM if needed */

	case BW_CALCS_VERSION_VEGAM:

#endif

		vbios.memory_type = bw_def_gddr5;

		vbios.dram_channel_width_in_bits = 32;

		vbios.number_of_dram_channels = asic_id.vram_width / vbios.dram_channel_width_in_bits;