diff options
-rw-r--r-- | drivers/gpu/drm/drm_sysfs.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index d7d8cecfb0e6..fa7fadce8063 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c | |||
@@ -208,9 +208,12 @@ static ssize_t status_show(struct device *device, | |||
208 | char *buf) | 208 | char *buf) |
209 | { | 209 | { |
210 | struct drm_connector *connector = to_drm_connector(device); | 210 | struct drm_connector *connector = to_drm_connector(device); |
211 | enum drm_connector_status status; | ||
212 | |||
213 | status = READ_ONCE(connector->status); | ||
211 | 214 | ||
212 | return snprintf(buf, PAGE_SIZE, "%s\n", | 215 | return snprintf(buf, PAGE_SIZE, "%s\n", |
213 | drm_get_connector_status_name(connector->status)); | 216 | drm_get_connector_status_name(status)); |
214 | } | 217 | } |
215 | 218 | ||
216 | static ssize_t dpms_show(struct device *device, | 219 | static ssize_t dpms_show(struct device *device, |
@@ -231,9 +234,11 @@ static ssize_t enabled_show(struct device *device, | |||
231 | char *buf) | 234 | char *buf) |
232 | { | 235 | { |
233 | struct drm_connector *connector = to_drm_connector(device); | 236 | struct drm_connector *connector = to_drm_connector(device); |
237 | bool enabled; | ||
238 | |||
239 | enabled = READ_ONCE(connector->encoder); | ||
234 | 240 | ||
235 | return snprintf(buf, PAGE_SIZE, "%s\n", connector->encoder ? "enabled" : | 241 | return snprintf(buf, PAGE_SIZE, enabled ? "enabled\n" : "disabled\n"); |
236 | "disabled"); | ||
237 | } | 242 | } |
238 | 243 | ||
239 | static ssize_t edid_show(struct file *filp, struct kobject *kobj, | 244 | static ssize_t edid_show(struct file *filp, struct kobject *kobj, |