[PATCH 4/4] drm/radeon: Propagate error from drm_fb_helper_init()

2010-06-06 Thread Chris Wilson 
Signed-off-by: Chris Wilson 
---
 drivers/gpu/drm/radeon/radeon_fb.c |   12 +---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_fb.c 
b/drivers/gpu/drm/radeon/radeon_fb.c
index e192acf..dc1634b 100644
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -363,6 +363,7 @@ int radeon_fbdev_init(struct radeon_device *rdev)
 {
struct radeon_fbdev *rfbdev;
int bpp_sel = 32;
+   int ret;

/* select 8 bpp console on RN50 or 16MB cards */
if (ASIC_IS_RN50(rdev) || rdev->mc.real_vram_size <= (32*1024*1024))
@@ -376,9 +377,14 @@ int radeon_fbdev_init(struct radeon_device *rdev)
rdev->mode_info.rfbdev = rfbdev;
rfbdev->helper.funcs = _fb_helper_funcs;

-   drm_fb_helper_init(rdev->ddev, >helper,
-  rdev->num_crtc,
-  RADEONFB_CONN_LIMIT);
+   ret = drm_fb_helper_init(rdev->ddev, >helper,
+rdev->num_crtc,
+RADEONFB_CONN_LIMIT);
+   if (ret) {
+   kfree(rfbdev);
+   return ret;
+   }
+
drm_fb_helper_single_add_all_connectors(>helper);
drm_fb_helper_initial_config(>helper, bpp_sel);
return 0;
-- 
1.7.1

[PATCH 4/4] drm/radeon: Propagate error from drm_fb_helper_init()

2010-06-06 Thread Chris Wilson 
Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
---
 drivers/gpu/drm/radeon/radeon_fb.c |   12 +---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/radeon/radeon_fb.c 
b/drivers/gpu/drm/radeon/radeon_fb.c
index e192acf..dc1634b 100644
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -363,6 +363,7 @@ int radeon_fbdev_init(struct radeon_device *rdev)
 {
struct radeon_fbdev *rfbdev;
int bpp_sel = 32;
+   int ret;
 
/* select 8 bpp console on RN50 or 16MB cards */
if (ASIC_IS_RN50(rdev) || rdev-mc.real_vram_size = (32*1024*1024))
@@ -376,9 +377,14 @@ int radeon_fbdev_init(struct radeon_device *rdev)
rdev-mode_info.rfbdev = rfbdev;
rfbdev-helper.funcs = radeon_fb_helper_funcs;
 
-   drm_fb_helper_init(rdev-ddev, rfbdev-helper,
-  rdev-num_crtc,
-  RADEONFB_CONN_LIMIT);
+   ret = drm_fb_helper_init(rdev-ddev, rfbdev-helper,
+rdev-num_crtc,
+RADEONFB_CONN_LIMIT);
+   if (ret) {
+   kfree(rfbdev);
+   return ret;
+   }
+
drm_fb_helper_single_add_all_connectors(rfbdev-helper);
drm_fb_helper_initial_config(rfbdev-helper, bpp_sel);
return 0;
-- 
1.7.1

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel