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>

3 files changed, 27 insertions, 28 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e4fb5364a533..0b400d1d2fe1 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2224,11 +2224,11 @@ static void ironlake_crtc_dpms(struct drm_crtc *crtc, int mode)
 static void intel_crtc_dpms_overlay(struct intel_crtc *intel_crtc, bool enable)
 {
         if (!enable && intel_crtc->overlay) {
-                struct intel_overlay *overlay = intel_crtc->overlay;
+                struct drm_device *dev = intel_crtc->base.dev;
 
-                mutex_lock(&overlay->dev->struct_mutex);
-                (void) intel_overlay_switch_off(overlay, false);
-                mutex_unlock(&overlay->dev->struct_mutex);
+                mutex_lock(&dev->struct_mutex);
+                (void) intel_overlay_switch_off(intel_crtc->overlay, false);
+                mutex_unlock(&dev->struct_mutex);
         }
 
         /* Let userspace switch the overlay on again. In most cases userspace
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 {
         struct drm_connector base;
 };
 
-struct intel_crtc;
-struct intel_overlay {
-        struct drm_device *dev;
-        struct intel_crtc *crtc;
-        struct drm_i915_gem_object *vid_bo;
-        struct drm_i915_gem_object *old_vid_bo;
-        int active;
-        int pfit_active;
-        u32 pfit_vscale_ratio; /* shifted-point number, (1<<12) == 1.0 */
-        u32 color_key;
-        u32 brightness, contrast, saturation;
-        u32 old_xscale, old_yscale;
-        /* register access */
-        u32 flip_addr;
-        struct drm_i915_gem_object *reg_bo;
-        /* flip handling */
-        uint32_t last_flip_req;
-        int hw_wedged;
-#define HW_WEDGED               1
-#define NEEDS_WAIT_FOR_FLIP     2
-#define RELEASE_OLD_VID         3
-#define SWITCH_OFF              4
-};
-
 struct intel_crtc {
         struct drm_crtc base;
         enum pipe pipe;
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 {
     u16 RESERVEDG[0x100 / 2 - N_HORIZ_UV_TAPS * N_PHASES];
 };
 
+struct intel_overlay {
+        struct drm_device *dev;
+        struct intel_crtc *crtc;
+        struct drm_i915_gem_object *vid_bo;
+        struct drm_i915_gem_object *old_vid_bo;
+        int active;
+        int pfit_active;
+        u32 pfit_vscale_ratio; /* shifted-point number, (1<<12) == 1.0 */
+        u32 color_key;
+        u32 brightness, contrast, saturation;
+        u32 old_xscale, old_yscale;
+        /* register access */
+        u32 flip_addr;
+        struct drm_i915_gem_object *reg_bo;
+        /* flip handling */
+        uint32_t last_flip_req;
+        int hw_wedged;
+#define HW_WEDGED               1
+#define NEEDS_WAIT_FOR_FLIP     2
+#define RELEASE_OLD_VID         3
+#define SWITCH_OFF              4
+};
+
 static struct overlay_registers *
 intel_overlay_map_regs_atomic(struct intel_overlay *overlay,
                               int slot)