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_overlay.c | |
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_overlay.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_overlay.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index 3533355c5ea3..0a7d3e688060 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c | |||
@@ -170,6 +170,29 @@ struct overlay_registers { | |||
170 | u16 RESERVEDG[0x100 / 2 - N_HORIZ_UV_TAPS * N_PHASES]; | 170 | u16 RESERVEDG[0x100 / 2 - N_HORIZ_UV_TAPS * N_PHASES]; |
171 | }; | 171 | }; |
172 | 172 | ||
173 | struct intel_overlay { | ||
174 | struct drm_device *dev; | ||
175 | struct intel_crtc *crtc; | ||
176 | struct drm_i915_gem_object *vid_bo; | ||
177 | struct drm_i915_gem_object *old_vid_bo; | ||
178 | int active; | ||
179 | int pfit_active; | ||
180 | u32 pfit_vscale_ratio; /* shifted-point number, (1<<12) == 1.0 */ | ||
181 | u32 color_key; | ||
182 | u32 brightness, contrast, saturation; | ||
183 | u32 old_xscale, old_yscale; | ||
184 | /* register access */ | ||
185 | u32 flip_addr; | ||
186 | struct drm_i915_gem_object *reg_bo; | ||
187 | /* flip handling */ | ||
188 | uint32_t last_flip_req; | ||
189 | int hw_wedged; | ||
190 | #define HW_WEDGED 1 | ||
191 | #define NEEDS_WAIT_FOR_FLIP 2 | ||
192 | #define RELEASE_OLD_VID 3 | ||
193 | #define SWITCH_OFF 4 | ||
194 | }; | ||
195 | |||
173 | static struct overlay_registers * | 196 | static struct overlay_registers * |
174 | intel_overlay_map_regs_atomic(struct intel_overlay *overlay, | 197 | intel_overlay_map_regs_atomic(struct intel_overlay *overlay, |
175 | int slot) | 198 | int slot) |