diff mbox

qxl: catch qxlfb_create_pinned_object failures

Message ID 1463072816-11788-1-git-send-email-kraxel@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Gerd Hoffmann May 12, 2016, 5:06 p.m. UTC 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 drivers/gpu/drm/qxl/qxl_fb.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Daniel Vetter May 17, 2016, 7:11 a.m. UTC | #1 
On Thu, May 12, 2016 at 07:06:56PM +0200, Gerd Hoffmann wrote:
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Applied to drm-misc, thanks.
-Daniel

> ---
>  drivers/gpu/drm/qxl/qxl_fb.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c
> index 7136e52..17c1ef0 100644
> --- a/drivers/gpu/drm/qxl/qxl_fb.c
> +++ b/drivers/gpu/drm/qxl/qxl_fb.c
> @@ -360,6 +360,9 @@ static int qxlfb_create(struct qxl_fbdev *qfbdev,
>  	mode_cmd.pixel_format = drm_mode_legacy_fb_format(bpp, depth);
>  
>  	ret = qxlfb_create_pinned_object(qfbdev, &mode_cmd, &gobj);
> +	if (ret < 0)
> +		return ret;
> +
>  	qbo = gem_to_qxl_bo(gobj);
>  	QXL_INFO(qdev, "%s: %dx%d %d\n", __func__, mode_cmd.width,
>  		 mode_cmd.height, mode_cmd.pitches[0]);
> -- 
> 1.8.3.1
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff mbox

Patch

diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c
index 7136e52..17c1ef0 100644
--- a/drivers/gpu/drm/qxl/qxl_fb.c
+++ b/drivers/gpu/drm/qxl/qxl_fb.c
@@ -360,6 +360,9 @@  static int qxlfb_create(struct qxl_fbdev *qfbdev,
 	mode_cmd.pixel_format = drm_mode_legacy_fb_format(bpp, depth);
 
 	ret = qxlfb_create_pinned_object(qfbdev, &mode_cmd, &gobj);
+	if (ret < 0)
+		return ret;
+
 	qbo = gem_to_qxl_bo(gobj);
 	QXL_INFO(qdev, "%s: %dx%d %d\n", __func__, mode_cmd.width,
 		 mode_cmd.height, mode_cmd.pitches[0]);