initial port of i915 to BSD, not finished doesn't work.. no idea why...

main
Dave Airlie 2004-07-29 11:09:22 +00:00
parent 862fcee057
commit 0b02bf9d45
10 changed files with 218 additions and 16 deletions

View File

@ -1,6 +1,12 @@
SHARED= ../shared
SHAREDFILES= drm.h \
drm_sarea.h \
i915.h \
i915_dma.c \
i915_drm.h \
i915_drv.h \
i915_irq.c \
i915_mem.c \
mach64.h \
mach64_dma.c \
mach64_drm.h \
@ -46,7 +52,7 @@ SHAREDFILES= drm.h \
via_mm.c \
via_mm.h
SUBDIR = mach64 mga r128 radeon sis tdfx
SUBDIR = i915 mach64 mga r128 radeon sis tdfx
CLEANFILES+= ${SHAREDFILES}

23
bsd-core/i915/Makefile Normal file
View File

@ -0,0 +1,23 @@
# $FreeBSD$
.PATH: ${.CURDIR}/..
KMOD = i915
NOMAN= YES
SRCS = i915_dma.c i915_drv.c i915_irq.c i915_mem.c
SRCS += device_if.h bus_if.h pci_if.h opt_drm.h
CFLAGS += ${DEBUG_FLAGS} -I. -I..
.if defined(DRM_DEBUG)
DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
.endif
.if !defined(DRM_NOLINUX)
DRM_LINUX_OPT= "\#define DRM_LINUX 1"
.endif
opt_drm.h:
touch opt_drm.h
echo $(DRM_DEBUG_OPT) >> opt_drm.h
echo $(DRM_LINUX_OPT) >> opt_drm.h
.include <bsd.kmod.mk>

61
bsd-core/i915_drv.c Normal file
View File

@ -0,0 +1,61 @@
/* i915_drv.c -- ATI Radeon driver -*- linux-c -*-
* Created: Wed Feb 14 17:10:04 2001 by gareth@valinux.com
*
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* 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, sublicense,
* 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 NONINFRINGEMENT. IN NO EVENT SHALL
* VA LINUX SYSTEMS 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.
*
* Authors:
* Gareth Hughes <gareth@valinux.com>
*
*/
#include "i915.h"
#include "drmP.h"
#include "drm.h"
#include "i915_drm.h"
#include "i915_drv.h"
#if __REALLY_HAVE_SG
#include "ati_pcigart.h"
#endif
#include "drm_agpsupport.h"
#include "drm_auth.h"
#include "drm_bufs.h"
#include "drm_context.h"
#include "drm_dma.h"
#include "drm_drawable.h"
#include "drm_drv.h"
#include "drm_fops.h"
#include "drm_ioctl.h"
#include "drm_irq.h"
#include "drm_lock.h"
#include "drm_memory.h"
#include "drm_pci.h"
#include "drm_vm.h"
#include "drm_sysctl.h"
#include "drm_scatter.h"
#ifdef __FreeBSD__
DRIVER_MODULE(DRIVER_NAME, pci, DRM(driver), DRM(devclass), 0, 0);
#elif defined(__NetBSD__)
CFDRIVER_DECL(i915, DV_TTY, NULL);
#endif /* __FreeBSD__ */

View File

@ -1,6 +1,12 @@
SHARED= ../shared
SHAREDFILES= drm.h \
drm_sarea.h \
i915.h \
i915_dma.c \
i915_drm.h \
i915_drv.h \
i915_irq.c \
i915_mem.c \
mach64.h \
mach64_dma.c \
mach64_drm.h \
@ -46,7 +52,7 @@ SHAREDFILES= drm.h \
via_mm.c \
via_mm.h
SUBDIR = mach64 mga r128 radeon sis tdfx
SUBDIR = i915 mach64 mga r128 radeon sis tdfx
CLEANFILES+= ${SHAREDFILES}

23
bsd/i915/Makefile Normal file
View File

@ -0,0 +1,23 @@
# $FreeBSD$
.PATH: ${.CURDIR}/..
KMOD = i915
NOMAN= YES
SRCS = i915_dma.c i915_drv.c i915_irq.c i915_mem.c
SRCS += device_if.h bus_if.h pci_if.h opt_drm.h
CFLAGS += ${DEBUG_FLAGS} -I. -I..
.if defined(DRM_DEBUG)
DRM_DEBUG_OPT= "\#define DRM_DEBUG 1"
.endif
.if !defined(DRM_NOLINUX)
DRM_LINUX_OPT= "\#define DRM_LINUX 1"
.endif
opt_drm.h:
touch opt_drm.h
echo $(DRM_DEBUG_OPT) >> opt_drm.h
echo $(DRM_LINUX_OPT) >> opt_drm.h
.include <bsd.kmod.mk>

