Commit a0909cc5 authored by Boris Brezillon's avatar Boris Brezillon Committed by Daniel Vetter

drm/atomic: Handle funcs->best_encoder == NULL case

Fallback drm_atomic_helper_best_encoder() is funcs->best_encoder() is NULL
so that DRM drivers can leave this hook unassigned if they know they want
to use drm_atomic_helper_best_encoder().
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20160601180337.28e0917b@bbrezillon
parent 66fd7a66
...@@ -110,8 +110,10 @@ static int handle_conflicting_encoders(struct drm_atomic_state *state, ...@@ -110,8 +110,10 @@ static int handle_conflicting_encoders(struct drm_atomic_state *state,
if (funcs->atomic_best_encoder) if (funcs->atomic_best_encoder)
new_encoder = funcs->atomic_best_encoder(connector, conn_state); new_encoder = funcs->atomic_best_encoder(connector, conn_state);
else else if (funcs->best_encoder)
new_encoder = funcs->best_encoder(connector); new_encoder = funcs->best_encoder(connector);
else
new_encoder = drm_atomic_helper_best_encoder(connector);
if (new_encoder) { if (new_encoder) {
if (encoder_mask & (1 << drm_encoder_index(new_encoder))) { if (encoder_mask & (1 << drm_encoder_index(new_encoder))) {
......
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