diff options
| author |   Christian König <christian.koenig@amd.com> | 2022-04-29 15:29:08 +0200 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2022-05-05 12:30:10 +0200 |
| commit | 6071c4c2a319da360b0bf2bc397d4fefad10b2c8 (patch) | |
| tree | fc706c015190c700e499c920c05f6888842111e8 | |
| parent | drm/todo: Add entry for using kunit in the subsystem (diff) | |
| download | linux-dev-6071c4c2a319da360b0bf2bc397d4fefad10b2c8.tar.xz linux-dev-6071c4c2a319da360b0bf2bc397d4fefad10b2c8.zip | |
drm/qxl: add drm_gem_plane_helper_prepare_fb
We could need to wait for the pin to complete here.
Signed-off-by: Christian König <christian.koenig@amd.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: virtualization@lists.linux-foundation.org
Cc: spice-devel@lists.freedesktop.org
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220429134230.24334-4-christian.koenig@amd.com
| -rw-r--r-- | drivers/gpu/drm/qxl/qxl_display.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c index 9a9c29b1d3e1..9a64fa4c7530 100644 --- a/drivers/gpu/drm/qxl/qxl_display.c +++ b/drivers/gpu/drm/qxl/qxl_display.c @@ -34,6 +34,7 @@ #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> #include <drm/drm_simple_kms_helper.h> +#include <drm/drm_gem_atomic_helper.h> #include "qxl_drv.h" #include "qxl_object.h" @@ -829,6 +830,7 @@ static int qxl_plane_prepare_fb(struct drm_plane *plane, struct qxl_device *qdev = to_qxl(plane->dev); struct drm_gem_object *obj; struct qxl_bo *user_bo; + int ret; if (!new_state->fb) return 0; @@ -852,7 +854,11 @@ static int qxl_plane_prepare_fb(struct drm_plane *plane, qxl_free_cursor(old_cursor_bo); } - return qxl_bo_pin(user_bo); + ret = qxl_bo_pin(user_bo); + if (ret) + return ret; + + return drm_gem_plane_helper_prepare_fb(plane, new_state); } static void qxl_plane_cleanup_fb(struct drm_plane *plane, |