Deleted Added
full compact
r128_cce.c (145132) r128_cce.c (148211)
1/* r128_cce.c -- ATI Rage 128 driver -*- linux-c -*-
2 * Created: Wed Apr 5 19:24:19 2000 by kevin@precisioninsight.com */
3/*-
4 * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
5 * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
6 * All Rights Reserved.
7 *
8 * Permission is hereby granted, free of charge, to any person obtaining a

--- 13 unchanged lines hidden (view full) ---

22 * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
23 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
24 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
25 * DEALINGS IN THE SOFTWARE.
26 *
27 * Authors:
28 * Gareth Hughes <gareth@valinux.com>
29 *
1/* r128_cce.c -- ATI Rage 128 driver -*- linux-c -*-
2 * Created: Wed Apr 5 19:24:19 2000 by kevin@precisioninsight.com */
3/*-
4 * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
5 * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
6 * All Rights Reserved.
7 *
8 * Permission is hereby granted, free of charge, to any person obtaining a

--- 13 unchanged lines hidden (view full) ---

22 * PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
23 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
24 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
25 * DEALINGS IN THE SOFTWARE.
26 *
27 * Authors:
28 * Gareth Hughes <gareth@valinux.com>
29 *
30 * $FreeBSD: head/sys/dev/drm/r128_cce.c 145132 2005-04-16 03:44:47Z anholt $
30 * $FreeBSD: head/sys/dev/drm/r128_cce.c 148211 2005-07-20 21:10:57Z anholt $
31 */
32
33#include "dev/drm/drmP.h"
34#include "dev/drm/drm.h"
35#include "dev/drm/r128_drm.h"
36#include "dev/drm/r128_drv.h"
37
38#define R128_FIFO_DEBUG 0

--- 515 unchanged lines hidden (view full) ---

554
555 dev_priv->sarea_priv->last_dispatch = 0;
556 R128_WRITE(R128_LAST_DISPATCH_REG, dev_priv->sarea_priv->last_dispatch);
557
558#if __OS_HAS_AGP
559 if (dev_priv->is_pci) {
560#endif
561 if (!drm_ati_pcigart_init(dev, &dev_priv->phys_pci_gart,
31 */
32
33#include "dev/drm/drmP.h"
34#include "dev/drm/drm.h"
35#include "dev/drm/r128_drm.h"
36#include "dev/drm/r128_drv.h"
37
38#define R128_FIFO_DEBUG 0

--- 515 unchanged lines hidden (view full) ---

554
555 dev_priv->sarea_priv->last_dispatch = 0;
556 R128_WRITE(R128_LAST_DISPATCH_REG, dev_priv->sarea_priv->last_dispatch);
557
558#if __OS_HAS_AGP
559 if (dev_priv->is_pci) {
560#endif
561 if (!drm_ati_pcigart_init(dev, &dev_priv->phys_pci_gart,
562 &dev_priv->bus_pci_gart)) {
562 &dev_priv->bus_pci_gart, 0)) {
563 DRM_ERROR("failed to init PCI GART!\n");
564 dev->dev_private = (void *)dev_priv;
565 r128_do_cleanup_cce(dev);
566 return DRM_ERR(ENOMEM);
567 }
568 R128_WRITE(R128_PCI_GART_PAGE, dev_priv->bus_pci_gart);
569#if __OS_HAS_AGP
570 }

--- 375 unchanged lines hidden ---
563 DRM_ERROR("failed to init PCI GART!\n");
564 dev->dev_private = (void *)dev_priv;
565 r128_do_cleanup_cce(dev);
566 return DRM_ERR(ENOMEM);
567 }
568 R128_WRITE(R128_PCI_GART_PAGE, dev_priv->bus_pci_gart);
569#if __OS_HAS_AGP
570 }

--- 375 unchanged lines hidden ---