drm/via: Embed via_video in via_dri1 (e85e4ae0) · Commits · jan.koester / Linux

drivers/gpu/drm/via/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3,6 +3,6 @@
	# Makefile for the drm device driver. This driver provides support for the		# Makefile for the drm device driver. This driver provides support for the
	# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.		# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.

	via-y := via_irq.o via_dri1.o via_verifier.o via_video.o via_dmablit.o		via-y := via_irq.o via_dri1.o via_verifier.o via_dmablit.o

	obj-$(CONFIG_DRM_VIA) +=via.o		obj-$(CONFIG_DRM_VIA) +=via.o

drivers/gpu/drm/via/via_dri1.c

+65 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5,6 +5,7 @@
	* Copyright 2006 Tungsten Graphics Inc., Bismarck, ND., USA.		* Copyright 2006 Tungsten Graphics Inc., Bismarck, ND., USA.
	* Copyright 2004 Digeo, Inc., Palo Alto, CA, U.S.A. All Rights Reserved.		* Copyright 2004 Digeo, Inc., Palo Alto, CA, U.S.A. All Rights Reserved.
	* Copyright 2004 The Unichrome project. All Rights Reserved.		* Copyright 2004 The Unichrome project. All Rights Reserved.
			* Copyright 2005 Thomas Hellstrom. All Rights Reserved.
	*		*
	* Permission is hereby granted, free of charge, to any person obtaining a		* Permission is hereby granted, free of charge, to any person obtaining a
	* copy of this software and associated documentation files (the "Software"),		* copy of this software and associated documentation files (the "Software"),
	@@ -76,6 +77,69 @@ struct via_memblock {
	struct list_head owner_list;		struct list_head owner_list;
	};		};

			static void via_init_futex(drm_via_private_t *dev_priv)
			{
			unsigned int i;

			DRM_DEBUG("\n");

			for (i = 0; i < VIA_NR_XVMC_LOCKS; ++i) {
			init_waitqueue_head(&(dev_priv->decoder_queue[i]));
			XVMCLOCKPTR(dev_priv->sarea_priv, i)->lock = 0;
			}
			}

			static void via_cleanup_futex(drm_via_private_t *dev_priv)
			{
			}

			static void via_release_futex(drm_via_private_t *dev_priv, int context)
			{
			unsigned int i;
			volatile int *lock;

			if (!dev_priv->sarea_priv)
			return;

			for (i = 0; i < VIA_NR_XVMC_LOCKS; ++i) {
			lock = (volatile int *)XVMCLOCKPTR(dev_priv->sarea_priv, i);
			if ((_DRM_LOCKING_CONTEXT(*lock) == context)) {
			if (_DRM_LOCK_IS_HELD(*lock)
			&& (*lock & _DRM_LOCK_CONT)) {
			wake_up(&(dev_priv->decoder_queue[i]));
			}
			*lock = 0;
			}
			}
			}

			static int via_decoder_futex(struct drm_device dev, void data, struct drm_file *file_priv)
			{
			drm_via_futex_t *fx = data;
			volatile int *lock;
			drm_via_private_t dev_priv = (drm_via_private_t ) dev->dev_private;
			drm_via_sarea_t *sAPriv = dev_priv->sarea_priv;
			int ret = 0;

			DRM_DEBUG("\n");

			if (fx->lock >= VIA_NR_XVMC_LOCKS)
			return -EFAULT;

			lock = (volatile int *)XVMCLOCKPTR(sAPriv, fx->lock);

			switch (fx->func) {
			case VIA_FUTEX_WAIT:
			VIA_WAIT_ON(ret, dev_priv->decoder_queue[fx->lock],
			(fx->ms / 10) * (HZ / 100), *lock != fx->val);
			return ret;
			case VIA_FUTEX_WAKE:
			wake_up(&(dev_priv->decoder_queue[fx->lock]));
			return 0;
			}
			return 0;
			}

	static int via_agp_init(struct drm_device dev, void data, struct drm_file *file_priv)		static int via_agp_init(struct drm_device dev, void data, struct drm_file *file_priv)
	{		{
	drm_via_agp_t *agp = data;		drm_via_agp_t *agp = data;

drivers/gpu/drm/via/via_drv.h

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -183,7 +183,6 @@ do { \
	remove_wait_queue(&(queue), &entry); \		remove_wait_queue(&(queue), &entry); \
	} while (0)		} while (0)

	extern int via_decoder_futex(struct drm_device dev, void data, struct drm_file *file_priv);
	extern int via_wait_irq(struct drm_device dev, void data, struct drm_file *file_priv);		extern int via_wait_irq(struct drm_device dev, void data, struct drm_file *file_priv);
	extern int via_dma_blit_sync(struct drm_device dev, void data, struct drm_file *file_priv);		extern int via_dma_blit_sync(struct drm_device dev, void data, struct drm_file *file_priv);
	extern int via_dma_blit(struct drm_device dev, void data, struct drm_file *file_priv);		extern int via_dma_blit(struct drm_device dev, void data, struct drm_file *file_priv);
	@@ -203,9 +202,6 @@ extern void via_driver_irq_uninstall(struct drm_device *dev);
	extern int via_dma_cleanup(struct drm_device *dev);		extern int via_dma_cleanup(struct drm_device *dev);
	extern void via_init_command_verifier(void);		extern void via_init_command_verifier(void);
	extern int via_driver_dma_quiescent(struct drm_device *dev);		extern int via_driver_dma_quiescent(struct drm_device *dev);
	extern void via_init_futex(drm_via_private_t *dev_priv);
	extern void via_cleanup_futex(drm_via_private_t *dev_priv);
	extern void via_release_futex(drm_via_private_t *dev_priv, int context);

	extern void via_dmablit_handler(struct drm_device *dev, int engine, int from_irq);		extern void via_dmablit_handler(struct drm_device *dev, int engine, int from_irq);
	extern void via_init_dmablit(struct drm_device *dev);		extern void via_init_dmablit(struct drm_device *dev);

drivers/gpu/drm/via/via_video.c

deleted100644 → 0

+0 −94

Original line number	Original line	Diff line number	Diff line
	/*
	* Copyright 2005 Thomas Hellstrom. All Rights Reserved.
	*
	* Permission is hereby granted, free of charge, to any person obtaining a
	* copy of this software and associated documentation files (the "Software"),
	* to deal in the Software without restriction, including without limitation
	* the rights to use, copy, modify, merge, publish, distribute, sub license,
	* and/or sell copies of the Software, and to permit persons to whom the
	* Software is furnished to do so, subject to the following conditions:
	*
	* The above copyright notice and this permission notice (including the
	* next paragraph) shall be included in all copies or substantial portions
	* of the Software.
	*
	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
	* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
	* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
	* THE AUTHOR(S), AND/OR THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
	* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
	* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
	* DEALINGS IN THE SOFTWARE.
	*
	* Author: Thomas Hellstrom 2005.
	*
	* Video and XvMC related functions.
	*/

	#include <drm/drm_device.h>
	#include <drm/via_drm.h>

	#include "via_drv.h"

	void via_init_futex(drm_via_private_t *dev_priv)
	{
	unsigned int i;

	DRM_DEBUG("\n");

	for (i = 0; i < VIA_NR_XVMC_LOCKS; ++i) {
	init_waitqueue_head(&(dev_priv->decoder_queue[i]));
	XVMCLOCKPTR(dev_priv->sarea_priv, i)->lock = 0;
	}
	}

	void via_cleanup_futex(drm_via_private_t *dev_priv)
	{
	}

	void via_release_futex(drm_via_private_t *dev_priv, int context)
	{
	unsigned int i;
	volatile int *lock;

	if (!dev_priv->sarea_priv)
	return;

	for (i = 0; i < VIA_NR_XVMC_LOCKS; ++i) {
	lock = (volatile int *)XVMCLOCKPTR(dev_priv->sarea_priv, i);
	if ((_DRM_LOCKING_CONTEXT(*lock) == context)) {
	if (_DRM_LOCK_IS_HELD(*lock)
	&& (*lock & _DRM_LOCK_CONT)) {
	wake_up(&(dev_priv->decoder_queue[i]));
	}
	*lock = 0;
	}
	}
	}

	int via_decoder_futex(struct drm_device dev, void data, struct drm_file *file_priv)
	{
	drm_via_futex_t *fx = data;
	volatile int *lock;
	drm_via_private_t dev_priv = (drm_via_private_t ) dev->dev_private;
	drm_via_sarea_t *sAPriv = dev_priv->sarea_priv;
	int ret = 0;

	DRM_DEBUG("\n");

	if (fx->lock >= VIA_NR_XVMC_LOCKS)
	return -EFAULT;

	lock = (volatile int *)XVMCLOCKPTR(sAPriv, fx->lock);

	switch (fx->func) {
	case VIA_FUTEX_WAIT:
	VIA_WAIT_ON(ret, dev_priv->decoder_queue[fx->lock],
	(fx->ms / 10) * (HZ / 100), *lock != fx->val);
	return ret;
	case VIA_FUTEX_WAKE:
	wake_up(&(dev_priv->decoder_queue[fx->lock]));
	return 0;
	}
	return 0;
	}