projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge drm/drm-next into drm-intel-next-queued
[linux-block.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_drv.h
diff --git
a/drivers/gpu/drm/i915/i915_drv.h
b/drivers/gpu/drm/i915/i915_drv.h
index 2697960f15a9d3d2335d76e1fcbefcfa7561cc71..9aad3ec979bdb167fc9562402d0af342cf5faa63 100644
(file)
--- a/
drivers/gpu/drm/i915/i915_drv.h
+++ b/
drivers/gpu/drm/i915/i915_drv.h
@@
-827,6
+827,9
@@
struct i915_selftest_stash {
struct drm_i915_private {
struct drm_device drm;
struct drm_i915_private {
struct drm_device drm;
+ /* FIXME: Device release actions should all be moved to drmm_ */
+ bool do_release;
+
/* i915 device parameters */
struct i915_params params;
/* i915 device parameters */
struct i915_params params;