diff options
author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2011-11-07 15:03:18 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-12-06 05:23:31 -0500 |
commit | 722525481a058829f0bae0ec3aab96370f9ab455 (patch) | |
tree | a0cc8a1c62905c49ecf0f34e053f78718e4ec525 /include/drm | |
parent | db3e44996f23a2a7e826ede2dd9cb1571687a60f (diff) |
drm: remove unused fields in drm_connector and document the rest
We never used initial_x/y or the force_encoder_id, so drop those fields
and proide a basic description of the others.
Really, the ELD bits belong in drm_display_info rather than directly in
the connector, but that's a separate cleanup.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drm_crtc.h | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 1cdef2e4dfd2..738323659f9c 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h | |||
@@ -503,14 +503,37 @@ enum drm_connector_force { | |||
503 | 503 | ||
504 | /** | 504 | /** |
505 | * drm_connector - central DRM connector control structure | 505 | * drm_connector - central DRM connector control structure |
506 | * @crtc: CRTC this connector is currently connected to, NULL if none | 506 | * @dev: parent DRM device |
507 | * @kdev: kernel device for sysfs attributes | ||
508 | * @attr: sysfs attributes | ||
509 | * @head: list management | ||
510 | * @base: base KMS object | ||
511 | * @connector_type: one of the %DRM_MODE_CONNECTOR_<foo> types from drm_mode.h | ||
512 | * @connector_type_id: index into connector type enum | ||
507 | * @interlace_allowed: can this connector handle interlaced modes? | 513 | * @interlace_allowed: can this connector handle interlaced modes? |
508 | * @doublescan_allowed: can this connector handle doublescan? | 514 | * @doublescan_allowed: can this connector handle doublescan? |
509 | * @available_modes: modes available on this connector (from get_modes() + user) | 515 | * @modes: modes available on this connector (from fill_modes() + user) |
510 | * @initial_x: initial x position for this connector | 516 | * @status: one of the drm_connector_status enums (connected, not, or unknown) |
511 | * @initial_y: initial y position for this connector | 517 | * @probed_modes: list of modes derived directly from the display |
512 | * @status: connector connected? | 518 | * @display_info: information about attached display (e.g. from EDID) |
513 | * @funcs: connector control functions | 519 | * @funcs: connector control functions |
520 | * @user_modes: user added mode list | ||
521 | * @edid_blob_ptr: DRM property containing EDID if present | ||
522 | * @property_ids: property tracking for this connector | ||
523 | * @property_values: value pointers or data for properties | ||
524 | * @polled: a %DRM_CONNECTOR_POLL_<foo> value for core driven polling | ||
525 | * @dpms: current dpms state | ||
526 | * @helper_private: mid-layer private data | ||
527 | * @force: a %DRM_FORCE_<foo> state for forced mode sets | ||
528 | * @encoder_ids: valid encoders for this connector | ||
529 | * @encoder: encoder driving this connector, if any | ||
530 | * @eld: EDID-like data, if present | ||
531 | * @dvi_dual: dual link DVI, if found | ||
532 | * @max_tmds_clock: max clock rate, if found | ||
533 | * @latency_present: AV delay info from ELD, if found | ||
534 | * @video_latency: video latency info from ELD, if found | ||
535 | * @audio_latency: audio latency info from ELD, if found | ||
536 | * @null_edid_counter: track sinks that give us all zeros for the EDID | ||
514 | * | 537 | * |
515 | * Each connector may be connected to one or more CRTCs, or may be clonable by | 538 | * Each connector may be connected to one or more CRTCs, or may be clonable by |
516 | * another connector if they can share a CRTC. Each connector also has a specific | 539 | * another connector if they can share a CRTC. Each connector also has a specific |
@@ -531,7 +554,6 @@ struct drm_connector { | |||
531 | bool doublescan_allowed; | 554 | bool doublescan_allowed; |
532 | struct list_head modes; /* list of modes on this connector */ | 555 | struct list_head modes; /* list of modes on this connector */ |
533 | 556 | ||
534 | int initial_x, initial_y; | ||
535 | enum drm_connector_status status; | 557 | enum drm_connector_status status; |
536 | 558 | ||
537 | /* these are modes added by probing with DDC or the BIOS */ | 559 | /* these are modes added by probing with DDC or the BIOS */ |
@@ -555,7 +577,6 @@ struct drm_connector { | |||
555 | /* forced on connector */ | 577 | /* forced on connector */ |
556 | enum drm_connector_force force; | 578 | enum drm_connector_force force; |
557 | uint32_t encoder_ids[DRM_CONNECTOR_MAX_ENCODER]; | 579 | uint32_t encoder_ids[DRM_CONNECTOR_MAX_ENCODER]; |
558 | uint32_t force_encoder_id; | ||
559 | struct drm_encoder *encoder; /* currently active encoder */ | 580 | struct drm_encoder *encoder; /* currently active encoder */ |
560 | 581 | ||
561 | /* EDID bits */ | 582 | /* EDID bits */ |