Fri Jan 8 19:50:27 2010 UTC ()
Expand PMF_FN_* macros.


(dyoung)
diff -r1.6 -r1.7 src/sys/external/bsd/drm/dist/bsd-core/i915_drv.c
diff -r1.6 -r1.7 src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c
cvs diff -r1.6 -r1.7 src/sys/external/bsd/drm/dist/bsd-core/i915_drv.c (expand / switch to unified diff)

--- src/sys/external/bsd/drm/dist/bsd-core/i915_drv.c 2009/12/06 22:51:25 1.6
+++ src/sys/external/bsd/drm/dist/bsd-core/i915_drv.c 2010/01/08 19:50:27 1.7
@@ -153,36 +153,36 @@ static driver_t i915_driver = { @@ -153,36 +153,36 @@ static driver_t i915_driver = {
153}; 153};
154 154
155extern devclass_t drm_devclass; 155extern devclass_t drm_devclass;
156#if __FreeBSD_version >= 700010 156#if __FreeBSD_version >= 700010
157DRIVER_MODULE(i915, vgapci, i915_driver, drm_devclass, 0, 0); 157DRIVER_MODULE(i915, vgapci, i915_driver, drm_devclass, 0, 0);
158#else 158#else
159DRIVER_MODULE(i915, agp, i915_driver, drm_devclass, 0, 0); 159DRIVER_MODULE(i915, agp, i915_driver, drm_devclass, 0, 0);
160#endif 160#endif
161MODULE_DEPEND(i915, drm, 1, 1, 1); 161MODULE_DEPEND(i915, drm, 1, 1, 1);
162 162
163#elif defined(__NetBSD__) 163#elif defined(__NetBSD__)
164 164
165static bool 165static bool
166i915drm_suspend(device_t self PMF_FN_ARGS) 166i915drm_suspend(device_t self, pmf_qual_t qual)
167{ 167{
168 struct drm_device *dev = device_private(self); 168 struct drm_device *dev = device_private(self);
169 169
170 i915_save_state(dev); 170 i915_save_state(dev);
171 return true;  171 return true;
172} 172}
173 173
174static bool 174static bool
175i915drm_resume(device_t self PMF_FN_ARGS) 175i915drm_resume(device_t self, pmf_qual_t qual)
176{ 176{
177 struct drm_device *dev = device_private(self); 177 struct drm_device *dev = device_private(self);
178 178
179 i915_restore_state(dev); 179 i915_restore_state(dev);
180 return true;  180 return true;
181} 181}
182 182
183static int 183static int
184i915drm_probe(device_t parent, cfdata_t match, void *aux) 184i915drm_probe(device_t parent, cfdata_t match, void *aux)
185{ 185{
186 struct pci_attach_args *pa = aux; 186 struct pci_attach_args *pa = aux;
187 return drm_probe(pa, i915_pciidlist); 187 return drm_probe(pa, i915_pciidlist);
188} 188}
cvs diff -r1.6 -r1.7 src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c (expand / switch to unified diff)

--- src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c 2009/12/14 21:01:07 1.6
+++ src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c 2010/01/08 19:50:27 1.7
@@ -125,40 +125,40 @@ static driver_t radeon_driver = { @@ -125,40 +125,40 @@ static driver_t radeon_driver = {
125}; 125};
126 126
127extern devclass_t drm_devclass; 127extern devclass_t drm_devclass;
128#if __FreeBSD_version >= 700010 128#if __FreeBSD_version >= 700010
129DRIVER_MODULE(radeon, vgapci, radeon_driver, drm_devclass, 0, 0); 129DRIVER_MODULE(radeon, vgapci, radeon_driver, drm_devclass, 0, 0);
130#else 130#else
131DRIVER_MODULE(radeon, pci, radeon_driver, drm_devclass, 0, 0); 131DRIVER_MODULE(radeon, pci, radeon_driver, drm_devclass, 0, 0);
132#endif 132#endif
133MODULE_DEPEND(radeon, drm, 1, 1, 1); 133MODULE_DEPEND(radeon, drm, 1, 1, 1);
134 134
135#elif defined(__NetBSD__) 135#elif defined(__NetBSD__)
136 136
137static bool 137static bool
138radeondrm_suspend(device_t self PMF_FN_ARGS) 138radeondrm_suspend(device_t self, pmf_qual_t qual)
139{ 139{
140 struct drm_device *rad_dev = device_private(self); 140 struct drm_device *rad_dev = device_private(self);
141 drm_radeon_cp_stop_t stop_args; 141 drm_radeon_cp_stop_t stop_args;
142 142
143 stop_args.flush = stop_args.idle = 0; 143 stop_args.flush = stop_args.idle = 0;
144 if (radeon_cp_stop(rad_dev, &stop_args, rad_dev->lock.file_priv) != 0) 144 if (radeon_cp_stop(rad_dev, &stop_args, rad_dev->lock.file_priv) != 0)
145 return false; 145 return false;
146 146
147 return true; 147 return true;
148} 148}
149 149
150static bool 150static bool
151radeondrm_resume(device_t self PMF_FN_ARGS) 151radeondrm_resume(device_t self, pmf_qual_t qual)
152{ 152{
153 struct drm_device *rad_dev = device_private(self); 153 struct drm_device *rad_dev = device_private(self);
154 if (radeon_cp_resume(rad_dev, NULL, NULL) != 0) 154 if (radeon_cp_resume(rad_dev, NULL, NULL) != 0)
155 return false; 155 return false;
156  156
157 return true; 157 return true;
158} 158}
159 159
160static int 160static int
161radeondrm_probe(device_t parent, cfdata_t match, void *aux) 161radeondrm_probe(device_t parent, cfdata_t match, void *aux)
162{ 162{
163 struct pci_attach_args *pa = aux; 163 struct pci_attach_args *pa = aux;
164 return drm_probe(pa, radeon_pciidlist); 164 return drm_probe(pa, radeon_pciidlist);