20.09.2013, в 22:33, Alex Deucher <alexdeucher@xxxxxxxxx> написал(а):
> On Fri, Sep 20, 2013 at 9:36 AM, Alex Ivanov <gnidorah@xxxxxxxxx> wrote:
>> Prevent NULL pointer dereference in case when radeon_ring_fini() did it's job.
>>
>> Reading of r100_cp_ring_info and radeon_ring_gfx debugfs entries will lead to a KP if ring buffer was deallocated, e.g. on failed ring test.
>> Seen on PA-RISC machine having "radeon: ring test failed (scratch(0x8504)=0xCAFEDEAD)" issue.
>>
>> Signed-off-by: Alex Ivanov <gnidorah@xxxxxxxxx>
>
> Applied. thanks!
>
> Alex
One more. Thank you!
Signed-off-by: Alex Ivanov <gnidorah@xxxxxxxxx>
---
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index e29faa7..e6d1897 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -1319,6 +1319,11 @@ int radeon_device_init(struct radeon_device *rdev,
if (r)
return r;
}
+ /* If ring buffer or PCI GART got uninitialized, we should't run tests */
+ if (!rdev->accel_working) {
+ DRM_INFO("radeon: acceleration disabled, skipping tests and benchmark.\n");
+ return 0;
+ }
if ((radeon_testing & 1)) {
radeon_test_moves(rdev);
}
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
