aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2016-03-30 05:45:14 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-03-30 11:21:36 -0400
commitaa2e2996b1518b3e4b72dab5c2cb6cd082e3002e (patch)
tree3d11c22ccbf5ce3409976388042559c13244f428
parente6bf6e5799f72f04bac61056804d6dd8dac98062 (diff)
drm/sysfs: Nuke TV/DVI property files
This goes all the way back to the original KMS commit aeons ago commit f453ba0460742ad027ae0c4c7d61e62817b3e7ef Author: Dave Airlie <airlied@redhat.com> Date: Fri Nov 7 14:05:41 2008 -0800 DRM: add mode setting support But it seems to be completely unused. Only i915 and nouveau even register these properties, and the corresponding DDX don't even look at them. Also the sysfs files are read-only, so not useful to configure anything. I suspect that this was added with the goal to have read-only access to all properties in sysfs, but we never followed through on that. Also, that should be done in a more generic fashion. Since it would be real work to fix up the locking (with atomic we're now chasing pointers when reading properties) and it seems unused lets just nuke this all. It's easier. Of course we'll keep the properties themselves, those are still exposed through the KMS ioctls. Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1459331120-27864-5-git-send-email-daniel.vetter@ffwll.ch
-rw-r--r--drivers/gpu/drm/drm_sysfs.c156
1 files changed, 0 insertions, 156 deletions
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index d503f8e8c2d1..d7d8cecfb0e6 100644
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -287,102 +287,6 @@ static ssize_t modes_show(struct device *device,
287 return written; 287 return written;
288} 288}
289 289
290static ssize_t tv_subconnector_show(struct device *device,
291 struct device_attribute *attr,
292 char *buf)
293{
294 struct drm_connector *connector = to_drm_connector(device);
295 struct drm_device *dev = connector->dev;
296 struct drm_property *prop;
297 uint64_t subconnector;
298 int ret;
299
300 prop = dev->mode_config.tv_subconnector_property;
301 if (!prop) {
302 DRM_ERROR("Unable to find subconnector property\n");
303 return 0;
304 }
305
306 ret = drm_object_property_get_value(&connector->base, prop, &subconnector);
307 if (ret)
308 return 0;
309
310 return snprintf(buf, PAGE_SIZE, "%s",
311 drm_get_tv_subconnector_name((int)subconnector));
312}
313
314static ssize_t tv_select_subconnector_show(struct device *device,
315 struct device_attribute *attr,
316 char *buf)
317{
318 struct drm_connector *connector = to_drm_connector(device);
319 struct drm_device *dev = connector->dev;
320 struct drm_property *prop;
321 uint64_t subconnector;
322 int ret;
323
324 prop = dev->mode_config.tv_select_subconnector_property;
325 if (!prop) {
326 DRM_ERROR("Unable to find select subconnector property\n");
327 return 0;
328 }
329
330 ret = drm_object_property_get_value(&connector->base, prop, &subconnector);
331 if (ret)
332 return 0;
333
334 return snprintf(buf, PAGE_SIZE, "%s",
335 drm_get_tv_select_name((int)subconnector));
336}
337
338static ssize_t dvii_subconnector_show(struct device *device,
339 struct device_attribute *attr,
340 char *buf)
341{
342 struct drm_connector *connector = to_drm_connector(device);
343 struct drm_device *dev = connector->dev;
344 struct drm_property *prop;
345 uint64_t subconnector;
346 int ret;
347
348 prop = dev->mode_config.dvi_i_subconnector_property;
349 if (!prop) {
350 DRM_ERROR("Unable to find subconnector property\n");
351 return 0;
352 }
353
354 ret = drm_object_property_get_value(&connector->base, prop, &subconnector);
355 if (ret)
356 return 0;
357
358 return snprintf(buf, PAGE_SIZE, "%s",
359 drm_get_dvi_i_subconnector_name((int)subconnector));
360}
361
362static ssize_t dvii_select_subconnector_show(struct device *device,
363 struct device_attribute *attr,
364 char *buf)
365{
366 struct drm_connector *connector = to_drm_connector(device);
367 struct drm_device *dev = connector->dev;
368 struct drm_property *prop;
369 uint64_t subconnector;
370 int ret;
371
372 prop = dev->mode_config.dvi_i_select_subconnector_property;
373 if (!prop) {
374 DRM_ERROR("Unable to find select subconnector property\n");
375 return 0;
376 }
377
378 ret = drm_object_property_get_value(&connector->base, prop, &subconnector);
379 if (ret)
380 return 0;
381
382 return snprintf(buf, PAGE_SIZE, "%s",
383 drm_get_dvi_i_select_name((int)subconnector));
384}
385
386static DEVICE_ATTR_RW(status); 290static DEVICE_ATTR_RW(status);
387static DEVICE_ATTR_RO(enabled); 291static DEVICE_ATTR_RO(enabled);
388static DEVICE_ATTR_RO(dpms); 292static DEVICE_ATTR_RO(dpms);
@@ -396,54 +300,6 @@ static struct attribute *connector_dev_attrs[] = {
396 NULL 300 NULL
397}; 301};
398 302
399static DEVICE_ATTR_RO(tv_subconnector);
400static DEVICE_ATTR_RO(tv_select_subconnector);
401
402static struct attribute *connector_tv_dev_attrs[] = {
403 &dev_attr_tv_subconnector.attr,
404 &dev_attr_tv_select_subconnector.attr,
405 NULL
406};
407
408static DEVICE_ATTR_RO(dvii_subconnector);
409static DEVICE_ATTR_RO(dvii_select_subconnector);
410
411static struct attribute *connector_dvii_dev_attrs[] = {
412 &dev_attr_dvii_subconnector.attr,
413 &dev_attr_dvii_select_subconnector.attr,
414 NULL
415};
416
417/* Connector type related helpers */
418static int kobj_connector_type(struct kobject *kobj)
419{
420 struct device *dev = kobj_to_dev(kobj);
421 struct drm_connector *connector = to_drm_connector(dev);
422
423 return connector->connector_type;
424}
425
426static umode_t connector_is_dvii(struct kobject *kobj,
427 struct attribute *attr, int idx)
428{
429 return kobj_connector_type(kobj) == DRM_MODE_CONNECTOR_DVII ?
430 attr->mode : 0;
431}
432
433static umode_t connector_is_tv(struct kobject *kobj,
434 struct attribute *attr, int idx)
435{
436 switch (kobj_connector_type(kobj)) {
437 case DRM_MODE_CONNECTOR_Composite:
438 case DRM_MODE_CONNECTOR_SVIDEO:
439 case DRM_MODE_CONNECTOR_Component:
440 case DRM_MODE_CONNECTOR_TV:
441 return attr->mode;
442 }
443
444 return 0;
445}
446
447static struct bin_attribute edid_attr = { 303static struct bin_attribute edid_attr = {
448 .attr.name = "edid", 304 .attr.name = "edid",
449 .attr.mode = 0444, 305 .attr.mode = 0444,
@@ -461,20 +317,8 @@ static const struct attribute_group connector_dev_group = {
461 .bin_attrs = connector_bin_attrs, 317 .bin_attrs = connector_bin_attrs,
462}; 318};
463 319
464static const struct attribute_group connector_tv_dev_group = {
465 .attrs = connector_tv_dev_attrs,
466 .is_visible = connector_is_tv,
467};
468
469static const struct attribute_group connector_dvii_dev_group = {
470 .attrs = connector_dvii_dev_attrs,
471 .is_visible = connector_is_dvii,
472};
473
474static const struct attribute_group *connector_dev_groups[] = { 320static const struct attribute_group *connector_dev_groups[] = {
475 &connector_dev_group, 321 &connector_dev_group,
476 &connector_tv_dev_group,
477 &connector_dvii_dev_group,
478 NULL 322 NULL
479}; 323};
480 324