Commit 618e51cd authored by Hans de Goede's avatar Hans de Goede Committed by Alex Deucher
Browse files

drm/amd/display/amdgpu_dm: Move most backlight setup into setup_backlight_device() 



Rename register_backlight_device() to setup_backlight_device()
and move all backlight setup related calls from
amdgpu_dm_register_backlight_device() and from
amdgpu_dm_initialize_drm_device() there.

This leaves amdgpu_dm_register_backlight_device() dealing purely
with registering the actual backlight class device.

This is a preparation patch for moving the actual backlight class device
registering to drm_connector_funcs.late_register.

Reviewed-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f196198c

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

+8 −9
Original line number Diff line number Diff line
@@ -4182,9 +4182,6 @@ amdgpu_dm_register_backlight_device(struct amdgpu_display_manager *dm) 
	char bl_name[16];

	struct backlight_properties props = { 0 };



	amdgpu_dm_update_backlight_caps(dm, dm->num_of_edps);

	dm->brightness[dm->num_of_edps] = AMDGPU_MAX_BL_LEVEL;



	if (!acpi_video_backlight_use_native()) {

		drm_info(adev_to_drm(dm->adev), "Skipping amdgpu DM backlight registration\n");

		/* Try registering an ACPI video backlight device instead. */
@@ -4253,7 +4250,7 @@ static int initialize_plane(struct amdgpu_display_manager *dm, 
}





static void register_backlight_device(struct amdgpu_display_manager *dm,

static void setup_backlight_device(struct amdgpu_display_manager *dm,

				   struct amdgpu_dm_connector *aconnector)

{

	struct dc_link *link = aconnector->dc_link;
@@ -4270,6 +4267,9 @@ static void register_backlight_device(struct amdgpu_display_manager *dm, 


	aconnector->bl_idx = bl_idx;



	amdgpu_dm_update_backlight_caps(dm, bl_idx);

	dm->brightness[bl_idx] = AMDGPU_MAX_BL_LEVEL;



	amdgpu_dm_register_backlight_device(dm);

	if (!dm->backlight_dev[bl_idx]) {

		aconnector->bl_idx = -1;
@@ -4278,6 +4278,8 @@ static void register_backlight_device(struct amdgpu_display_manager *dm, 


	dm->backlight_link[bl_idx] = link;

	dm->num_of_edps++;



	update_connector_ext_caps(aconnector);

}



static void amdgpu_set_panel_orientation(struct drm_connector *connector);
@@ -4457,10 +4459,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 


			if (ret) {

				amdgpu_dm_update_connector_after_detect(aconnector);

				register_backlight_device(dm, aconnector);



				if (dm->num_of_edps)

					update_connector_ext_caps(aconnector);

				setup_backlight_device(dm, aconnector);



				if (psr_feature_enabled)

					amdgpu_dm_set_psr_caps(link);