diff options
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/Makefile.kernel | 2 | ||||
| -rw-r--r-- | linux-core/radeon_buffer.c | 117 | ||||
| -rw-r--r-- | linux-core/radeon_drv.c | 39 | ||||
| -rw-r--r-- | linux-core/radeon_fence.c | 128 | 
4 files changed, 285 insertions, 1 deletions
| diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel index 6f5b021b..510509cc 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -27,7 +27,7 @@ nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \  		nv04_fb.o nv10_fb.o nv40_fb.o \  		nv04_graph.o nv10_graph.o nv20_graph.o nv30_graph.o \  		nv40_graph.o -radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o +radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o radeon_fence.o radeon_buffer.o  sis-objs    := sis_drv.o sis_mm.o  ffb-objs    := ffb_drv.o ffb_context.o  savage-objs := savage_drv.o savage_bci.o savage_state.o diff --git a/linux-core/radeon_buffer.c b/linux-core/radeon_buffer.c new file mode 100644 index 00000000..796191c1 --- /dev/null +++ b/linux-core/radeon_buffer.c @@ -0,0 +1,117 @@ +/************************************************************************** + *  + * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND., USA + * 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 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 COPYRIGHT HOLDERS, AUTHORS AND/OR ITS 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. + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + *  + *  + **************************************************************************/ +/* + * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com> + */ + +#include "drmP.h" +#include "radeon_drm.h" +#include "radeon_drv.h" + + +drm_ttm_backend_t *radeon_create_ttm_backend_entry(drm_device_t * dev) +{ +	return drm_agp_init_ttm(dev, NULL); +} + +int radeon_fence_types(drm_buffer_object_t *bo, uint32_t * class, uint32_t * type) +{ +	*class = 0; +	if (bo->mem.flags & (DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE)) +		*type = 3; +	else +		*type = 1; +	return 0; +} + +int radeon_invalidate_caches(drm_device_t * dev, uint32_t flags) +{ +	/* +	 * FIXME: Only emit once per batchbuffer submission. +	 */ +#if 0 +	uint32_t flush_cmd = MI_NO_WRITE_FLUSH; + +	if (flags & DRM_BO_FLAG_READ) +		flush_cmd |= MI_READ_FLUSH; +	if (flags & DRM_BO_FLAG_EXE) +		flush_cmd |= MI_EXE_FLUSH; + +	return 0; +//	return radeon_emit_mi_flush(dev, flush_cmd); +#endif +	return 0; +} + +uint32_t radeon_evict_mask(drm_buffer_object_t *bo) +{ +	switch (bo->mem.mem_type) { +	case DRM_BO_MEM_LOCAL: +	case DRM_BO_MEM_TT: +		return DRM_BO_FLAG_MEM_LOCAL; +	default: +		return DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_CACHED; +	} +} + +int radeon_init_mem_type(drm_device_t * dev, uint32_t type, +			 drm_mem_type_manager_t * man) +{ +	switch (type) { +	case DRM_BO_MEM_LOCAL: +		man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE | +		    _DRM_FLAG_MEMTYPE_CACHED; +		man->drm_bus_maptype = 0; +		break; +	case DRM_BO_MEM_TT: +		if (!(drm_core_has_AGP(dev) && dev->agp)) { +			DRM_ERROR("AGP is not enabled for memory type %u\n", +				  (unsigned)type); +			return -EINVAL; +		} +		man->io_offset = dev->agp->agp_info.aper_base; +		man->io_size = dev->agp->agp_info.aper_size * 1024 * 1024; +		man->io_addr = NULL; +		man->flags = _DRM_FLAG_MEMTYPE_MAPPABLE | +		    _DRM_FLAG_MEMTYPE_CSELECT | _DRM_FLAG_NEEDS_IOREMAP; +		man->drm_bus_maptype = _DRM_AGP; +		break; +	default: +		DRM_ERROR("Unsupported memory type %u\n", (unsigned)type); +		return -EINVAL; +	} +	return 0; +} + +int radeon_move(drm_buffer_object_t * bo, +		int evict, int no_wait, drm_bo_mem_reg_t * new_mem) +{ + +	return 0; +} + diff --git a/linux-core/radeon_drv.c b/linux-core/radeon_drv.c index 43b9aca0..6f63a7c4 100644 --- a/linux-core/radeon_drv.c +++ b/linux-core/radeon_drv.c @@ -56,6 +56,38 @@ static struct pci_device_id pciidlist[] = {  	radeon_PCI_IDS  }; + +#ifdef RADEON_HAVE_FENCE +static drm_fence_driver_t radeon_fence_driver = { +	.num_classes = 1, +	.wrap_diff = (1 << 30), +	.flush_diff = (1 << 29), +	.sequence_mask = 0xffffffffU, +	.lazy_capable = 1, +	.emit = radeon_fence_emit_sequence, +	.poke_flush = radeon_poke_flush, +	.has_irq = radeon_fence_has_irq, +}; +#endif +#ifdef RADEON_HAVE_BUFFER + +static uint32_t radeon_mem_prios[] = {DRM_BO_MEM_PRIV0, DRM_BO_MEM_TT, DRM_BO_MEM_LOCAL}; +static uint32_t radeon_busy_prios[] = {DRM_BO_MEM_TT, DRM_BO_MEM_PRIV0, DRM_BO_MEM_LOCAL}; + +static drm_bo_driver_t radeon_bo_driver = { +	.mem_type_prio = radeon_mem_prios, +	.mem_busy_prio = radeon_busy_prios, +	.num_mem_type_prio = sizeof(radeon_mem_prios)/sizeof(uint32_t), +	.num_mem_busy_prio = sizeof(radeon_busy_prios)/sizeof(uint32_t), +	.create_ttm_backend_entry = radeon_create_ttm_backend_entry, +	.fence_type = radeon_fence_types, +	.invalidate_caches = radeon_invalidate_caches, +	.init_mem_type = radeon_init_mem_type, +	.evict_mask = radeon_evict_mask, +	.move = radeon_move, +}; +#endif +  static int probe(struct pci_dev *pdev, const struct pci_device_id *ent);  static struct drm_driver driver = {  	.driver_features = @@ -100,6 +132,13 @@ static struct drm_driver driver = {  		.remove = __devexit_p(drm_cleanup_pci),  	}, +#ifdef RADEON_HAVE_FENCE +	.fence_driver = &radeon_fence_driver, +#endif +#ifdef RADEON_HAVE_BUFFER +	.bo_driver = &radeon_bo_driver, +#endif +  	.name = DRIVER_NAME,  	.desc = DRIVER_DESC,  	.date = DRIVER_DATE, diff --git a/linux-core/radeon_fence.c b/linux-core/radeon_fence.c new file mode 100644 index 00000000..57b318af --- /dev/null +++ b/linux-core/radeon_fence.c @@ -0,0 +1,128 @@ +/************************************************************************** + *  + * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND., USA + * 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 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 COPYRIGHT HOLDERS, AUTHORS AND/OR ITS 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. + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + *  + *  + **************************************************************************/ +/* + * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com> + */ + +#include "drmP.h" +#include "drm.h" +#include "radeon_drm.h" +#include "radeon_drv.h" + +/* + * Implements an intel sync flush operation. + */ + +static void radeon_perform_flush(drm_device_t * dev) +{ +	drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private; +	drm_fence_manager_t *fm = &dev->fm; +	drm_fence_class_manager_t *fc = &dev->fm.class[0]; +	drm_fence_driver_t *driver = dev->driver->fence_driver; +	uint32_t pending_flush_types = 0; +	uint32_t flush_flags = 0; +	uint32_t flush_sequence = 0; +	uint32_t i_status; +	uint32_t diff; +	uint32_t sequence; + +	if (!dev_priv) +		return; + +	pending_flush_types = fc->pending_flush | +		((fc->pending_exe_flush) ? DRM_FENCE_TYPE_EXE : 0); + +	if (pending_flush_types) { +		drm_fence_handler(dev, 0, 0,0); + +	} + +	return; +} + +void radeon_poke_flush(drm_device_t * dev, uint32_t class) +{ +	drm_fence_manager_t *fm = &dev->fm; +	unsigned long flags; + +	if (class != 0) +		return; + +	write_lock_irqsave(&fm->lock, flags); +	radeon_perform_flush(dev); +	write_unlock_irqrestore(&fm->lock, flags); +} + +int radeon_fence_emit_sequence(drm_device_t *dev, uint32_t class, +			       uint32_t flags, uint32_t *sequence, +			       uint32_t *native_type) +{ +	drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private; +	RING_LOCALS; + +	if (!dev_priv) +		return -EINVAL; + +	*native_type = DRM_FENCE_TYPE_EXE; +	if (flags & DRM_RADEON_FENCE_FLAG_FLUSHED) { +		*native_type |= DRM_RADEON_FENCE_TYPE_RW; +		 +		BEGIN_RING(4); +		 +		RADEON_FLUSH_CACHE(); +		RADEON_FLUSH_ZCACHE(); +		ADVANCE_RING(); +	} + +	radeon_emit_irq(dev); +	*sequence = (uint32_t) dev_priv->counter; + + +	return 0; +} + +void radeon_fence_handler(drm_device_t * dev) +{ +	drm_fence_manager_t *fm = &dev->fm; + +	write_lock(&fm->lock); +	radeon_perform_flush(dev); +	write_unlock(&fm->lock); +} + +int radeon_fence_has_irq(drm_device_t *dev, uint32_t class, uint32_t flags) +{ +	/* +	 * We have an irq that tells us when we have a new breadcrumb. +	 */ + +	if (class == 0 && flags == DRM_FENCE_TYPE_EXE) +		return 1; + +	return 0; +} | 