61
bsd/i915_drv.c Normal file
View File

@ -0,0 +1,61 @@
/* i915_drv.c -- ATI Radeon driver -*- linux-c -*-
* Created: Wed Feb 14 17:10:04 2001 by gareth@valinux.com
*
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
* 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, sublicense,
* 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 NONINFRINGEMENT. IN NO EVENT SHALL
* VA LINUX SYSTEMS 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.
*
* Authors:
* Gareth Hughes <gareth@valinux.com>
*
*/
#include "i915.h"
#include "drmP.h"
#include "drm.h"
#include "i915_drm.h"
#include "i915_drv.h"
#if __REALLY_HAVE_SG
#include "ati_pcigart.h"
#endif
#include "drm_agpsupport.h"
#include "drm_auth.h"
#include "drm_bufs.h"
#include "drm_context.h"
#include "drm_dma.h"
#include "drm_drawable.h"
#include "drm_drv.h"
#include "drm_fops.h"
#include "drm_ioctl.h"
#include "drm_irq.h"
#include "drm_lock.h"
#include "drm_memory.h"
#include "drm_pci.h"
#include "drm_vm.h"
#include "drm_sysctl.h"
#include "drm_scatter.h"
#ifdef __FreeBSD__
DRIVER_MODULE(DRIVER_NAME, pci, DRM(driver), DRM(devclass), 0, 0);
#elif defined(__NetBSD__)
CFDRIVER_DECL(i915, DV_TTY, NULL);
#endif /* __FreeBSD__ */

View File

