diff options
author | Jerome Glisse <jglisse@redhat.com> | 2010-01-17 15:21:56 -0500 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2010-01-20 17:47:01 -0500 |
commit | db96380ea26fcc31ab37189aedeabd12894b1431 (patch) | |
tree | ea5b5a5959b81fd2d60a705f96d0d1adeab86881 /drivers/gpu/drm/radeon/rv770.c | |
parent | 7e71c9e2e7704ebf044d4a964e02fbd2098a173f (diff) |
drm/radeon/kms: r600/r700 don't test ib if ib initialization fails
If ib initialization failed don't try to test ib as it will result
in an oops (accessing NULL ib buffer ptr).
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/gpu/drm/radeon/rv770.c')
-rw-r--r-- | drivers/gpu/drm/radeon/rv770.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index c8cf2bc2b911..cf8f2b17d627 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c | |||
@@ -1075,13 +1075,14 @@ int rv770_init(struct radeon_device *rdev) | |||
1075 | if (rdev->accel_working) { | 1075 | if (rdev->accel_working) { |
1076 | r = radeon_ib_pool_init(rdev); | 1076 | r = radeon_ib_pool_init(rdev); |
1077 | if (r) { | 1077 | if (r) { |
1078 | DRM_ERROR("radeon: failed initializing IB pool (%d).\n", r); | 1078 | dev_err(rdev->dev, "IB initialization failed (%d).\n", r); |
1079 | rdev->accel_working = false; | ||
1080 | } | ||
1081 | r = r600_ib_test(rdev); | ||
1082 | if (r) { | ||
1083 | DRM_ERROR("radeon: failed testing IB (%d).\n", r); | ||
1084 | rdev->accel_working = false; | 1079 | rdev->accel_working = false; |
1080 | } else { | ||
1081 | r = r600_ib_test(rdev); | ||
1082 | if (r) { | ||
1083 | dev_err(rdev->dev, "IB test failed (%d).\n", r); | ||
1084 | rdev->accel_working = false; | ||
1085 | } | ||
1085 | } | 1086 | } |
1086 | } | 1087 | } |
1087 | return 0; | 1088 | return 0; |