projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.10-rc2' into drm-intel-next-queued
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
i915
/
intel_ringbuffer.h
diff --git
a/drivers/gpu/drm/i915/intel_ringbuffer.h
b/drivers/gpu/drm/i915/intel_ringbuffer.h
index
d66208c
..
dac1614
100644
(file)
--- a/
drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/
drivers/gpu/drm/i915/intel_ringbuffer.h
@@
-135,7
+135,7
@@
struct intel_ring_buffer {
*/
bool itlb_before_ctx_switch;
struct i915_hw_context *default_context;
- struct
drm_i915_gem_object *last_context_obj
;
+ struct
i915_hw_context *last_context
;
void *private;
};