libXvMC: drop get_surface_status driver callback

It's unused. Also drop all related generic code that tries to do
clever stuff with this callback. These are all remnants from a
pre-gem world.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
(cherry picked from commit 5f64122551f2d8d41d745351b2e4e68208aa6084)

Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>

5 files changed, 3 insertions, 63 deletions

diff --git a/src/xvmc/i915_xvmc.c b/src/xvmc/i915_xvmc.c
index ec52c6c4..0773c2ed 100644
--- a/src/xvmc/i915_xvmc.c
+++ b/src/xvmc/i915_xvmc.c
@@ -1282,23 +1282,6 @@ static int i915_xvmc_mc_render_surface(Display * display, XvMCContext * context,
 	return 0;
 }
 
-static int i915_xvmc_mc_get_surface_status(Display * display,
-					   XvMCSurface * surface, int *stat)
-{
-	i915XvMCContext *pI915XvMC;
-	struct intel_xvmc_surface *intel_surf;
-
-	if (!display || !surface || !stat)
-		return BadValue;
-
-	*stat = 0;
-
-	if (!(intel_surf = surface->privData))
-		return XvMCBadSurface;
-
-	return 0;
-}
-
 struct _intel_xvmc_driver i915_xvmc_mc_driver = {
 	.type = XVMC_I915_MPEG2_MC,
 	.num_ctx = 0,
@@ -1308,5 +1291,4 @@ struct _intel_xvmc_driver i915_xvmc_mc_driver = {
 	.create_surface = i915_xvmc_mc_create_surface,
 	.destroy_surface = i915_xvmc_mc_destroy_surface,
 	.render_surface = i915_xvmc_mc_render_surface,
-	.get_surface_status = i915_xvmc_mc_get_surface_status,
 };
diff --git a/src/xvmc/i965_xvmc.c b/src/xvmc/i965_xvmc.c
index 96aef2df..31e61843 100644
--- a/src/xvmc/i965_xvmc.c
+++ b/src/xvmc/i965_xvmc.c
@@ -877,13 +877,6 @@ static Status render_surface(Display * display,
 	return Success;
 }
 
-static Status get_surface_status(Display * display,
-				 XvMCSurface * surface, int *stats)
-{
-	*stats = 0;
-	return 0;
-}
-
 static Status create_context(Display * display, XvMCContext * context,
 			     int priv_count, CARD32 * priv_data)
 {
@@ -908,5 +901,4 @@ struct _intel_xvmc_driver i965_xvmc_mc_driver = {
 	.create_surface = create_surface,
 	.destroy_surface = destroy_surface,
 	.render_surface = render_surface,
-	.get_surface_status = get_surface_status,
 };
diff --git a/src/xvmc/intel_xvmc.c b/src/xvmc/intel_xvmc.c
index 0279d5e8..f5d9b183 100644
--- a/src/xvmc/intel_xvmc.c
+++ b/src/xvmc/intel_xvmc.c
@@ -742,10 +742,6 @@ _X_EXPORT Status XvMCSyncSurface(Display * display, XvMCSurface * surface)
 	if (!display || !surface)
 		return XvMCBadSurface;
 
-	do {
-		ret = XvMCGetSurfaceStatus(display, surface, &stat);
-	} while (!ret && (stat & XVMC_RENDERING));
-
 	return ret;
 }
 
@@ -763,6 +759,7 @@ _X_EXPORT Status XvMCFlushSurface(Display * display, XvMCSurface * surface)
 {
 	if (!display || !surface)
 		return XvMCBadSurface;
+
 	return Success;
 }
 
@@ -781,16 +778,10 @@ _X_EXPORT Status XvMCFlushSurface(Display * display, XvMCSurface * surface)
 _X_EXPORT Status XvMCGetSurfaceStatus(Display * display, XvMCSurface * surface,
 				      int *stat)
 {
-	Status ret;
-
 	if (!display || !surface || !stat)
 		return XvMCBadSurface;
 
-	ret = (xvmc_driver->get_surface_status) (display, surface, stat);
-	if (ret) {
-		XVMC_ERR("get surface status fail\n");
-		return ret;
-	}
+	*stat = 0;
 
 	return Success;
 }
@@ -812,21 +803,7 @@ _X_EXPORT Status XvMCHideSurface(Display * display, XvMCSurface * surface)
 	if (!display || !surface)
 		return XvMCBadSurface;
 
-	XvMCSyncSurface(display, surface);
-
-	/*
-	   Get the status of the surface, if it is not currently displayed
-	   we don't need to worry about it.
-	 */
-	if ((ret = XvMCGetSurfaceStatus(display, surface, &stat)) != Success)
-		return ret;
-
-	if (!(stat & XVMC_DISPLAYING))
-		return Success;
-
-	/* FIXME: */
-	XVMC_ERR("XvMCHideSurface not implemented!\n");
-	return BadValue;
+	return Success;
 }
 
 /*
diff --git a/src/xvmc/intel_xvmc.h b/src/xvmc/intel_xvmc.h
index c5a7e0ed..21b7b816 100644
--- a/src/xvmc/intel_xvmc.h
+++ b/src/xvmc/intel_xvmc.h
@@ -187,9 +187,6 @@ typedef struct _intel_xvmc_driver {
 				  XvMCMacroBlockArray * macroblock_array,
 				  XvMCBlockArray * blocks);
 
-	 Status(*get_surface_status) (Display * display, XvMCSurface * surface,
-				      int *stat);
-
 	 Status(*begin_surface) (Display * display, XvMCContext * context,
 				 XvMCSurface * target_surface,
 				 XvMCSurface * past_surface,
diff --git a/src/xvmc/xvmc_vld.c b/src/xvmc/xvmc_vld.c
index ee216c22..7942569a 100644
--- a/src/xvmc/xvmc_vld.c
+++ b/src/xvmc/xvmc_vld.c
@@ -660,13 +660,6 @@ static Status load_qmatrix(Display * display, XvMCContext * context,
 	return Success;
 }
 
-static Status get_surface_status(Display * display, XvMCSurface * surface,
-				 int *status)
-{
-	*status = 0;
-	return Success;
-}
-
 static Status vld_state(const XvMCMpegControl * control)
 {
 	struct brw_vld_state tmp, *vld = &tmp;
@@ -1253,7 +1246,6 @@ struct _intel_xvmc_driver xvmc_vld_driver = {
 	.create_surface = create_surface,
 	.destroy_surface = destroy_surface,
 	.load_qmatrix = load_qmatrix,
-	.get_surface_status = get_surface_status,
 	.begin_surface = begin_surface,
 	.render_surface = render_surface,
 	.put_slice = put_slice,