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

Commit f0c60574 authored by Ander Conselvan de Oliveira's avatar Ander Conselvan de Oliveira Committed by Daniel Vetter
Browse files

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



Use the helpers introduced by the commit below to properly initialize
the duplicated states.

commit f5e7840b
Author: Thierry Reding <treding@nvidia.com>
Date:   Wed Jan 28 14:54:32 2015 +0100

    drm/atomic: Add helpers for state-subclassing drivers

Signed-off-by: default avatarAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e5d958ef

drivers/gpu/drm/i915/intel_atomic.c

+6 −2
Original line number Diff line number Diff line
@@ -250,7 +250,11 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc) 
		crtc_state = kmemdup(intel_crtc->config,

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



	if (crtc_state)

	if (!crtc_state)

		return NULL;



	__drm_atomic_helper_crtc_duplicate_state(crtc, &crtc_state->base);



	crtc_state->base.crtc = crtc;



	return &crtc_state->base;

drivers/gpu/drm/i915/intel_atomic_plane.c

+2 −2
Original line number Diff line number Diff line
@@ -85,8 +85,8 @@ intel_plane_duplicate_state(struct drm_plane *plane) 
		return NULL;



	state = &intel_state->base;

	if (state->fb)

		drm_framebuffer_reference(state->fb);



	__drm_atomic_helper_plane_duplicate_state(plane, state);



	return state;

}