diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-08-12 08:53:37 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-08 05:23:53 -0400 |
commit | 23f09ce31ca68af3728ac5eed3e3efb03c5f990a (patch) | |
tree | 12ecc7a2794fa9853278edf1ea0499d65a3ec29a /drivers/gpu/drm/i915/intel_drv.h | |
parent | 5dcdbcb06badbdf2faa698bf3198e421a1e12840 (diff) |
drm/i915/overlay: Make the overlay control struct opaque.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 44744537a0cf..949cfda4b49a 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -146,30 +146,6 @@ struct intel_connector { | |||
146 | struct drm_connector base; | 146 | struct drm_connector base; |
147 | }; | 147 | }; |
148 | 148 | ||
149 | struct intel_crtc; | ||
150 | struct intel_overlay { | ||
151 | struct drm_device *dev; | ||
152 | struct intel_crtc *crtc; | ||
153 | struct drm_i915_gem_object *vid_bo; | ||
154 | struct drm_i915_gem_object *old_vid_bo; | ||
155 | int active; | ||
156 | int pfit_active; | ||
157 | u32 pfit_vscale_ratio; /* shifted-point number, (1<<12) == 1.0 */ | ||
158 | u32 color_key; | ||
159 | u32 brightness, contrast, saturation; | ||
160 | u32 old_xscale, old_yscale; | ||
161 | /* register access */ | ||
162 | u32 flip_addr; | ||
163 | struct drm_i915_gem_object *reg_bo; | ||
164 | /* flip handling */ | ||
165 | uint32_t last_flip_req; | ||
166 | int hw_wedged; | ||
167 | #define HW_WEDGED 1 | ||
168 | #define NEEDS_WAIT_FOR_FLIP 2 | ||
169 | #define RELEASE_OLD_VID 3 | ||
170 | #define SWITCH_OFF 4 | ||
171 | }; | ||
172 | |||
173 | struct intel_crtc { | 149 | struct intel_crtc { |
174 | struct drm_crtc base; | 150 | struct drm_crtc base; |
175 | enum pipe pipe; | 151 | enum pipe pipe; |