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

drm/kms: Duct-tape for mode object lifetime checks

commit 4f5368b5541a902f6596558b05f5c21a9770dd32
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Fri Jun 14 08:17:23 2019 +0200

drm/kms: Catch mode_object lifetime errors

uncovered a bit a mess in dp drivers. Most drivers (from a quick look,
all except i915) register all the dp stuff in their init code, which
is too early. With CONFIG_DRM_DP_AUX_CHARDEV this will blow up,
because drm_dp_aux_register tries to add a child to a device in sysfs
(the connector) which doesn't even exist yet.

No one seems to have cared thus far. But with the above change I also
moved the setting of dev->registered after the ->load callback, in an
attempt to keep old drivers from hitting any WARN_ON backtraces. But
that moved radeon.ko from the "working, by accident" to "now also
broken" category.

Since this is a huge mess I figured a revert would be simplest. But
this check has already caught issues in i915:

commit 1b9bd09630d4db4827cc04d358a41a16a6bc2cb0
Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
Date: Tue Aug 20 19:16:57 2019 +0300

drm/i915: Do not create a new max_bpc prop for MST connectors

Hence I'd like to retain it. Fix the radeon regression by moving the
setting of dev->registered back to were it was, and stop the
backtraces with an explicit check for dev->driver->load.

Everyone else will stay as broken with CONFIG_DRM_DP_AUX_CHARDEV. The
next patch will improve the kerneldoc and add a todo entry for this.

Fixes: 4f5368b5541a ("drm/kms: Catch mode_object lifetime errors")
Cc: Sean Paul <sean@poorly.run>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reported-by: Michel Dänzer <michel@daenzer.net>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Tested-by: Michel Dänzer <mdaenzer@redhat.com>
Cc: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190917120936.7501-1-daniel.vetter@ffwll.ch

+4 -4
+2 -2
drivers/gpu/drm/drm_drv.c
··· 976 976 if (ret) 977 977 goto err_minors; 978 978 979 + dev->registered = true; 980 + 979 981 if (dev->driver->load) { 980 982 ret = dev->driver->load(dev, flags); 981 983 if (ret) 982 984 goto err_minors; 983 985 } 984 - 985 - dev->registered = true; 986 986 987 987 if (drm_core_check_feature(dev, DRIVER_MODESET)) 988 988 drm_modeset_register_all(dev);
+2 -2
drivers/gpu/drm/drm_mode_object.c
··· 42 42 { 43 43 int ret; 44 44 45 - WARN_ON(dev->registered && !obj_free_cb); 45 + WARN_ON(!dev->driver->load && dev->registered && !obj_free_cb); 46 46 47 47 mutex_lock(&dev->mode_config.idr_mutex); 48 48 ret = idr_alloc(&dev->mode_config.object_idr, register_obj ? obj : NULL, ··· 104 104 void drm_mode_object_unregister(struct drm_device *dev, 105 105 struct drm_mode_object *object) 106 106 { 107 - WARN_ON(dev->registered && !object->free_cb); 107 + WARN_ON(!dev->driver->load && dev->registered && !object->free_cb); 108 108 109 109 mutex_lock(&dev->mode_config.idr_mutex); 110 110 if (object->id) {