Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8c2ba31 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Fixup locking WARNINGs in drm_mode_config_reset 



With

commit 7a3f3d66
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Thu Jul 9 23:44:28 2015 +0200

    drm: Check locking in drm_for_each_connector

we started checking the locking in drm_for_each_connector but somehow
I totally missed drm_mode_config_reset. There's no problem there since
this function should only be called in single-threaded contexts
(driver load or resume), so just wrap the loop with the right lock.

v2: Drink coffee and all that ...

Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reported-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parent bf9e37ba

drivers/gpu/drm/drm_crtc.c

+2 −0
Original line number Diff line number Diff line
@@ -5273,12 +5273,14 @@ void drm_mode_config_reset(struct drm_device *dev) 
		if (encoder->funcs->reset)

			encoder->funcs->reset(encoder);



	mutex_lock(&dev->mode_config.mutex);

	drm_for_each_connector(connector, dev) {

		connector->status = connector_status_unknown;



		if (connector->funcs->reset)

			connector->funcs->reset(connector);

	}

	mutex_unlock(&dev->mode_config.mutex);

}

EXPORT_SYMBOL(drm_mode_config_reset);