Deleted Added
full compact
radeon_cp.c (184375) radeon_cp.c (189130)
1/* radeon_cp.c -- CP support for Radeon -*- linux-c -*- */
2/*-
3 * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
4 * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
5 * Copyright 2007 Advanced Micro Devices, Inc.
6 * All Rights Reserved.
7 *
8 * Permission is hereby granted, free of charge, to any person obtaining a

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

25 * DEALINGS IN THE SOFTWARE.
26 *
27 * Authors:
28 * Kevin E. Martin <martin@valinux.com>
29 * Gareth Hughes <gareth@valinux.com>
30 */
31
32#include <sys/cdefs.h>
1/* radeon_cp.c -- CP support for Radeon -*- linux-c -*- */
2/*-
3 * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
4 * Copyright 2000 VA Linux Systems, Inc., Fremont, California.
5 * Copyright 2007 Advanced Micro Devices, Inc.
6 * All Rights Reserved.
7 *
8 * Permission is hereby granted, free of charge, to any person obtaining a

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

25 * DEALINGS IN THE SOFTWARE.
26 *
27 * Authors:
28 * Kevin E. Martin <martin@valinux.com>
29 * Gareth Hughes <gareth@valinux.com>
30 */
31
32#include <sys/cdefs.h>
33__FBSDID("$FreeBSD: head/sys/dev/drm/radeon_cp.c 184375 2008-10-27 21:24:34Z rnoland $");
33__FBSDID("$FreeBSD: head/sys/dev/drm/radeon_cp.c 189130 2009-02-28 02:37:55Z rnoland $");
34
35#include "dev/drm/drmP.h"
36#include "dev/drm/drm.h"
37#include "dev/drm/radeon_drm.h"
38#include "dev/drm/radeon_drv.h"
39#include "dev/drm/r300_reg.h"
40
41#include "dev/drm/radeon_microcode.h"

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

1746 dev_priv->chip_family = flags & RADEON_FAMILY_MASK;
1747 if (drm_device_is_agp(dev))
1748 dev_priv->flags |= RADEON_IS_AGP;
1749 else if (drm_device_is_pcie(dev))
1750 dev_priv->flags |= RADEON_IS_PCIE;
1751 else
1752 dev_priv->flags |= RADEON_IS_PCI;
1753
34
35#include "dev/drm/drmP.h"
36#include "dev/drm/drm.h"
37#include "dev/drm/radeon_drm.h"
38#include "dev/drm/radeon_drv.h"
39#include "dev/drm/r300_reg.h"
40
41#include "dev/drm/radeon_microcode.h"

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

1746 dev_priv->chip_family = flags & RADEON_FAMILY_MASK;
1747 if (drm_device_is_agp(dev))
1748 dev_priv->flags |= RADEON_IS_AGP;
1749 else if (drm_device_is_pcie(dev))
1750 dev_priv->flags |= RADEON_IS_PCIE;
1751 else
1752 dev_priv->flags |= RADEON_IS_PCI;
1753
1754 ret = drm_vblank_init(dev, 2);
1755 if (ret) {
1756 radeon_driver_unload(dev);
1757 return ret;
1758 }
1759
1754 DRM_DEBUG("%s card detected\n",
1755 ((dev_priv->flags & RADEON_IS_AGP) ? "AGP" : (((dev_priv->flags & RADEON_IS_PCIE) ? "PCIE" : "PCI"))));
1756 return ret;
1757}
1758
1759/* Create mappings for registers and framebuffer so userland doesn't necessarily
1760 * have to find them.
1761 */

--- 34 unchanged lines hidden ---
1760 DRM_DEBUG("%s card detected\n",
1761 ((dev_priv->flags & RADEON_IS_AGP) ? "AGP" : (((dev_priv->flags & RADEON_IS_PCIE) ? "PCIE" : "PCI"))));
1762 return ret;
1763}
1764
1765/* Create mappings for registers and framebuffer so userland doesn't necessarily
1766 * have to find them.
1767 */

--- 34 unchanged lines hidden ---