diff options
Diffstat (limited to 'drivers/gpu/drm/qxl/qxl_display.c')
| -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,  |