Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2a066f3 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/i915: Use crtc->state for duplication. 



In async mode crtc->config can be updated after the locks are released,
resulting in the wrong state being duplicated.

Note that this also removes a spurious assignment of crtc_state->crtc
introduced in

commit f0c60574
Author: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Date:   Tue Apr 21 17:12:58 2015 +0300

    drm/i915: Call drm helpers when duplicating crtc and plane states

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent bca8013e

drivers/gpu/drm/i915/intel_atomic.c

+1 −9
Original line number Diff line number Diff line
@@ -85,22 +85,14 @@ intel_connector_atomic_get_property(struct drm_connector *connector, 
struct drm_crtc_state *

intel_crtc_duplicate_state(struct drm_crtc *crtc)

{

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	struct intel_crtc_state *crtc_state;



	if (WARN_ON(!intel_crtc->config))

		crtc_state = kzalloc(sizeof(*crtc_state), GFP_KERNEL);

	else

		crtc_state = kmemdup(intel_crtc->config,

				     sizeof(*intel_crtc->config), GFP_KERNEL);



	crtc_state = kmemdup(crtc->state, sizeof(*crtc_state), GFP_KERNEL);

	if (!crtc_state)

		return NULL;



	__drm_atomic_helper_crtc_duplicate_state(crtc, &crtc_state->base);



	crtc_state->base.crtc = crtc;



	return &crtc_state->base;

}