Commit 4cee6a90 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: move bl encoder assignment into bl init 



So that the bl encoder will be null if the GPU does not
control the backlight.

Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 22ca7ca5

drivers/gpu/drm/radeon/atombios_encoders.c

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ void radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder, 
	backlight_update_status(bd);



	DRM_INFO("radeon atom DIG backlight initialized\n");

	rdev->mode_info.bl_encoder = radeon_encoder;



	return;

drivers/gpu/drm/radeon/radeon_encoders.c

+0 −1
Original line number Diff line number Diff line
@@ -194,7 +194,6 @@ static void radeon_encoder_add_backlight(struct radeon_encoder *radeon_encoder, 
			radeon_atom_backlight_init(radeon_encoder, connector);

		else

			radeon_legacy_backlight_init(radeon_encoder, connector);

		rdev->mode_info.bl_encoder = radeon_encoder;

	}

}

drivers/gpu/drm/radeon/radeon_legacy_encoders.c

+1 −0
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ void radeon_legacy_backlight_init(struct radeon_encoder *radeon_encoder, 
	backlight_update_status(bd);



	DRM_INFO("radeon legacy LVDS backlight initialized\n");

	rdev->mode_info.bl_encoder = radeon_encoder;



	return;

CRA Git | Maintained and supported by SUSTech CRA and CCSE