Skip to content

Commit 51e857a

Browse files
atseanpaulmlankhorst
authored andcommitted
drm/amdgpu: Fix connector atomic_check compilation fail
I missed amdgpu in my connnector_helper_funcs->atomic_check conversion, which is understandably causing compilation failures. Fixes: 6f3b627 ("drm: Convert connector_helper_funcs->atomic_check to accept drm_atomic_state") Cc: Daniel Vetter <[email protected]> Cc: Ville Syrjälä <[email protected]> Cc: Jani Nikula <[email protected]> Cc: Joonas Lahtinen <[email protected]> Cc: Rodrigo Vivi <[email protected]> Cc: Ben Skeggs <[email protected]> Cc: Laurent Pinchart <[email protected]> Cc: Kieran Bingham <[email protected]> Cc: Eric Anholt <[email protected]> Cc: Laurent Pinchart <[email protected]> [for rcar lvds] Cc: Sean Paul <[email protected]> Cc: Maarten Lankhorst <[email protected]> Cc: Maxime Ripard <[email protected]> Cc: Sean Paul <[email protected]> Cc: David Airlie <[email protected]> Cc: Lyude Paul <[email protected]> Cc: Karol Herbst <[email protected]> Cc: Ilia Mirkin <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Reported-by: Chris Wilson <[email protected]> Signed-off-by: Sean Paul <[email protected]> Signed-off-by: Maarten Lankhorst <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 9f9b255 commit 51e857a

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3953,9 +3953,10 @@ is_hdr_metadata_different(const struct drm_connector_state *old_state,
39533953

39543954
static int
39553955
amdgpu_dm_connector_atomic_check(struct drm_connector *conn,
3956-
struct drm_connector_state *new_con_state)
3956+
struct drm_atomic_state *state)
39573957
{
3958-
struct drm_atomic_state *state = new_con_state->state;
3958+
struct drm_connector_state *new_con_state =
3959+
drm_atomic_get_new_connector_state(state, conn);
39593960
struct drm_connector_state *old_con_state =
39603961
drm_atomic_get_old_connector_state(state, conn);
39613962
struct drm_crtc *crtc = new_con_state->crtc;

0 commit comments

Comments
 (0)