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

Commit 614499b4 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: give each backlight a unique id 

In cases where we have multiple radeons with backlight controls.

Should fix:
https://bugzilla.kernel.org/show_bug.cgi?id=48941



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

drivers/gpu/drm/radeon/atombios_encoders.c

+4 −1
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ void radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder, 
	struct radeon_backlight_privdata *pdata;

	struct radeon_encoder_atom_dig *dig;

	u8 backlight_level;

	char bl_name[16];



	if (!radeon_encoder->enc_priv)

		return;
@@ -203,7 +204,9 @@ void radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder, 
	memset(&props, 0, sizeof(props));

	props.max_brightness = RADEON_MAX_BL_LEVEL;

	props.type = BACKLIGHT_RAW;

	bd = backlight_device_register("radeon_bl", &drm_connector->kdev,

	snprintf(bl_name, sizeof(bl_name),

		 "radeon_bl%d", dev->primary->index);

	bd = backlight_device_register(bl_name, &drm_connector->kdev,

				       pdata, &radeon_atom_backlight_ops, &props);

	if (IS_ERR(bd)) {

		DRM_ERROR("Backlight registration failed\n");

drivers/gpu/drm/radeon/radeon_legacy_encoders.c

+4 −1
Original line number Diff line number Diff line
@@ -370,6 +370,7 @@ void radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder, 
	struct backlight_properties props;

	struct radeon_backlight_privdata *pdata;

	uint8_t backlight_level;

	char bl_name[16];



	if (!radeon_encoder->enc_priv)

		return;
@@ -389,7 +390,9 @@ void radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder, 
	memset(&props, 0, sizeof(props));

	props.max_brightness = RADEON_MAX_BL_LEVEL;

	props.type = BACKLIGHT_RAW;

	bd = backlight_device_register("radeon_bl", &drm_connector->kdev,

	snprintf(bl_name, sizeof(bl_name),

		 "radeon_bl%d", dev->primary->index);

	bd = backlight_device_register(bl_name, &drm_connector->kdev,

				       pdata, &radeon_backlight_ops, &props);

	if (IS_ERR(bd)) {

		DRM_ERROR("Backlight registration failed\n");