Эх сурвалжийг харах

drm/amd/display: use configurable FBC option in dm

Replace ENABLE_FBC macro with config option CONFIG_DRM_AMD_DC_FBC
in dm. DC code has been already updated the same way.

Signed-off-by: Roman Li <Roman.Li@amd.com>
Reviewed-by: Shirish Shankarappa <Shirish.S@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Roman Li 7 жил өмнө
parent
commit
6ef39a6224

+ 2 - 2
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

@@ -344,7 +344,7 @@ static void hotplug_notify_work_func(struct work_struct *work)
 	drm_kms_helper_hotplug_event(dev);
 	drm_kms_helper_hotplug_event(dev);
 }
 }
 
 
-#ifdef ENABLE_FBC
+#if defined(CONFIG_DRM_AMD_DC_FBC)
 #include "dal_asic_id.h"
 #include "dal_asic_id.h"
 /* Allocate memory for FBC compressed data  */
 /* Allocate memory for FBC compressed data  */
 /* TODO: Dynamic allocation */
 /* TODO: Dynamic allocation */
@@ -422,7 +422,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
 	else
 	else
 		init_data.log_mask = DC_MIN_LOG_MASK;
 		init_data.log_mask = DC_MIN_LOG_MASK;
 
 
-#ifdef ENABLE_FBC
+#if defined(CONFIG_DRM_AMD_DC_FBC)
 	if (adev->family == FAMILY_CZ)
 	if (adev->family == FAMILY_CZ)
 		amdgpu_dm_initialize_fbc(adev);
 		amdgpu_dm_initialize_fbc(adev);
 	init_data.fbc_gpu_addr = adev->dm.compressor.gpu_addr;
 	init_data.fbc_gpu_addr = adev->dm.compressor.gpu_addr;

+ 2 - 2
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h

@@ -72,7 +72,7 @@ struct irq_list_head {
 	struct work_struct work;
 	struct work_struct work;
 };
 };
 
 
-#ifdef ENABLE_FBC
+#if defined(CONFIG_DRM_AMD_DC_FBC)
 struct dm_comressor_info {
 struct dm_comressor_info {
 	void *cpu_addr;
 	void *cpu_addr;
 	struct amdgpu_bo *bo_ptr;
 	struct amdgpu_bo *bo_ptr;
@@ -142,7 +142,7 @@ struct amdgpu_display_manager {
 	 * Caches device atomic state for suspend/resume
 	 * Caches device atomic state for suspend/resume
 	 */
 	 */
 	struct drm_atomic_state *cached_state;
 	struct drm_atomic_state *cached_state;
-#ifdef ENABLE_FBC
+#if defined(CONFIG_DRM_AMD_DC_FBC)
 	struct dm_comressor_info compressor;
 	struct dm_comressor_info compressor;
 #endif
 #endif
 };
 };