Deleted Added
sdiff udiff text old ( 183833 ) new ( 189563 )
full compact
radeon_drv.c (183833) radeon_drv.c (189563)
1/* radeon_drv.c -- ATI Radeon driver -*- linux-c -*-
2 * Created: Wed Feb 14 17:10:04 2001 by gareth@valinux.com
3 */
4/*-
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

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

25 * OTHER DEALINGS IN THE SOFTWARE.
26 *
27 * Authors:
28 * Gareth Hughes <gareth@valinux.com>
29 *
30 */
31
32#include <sys/cdefs.h>
1/* radeon_drv.c -- ATI Radeon driver -*- linux-c -*-
2 * Created: Wed Feb 14 17:10:04 2001 by gareth@valinux.com
3 */
4/*-
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

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

25 * OTHER DEALINGS IN THE SOFTWARE.
26 *
27 * Authors:
28 * Gareth Hughes <gareth@valinux.com>
29 *
30 */
31
32#include <sys/cdefs.h>
33__FBSDID("$FreeBSD: head/sys/dev/drm/radeon_drv.c 183833 2008-10-13 18:03:27Z rnoland $");
33__FBSDID("$FreeBSD: head/sys/dev/drm/radeon_drv.c 189563 2009-03-09 07:55:18Z 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/drm_pciids.h"
40
41int radeon_no_wb;

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

75 dev->driver->desc = DRIVER_DESC;
76 dev->driver->date = DRIVER_DATE;
77 dev->driver->major = DRIVER_MAJOR;
78 dev->driver->minor = DRIVER_MINOR;
79 dev->driver->patchlevel = DRIVER_PATCHLEVEL;
80}
81
82static int
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/drm_pciids.h"
40
41int radeon_no_wb;

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

75 dev->driver->desc = DRIVER_DESC;
76 dev->driver->date = DRIVER_DATE;
77 dev->driver->major = DRIVER_MAJOR;
78 dev->driver->minor = DRIVER_MINOR;
79 dev->driver->patchlevel = DRIVER_PATCHLEVEL;
80}
81
82static int
83radeon_probe(device_t dev)
83radeon_probe(device_t kdev)
84{
84{
85 return drm_probe(dev, radeon_pciidlist);
85 return drm_probe(kdev, radeon_pciidlist);
86}
87
88static int
86}
87
88static int
89radeon_attach(device_t nbdev)
89radeon_attach(device_t kdev)
90{
90{
91 struct drm_device *dev = device_get_softc(nbdev);
91 struct drm_device *dev = device_get_softc(kdev);
92
93 dev->driver = malloc(sizeof(struct drm_driver_info), DRM_MEM_DRIVER,
94 M_WAITOK | M_ZERO);
95
96 radeon_configure(dev);
97
92
93 dev->driver = malloc(sizeof(struct drm_driver_info), DRM_MEM_DRIVER,
94 M_WAITOK | M_ZERO);
95
96 radeon_configure(dev);
97
98 return drm_attach(nbdev, radeon_pciidlist);
98 return drm_attach(kdev, radeon_pciidlist);
99}
100
101static int
99}
100
101static int
102radeon_detach(device_t nbdev)
102radeon_detach(device_t kdev)
103{
103{
104 struct drm_device *dev = device_get_softc(nbdev);
104 struct drm_device *dev = device_get_softc(kdev);
105 int ret;
106
105 int ret;
106
107 ret = drm_detach(nbdev);
107 ret = drm_detach(kdev);
108
109 free(dev->driver, DRM_MEM_DRIVER);
110
111 return ret;
112}
113
114static device_method_t radeon_methods[] = {
115 /* Device interface */

--- 20 unchanged lines hidden --- 		108
109 free(dev->driver, DRM_MEM_DRIVER);
110
111 return ret;
112}
113
114static device_method_t radeon_methods[] = {
115 /* Device interface */

--- 20 unchanged lines hidden ---