Commit 83a3439d authored by Hans de Goede's avatar Hans de Goede Committed by Alex Deucher
Browse files

drm/amdgpu: Drop CONFIG_BACKLIGHT_CLASS_DEVICE ifdefs 



The DRM_AMDGPU Kconfig code contains:

	select BACKLIGHT_CLASS_DEVICE

So the condition these ifdefs test for is always true, drop them.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 43af2220

drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c

+0 −6
Original line number Diff line number Diff line
@@ -66,9 +66,7 @@ struct amdgpu_atif { 
	struct amdgpu_atif_notifications notifications;

	struct amdgpu_atif_functions functions;

	struct amdgpu_atif_notification_cfg notification_cfg;

#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)

	struct backlight_device *bd;

#endif

	struct amdgpu_dm_backlight_caps backlight_caps;

};
@@ -436,7 +434,6 @@ static int amdgpu_atif_handler(struct amdgpu_device *adev, 
		DRM_DEBUG_DRIVER("ATIF: %d pending SBIOS requests\n", count);



		if (req.pending & ATIF_PANEL_BRIGHTNESS_CHANGE_REQUEST) {

#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)

			if (atif->bd) {

				DRM_DEBUG_DRIVER("Changing brightness to %d\n",

						 req.backlight_level);
@@ -447,7 +444,6 @@ static int amdgpu_atif_handler(struct amdgpu_device *adev, 
				 */

				backlight_device_set_brightness(atif->bd, req.backlight_level);

			}

#endif

		}



		if (req.pending & ATIF_DGPU_DISPLAY_EVENT) {
@@ -849,7 +845,6 @@ int amdgpu_acpi_init(struct amdgpu_device *adev) 
{

	struct amdgpu_atif *atif = &amdgpu_acpi_priv.atif;



#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)

	if (atif->notifications.brightness_change) {

		if (amdgpu_device_has_dc_support(adev)) {

#if defined(CONFIG_DRM_AMD_DC)
@@ -876,7 +871,6 @@ int amdgpu_acpi_init(struct amdgpu_device *adev) 
			}

		}

	}

#endif

	adev->acpi_nb.notifier_call = amdgpu_acpi_event;

	register_acpi_notifier(&adev->acpi_nb);

drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h

+0 −4
Original line number Diff line number Diff line
@@ -349,15 +349,11 @@ struct amdgpu_mode_info { 


#define AMDGPU_MAX_BL_LEVEL 0xFF



#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)



struct amdgpu_backlight_privdata {

	struct amdgpu_encoder *encoder;

	uint8_t negative;

};



#endif



struct amdgpu_atom_ss {

	uint16_t percentage;

	uint16_t percentage_divider;

drivers/gpu/drm/amd/amdgpu/atombios_encoders.c

+0 −14
Original line number Diff line number Diff line
@@ -118,8 +118,6 @@ amdgpu_atombios_encoder_set_backlight_level(struct amdgpu_encoder *amdgpu_encode 
	}

}



#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) || defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)



static u8 amdgpu_atombios_encoder_backlight_level(struct backlight_device *bd)

{

	u8 level;
@@ -251,18 +249,6 @@ amdgpu_atombios_encoder_fini_backlight(struct amdgpu_encoder *amdgpu_encoder) 
	}

}



#else /* !CONFIG_BACKLIGHT_CLASS_DEVICE */



void amdgpu_atombios_encoder_init_backlight(struct amdgpu_encoder *encoder)

{

}



void amdgpu_atombios_encoder_fini_backlight(struct amdgpu_encoder *encoder)

{

}



#endif



bool amdgpu_atombios_encoder_is_digital(struct drm_encoder *encoder)

{

	struct amdgpu_encoder *amdgpu_encoder = to_amdgpu_encoder(encoder);

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

+1 −14
Original line number Diff line number Diff line
@@ -3862,9 +3862,6 @@ static int amdgpu_dm_mode_config_init(struct amdgpu_device *adev) 
#define AMDGPU_DM_DEFAULT_MAX_BACKLIGHT 255

#define AUX_BL_DEFAULT_TRANSITION_TIME_MS 50



#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) ||\

	defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)



static void amdgpu_dm_update_backlight_caps(struct amdgpu_display_manager *dm,

					    int bl_idx)

{
@@ -4068,7 +4065,6 @@ amdgpu_dm_register_backlight_device(struct amdgpu_display_manager *dm) 
	else

		DRM_DEBUG_DRIVER("DM: Registered Backlight device: %s\n", bl_name);

}

#endif



static int initialize_plane(struct amdgpu_display_manager *dm,

			    struct amdgpu_mode_info *mode_info, int plane_id,
@@ -4114,9 +4110,6 @@ static int initialize_plane(struct amdgpu_display_manager *dm, 
static void register_backlight_device(struct amdgpu_display_manager *dm,

				      struct dc_link *link)

{

#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) ||\

	defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)



	if ((link->connector_signal & (SIGNAL_TYPE_EDP | SIGNAL_TYPE_LVDS)) &&

	    link->type != dc_connection_none) {

		/*
@@ -4132,7 +4125,6 @@ static void register_backlight_device(struct amdgpu_display_manager *dm, 
			dm->num_of_edps++;

		}

	}

#endif

}
@@ -7064,15 +7056,12 @@ static void amdgpu_dm_connector_destroy(struct drm_connector *connector) 
	if (aconnector->mst_mgr.dev)

		drm_dp_mst_topology_mgr_destroy(&aconnector->mst_mgr);



#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) ||\

	defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)

	for (i = 0; i < dm->num_of_edps; i++) {

		if ((link == dm->backlight_link[i]) && dm->backlight_dev[i]) {

			backlight_device_unregister(dm->backlight_dev[i]);

			dm->backlight_dev[i] = NULL;

		}

	}

#endif



	if (aconnector->dc_em_sink)

		dc_sink_release(aconnector->dc_em_sink);
@@ -10155,15 +10144,13 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) 
	/* Update audio instances for each connector. */

	amdgpu_dm_commit_audio(dev, state);



#if defined(CONFIG_BACKLIGHT_CLASS_DEVICE) ||		\

	defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)

	/* restore the backlight level */

	for (i = 0; i < dm->num_of_edps; i++) {

		if (dm->backlight_dev[i] &&

		    (dm->actual_brightness[i] != dm->brightness[i]))

			amdgpu_dm_backlight_set_level(dm, i, dm->brightness[i]);

	}

#endif



	/*

	 * send vblank event on all events not handled in flip and

	 * mark consumed event for drm_atomic_helper_commit_hw_done