@ -81,7 +81,7 @@ void i915_kernel_lost_context(drm_device_t *dev)
}
int i915_cleanup(drm_device_t *dev)
static int i915_dma_cleanup(drm_device_t *dev)
{
/* Make sure interrupts are disabled here because the uninstall ioctl
* may not have been called from userspace and after dev_private
@ -98,9 +98,15 @@ int i915_cleanup(drm_device_t *dev)
}
if (dev_priv->hw_status_page) {
#ifdef __FreeBSD__
#if __FreeBSD_version > 500000
contigfree(dev_priv->hw_status_page, PAGE_SIZE, DRM(M_DRM));
#endif
#else
pci_free_consistent(dev->pdev, PAGE_SIZE,
dev_priv->hw_status_page,
dev_priv->dma_status_page);
#endif
/* Need to rewrite hardware status page */
I915_WRITE(0x02080, 0x1ffff000);
}
@ -126,14 +132,14 @@ static int i915_initialize(drm_device_t *dev,
if(!dev_priv->sarea) {
DRM_ERROR("can not find sarea!\n");
dev->dev_private = (void *)dev_priv;
i915_cleanup(dev);
i915_dma_cleanup(dev);
return DRM_ERR(EINVAL);
}
DRM_FIND_MAP( dev_priv->mmio_map, init->mmio_offset );
if(!dev_priv->mmio_map) {
dev->dev_private = (void *)dev_priv;
i915_cleanup(dev);
i915_dma_cleanup(dev);
DRM_ERROR("can not find mmio map!\n");
return DRM_ERR(EINVAL);
}
@ -157,7 +163,7 @@ static int i915_initialize(drm_device_t *dev,
if (dev_priv->ring.map.handle == NULL) {
dev->dev_private = (void *) dev_priv;
i915_cleanup(dev);
i915_dma_cleanup(dev);
DRM_ERROR("can not ioremap virtual address for"
" ring buffer\n");
return DRM_ERR(ENOMEM);
@ -180,13 +186,18 @@ static int i915_initialize(drm_device_t *dev,
dev_priv->allow_batchbuffer = 1;
/* Program Hardware Status Page */
#ifdef __FreeBSD__
dev_priv->hw_status_page = contigmalloc(PAGE_SIZE, DRM(M_DRM), M_NOWAIT, 0ul, 0, 0, 0);
dev_priv->dma_status_page = vtophys(dev_priv->hw_status_page);
#else
dev_priv->hw_status_page =
pci_alloc_consistent( dev->pdev, PAGE_SIZE,
&dev_priv->dma_status_page );
#endif
if (!dev_priv->hw_status_page) {
dev->dev_private = (void *)dev_priv;
i915_cleanup(dev);
i915_dma_cleanup(dev);
DRM_ERROR("Can not allocate hardware status page\n");
return DRM_ERR(ENOMEM);
}
@ -257,7 +268,7 @@ int i915_dma_init( DRM_IOCTL_ARGS )
retcode = i915_initialize(dev, dev_priv, &init);
break;
case I915_CLEANUP_DMA:
retcode = i915_cleanup(dev);
retcode = i915_dma_cleanup(dev);
break;
case I915_RESUME_DMA:
retcode = i915_resume(dev);

View File

@ -61,7 +61,7 @@ typedef struct drm_i915_private {
/* i915_dma.c */
extern int i915_dma_init( DRM_IOCTL_ARGS );
extern int i915_cleanup(drm_device_t *dev);
extern int i915_dma_cleanup(drm_device_t *dev);
extern int i915_flush_ioctl( DRM_IOCTL_ARGS );
extern int i915_batchbuffer( DRM_IOCTL_ARGS );
extern int i915_flip_bufs( DRM_IOCTL_ARGS );

View File

@ -81,7 +81,7 @@ void i915_kernel_lost_context(drm_device_t *dev)
}
int i915_cleanup(drm_device_t *dev)
static int i915_dma_cleanup(drm_device_t *dev)
{
/* Make sure interrupts are disabled here because the uninstall ioctl
* may not have been called from userspace and after dev_private
@ -98,9 +98,15 @@ int i915_cleanup(drm_device_t *dev)
}
if (dev_priv->hw_status_page) {
#ifdef __FreeBSD__
#if __FreeBSD_version > 500000
contigfree(dev_priv->hw_status_page, PAGE_SIZE, DRM(M_DRM));
#endif
#else
pci_free_consistent(dev->pdev, PAGE_SIZE,
dev_priv->hw_status_page,
dev_priv->dma_status_page);
#endif
/* Need to rewrite hardware status page */
I915_WRITE(0x02080, 0x1ffff000);
}
@ -126,14 +132,14 @@ static int i915_initialize(drm_device_t *dev,
if(!dev_priv->sarea) {
DRM_ERROR("can not find sarea!\n");
dev->dev_private = (void *)dev_priv;
i915_cleanup(dev);
i915_dma_cleanup(dev);
return DRM_ERR(EINVAL);
}
DRM_FIND_MAP( dev_priv->mmio_map, init->mmio_offset );
if(!dev_priv->mmio_map) {
dev->dev_private = (void *)dev_priv;
i915_cleanup(dev);
i915_dma_cleanup(dev);
DRM_ERROR("can not find mmio map!\n");
return DRM_ERR(EINVAL);
}
@ -157,7 +163,7 @@ static int i915_initialize(drm_device_t *dev,
if (dev_priv->ring.map.handle == NULL) {
dev->dev_private = (void *) dev_priv;
i915_cleanup(dev);
i915_dma_cleanup(dev);
DRM_ERROR("can not ioremap virtual address for"
" ring buffer\n");
return DRM_ERR(ENOMEM);
@ -180,13 +186,18 @@ static int i915_initialize(drm_device_t *dev,
dev_priv->allow_batchbuffer = 1;
/* Program Hardware Status Page */
#ifdef __FreeBSD__
dev_priv->hw_status_page = contigmalloc(PAGE_SIZE, DRM(M_DRM), M_NOWAIT, 0ul, 0, 0, 0);
dev_priv->dma_status_page = vtophys(dev_priv->hw_status_page);
#else
dev_priv->hw_status_page =
pci_alloc_consistent( dev->pdev, PAGE_SIZE,
&dev_priv->dma_status_page );
#endif
if (!dev_priv->hw_status_page) {
dev->dev_private = (void *)dev_priv;
i915_cleanup(dev);
i915_dma_cleanup(dev);
DRM_ERROR("Can not allocate hardware status page\n");
return DRM_ERR(ENOMEM);
}
@ -257,7 +268,7 @@ int i915_dma_init( DRM_IOCTL_ARGS )
retcode = i915_initialize(dev, dev_priv, &init);
break;
case I915_CLEANUP_DMA:
retcode = i915_cleanup(dev);
retcode = i915_dma_cleanup(dev);
break;
case I915_RESUME_DMA:
retcode = i915_resume(dev);

View File

@ -61,7 +61,7 @@ typedef struct drm_i915_private {
/* i915_dma.c */
extern int i915_dma_init( DRM_IOCTL_ARGS );
extern int i915_cleanup(drm_device_t *dev);
extern int i915_dma_cleanup(drm_device_t *dev);
extern int i915_flush_ioctl( DRM_IOCTL_ARGS );
extern int i915_batchbuffer( DRM_IOCTL_ARGS );
extern int i915_flip_bufs( DRM_IOCTL_ARGS );