summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2007-11-28 15:18:25 +1000
committerDave Airlie <airlied@redhat.com>2007-12-03 15:30:05 +1000
commit91cd3e3c097d581ea75ec4bcbc1ba8d23b471a2e (patch)
treed8688a8e5e97345d5c465a3c68591fc28765f256 /shared-core
parent617cbeed2ae71c5560f597db49637df10edd8a52 (diff)
modesetting API change for removing mode ids and making modes per output.
so really want to get a list of modes per output not the global hammer list. also we remove the mode ids and let the user pass back the full mode description need to fix up add/remove mode for user modes now
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/drm.h14
1 files changed, 3 insertions, 11 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h
index 9219b456..5c24e0af 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -908,9 +908,6 @@ struct drm_mm_init_arg {
#define DRM_MODE_TYPE_DRIVER (1<<6)
struct drm_mode_modeinfo {
-
- unsigned int id;
-
unsigned int clock;
unsigned short hdisplay, hsync_start, hsync_end, htotal, hskew;
unsigned short vdisplay, vsync_start, vsync_end, vtotal, vscan;
@@ -932,10 +929,6 @@ struct drm_mode_card_res {
int count_outputs;
unsigned int __user *output_id;
-
- int count_modes;
- struct drm_mode_modeinfo __user *modes;
-
};
struct drm_mode_crtc {
@@ -944,8 +937,6 @@ struct drm_mode_crtc {
int x, y; /**< Position on the frameuffer */
- unsigned int mode; /**< Current mode used */
-
int count_outputs;
unsigned int outputs; /**< Outputs that are connected */
@@ -955,7 +946,8 @@ struct drm_mode_crtc {
unsigned int __user *set_outputs; /**< Outputs to be connected */
int gamma_size;
-
+ int mode_valid;
+ struct drm_mode_modeinfo mode;
};
struct drm_mode_get_output {
@@ -975,7 +967,7 @@ struct drm_mode_get_output {
unsigned int clones; /**< list of clones */
int count_modes;
- unsigned int __user *modes; /**< list of modes it supports */
+ struct drm_mode_modeinfo *modes;
int count_props;
unsigned int __user *props;