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

Commit cd23492a authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: fix compilation with backlight disabled 



Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a1871936

drivers/gpu/drm/radeon/radeon_acpi.c

+2 −0
Original line number Diff line number Diff line
@@ -370,6 +370,7 @@ int radeon_atif_handler(struct radeon_device *rdev, 


			radeon_set_backlight_level(rdev, enc, req.backlight_level);



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

			if (rdev->is_atom_bios) {

				struct radeon_encoder_atom_dig *dig = enc->enc_priv;

				backlight_force_update(dig->bl_dev,
@@ -379,6 +380,7 @@ int radeon_atif_handler(struct radeon_device *rdev, 
				backlight_force_update(dig->bl_dev,

						       BACKLIGHT_UPDATE_HOTKEY);

			}

#endif

		}

	}

	/* TODO: check other events */

drivers/gpu/drm/radeon/radeon_legacy_encoders.c

+21 −21
Original line number Diff line number Diff line
@@ -269,27 +269,6 @@ static const struct drm_encoder_helper_funcs radeon_legacy_lvds_helper_funcs = { 
	.disable = radeon_legacy_encoder_disable,

};



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



static uint8_t radeon_legacy_lvds_level(struct backlight_device *bd)

{

	struct radeon_backlight_privdata *pdata = bl_get_data(bd);

	uint8_t level;



	/* Convert brightness to hardware level */

	if (bd->props.brightness < 0)

		level = 0;

	else if (bd->props.brightness > RADEON_MAX_BL_LEVEL)

		level = RADEON_MAX_BL_LEVEL;

	else

		level = bd->props.brightness;



	if (pdata->negative)

		level = RADEON_MAX_BL_LEVEL - level;



	return level;

}



u8

radeon_legacy_get_backlight_level(struct radeon_encoder *radeon_encoder)

{
@@ -331,6 +310,27 @@ radeon_legacy_set_backlight_level(struct radeon_encoder *radeon_encoder, u8 leve 
	radeon_legacy_lvds_update(&radeon_encoder->base, dpms_mode);

}



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



static uint8_t radeon_legacy_lvds_level(struct backlight_device *bd)

{

	struct radeon_backlight_privdata *pdata = bl_get_data(bd);

	uint8_t level;



	/* Convert brightness to hardware level */

	if (bd->props.brightness < 0)

		level = 0;

	else if (bd->props.brightness > RADEON_MAX_BL_LEVEL)

		level = RADEON_MAX_BL_LEVEL;

	else

		level = bd->props.brightness;



	if (pdata->negative)

		level = RADEON_MAX_BL_LEVEL - level;



	return level;

}



static int radeon_legacy_backlight_update_status(struct backlight_device *bd)

{

	struct radeon_backlight_privdata *pdata = bl_get_data(bd);