aboutsummaryrefslogtreecommitdiff
path: root/linux-core/drm_crtc.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2007-12-18 19:18:21 +1100
committerDave Airlie <airlied@redhat.com>2007-12-18 19:18:21 +1100
commit629231c62675fe09f4eb948861a21980a9b79a5a (patch)
tree097ebcbb9f305fdac4cb3ebc15ef89bb8cea20fd /linux-core/drm_crtc.h
parentea915c77e169a50ca7dc557512212eafa93e2205 (diff)
parent6d03411e5faa124bac014ebacec470ffd7cf2ce4 (diff)
Merge branch 'modesetting-airlied' into modesetting-101
Diffstat (limited to 'linux-core/drm_crtc.h')
-rw-r--r--linux-core/drm_crtc.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/linux-core/drm_crtc.h b/linux-core/drm_crtc.h
index ce502062..54e0c000 100644
--- a/linux-core/drm_crtc.h
+++ b/linux-core/drm_crtc.h
@@ -433,7 +433,6 @@ struct drm_output_funcs {
* @subpixel_order: for this output
* @mm_width: displayable width of output in mm
* @mm_height: displayable height of output in mm
- * @name: name of output (should be one of a few standard names)
* @funcs: output control functions
* @driver_private: private driver data
*
@@ -447,6 +446,9 @@ struct drm_output {
struct list_head head;
struct drm_crtc *crtc;
int id; /* idr assigned */
+
+ int output_type;
+ int output_type_id;
unsigned long possible_crtcs;
unsigned long possible_clones;
bool interlace_allowed;
@@ -467,10 +469,9 @@ struct drm_output {
enum subpixel_order subpixel_order;
int mm_width, mm_height;
struct drm_display_info *monitor_info; /* if any */
- char name[DRM_OUTPUT_LEN];
- const struct drm_output_funcs *funcs;
+ const struct drm_output_funcs *funcs;
void *driver_private;
-
+ uint32_t make_shit_work;
struct list_head user_modes;
struct drm_property_blob *edid_blob_ptr;
u32 property_ids[DRM_OUTPUT_MAX_PROPERTY];
@@ -526,9 +527,10 @@ struct drm_mode_config {
struct drm_output *drm_output_create(struct drm_device *dev,
const struct drm_output_funcs *funcs,
- const char *name);
+ int type);
+
+extern char *drm_get_output_name(struct drm_output *output);
extern void drm_output_destroy(struct drm_output *output);
-extern bool drm_output_rename(struct drm_output *output, const char *name);
extern void drm_fb_release(struct file *filp);
extern struct edid *drm_get_edid(struct drm_output *output,