From 352d2b7ec32b5ace348414cd8a7e783a6ed86898 Mon Sep 17 00:00:00 2001 From: Roman Li Date: Thu, 26 Oct 2017 18:43:58 -0400 Subject: [PATCH 2807/4131] 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 Reviewed-by: Shirish Shankarappa Acked-by: Harry Wentland Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++-- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index d9b204f..fbff613 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -356,7 +356,7 @@ static void hotplug_notify_work_func(struct work_struct *work) drm_kms_helper_hotplug_event(dev); } -#ifdef ENABLE_FBC +#if defined(CONFIG_DRM_AMD_DC_FBC) #include "dal_asic_id.h" /* Allocate memory for FBC compressed data */ /* TODO: Dynamic allocation */ @@ -434,7 +434,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) else init_data.log_mask = DC_MIN_LOG_MASK; -#ifdef ENABLE_FBC +#if defined(CONFIG_DRM_AMD_DC_FBC) if (adev->family == FAMILY_CZ) amdgpu_dm_initialize_fbc(adev); init_data.fbc_gpu_addr = adev->dm.compressor.gpu_addr; diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h index 6b81e12..450379d 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h @@ -72,7 +72,7 @@ struct irq_list_head { struct work_struct work; }; -#ifdef ENABLE_FBC +#if defined(CONFIG_DRM_AMD_DC_FBC) struct dm_comressor_info { void *cpu_addr; struct amdgpu_bo *bo_ptr; @@ -142,7 +142,7 @@ struct amdgpu_display_manager { * Caches device atomic state for suspend/resume */ struct drm_atomic_state *cached_state; -#ifdef ENABLE_FBC +#if defined(CONFIG_DRM_AMD_DC_FBC) struct dm_comressor_info compressor; #endif }; -- 2.7.4