aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_drv.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-06 21:06:44 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-06 21:06:44 -0500
commitc89a9f5a42811aa5b2f258e32750c0109f570fc1 (patch)
tree53f64a1326f0c3884261ad2160e1b18cc7af5fb6 /drivers/gpu/drm/i915/intel_drv.h
parentdb30c70575822cc84d87b5613c19cac24734b99f (diff)
parenta75f28419a7efff611a81293d41d0e2137d7591e (diff)
Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: fix ordering of driver unload vs agp unload. drm/i915: Respect the other stolen memory sizes we know of. drm/i915: Non-mobile parts don't have integrated TV-out. drm/i915: Add support for integrated HDMI on G4X hardware. drm/i915: Pin cursor bo and unpin old bo when setting cursor. drm/i915: Don't allow objects to get bound while VT switched.
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r--drivers/gpu/drm/i915/intel_drv.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 407edd5bf58..8a4cc50c5b4 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -53,6 +53,7 @@
53#define INTEL_OUTPUT_SDVO 3 53#define INTEL_OUTPUT_SDVO 3
54#define INTEL_OUTPUT_LVDS 4 54#define INTEL_OUTPUT_LVDS 4
55#define INTEL_OUTPUT_TVOUT 5 55#define INTEL_OUTPUT_TVOUT 5
56#define INTEL_OUTPUT_HDMI 6
56 57
57#define INTEL_DVO_CHIP_NONE 0 58#define INTEL_DVO_CHIP_NONE 0
58#define INTEL_DVO_CHIP_LVDS 1 59#define INTEL_DVO_CHIP_LVDS 1
@@ -88,6 +89,7 @@ struct intel_crtc {
88 struct drm_crtc base; 89 struct drm_crtc base;
89 int pipe; 90 int pipe;
90 int plane; 91 int plane;
92 struct drm_gem_object *cursor_bo;
91 uint32_t cursor_addr; 93 uint32_t cursor_addr;
92 u8 lut_r[256], lut_g[256], lut_b[256]; 94 u8 lut_r[256], lut_g[256], lut_b[256];
93 int dpms_mode; 95 int dpms_mode;
@@ -108,7 +110,8 @@ int intel_ddc_get_modes(struct intel_output *intel_output);
108extern bool intel_ddc_probe(struct intel_output *intel_output); 110extern bool intel_ddc_probe(struct intel_output *intel_output);
109 111
110extern void intel_crt_init(struct drm_device *dev); 112extern void intel_crt_init(struct drm_device *dev);
111extern void intel_sdvo_init(struct drm_device *dev, int output_device); 113extern void intel_hdmi_init(struct drm_device *dev, int sdvox_reg);
114extern bool intel_sdvo_init(struct drm_device *dev, int output_device);
112extern void intel_dvo_init(struct drm_device *dev); 115extern void intel_dvo_init(struct drm_device *dev);
113extern void intel_tv_init(struct drm_device *dev); 116extern void intel_tv_init(struct drm_device *dev);
114extern void intel_lvds_init(struct drm_device *dev); 117extern void intel_lvds_init(struct drm_device *dev);