From 3ff28f33afb016e2635565dbf39dc5ddb2b0329c Mon Sep 17 00:00:00 2001 From: Jerome Glisse Date: Sun, 17 Jan 2010 21:21:41 +0100 Subject: [PATCH] --- yaml --- r: 179927 b: refs/heads/master c: 7e71c9e2e7704ebf044d4a964e02fbd2098a173f h: refs/heads/master i: 179925: 466cc370168ac1a989460c67e811f83dc306a632 179923: 0598fd743cdd92ff05ff1150bf49bc4edbe269ea 179919: dc025af6baa3556a38d76e5bd43099f7977885ae v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_display.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a7e7ef91a85a..1d2d41ad1514 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7924e5eb8fe422d6b1ce3b3e2be749a480dfcdd9 +refs/heads/master: 7e71c9e2e7704ebf044d4a964e02fbd2098a173f diff --git a/trunk/drivers/gpu/drm/radeon/radeon_display.c b/trunk/drivers/gpu/drm/radeon/radeon_display.c index 49f3c69cf240..f899320f0a6b 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_display.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_display.c @@ -715,7 +715,11 @@ radeon_user_framebuffer_create(struct drm_device *dev, struct drm_gem_object *obj; obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handle); - + if (obj == NULL) { + dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, " + "can't create framebuffer\n", mode_cmd->handle); + return NULL; + } return radeon_framebuffer_create(dev, mode_cmd, obj); }