From c07a2d1194fc694785771643c413c44adf7635d3 Mon Sep 17 00:00:00 2001 From: Matt Roper Date: Mon, 6 Jul 2015 09:19:24 -0700 Subject: [PATCH] drm/i915: Don't dereference NULL plane while setting up scalers intel_atomic_setup_scalers() dereferences 'plane' before the plane has been assigned. The plane ID assignment doing this dereference is only needed for debugging messages later in the function, so just move the assignment farther down the function to a point where plane will no longer be NULL. This was introduced in: commit 133b0d128be39e308ccd3b3d765c31ebdbf5380e Author: Maarten Lankhorst Date: Mon Jun 15 12:33:39 2015 +0200 drm/i915: Clean up intel_atomic_setup_scalers slightly. Cc: Maarten Lankhorst Cc: Bob Paauwe Reported-by: Bob Paauwe Signed-off-by: Matt Roper Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_atomic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c index 0aeced82201e..5c79a31603af 100644 --- a/drivers/gpu/drm/i915/intel_atomic.c +++ b/drivers/gpu/drm/i915/intel_atomic.c @@ -325,7 +325,6 @@ int intel_atomic_setup_scalers(struct drm_device *dev, scaler_id = &scaler_state->scaler_id; } else { name = "PLANE"; - idx = plane->base.id; if (!drm_state) continue; @@ -359,6 +358,7 @@ int intel_atomic_setup_scalers(struct drm_device *dev, } intel_plane = to_intel_plane(plane); + idx = plane->base.id; /* plane on different crtc cannot be a scaler user of this crtc */ if (WARN_ON(intel_plane->pipe != intel_crtc->pipe)) { -- 2.30.2