Instead of manually adjusting the plane state.

Signed-off-by: Christian König <christian.koe...@amd.com>
Cc: Karol Herbst <kher...@redhat.com>
Cc: Lyude Paul <ly...@redhat.com>
Cc: Ben Skeggs <bske...@redhat.com>
Cc: Maxime Ripard <max...@cerno.tech>
---
 drivers/gpu/drm/nouveau/dispnv50/wndw.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.c 
b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
index 8642b84ea20c..bb8a4601e0d9 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
@@ -32,6 +32,7 @@
 
 #include <drm/drm_atomic.h>
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_gem_atomic_helper.h>
 #include <drm/drm_fourcc.h>
 
 #include "nouveau_bo.h"
@@ -558,9 +559,7 @@ nv50_wndw_prepare_fb(struct drm_plane *plane, struct 
drm_plane_state *state)
                        asyw->image.handle[0] = ctxdma->object.handle;
        }
 
-       ret = dma_resv_get_singleton(nvbo->bo.base.resv,
-                                    DMA_RESV_USAGE_WRITE,
-                                    &asyw->state.fence);
+       ret = drm_gem_plane_helper_prepare_fb(plane, state);
        if (ret)
                return ret;
 
-- 
2.25.1

Reply via email to