Deleted Added
full compact
radeon_drv.c (259016) radeon_drv.c (265262)
1/**
2 * \file radeon_drv.c
3 * ATI Radeon driver
4 *
5 * \author Gareth Hughes <gareth@valinux.com>
6 */
7
8/*

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

25 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
26 * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
27 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
28 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
29 * OTHER DEALINGS IN THE SOFTWARE.
30 */
31
32#include <sys/cdefs.h>
1/**
2 * \file radeon_drv.c
3 * ATI Radeon driver
4 *
5 * \author Gareth Hughes <gareth@valinux.com>
6 */
7
8/*

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

25 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
26 * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
27 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
28 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
29 * OTHER DEALINGS IN THE SOFTWARE.
30 */
31
32#include <sys/cdefs.h>
33__FBSDID("$FreeBSD: head/sys/dev/drm2/radeon/radeon_drv.c 259016 2013-12-05 22:38:53Z ray $");
33__FBSDID("$FreeBSD: head/sys/dev/drm2/radeon/radeon_drv.c 265262 2014-05-03 11:23:10Z dumbbell $");
34
35#include <dev/drm2/drmP.h>
36#include <dev/drm2/radeon/radeon_drm.h>
37#include "radeon_drv.h"
38#include "radeon_gem.h"
39#include "radeon_kms.h"
40#include "radeon_irq_kms.h"
41

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

80#define KMS_DRIVER_MINOR 29
81#define KMS_DRIVER_PATCHLEVEL 0
82int radeon_suspend_kms(struct drm_device *dev);
83int radeon_resume_kms(struct drm_device *dev);
84extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, int crtc,
85 int *vpos, int *hpos);
86extern struct drm_ioctl_desc radeon_ioctls_kms[];
87extern int radeon_max_kms_ioctl;
34
35#include <dev/drm2/drmP.h>
36#include <dev/drm2/radeon/radeon_drm.h>
37#include "radeon_drv.h"
38#include "radeon_gem.h"
39#include "radeon_kms.h"
40#include "radeon_irq_kms.h"
41

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

80#define KMS_DRIVER_MINOR 29
81#define KMS_DRIVER_PATCHLEVEL 0
82int radeon_suspend_kms(struct drm_device *dev);
83int radeon_resume_kms(struct drm_device *dev);
84extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, int crtc,
85 int *vpos, int *hpos);
86extern struct drm_ioctl_desc radeon_ioctls_kms[];
87extern int radeon_max_kms_ioctl;
88#ifdef COMPAT_FREEBSD32
89extern struct drm_ioctl_desc radeon_compat_ioctls[];
90extern int radeon_num_compat_ioctls;
91#endif
88#ifdef DUMBBELL_WIP
89int radeon_mmap(struct file *filp, struct vm_area_struct *vma);
90#endif /* DUMBBELL_WIP */
91int radeon_mode_dumb_mmap(struct drm_file *filp,
92 struct drm_device *dev,
93 uint32_t handle, uint64_t *offset_p);
94int radeon_mode_dumb_create(struct drm_file *file_priv,
95 struct drm_device *dev,

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

461radeon_attach(device_t kdev)
462{
463 struct drm_device *dev;
464
465 dev = device_get_softc(kdev);
466 if (radeon_modeset == 1) {
467 kms_driver.driver_features |= DRIVER_MODESET;
468 kms_driver.max_ioctl = radeon_max_kms_ioctl;
92#ifdef DUMBBELL_WIP
93int radeon_mmap(struct file *filp, struct vm_area_struct *vma);
94#endif /* DUMBBELL_WIP */
95int radeon_mode_dumb_mmap(struct drm_file *filp,
96 struct drm_device *dev,
97 uint32_t handle, uint64_t *offset_p);
98int radeon_mode_dumb_create(struct drm_file *file_priv,
99 struct drm_device *dev,

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

465radeon_attach(device_t kdev)
466{
467 struct drm_device *dev;
468
469 dev = device_get_softc(kdev);
470 if (radeon_modeset == 1) {
471 kms_driver.driver_features |= DRIVER_MODESET;
472 kms_driver.max_ioctl = radeon_max_kms_ioctl;
473#ifdef COMPAT_FREEBSD32
474 kms_driver.compat_ioctls = radeon_compat_ioctls;
475 kms_driver.compat_ioctls_nr = &radeon_num_compat_ioctls;
476#endif
469 radeon_register_atpx_handler();
470 }
471 dev->driver = &kms_driver;
472 return (drm_attach(kdev, pciidlist));
473}
474
475static int
476radeon_suspend(device_t kdev)

--- 53 unchanged lines hidden ---
477 radeon_register_atpx_handler();
478 }
479 dev->driver = &kms_driver;
480 return (drm_attach(kdev, pciidlist));
481}
482
483static int
484radeon_suspend(device_t kdev)

--- 53 unchanged lines hidden ---