Merge tag 'amd-drm-next-5.13-2021-03-23' of https://gitlab.freedesktop.org/agd5f...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / display / amdgpu_dm / amdgpu_dm.c

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 ddfdfaf444397ae777e6f141541c3089a2beb770..00edf78975b1b775954377c0b6d2282235e04b6b 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -990,8 +990,7 @@ static void event_mall_stutter(struct work_struct *work)
        else
                dm->active_vblank_irq_count--;
 
-       dc_allow_idle_optimizations(
-               dm->dc, dm->active_vblank_irq_count == 0);
+       dc_allow_idle_optimizations(dm->dc, dm->active_vblank_irq_count == 0);
 
        DRM_DEBUG_DRIVER("Allow idle optimizations (MALL): %d\n", dm->active_vblank_irq_count == 0);
 
@@ -4689,7 +4688,6 @@ fill_dc_plane_info_and_addr(struct amdgpu_device *adev,
        const struct drm_framebuffer *fb = plane_state->fb;
        const struct amdgpu_framebuffer *afb =
                to_amdgpu_framebuffer(plane_state->fb);
-       struct drm_format_name_buf format_name;
        int ret;
 
        memset(plane_info, 0, sizeof(*plane_info));
@@ -4737,8 +4735,8 @@ fill_dc_plane_info_and_addr(struct amdgpu_device *adev,
                break;
        default:
                DRM_ERROR(
-                       "Unsupported screen format %s\n",
-                       drm_get_format_name(fb->format->format, &format_name));
+                       "Unsupported screen format %p4cc\n",
+                       &fb->format->format);
                return -EINVAL;
        }
 
@@ -6730,8 +6728,10 @@ static int dm_plane_helper_check_state(struct drm_plane_state *state,
 }
 
 static int dm_plane_atomic_check(struct drm_plane *plane,
-                                struct drm_plane_state *state)
+                                struct drm_atomic_state *state)
 {
+       struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
+                                                                                plane);
        struct amdgpu_device *adev = drm_to_adev(plane->dev);
        struct dc *dc = adev->dm.dc;
        struct dm_plane_state *dm_plane_state;
@@ -6739,23 +6739,24 @@ static int dm_plane_atomic_check(struct drm_plane *plane,
        struct drm_crtc_state *new_crtc_state;
        int ret;
 
-       trace_amdgpu_dm_plane_atomic_check(state);
+       trace_amdgpu_dm_plane_atomic_check(new_plane_state);
 
-       dm_plane_state = to_dm_plane_state(state);
+       dm_plane_state = to_dm_plane_state(new_plane_state);
 
        if (!dm_plane_state->dc_state)
                return 0;
 
        new_crtc_state =
-               drm_atomic_get_new_crtc_state(state->state, state->crtc);
+               drm_atomic_get_new_crtc_state(state,
+                                             new_plane_state->crtc);
        if (!new_crtc_state)
                return -EINVAL;
 
-       ret = dm_plane_helper_check_state(state, new_crtc_state);
+       ret = dm_plane_helper_check_state(new_plane_state, new_crtc_state);
        if (ret)
                return ret;
 
-       ret = fill_dc_scaling_info(state, &scaling_info);
+       ret = fill_dc_scaling_info(new_plane_state, &scaling_info);
        if (ret)
                return ret;
 
@@ -6766,7 +6767,7 @@ static int dm_plane_atomic_check(struct drm_plane *plane,
 }
 
 static int dm_plane_atomic_async_check(struct drm_plane *plane,
-                                      struct drm_plane_state *new_plane_state)
+                                      struct drm_atomic_state *state)
 {
        /* Only support async updates on cursor planes. */
        if (plane->type != DRM_PLANE_TYPE_CURSOR)
@@ -6776,10 +6777,12 @@ static int dm_plane_atomic_async_check(struct drm_plane *plane,
 }
 
 static void dm_plane_atomic_async_update(struct drm_plane *plane,
-                                        struct drm_plane_state *new_state)
+                                        struct drm_atomic_state *state)
 {
+       struct drm_plane_state *new_state = drm_atomic_get_new_plane_state(state,
+                                                                          plane);
        struct drm_plane_state *old_state =
-               drm_atomic_get_old_plane_state(new_state->state, plane);
+               drm_atomic_get_old_plane_state(state, plane);
 
        trace_amdgpu_dm_atomic_update_cursor(new_state);