[Intel-gfx] [PATCH 00/18] rip out i830_memory, part 2: xvmc

[Daniel Vetter]

On Wed, Mar 03, 2010 at 04:44:25PM -0800, Carl Worth wrote:
> diff --git a/src/i915_hwmc.c b/src/i915_hwmc.c
> index 4395cdc..c0b0bb8 100644
> --- a/src/i915_hwmc.c
> +++ b/src/i915_hwmc.c
> @@ -797,6 +797,7 @@ static int i915_xvmc_put_image(ScrnInfoPtr scrn,
>  	int ret;
>  
>  	if (FOURCC_XVMC == id) {
> +#if 0
>  		switch (xvmc_cmd->command) {
>  		case INTEL_XVMC_COMMAND_DISPLAY:
>  			if ((xvmc_cmd->srfNo >= I915_XVMC_MAX_SURFACES) ||
> @@ -815,6 +816,9 @@ static int i915_xvmc_put_image(ScrnInfoPtr scrn,
>  		default:
>  			return 0;
>  		}
> +#endif
> +		/* Pass the GEM object name through the pointer arg. */
> +		buf = (void *)(uintptr_t)xvmc_cmd->handle;
>  	}
>  
>  	ret =
> 
> Why are we adding an #if 0 instead of just deleting the code here?

Because I've forgotten to kill it after the code really worked. Please
kill it.

Thanks, Daniel
-- 
Daniel Vetter
Mail: daniel at ffwll.ch
Mobile: +41 (0)79 365 57 48