Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index 85da4c40694c..2eee8e016b38 100644
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -158,8 +158,15 @@ static ssize_t status_show(struct device *device,
 {
         struct drm_connector *connector = to_drm_connector(device);
         enum drm_connector_status status;
+        int ret;
+
+        ret = mutex_lock_interruptible(&connector->dev->mode_config.mutex);
+        if (ret)
+                return ret;
 
         status = connector->funcs->detect(connector, true);
+        mutex_unlock(&connector->dev->mode_config.mutex);
+
         return snprintf(buf, PAGE_SIZE, "%s\n",
                         drm_get_connector_status_name(status));
 }