summaryrefslogtreecommitdiff
path: root/linux-core/drm_bo.c
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-01-29 13:36:17 +0100
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-01-29 13:37:02 +0100
commit9a654e71bda3530f6d18d115729af27cc15033de (patch)
treee2ba4f118200af526b20980225f97ca4fe33a302 /linux-core/drm_bo.c
parent45418bb1b1a0fac38f0dda7e29022bfb4cae3d03 (diff)
Use pre-defined list_splice function.
Diffstat (limited to 'linux-core/drm_bo.c')
-rw-r--r--linux-core/drm_bo.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c
index 13127834..cd0f4765 100644
--- a/linux-core/drm_bo.c
+++ b/linux-core/drm_bo.c
@@ -381,7 +381,8 @@ int drm_fence_buffer_objects(drm_file_t * priv,
uint32_t fence_type = 0;
int count = 0;
int ret = 0;
- struct list_head f_list, *l;
+ struct list_head *l;
+ LIST_HEAD(f_list);
mutex_lock(&dev->struct_mutex);
@@ -411,8 +412,7 @@ int drm_fence_buffer_objects(drm_file_t * priv,
* the ones we already have..
*/
- list_add_tail(&f_list, list);
- list_del_init(list);
+ list_splice_init(list, &f_list);
if (fence) {
if ((fence_type & fence->type) != fence_type) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-16 00:30:06 +0000
#n162'>162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 
/*
 * (C) Copyright IBM Corporation 2007
 * 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
 * on 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 AUTHORS AND/OR THEIR SUPPLIERS 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.
 *
 * Authors:
 *    Ian Romanick <idr@us.ibm.com>
 */

#include "xgi_drv.h"
#include "xgi_regs.h"
#include "xgi_misc.h"
#include "xgi_cmdlist.h"

static int xgi_low_level_fence_emit(struct drm_device *dev, u32 *sequence)
{
	struct xgi_info *const info = dev->dev_private;

	if (info == NULL) {
		DRM_ERROR("called with no initialization\n");
		return -EINVAL;
	}

	DRM_SPINLOCK(&info->fence_lock);
	info->next_sequence++;
	if (info->next_sequence > BEGIN_BEGIN_IDENTIFICATION_MASK) {
		info->next_sequence = 1;
	}

	*sequence = (u32) info->next_sequence;
	DRM_SPINUNLOCK(&info->fence_lock);


	xgi_emit_irq(info);
	return 0;
}

#define GET_BEGIN_ID(i) (le32_to_cpu(DRM_READ32((i)->mmio_map, 0x2820)) \
				 & BEGIN_BEGIN_IDENTIFICATION_MASK)

static int xgi_low_level_fence_wait(struct drm_device *dev, unsigned *sequence)
{
	struct xgi_info *const info = dev->dev_private;
	unsigned int cur_fence;
	int ret = 0;

	if (info == NULL) {
		DRM_ERROR("called with no initialization\n");
		return -EINVAL;
	}

	/* Assume that the user has missed the current sequence number
	 * by about a day rather than she wants to wait for years
	 * using fences.
	 */
	DRM_WAIT_ON(ret, info->fence_queue, 3 * DRM_HZ,
		    ((((cur_fence = GET_BEGIN_ID(info))
		      - *sequence) & BEGIN_BEGIN_IDENTIFICATION_MASK)
		     <= (1 << 18)));

	info->complete_sequence = cur_fence;
	*sequence = cur_fence;

	return ret;
}


int xgi_set_fence_ioctl(struct drm_device * dev, void * data,
			struct drm_file * filp)
{
	(void) filp;
	return xgi_low_level_fence_emit(dev, (u32 *) data);
}


int xgi_wait_fence_ioctl(struct drm_device * dev, void * data,
			 struct drm_file * filp)
{
	(void) filp;
	return xgi_low_level_fence_wait(dev, (u32 *) data);
}


#ifdef XGI_HAVE_FENCE
static void xgi_fence_poll(struct drm_device * dev, uint32_t class, 
			   uint32_t waiting_types)
{
	struct xgi_info * info = dev->dev_private;
	uint32_t signaled_types = 0;


	if ((info == NULL) || (class != 0))
		return;

	DRM_SPINLOCK(&info->fence_lock);

	if (waiting_types) {
		if (waiting_types & DRM_FENCE_TYPE_EXE) {
			const u32 begin_id = le32_to_cpu(DRM_READ32(info->mmio_map,
							0x2820))
				& BEGIN_BEGIN_IDENTIFICATION_MASK;

			if (begin_id != info->complete_sequence) {
				info->complete_sequence = begin_id;
				signaled_types |= DRM_FENCE_TYPE_EXE;
			}
		}

		if (signaled_types) {
			drm_fence_handler(dev, 0, info->complete_sequence,
					  signaled_types, 0);
		}
	}

	DRM_SPINUNLOCK(&info->fence_lock);
}


int xgi_fence_emit_sequence(struct drm_device * dev, uint32_t class,
			    uint32_t flags, uint32_t * sequence,
			    uint32_t * native_type)
{
	int err;

	(void) flags;

	if (class != 0)
		return -EINVAL;

	err = xgi_low_level_fence_emit(dev, sequence);
	if (err)
		return err;

	*native_type = DRM_FENCE_TYPE_EXE;
	return 0;
}


void xgi_fence_handler(struct drm_device * dev)
{
	struct drm_fence_manager * fm = &dev->fm;
	struct drm_fence_class_manager *fc = &fm->fence_class[0];

	write_lock(&fm->lock);
	xgi_fence_poll(dev, 0, fc->waiting_types);
	write_unlock(&fm->lock);
}


int xgi_fence_has_irq(struct drm_device *dev, uint32_t class, uint32_t flags)
{
	return ((class == 0) && (flags == DRM_FENCE_TYPE_EXE)) ? 1 : 0;
}

struct drm_fence_driver xgi_fence_driver = {
	.num_classes = 1,
	.wrap_diff = BEGIN_BEGIN_IDENTIFICATION_MASK,
	.flush_diff = BEGIN_BEGIN_IDENTIFICATION_MASK - 1,
	.sequence_mask = BEGIN_BEGIN_IDENTIFICATION_MASK,
	.has_irq = xgi_fence_has_irq,
	.emit = xgi_fence_emit_sequence,
	.flush = NULL,
	.poll = xgi_fence_poll,
	.needed_flush = NULL,
	.wait = NULL
};

#endif /* XGI_HAVE_FENCE */
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-16 00:30:06 +0000