| i915_drv.c (183573) | i915_drv.c (183604) |
|---|---|
| 1/* i915_drv.c -- Intel i915 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/* i915_drv.c -- Intel i915 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/i915_drv.c 183573 2008-10-03 16:59:11Z rnoland $"); | 33__FBSDID("$FreeBSD: head/sys/dev/drm/i915_drv.c 183604 2008-10-04 14:48:40Z rnoland $"); |
| 34 35#include "dev/drm/drmP.h" 36#include "dev/drm/drm.h" 37#include "dev/drm/i915_drm.h" 38#include "dev/drm/i915_drv.h" 39#include "dev/drm/drm_pciids.h" 40 41/* drv_PCI_IDs comes from drm_pciids.h, generated from drm_pciids.txt. */ --- 67 unchanged lines hidden (view full) --- 109 110static int 111i915_attach(device_t nbdev) 112{ 113 struct drm_device *dev = device_get_softc(nbdev); 114 115 bzero(dev, sizeof(struct drm_device)); 116 | 34 35#include "dev/drm/drmP.h" 36#include "dev/drm/drm.h" 37#include "dev/drm/i915_drm.h" 38#include "dev/drm/i915_drv.h" 39#include "dev/drm/drm_pciids.h" 40 41/* drv_PCI_IDs comes from drm_pciids.h, generated from drm_pciids.txt. */ --- 67 unchanged lines hidden (view full) --- 109 110static int 111i915_attach(device_t nbdev) 112{ 113 struct drm_device *dev = device_get_softc(nbdev); 114 115 bzero(dev, sizeof(struct drm_device)); 116 |
| 117 dev->driver = malloc(sizeof(struct drm_driver_info), M_DRM, M_NOWAIT | M_ZERO); | 117 dev->driver = malloc(sizeof(struct drm_driver_info), M_DRM, 118 M_WAITOK | M_ZERO); 119 |
| 118 i915_configure(dev); 119 120 return drm_attach(nbdev, i915_pciidlist); 121} 122 123static int 124i915_detach(device_t nbdev) 125{ --- 38 unchanged lines hidden --- | 120 i915_configure(dev); 121 122 return drm_attach(nbdev, i915_pciidlist); 123} 124 125static int 126i915_detach(device_t nbdev) 127{ --- 38 unchanged lines hidden --- |