diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2015-09-10 17:08:02 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-09-10 19:27:17 +0300 |
| commit | bca8013ec24210087bfed49678ec821c811982b1 (patch) | |
| tree | ba8ac425fee17b34b752d7016ad2b93be553e277 /drivers/gpu/drm/i915/intel_atomic_plane.c | |
| parent | 8e0e9ceaa05317c6644635f8816705b609f2c274 (diff) | |
| download | linux-bca8013ec24210087bfed49678ec821c811982b1.tar.xz | |
drm/i915: Do not handle a null plane state.
With the conversion to atomic this cannot happen any more.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_atomic_plane.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_atomic_plane.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c index f1ab8e4b9c11..a11980696595 100644 --- a/drivers/gpu/drm/i915/intel_atomic_plane.c +++ b/drivers/gpu/drm/i915/intel_atomic_plane.c @@ -76,11 +76,7 @@ intel_plane_duplicate_state(struct drm_plane *plane) struct drm_plane_state *state; struct intel_plane_state *intel_state; - if (WARN_ON(!plane->state)) - intel_state = intel_create_plane_state(plane); - else - intel_state = kmemdup(plane->state, sizeof(*intel_state), - GFP_KERNEL); + intel_state = kmemdup(plane->state, sizeof(*intel_state), GFP_KERNEL); if (!intel_state) return NULL; |