[Intel-gfx] [PATCH] drm/amdgpu: Fix connector atomic_check compilation fail

[Maarten Lankhorst]

Op 14-06-2019 om 02:27 schreef Sean Paul:
> From: Sean Paul <seanpaul at chromium.org>
>
> I missed amdgpu in my connnector_helper_funcs->atomic_check conversion,
> which is understandably causing compilation failures.
>
> Fixes: 6f3b62781bbd ("drm: Convert connector_helper_funcs->atomic_check to accept drm_atomic_state")
> Cc: Daniel Vetter <daniel at ffwll.ch>
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Cc: Jani Nikula <jani.nikula at linux.intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Cc: Ben Skeggs <bskeggs at redhat.com>
> Cc: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> Cc: Kieran Bingham <kieran.bingham+renesas at ideasonboard.com>
> Cc: Eric Anholt <eric at anholt.net>
> Cc: Laurent Pinchart <laurent.pinchart at ideasonboard.com> [for rcar lvds]
> Cc: Sean Paul <seanpaul at chromium.org>
> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Cc: Maxime Ripard <maxime.ripard at bootlin.com>
> Cc: Sean Paul <sean at poorly.run>
> Cc: David Airlie <airlied at linux.ie>
> Cc: Lyude Paul <lyude at redhat.com>
> Cc: Karol Herbst <karolherbst at gmail.com>
> Cc: Ilia Mirkin <imirkin at alum.mit.edu>
> Cc: dri-devel at lists.freedesktop.org
> Cc: intel-gfx at lists.freedesktop.org
> Cc: linux-renesas-soc at vger.kernel.org
> Reported-by: Chris Wilson <chris at chris-wilson.co.uk>
> Signed-off-by: Sean Paul <seanpaul at chromium.org>
> ---
>  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 3a723e553a193..3d5e828c3d284 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -3953,9 +3953,10 @@ is_hdr_metadata_different(const struct drm_connector_state *old_state,
>  
>  static int
>  amdgpu_dm_connector_atomic_check(struct drm_connector *conn,
> -				 struct drm_connector_state *new_con_state)
> +				 struct drm_atomic_state *state)
>  {
> -	struct drm_atomic_state *state = new_con_state->state;
> +	struct drm_connector_state *new_con_state =
> +		drm_atomic_get_new_connector_state(state, conn);
>  	struct drm_connector_state *old_con_state =
>  		drm_atomic_get_old_connector_state(state, conn);
>  	struct drm_crtc *crtc = new_con_state->crtc;

Thanks, applied. :)