Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/nouveau/kms: Fix backlight registration

The nouveau code used to call drm_fb_helper_initial_config() from
nouveau_fbcon_init() before calling drm_dev_register(). This would
probe all connectors so that drm_connector->status could be used during
backlight registration which runs from nouveau_connector_late_register().

After commit 4a16dd9d18a0 ("drm/nouveau/kms: switch to drm fbdev helpers")
the fbdev emulation code, which now is a drm-client, can only run after
drm_dev_register(). So during backlight registration the connectors are
not probed yet and the drm_connector->status == connected check in
nv50_backlight_init() would now always fail.

Replace the drm_connector->status == connected check with
a drm_helper_probe_detect() == connected check to fix nv_backlight
no longer getting registered because of this.

Fixes: 4a16dd9d18a0 ("drm/nouveau/kms: switch to drm fbdev helpers")
Link: https://gitlab.freedesktop.org/drm/nouveau/-/issues/202
Link: https://bugzilla.redhat.com/show_bug.cgi?id=2181941
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230326205433.36485-1-hdegoede@redhat.com

+6 -1
+6 -1
drivers/gpu/drm/nouveau/nouveau_backlight.c
··· 33 33 #include <linux/apple-gmux.h> 34 34 #include <linux/backlight.h> 35 35 #include <linux/idr.h> 36 + #include <drm/drm_probe_helper.h> 36 37 37 38 #include "nouveau_drv.h" 38 39 #include "nouveau_reg.h" ··· 300 299 struct nouveau_drm *drm = nouveau_drm(nv_encoder->base.base.dev); 301 300 struct nvif_object *device = &drm->client.device.object; 302 301 302 + /* 303 + * Note when this runs the connectors have not been probed yet, 304 + * so nv_conn->base.status is not set yet. 305 + */ 303 306 if (!nvif_rd32(device, NV50_PDISP_SOR_PWM_CTL(ffs(nv_encoder->dcb->or) - 1)) || 304 - nv_conn->base.status != connector_status_connected) 307 + drm_helper_probe_detect(&nv_conn->base, NULL, false) != connector_status_connected) 305 308 return -ENODEV; 306 309 307 310 if (nv_conn->type == DCB_CONNECTOR_eDP) {