On Tue, Jan 20, 2015 at 11:48:23AM +0100, Thierry Reding wrote:
> From: Thierry Reding <treding at nvidia.com>
>
> This callback can be used instead of the legacy ->mode_fixup() and is
> passed the CRTC and connector states. It can thus use these states to
> validate the modeset and cache values in the state to be used during
> the actual modeset.
>
> Signed-off-by: Thierry Reding <treding at nvidia.com>
Yeah, this addition makes sense.
Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
> drivers/gpu/drm/drm_atomic_helper.c | 23 ++++++++++++++++-------
> include/drm/drm_crtc_helper.h | 6 ++++++
> 2 files changed, 22 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c
> b/drivers/gpu/drm/drm_atomic_helper.c
> index 1cb04402cd73..b837d148d880 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -297,13 +297,22 @@ mode_fixup(struct drm_atomic_state *state)
> }
> }
>
> -
> - ret = funcs->mode_fixup(encoder, &crtc_state->mode,
> - &crtc_state->adjusted_mode);
> - if (!ret) {
> - DRM_DEBUG_KMS("[ENCODER:%d:%s] fixup failed\n",
> - encoder->base.id, encoder->name);
> - return -EINVAL;
> + if (funcs->atomic_check) {
> + ret = funcs->atomic_check(encoder, crtc_state,
> + conn_state);
> + if (ret) {
> + DRM_DEBUG_KMS("[ENCODER:%d:%s] check failed\n",
> + encoder->base.id, encoder->name);
> + return ret;
> + }
> + } else {
> + ret = funcs->mode_fixup(encoder, &crtc_state->mode,
> + &crtc_state->adjusted_mode);
> + if (!ret) {
> + DRM_DEBUG_KMS("[ENCODER:%d:%s] fixup failed\n",
> + encoder->base.id, encoder->name);
> + return -EINVAL;
> + }
> }
> }
>
> diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
> index e76828d81a8b..5810c027acdc 100644
> --- a/include/drm/drm_crtc_helper.h
> +++ b/include/drm/drm_crtc_helper.h
> @@ -115,6 +115,7 @@ struct drm_crtc_helper_funcs {
> * @get_crtc: return CRTC that the encoder is currently attached to
> * @detect: connection status detection
> * @disable: disable encoder when not in use (overrides DPMS off)
> + * @atomic_check: check for validity of an atomic update
> *
> * The helper operations are called by the mid-layer CRTC helper.
> */
> @@ -137,6 +138,11 @@ struct drm_encoder_helper_funcs {
> struct drm_connector *connector);
> /* disable encoder when not in use - more explicit than dpms off */
> void (*disable)(struct drm_encoder *encoder);
> +
> + /* atomic helpers */
> + int (*atomic_check)(struct drm_encoder *encoder,
> + struct drm_crtc_state *crtc_state,
> + struct drm_connector_state *conn_state);
> };
>
> /**
> --
> 2.1.3
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
