Revert "drm/amd/display: Pass proper parent for DM backlight device registration"

This reverts commit d24b77e444bef83155557ebf4c2b3c551f198926.

This does not work as expected.

Bug: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/issues/730
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 4458e00f5b154a42977c796f0b6a5af1c8b0f8c7..0e92bf6d286edb21c18cc7602e3e2a84e7c2362e 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -4181,8 +4181,7 @@ static const struct backlight_ops amdgpu_dm_backlight_ops = {
 };
 
 static void
-amdgpu_dm_register_backlight_device(struct amdgpu_display_manager *dm,
-                                   struct amdgpu_dm_connector *aconnector)
+amdgpu_dm_register_backlight_device(struct amdgpu_display_manager *dm)
 {
        char bl_name[16];
        struct backlight_properties props = { 0 };
@@ -4205,7 +4204,7 @@ amdgpu_dm_register_backlight_device(struct amdgpu_display_manager *dm,
                 adev_to_drm(dm->adev)->primary->index + dm->num_of_edps);
 
        dm->backlight_dev[dm->num_of_edps] = backlight_device_register(bl_name,
-                                                                      aconnector->base.kdev,
+                                                                      adev_to_drm(dm->adev)->dev,
                                                                       dm,
                                                                       &amdgpu_dm_backlight_ops,
                                                                       &props);
@@ -4258,7 +4257,6 @@ static int initialize_plane(struct amdgpu_display_manager *dm,
 
 
 static void register_backlight_device(struct amdgpu_display_manager *dm,
-                                     struct amdgpu_dm_connector *aconnector,
                                      struct dc_link *link)
 {
        if ((link->connector_signal & (SIGNAL_TYPE_EDP | SIGNAL_TYPE_LVDS)) &&
@@ -4269,7 +4267,7 @@ static void register_backlight_device(struct amdgpu_display_manager *dm,
                 * is better then a black screen.
                 */
                if (!dm->backlight_dev[dm->num_of_edps])
-                       amdgpu_dm_register_backlight_device(dm, aconnector);
+                       amdgpu_dm_register_backlight_device(dm);
 
                if (dm->backlight_dev[dm->num_of_edps]) {
                        dm->backlight_link[dm->num_of_edps] = link;
@@ -4455,7 +4453,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, link);
+                               register_backlight_device(dm, link);
 
                                if (dm->num_of_edps)
                                        update_connector_ext_caps(aconnector);