[Intel-gfx] [PATCH] Xv: enable drmmode overlay

[Daniel Vetter]

Now that libdrm 2.4.16 is released (and already required) we can
unconditionally enable this.

Please add something like this to the release-notes/NEWS file:

* Overlay support for kernel modesetting. This needs at least kernel
  v2.6.33 to work. A backport to 2.6.32 is available at:

  http://gitorious.org/daniel-s-linux-stuff/linux-kernel/commits/intel-kms-overlay-for-2.6.32

Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
---
 src/i830_video.c |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/src/i830_video.c b/src/i830_video.c
index b0403d4..7d0d3bf 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -203,7 +203,6 @@ static XF86ImageRec Images[NUM_IMAGES] = {
 /* kernel modesetting overlay functions */
 static Bool drmmode_has_overlay(ScrnInfoPtr scrn)
 {
-#ifdef DRM_MODE_OVERLAY_LANDED
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	struct drm_i915_getparam gp;
 	int has_overlay = 0;
@@ -213,14 +212,10 @@ static Bool drmmode_has_overlay(ScrnInfoPtr scrn)
 	drmCommandWriteRead(intel->drmSubFD, DRM_I915_GETPARAM, &gp, sizeof(gp));
 
 	return has_overlay ? TRUE : FALSE;
-#else
-	return FALSE;
-#endif
 }
 
 static void drmmode_overlay_update_attrs(ScrnInfoPtr scrn)
 {
-#ifdef DRM_MODE_OVERLAY_LANDED
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	intel_adaptor_private *adaptor_priv = intel_get_adaptor_private(scrn);
 	struct drm_intel_overlay_attrs attrs;
@@ -243,12 +238,10 @@ static void drmmode_overlay_update_attrs(ScrnInfoPtr scrn)
 
 	if (ret != 0)
 		OVERLAY_DEBUG("overlay attrs ioctl failed: %i\n", ret);
-#endif
 }
 
 static void drmmode_overlay_off(ScrnInfoPtr scrn)
 {
-#ifdef DRM_MODE_OVERLAY_LANDED
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	struct drm_intel_overlay_put_image request;
 	int ret;
@@ -260,7 +253,6 @@ static void drmmode_overlay_off(ScrnInfoPtr scrn)
 
 	if (ret != 0)
 		OVERLAY_DEBUG("overlay switch-off ioctl failed: %i\n", ret);
-#endif
 }
 
 static Bool
@@ -270,7 +262,6 @@ drmmode_overlay_put_image(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
 			  BoxPtr dstBox, short src_w, short src_h, short drw_w,
 			  short drw_h)
 {
-#ifdef DRM_MODE_OVERLAY_LANDED
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	intel_adaptor_private *adaptor_priv = intel_get_adaptor_private(scrn);
 	struct drm_intel_overlay_put_image request;
@@ -336,9 +327,6 @@ drmmode_overlay_put_image(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
 		return FALSE;
 	} else
 		return TRUE;
-#else
-	return FALSE;
-#endif
 }
 
 void I830InitVideo(ScreenPtr screen)
-- 
1.6.5.3