diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-12-21 13:46:30 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-12-21 13:46:30 +0300 |
| commit | 1d9d4495001d3c470e5c902ff35a6aa626924fc1 (patch) | |
| tree | 1ae39f4ccadb610bc16fea88a1f93b23a4df37b1 /drivers/gpu/drm/i915/intel_atomic_plane.c | |
| parent | d3d33aabac51341065bcce0e9c2d9d27902a08c4 (diff) | |
| parent | e2dc7d7d8ed3019f72855af1c3dcda3fb456b488 (diff) | |
| download | linux-1d9d4495001d3c470e5c902ff35a6aa626924fc1.tar.xz | |
Merge branch 'topic/hdmi-jack' into for-next
Diffstat (limited to 'drivers/gpu/drm/i915/intel_atomic_plane.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_atomic_plane.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c index a11980696595..c6bb0fc1edfb 100644 --- a/drivers/gpu/drm/i915/intel_atomic_plane.c +++ b/drivers/gpu/drm/i915/intel_atomic_plane.c @@ -84,6 +84,7 @@ intel_plane_duplicate_state(struct drm_plane *plane) state = &intel_state->base; __drm_atomic_helper_plane_duplicate_state(plane, state); + intel_state->wait_req = NULL; return state; } @@ -100,6 +101,7 @@ void intel_plane_destroy_state(struct drm_plane *plane, struct drm_plane_state *state) { + WARN_ON(state && to_intel_plane_state(state)->wait_req); drm_atomic_helper_plane_destroy_state(plane, state); } |