Turns out that we don't actually check this anywhere, and additionally actually forget to even mention this in our documentation.
Since we've had one driver making this mistake already, let's clarify this by mentioning this limitation in the kernel docs. Additionally, for drivers not using the legacy ->load/->unload() hooks (which make it impossible to create all encoders before registration): print a big warning when drm_encoder_init() is called after device registration, or when drm_encoder_cleanup() is called before device unregistration.
Signed-off-by: Lyude Paul lyude@redhat.com Cc: Ville Syrjälä ville.syrjala@linux.intel.com --- drivers/gpu/drm/drm_encoder.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/drm_encoder.c b/drivers/gpu/drm/drm_encoder.c index 80d88a55302e..5c5e40aafa4e 100644 --- a/drivers/gpu/drm/drm_encoder.c +++ b/drivers/gpu/drm/drm_encoder.c @@ -99,9 +99,12 @@ void drm_encoder_unregister_all(struct drm_device *dev) * @encoder_type: user visible type of the encoder * @name: printf style format string for the encoder name, or NULL for default name * - * Initialises a preallocated encoder. Encoder should be subclassed as part of - * driver encoder objects. At driver unload time drm_encoder_cleanup() should be - * called from the driver's &drm_encoder_funcs.destroy hook. + * Initialises a preallocated encoder. The encoder should be subclassed as + * part of driver encoder objects. This function may not be called after the + * device is registered with drm_dev_register(). + * + * At driver unload time drm_encoder_cleanup() must be called from the + * driver's &drm_encoder_funcs.destroy hook. * * Returns: * Zero on success, error code on failure. @@ -117,6 +120,14 @@ int drm_encoder_init(struct drm_device *dev, if (WARN_ON(dev->mode_config.num_encoder >= 32)) return -EINVAL;
+ /* + * Encoders should never be added after device registration, with the + * exception of drivers using the legacy load/unload callbacks where + * it's impossible to create encoders beforehand. Such drivers should + * convert to using drm_dev_register() and friends. + */ + WARN_ON(dev->registered && !dev->driver->load); + ret = drm_mode_object_add(dev, &encoder->base, DRM_MODE_OBJECT_ENCODER); if (ret) return ret; @@ -155,16 +166,22 @@ EXPORT_SYMBOL(drm_encoder_init); * drm_encoder_cleanup - cleans up an initialised encoder * @encoder: encoder to cleanup * - * Cleans up the encoder but doesn't free the object. + * Cleans up the encoder but doesn't free the object. This function may not be + * called until the respective &struct drm_device has been unregistered from + * userspace using drm_dev_unregister(). */ void drm_encoder_cleanup(struct drm_encoder *encoder) { struct drm_device *dev = encoder->dev;
- /* Note that the encoder_list is considered to be static; should we - * remove the drm_encoder at runtime we would have to decrement all - * the indices on the drm_encoder after us in the encoder_list. + /* + * Encoders should never be removed after device registration, with + * the exception of drivers using the legacy load/unload callbacks + * where it's impossible to remove encoders until after + * deregistration. Such drivers should convert to using + * drm_dev_register() and friends. */ + WARN_ON(dev->registered && !dev->driver->unload);
if (encoder->bridge) { struct drm_bridge *bridge = encoder->bridge;