We're not really concerned with races during setup, but we do want to keep
the warning around given how easy it is to misplace that lock.
Signed-off-by: Eric Anholt <e...@anholt.net>
---
drivers/gpu/drm/drm_crtc_helper.c | 3 +++
drivers/gpu/drm/i915/intel_tv.c | 2 ++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/gpu/drm/drm_crtc_helper.c
b/drivers/gpu/drm/drm_crtc_helper.c
index d8a982b..f4e6d1d 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -766,7 +766,10 @@ bool drm_helper_initial_config(struct drm_device *dev,
bool can_grow)
{
int ret = false;
+ mutex_lock(&dev->mode_config.mutex);
drm_helper_plugged_event(dev);
+ mutex_unlock(&dev->mode_config.mutex);
+
return ret;
}
EXPORT_SYMBOL(drm_helper_initial_config);
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index fbb35dc..aa36f92 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1704,6 +1704,7 @@ intel_tv_init(struct drm_device *dev)
goto out;
for (i = 0; i < NUM_TV_MODES; i++)
tv_format_names[i] = tv_modes[i].name;
+ mutex_lock(&dev->mode_config.mutex);
drm_mode_create_tv_properties(dev, NUM_TV_MODES, tv_format_names);
drm_connector_attach_property(connector,
dev->mode_config.tv_mode_property,
@@ -1720,6 +1721,7 @@ intel_tv_init(struct drm_device *dev)
drm_connector_attach_property(connector,
dev->mode_config.tv_bottom_margin_property,
tv_priv->margin[TV_MARGIN_BOTTOM]);
+ mutex_unlock(&dev->mode_config.mutex);
out:
drm_sysfs_connector_add(connector);
}
--
1.5.6.5
------------------------------------------------------------------------------
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
