Reviewed-by: Ander Conselvan de Oliveira <conselvan2@xxxxxxxxx>
On Thu, 2015-07-30 at 14:57 +0200, Maarten Lankhorst wrote:
> First step in removing dpms and validating atomic state.
>
> There can still be a mismatch in the connector state because the dpms
> callbacks are still used, but this can not happen immediately after a modeset.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_crt.c | 2 --
> drivers/gpu/drm/i915/intel_display.c | 12 ++++++------
> drivers/gpu/drm/i915/intel_drv.h | 1 -
> drivers/gpu/drm/i915/intel_dvo.c | 2 --
> drivers/gpu/drm/i915/intel_sdvo.c | 2 --
> 5 files changed, 6 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
> index 5d78c1feec81..9eba3dd5b434 100644
> --- a/drivers/gpu/drm/i915/intel_crt.c
> +++ b/drivers/gpu/drm/i915/intel_crt.c
> @@ -280,8 +280,6 @@ static int intel_crt_dpms(struct drm_connector *connector, int mode)
> intel_crtc_update_dpms(crtc);
> }
>
> - intel_modeset_check_state(connector->dev);
> -
> return 0;
> }
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index dfe4407b0390..77b4da7e698c 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -6440,8 +6440,6 @@ int intel_connector_dpms(struct drm_connector *connector, int mode)
> if (connector->encoder)
> intel_encoder_dpms(to_intel_encoder(connector->encoder), mode);
>
> - intel_modeset_check_state(connector->dev);
> -
> return 0;
> }
>
> @@ -12900,8 +12898,9 @@ check_shared_dpll_state(struct drm_device *dev)
> }
> }
>
> -void
> -intel_modeset_check_state(struct drm_device *dev)
> +static void
> +intel_modeset_check_state(struct drm_device *dev,
> + struct drm_atomic_state *old_state)
> {
> check_wm_state(dev);
> check_connector_state(dev);
> @@ -13290,10 +13289,11 @@ static int intel_atomic_commit(struct drm_device *dev,
>
> drm_atomic_helper_wait_for_vblanks(dev, state);
> drm_atomic_helper_cleanup_planes(dev, state);
> - drm_atomic_state_free(state);
>
> if (any_ms)
> - intel_modeset_check_state(dev);
> + intel_modeset_check_state(dev, state);
> +
> + drm_atomic_state_free(state);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 320c9e6bd848..0da4236dc85a 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -999,7 +999,6 @@ int intel_connector_init(struct intel_connector *);
> struct intel_connector *intel_connector_alloc(void);
> int intel_connector_dpms(struct drm_connector *, int mode);
> bool intel_connector_get_hw_state(struct intel_connector *connector);
> -void intel_modeset_check_state(struct drm_device *dev);
> bool ibx_digital_port_connected(struct drm_i915_private *dev_priv,
> struct intel_digital_port *port);
> void intel_connector_attach_encoder(struct intel_connector *connector,
> diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
> index fd5e522abebb..600f7fb855d8 100644
> --- a/drivers/gpu/drm/i915/intel_dvo.c
> +++ b/drivers/gpu/drm/i915/intel_dvo.c
> @@ -237,8 +237,6 @@ static int intel_dvo_dpms(struct drm_connector *connector, int mode)
> intel_crtc_update_dpms(crtc);
> }
>
> - intel_modeset_check_state(connector->dev);
> -
> return 0;
> }
>
> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
> index 2c435a79d4da..8911e0e417ee 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> @@ -1550,8 +1550,6 @@ static int intel_sdvo_dpms(struct drm_connector *connector, int mode)
> intel_sdvo_set_active_outputs(intel_sdvo, intel_sdvo->attached_output);
> }
>
> - intel_modeset_check_state(connector->dev);
> -
> return 0;
> }
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
