diff options
| author | Jerome Glisse <jglisse@redhat.com> | 2010-02-04 17:27:27 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-02-05 02:43:09 +0100 |
| commit | c38c7b64a2747a211c3a6e8e5919ee25ccd474e7 (patch) | |
| tree | f994fb9585b8064db19ceda25a9be127655ceee0 /drivers/gpu/drm/radeon/rv770.c | |
| parent | drm/radeon/kms: Fix oops after radeon_cs_parser_init() failure. (diff) | |
| download | linux-c38c7b64a2747a211c3a6e8e5919ee25ccd474e7.tar.xz linux-c38c7b64a2747a211c3a6e8e5919ee25ccd474e7.zip | |
drm/radeon/kms: move blit initialization after we disabled VGA
VGA might be overwritting VRAM and corrupt our blit shader leading
to corruption, it likely won't happen if you load fbcon right after
radeon. Thanks to Shawn Starr and Andre Maasikas for tracking down
this issue.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/rv770.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/rv770.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 2d465768ac71..06b037eebef5 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c @@ -887,6 +887,12 @@ static int rv770_startup(struct radeon_device *rdev) return r; } rv770_gpu_init(rdev); + r = r600_blit_init(rdev); + if (r) { + r600_blit_fini(rdev); + rdev->asic->copy = NULL; + dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r); + } /* pin copy shader into vram */ if (rdev->r600_blit.shader_obj) { r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false); @@ -1055,12 +1061,6 @@ int rv770_init(struct radeon_device *rdev) r = r600_pcie_gart_init(rdev); if (r) return r; - r = r600_blit_init(rdev); - if (r) { - r600_blit_fini(rdev); - rdev->asic->copy = NULL; - dev_warn(rdev->dev, "failed blitter (%d) falling back to memcpy\n", r); - } rdev->accel_working = true; r = rv770_startup(rdev); |