diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-09-23 19:23:33 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2009-09-28 22:15:23 -0400 |
commit | 4f49be546806bf3839daa0601e1c2d4342c93359 (patch) | |
tree | fd65f1a61476851504b85c8297d9fde9cd7ef85e /drivers/gpu | |
parent | 17d857be649a21ca90008c6dc425d849fa83db5c (diff) |
drm/i915: Record device minor rather than pointer in TRACE_EVENT
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/i915/i915_trace.h | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h index 5567a40816f3..908b3c4d8cf7 100644 --- a/drivers/gpu/drm/i915/i915_trace.h +++ b/drivers/gpu/drm/i915/i915_trace.h | |||
@@ -158,16 +158,16 @@ TRACE_EVENT(i915_gem_request_submit, | |||
158 | TP_ARGS(dev, seqno), | 158 | TP_ARGS(dev, seqno), |
159 | 159 | ||
160 | TP_STRUCT__entry( | 160 | TP_STRUCT__entry( |
161 | __field(struct drm_device *, dev) | 161 | __field(u32, dev) |
162 | __field(u32, seqno) | 162 | __field(u32, seqno) |
163 | ), | 163 | ), |
164 | 164 | ||
165 | TP_fast_assign( | 165 | TP_fast_assign( |
166 | __entry->dev = dev; | 166 | __entry->dev = dev->primary->index; |
167 | __entry->seqno = seqno; | 167 | __entry->seqno = seqno; |
168 | ), | 168 | ), |
169 | 169 | ||
170 | TP_printk("dev=%p, seqno=%u", __entry->dev, __entry->seqno) | 170 | TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno) |
171 | ); | 171 | ); |
172 | 172 | ||
173 | TRACE_EVENT(i915_gem_request_flush, | 173 | TRACE_EVENT(i915_gem_request_flush, |
@@ -178,20 +178,20 @@ TRACE_EVENT(i915_gem_request_flush, | |||
178 | TP_ARGS(dev, seqno, flush_domains, invalidate_domains), | 178 | TP_ARGS(dev, seqno, flush_domains, invalidate_domains), |
179 | 179 | ||
180 | TP_STRUCT__entry( | 180 | TP_STRUCT__entry( |
181 | __field(struct drm_device *, dev) | 181 | __field(u32, dev) |
182 | __field(u32, seqno) | 182 | __field(u32, seqno) |
183 | __field(u32, flush_domains) | 183 | __field(u32, flush_domains) |
184 | __field(u32, invalidate_domains) | 184 | __field(u32, invalidate_domains) |
185 | ), | 185 | ), |
186 | 186 | ||
187 | TP_fast_assign( | 187 | TP_fast_assign( |
188 | __entry->dev = dev; | 188 | __entry->dev = dev->primary->index; |
189 | __entry->seqno = seqno; | 189 | __entry->seqno = seqno; |
190 | __entry->flush_domains = flush_domains; | 190 | __entry->flush_domains = flush_domains; |
191 | __entry->invalidate_domains = invalidate_domains; | 191 | __entry->invalidate_domains = invalidate_domains; |
192 | ), | 192 | ), |
193 | 193 | ||
194 | TP_printk("dev=%p, seqno=%u, flush=%04x, invalidate=%04x", | 194 | TP_printk("dev=%u, seqno=%u, flush=%04x, invalidate=%04x", |
195 | __entry->dev, __entry->seqno, | 195 | __entry->dev, __entry->seqno, |
196 | __entry->flush_domains, __entry->invalidate_domains) | 196 | __entry->flush_domains, __entry->invalidate_domains) |
197 | ); | 197 | ); |
@@ -204,16 +204,16 @@ TRACE_EVENT(i915_gem_request_complete, | |||
204 | TP_ARGS(dev, seqno), | 204 | TP_ARGS(dev, seqno), |
205 | 205 | ||
206 | TP_STRUCT__entry( | 206 | TP_STRUCT__entry( |
207 | __field(struct drm_device *, dev) | 207 | __field(u32, dev) |
208 | __field(u32, seqno) | 208 | __field(u32, seqno) |
209 | ), | 209 | ), |
210 | 210 | ||
211 | TP_fast_assign( | 211 | TP_fast_assign( |
212 | __entry->dev = dev; | 212 | __entry->dev = dev->primary->index; |
213 | __entry->seqno = seqno; | 213 | __entry->seqno = seqno; |
214 | ), | 214 | ), |
215 | 215 | ||
216 | TP_printk("dev=%p, seqno=%u", __entry->dev, __entry->seqno) | 216 | TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno) |
217 | ); | 217 | ); |
218 | 218 | ||
219 | TRACE_EVENT(i915_gem_request_retire, | 219 | TRACE_EVENT(i915_gem_request_retire, |
@@ -223,16 +223,16 @@ TRACE_EVENT(i915_gem_request_retire, | |||
223 | TP_ARGS(dev, seqno), | 223 | TP_ARGS(dev, seqno), |
224 | 224 | ||
225 | TP_STRUCT__entry( | 225 | TP_STRUCT__entry( |
226 | __field(struct drm_device *, dev) | 226 | __field(u32, dev) |
227 | __field(u32, seqno) | 227 | __field(u32, seqno) |
228 | ), | 228 | ), |
229 | 229 | ||
230 | TP_fast_assign( | 230 | TP_fast_assign( |
231 | __entry->dev = dev; | 231 | __entry->dev = dev->primary->index; |
232 | __entry->seqno = seqno; | 232 | __entry->seqno = seqno; |
233 | ), | 233 | ), |
234 | 234 | ||
235 | TP_printk("dev=%p, seqno=%u", __entry->dev, __entry->seqno) | 235 | TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno) |
236 | ); | 236 | ); |
237 | 237 | ||
238 | TRACE_EVENT(i915_gem_request_wait_begin, | 238 | TRACE_EVENT(i915_gem_request_wait_begin, |
@@ -242,16 +242,16 @@ TRACE_EVENT(i915_gem_request_wait_begin, | |||
242 | TP_ARGS(dev, seqno), | 242 | TP_ARGS(dev, seqno), |
243 | 243 | ||
244 | TP_STRUCT__entry( | 244 | TP_STRUCT__entry( |
245 | __field(struct drm_device *, dev) | 245 | __field(u32, dev) |
246 | __field(u32, seqno) | 246 | __field(u32, seqno) |
247 | ), | 247 | ), |
248 | 248 | ||
249 | TP_fast_assign( | 249 | TP_fast_assign( |
250 | __entry->dev = dev; | 250 | __entry->dev = dev->primary->index; |
251 | __entry->seqno = seqno; | 251 | __entry->seqno = seqno; |
252 | ), | 252 | ), |
253 | 253 | ||
254 | TP_printk("dev=%p, seqno=%u", __entry->dev, __entry->seqno) | 254 | TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno) |
255 | ); | 255 | ); |
256 | 256 | ||
257 | TRACE_EVENT(i915_gem_request_wait_end, | 257 | TRACE_EVENT(i915_gem_request_wait_end, |
@@ -261,16 +261,16 @@ TRACE_EVENT(i915_gem_request_wait_end, | |||
261 | TP_ARGS(dev, seqno), | 261 | TP_ARGS(dev, seqno), |
262 | 262 | ||
263 | TP_STRUCT__entry( | 263 | TP_STRUCT__entry( |
264 | __field(struct drm_device *, dev) | 264 | __field(u32, dev) |
265 | __field(u32, seqno) | 265 | __field(u32, seqno) |
266 | ), | 266 | ), |
267 | 267 | ||
268 | TP_fast_assign( | 268 | TP_fast_assign( |
269 | __entry->dev = dev; | 269 | __entry->dev = dev->primary->index; |
270 | __entry->seqno = seqno; | 270 | __entry->seqno = seqno; |
271 | ), | 271 | ), |
272 | 272 | ||
273 | TP_printk("dev=%p, seqno=%u", __entry->dev, __entry->seqno) | 273 | TP_printk("dev=%u, seqno=%u", __entry->dev, __entry->seqno) |
274 | ); | 274 | ); |
275 | 275 | ||
276 | TRACE_EVENT(i915_ring_wait_begin, | 276 | TRACE_EVENT(i915_ring_wait_begin, |
@@ -280,14 +280,14 @@ TRACE_EVENT(i915_ring_wait_begin, | |||
280 | TP_ARGS(dev), | 280 | TP_ARGS(dev), |
281 | 281 | ||
282 | TP_STRUCT__entry( | 282 | TP_STRUCT__entry( |
283 | __field(struct drm_device *, dev) | 283 | __field(u32, dev) |
284 | ), | 284 | ), |
285 | 285 | ||
286 | TP_fast_assign( | 286 | TP_fast_assign( |
287 | __entry->dev = dev; | 287 | __entry->dev = dev->primary->index; |
288 | ), | 288 | ), |
289 | 289 | ||
290 | TP_printk("dev=%p", __entry->dev) | 290 | TP_printk("dev=%u", __entry->dev) |
291 | ); | 291 | ); |
292 | 292 | ||
293 | TRACE_EVENT(i915_ring_wait_end, | 293 | TRACE_EVENT(i915_ring_wait_end, |
@@ -297,14 +297,14 @@ TRACE_EVENT(i915_ring_wait_end, | |||
297 | TP_ARGS(dev), | 297 | TP_ARGS(dev), |
298 | 298 | ||
299 | TP_STRUCT__entry( | 299 | TP_STRUCT__entry( |
300 | __field(struct drm_device *, dev) | 300 | __field(u32, dev) |
301 | ), | 301 | ), |
302 | 302 | ||
303 | TP_fast_assign( | 303 | TP_fast_assign( |
304 | __entry->dev = dev; | 304 | __entry->dev = dev->primary->index; |
305 | ), | 305 | ), |
306 | 306 | ||
307 | TP_printk("dev=%p", __entry->dev) | 307 | TP_printk("dev=%u", __entry->dev) |
308 | ); | 308 | ); |
309 | 309 | ||
310 | #endif /* _I915_TRACE_H_ */ | 310 | #endif /* _I915_TRACE_H_ */ |