Skip to content

Commit

Permalink
drm/i915: Do not handle a null plane state.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Maarten Lankhorst authored and Daniel Vetter committed Sep 10, 2015
1 parent 8e0e9ce commit bca8013
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions drivers/gpu/drm/i915/intel_atomic_plane.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit bca8013

Please sign in to comment.