From: Maarten Lankhorst Date: Thu, 10 Sep 2015 14:08:02 +0000 (+0200) Subject: drm/i915: Do not handle a null plane state. X-Git-Tag: MMI-PSA29.97-13-9~7427^2~45^2~1517 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bca8013ec24210087bfed49678ec821c811982b1;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/i915: Do not handle a null plane state. With the conversion to atomic this cannot happen any more. Signed-off-by: Maarten Lankhorst Signed-off-by: Daniel Vetter --- 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;