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

Commit 5099114b authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/display: drop DRM_AMD_DC_FBC kconfig option 



Just enable it always.  This was leftover from feature
bring up.

Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b646c1dc

drivers/gpu/drm/amd/display/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -9,16 +9,6 @@ config DRM_AMD_DC 
	  support for AMDGPU. This adds required support for Vega and

	  Raven ASICs.



config DRM_AMD_DC_FBC

	bool "AMD FBC - Enable Frame Buffer Compression"

	depends on DRM_AMD_DC

	help

	  Choose this option if you want to use frame buffer compression

	  support.

	  This is a power optimisation feature, check its availability

	  on your hardware before enabling this option.





config DRM_AMD_DC_DCN1_0

	bool "DCN 1.0 Raven family"

	depends on DRM_AMD_DC && X86

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

+1 −4
Original line number Diff line number Diff line
@@ -347,7 +347,6 @@ static void hotplug_notify_work_func(struct work_struct *work) 
	drm_kms_helper_hotplug_event(dev);

}



#if defined(CONFIG_DRM_AMD_DC_FBC)

/* Allocate memory for FBC compressed data  */

static void amdgpu_dm_fbc_init(struct drm_connector *connector)

{
@@ -388,7 +387,6 @@ static void amdgpu_dm_fbc_init(struct drm_connector *connector) 
	}



}

#endif





/* Init display KMS
@@ -3429,9 +3427,8 @@ static int amdgpu_dm_connector_get_modes(struct drm_connector *connector) 
	amdgpu_dm_connector_ddc_get_modes(connector, edid);

	amdgpu_dm_connector_add_common_modes(encoder, connector);



#if defined(CONFIG_DRM_AMD_DC_FBC)

	amdgpu_dm_fbc_init(connector);

#endif



	return amdgpu_dm_connector->num_modes;

}

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

+1 −4
Original line number Diff line number Diff line
@@ -72,13 +72,11 @@ struct irq_list_head { 
	struct work_struct work;

};



#if defined(CONFIG_DRM_AMD_DC_FBC)

struct dm_comressor_info {

	void *cpu_addr;

	struct amdgpu_bo *bo_ptr;

	uint64_t gpu_addr;

};

#endif





struct amdgpu_display_manager {
@@ -129,9 +127,8 @@ struct amdgpu_display_manager { 
	 * Caches device atomic state for suspend/resume

	 */

	struct drm_atomic_state *cached_state;

#if defined(CONFIG_DRM_AMD_DC_FBC)



	struct dm_comressor_info compressor;

#endif

};



struct amdgpu_dm_connector {

drivers/gpu/drm/amd/display/dc/dc.h

+0 −2
Original line number Diff line number Diff line
@@ -289,9 +289,7 @@ struct dc { 
	bool apply_edp_fast_boot_optimization;



	/* FBC compressor */

#if defined(CONFIG_DRM_AMD_DC_FBC)

	struct compressor *fbc_compressor;

#endif

};



enum frame_buffer_mode {

drivers/gpu/drm/amd/display/dc/dc_types.h

+0 −2
Original line number Diff line number Diff line
@@ -92,9 +92,7 @@ struct dc_context { 
	bool created_bios;

	struct gpio_service *gpio_service;

	struct i2caux *i2caux;

#if defined(CONFIG_DRM_AMD_DC_FBC)

	uint64_t fbc_gpu_addr;

#endif

};