Skip to contentSkip to conversation

drm/amdgpu/display: fix leftover CONFIG_DRM_AMD_DC_DCN3_1

PATCH In review Alex Deucher 2 participants 2 messages Aug 16, 2021

Subsystems (3)
lore
Share & tools
lore

Alex Deucher

author maintainer
#0 lore raw

PATCH 1/1 drm/amdgpu/display: fix leftover CONFIG_DRM_AMD_DC_DCN3_1

These were converted to CONFIG_DRM_AMD_DC_DCN, fix this case up.

Fixes d7cecec64d07 ("drm/amd/display: Ensure DCN save after VM setup")
---
 drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c +1 -1
index 80c752ca4a5a..cde8ed2560b3 100644
@@ -47,7 +47,7 @@ int dc_setup_system_context(struct dc *dc, struct dc_phy_addr_space_config *pa_c
 		 */
 		memcpy(&dc->vm_pa_config, pa_config, sizeof(struct dc_phy_addr_space_config));
 		dc->vm_pa_config.valid = true;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_1)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 		dc_z10_save_init(dc);
 #endif
 	}
Signature · 1 line
2.31.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Alex Deucher

These were converted to CONFIG_DRM_AMD_DC_DCN, fix this case up.

Fixes d7cecec64d07 ("drm/amd/display: Ensure DCN save after VM setup")

Harry

Quoted 18 lines
---
 drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c +1 -1
index 80c752ca4a5a..cde8ed2560b3 100644
@@ -47,7 +47,7 @@ int dc_setup_system_context(struct dc *dc, struct dc_phy_addr_space_config *pa_c
 		 */
 		memcpy(&dc->vm_pa_config, pa_config, sizeof(struct dc_phy_addr_space_config));
 		dc->vm_pa_config.valid = true;
-#if defined(CONFIG_DRM_AMD_DC_DCN3_1)
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 		dc_z10_save_init(dc);
 #endif
 	}