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

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
...@@ -250,8 +250,12 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc) ...@@ -250,8 +250,12 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)
crtc_state = kmemdup(intel_crtc->config, crtc_state = kmemdup(intel_crtc->config,
sizeof(*intel_crtc->config), GFP_KERNEL); sizeof(*intel_crtc->config), GFP_KERNEL);
if (crtc_state) if (!crtc_state)
crtc_state->base.crtc = crtc; return NULL;
__drm_atomic_helper_crtc_duplicate_state(crtc, &crtc_state->base);
crtc_state->base.crtc = crtc;
return &crtc_state->base; return &crtc_state->base;
} }
......
...@@ -85,8 +85,8 @@ intel_plane_duplicate_state(struct drm_plane *plane) ...@@ -85,8 +85,8 @@ intel_plane_duplicate_state(struct drm_plane *plane)
return NULL; return NULL;
state = &intel_state->base; state = &intel_state->base;
if (state->fb)
drm_framebuffer_reference(state->fb); __drm_atomic_helper_plane_duplicate_state(plane, state);
return state; return state;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment