summaryrefslogtreecommitdiff
path: root/shared-core
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 /shared-core
parentea915c77e169a50ca7dc557512212eafa93e2205 (diff)
parent6d03411e5faa124bac014ebacec470ffd7cf2ce4 (diff)
Merge branch 'modesetting-airlied' into modesetting-101
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/drm.h9
-rw-r--r--shared-core/i915_init.c4
2 files changed, 10 insertions, 3 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h
index 9a8dc1d2..f8d44048 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -950,6 +950,12 @@ struct drm_mode_crtc {
struct drm_mode_modeinfo mode;
};
+#define DRM_MODE_OUTPUT_NONE 0
+#define DRM_MODE_OUTPUT_DAC 1
+#define DRM_MODE_OUTPUT_TMDS 2
+#define DRM_MODE_OUTPUT_LVDS 3
+#define DRM_MODE_OUTPUT_TVDAC 4
+
struct drm_mode_get_output {
uint64_t modes_ptr;
@@ -960,7 +966,8 @@ struct drm_mode_get_output {
int count_props;
unsigned int output; /**< Id */
unsigned int crtc; /**< Id of crtc */
- unsigned char name[DRM_OUTPUT_NAME_LEN];
+ unsigned int output_type;
+ unsigned int output_type_id;
unsigned int connection;
unsigned int mm_width, mm_height; /**< HxW in millimeters */
diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c
index ebdcd5d3..3b271b17 100644
--- a/shared-core/i915_init.c
+++ b/shared-core/i915_init.c
@@ -188,8 +188,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
ret = drm_buffer_object_create(dev, size, drm_bo_type_kernel,
DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE |
DRM_BO_FLAG_MEM_VRAM |
- DRM_BO_FLAG_NO_EVICT |
- DRM_BO_HINT_DONT_FENCE, 0, 0x1, 0,
+ DRM_BO_FLAG_NO_EVICT,
+ DRM_BO_HINT_DONT_FENCE, 0x1, 0,
&dev_priv->ring_buffer);
if (ret < 0) {
DRM_ERROR("Unable to allocate or pin ring buffer\n");