On Wed, Feb 24, 2016 at 09:37:29AM +0100, Maarten Lankhorst wrote:
> Minor cleanup, connector and connector_state are always non-NULL here.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
> drivers/gpu/drm/drm_atomic_helper.c | 15 +++++----------
> 1 file changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c
> b/drivers/gpu/drm/drm_atomic_helper.c
> index a0226d4b949a..3d1f97a832fc 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -215,22 +215,16 @@ steal_encoder(struct drm_atomic_state *state,
> }
>
> static int
> -update_connector_routing(struct drm_atomic_state *state, int conn_idx)
> +update_connector_routing(struct drm_atomic_state *state,
> + struct drm_connector *connector,
> + struct drm_connector_state *connector_state)
> {
> const struct drm_connector_helper_funcs *funcs;
> struct drm_encoder *new_encoder;
> struct drm_crtc *encoder_crtc;
> - struct drm_connector *connector;
> - struct drm_connector_state *connector_state;
> struct drm_crtc_state *crtc_state;
> int idx, ret;
>
> - connector = state->connectors[conn_idx];
> - connector_state = state->connector_states[conn_idx];
> -
> - if (!connector)
> - return 0;
> -
> DRM_DEBUG_ATOMIC("Updating routing for [CONNECTOR:%d:%s]\n",
> connector->base.id,
> connector->name);
> @@ -494,7 +488,8 @@ drm_atomic_helper_check_modeset(struct drm_device *dev,
> * drivers must set crtc->mode_changed themselves when connector
> * properties need to be updated.
> */
> - ret = update_connector_routing(state, i);
> + ret = update_connector_routing(state, connector,
> + connector_state);
> if (ret)
> return ret;
> }
> --
> 2.1.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
