Attachment 62674 Details for Bug 43448 – libdrm fix

[patch] libdrm fix

0001-radeon-fall-back-to-1D-tiling-only-with-broken-kerne.patch (text/plain), 3.09 KB, created by Alex Deucher on 2012-06-06 06:26:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2012-06-06 06:26:50 UTC

Size: 3.09 KB

patch

obsolete

>From 4a25a3aaa4ab8c8155081f253f45416a3eea5a0d Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Wed, 6 Jun 2012 09:12:37 -0400
>Subject: [PATCH] radeon: fall back to 1D tiling only with broken kernels
>
>Certain cards report the the wrong bank setup which causes
>surface init to fail in the ddx and leads to no accel.
>If we hit an invalid tiling parameter, just set a default
>value and disable 2D tiling.
>
>Should fix:
>https://bugs.freedesktop.org/show_bug.cgi?id=43448
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>---
> radeon/radeon_surface.c |   28 +++++++++++++++++++++-------
> 1 files changed, 21 insertions(+), 7 deletions(-)
>
>diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c
>index a7b488b..adf209d 100644
>--- a/radeon/radeon_surface.c
>+++ b/radeon/radeon_surface.c
>@@ -206,7 +206,9 @@ static int r6_init_hw_info(struct radeon_surface_manager *surf_man)
>         surf_man->hw_info.num_pipes = 8;
>         break;
>     default:
>-        return -EINVAL;
>+        surf_man->hw_info.num_pipes = 8;
>+        surf_man->hw_info.allow_2d = 0;
>+        break;
>     }
> 
>     switch ((tiling_config & 0x30) >> 4) {
>@@ -217,7 +219,9 @@ static int r6_init_hw_info(struct radeon_surface_manager *surf_man)
>         surf_man->hw_info.num_banks = 8;
>         break;
>     default:
>-        return -EINVAL;
>+        surf_man->hw_info.num_banks = 8;
>+        surf_man->hw_info.allow_2d = 0;
>+        break;
>     }
> 
>     switch ((tiling_config & 0xc0) >> 6) {
>@@ -228,7 +232,9 @@ static int r6_init_hw_info(struct radeon_surface_manager *surf_man)
>         surf_man->hw_info.group_bytes = 512;
>         break;
>     default:
>-        return -EINVAL;
>+        surf_man->hw_info.group_bytes = 256;
>+        surf_man->hw_info.allow_2d = 0;
>+        break;
>     }
>     return 0;
> }
>@@ -458,7 +464,9 @@ static int eg_init_hw_info(struct radeon_surface_manager *surf_man)
>         surf_man->hw_info.num_pipes = 8;
>         break;
>     default:
>-        return -EINVAL;
>+        surf_man->hw_info.num_pipes = 8;
>+        surf_man->hw_info.allow_2d = 0;
>+        break;
>     }
> 
>     switch ((tiling_config & 0xf0) >> 4) {
>@@ -472,7 +480,9 @@ static int eg_init_hw_info(struct radeon_surface_manager *surf_man)
>         surf_man->hw_info.num_banks = 16;
>         break;
>     default:
>-        return -EINVAL;
>+        surf_man->hw_info.num_banks = 8;
>+        surf_man->hw_info.allow_2d = 0;
>+        break;
>     }
> 
>     switch ((tiling_config & 0xf00) >> 8) {
>@@ -483,7 +493,9 @@ static int eg_init_hw_info(struct radeon_surface_manager *surf_man)
>         surf_man->hw_info.group_bytes = 512;
>         break;
>     default:
>-        return -EINVAL;
>+        surf_man->hw_info.group_bytes = 256;
>+        surf_man->hw_info.allow_2d = 0;
>+        break;
>     }
> 
>     switch ((tiling_config & 0xf000) >> 12) {
>@@ -497,7 +509,9 @@ static int eg_init_hw_info(struct radeon_surface_manager *surf_man)
>         surf_man->hw_info.row_size = 4096;
>         break;
>     default:
>-        return -EINVAL;
>+        surf_man->hw_info.row_size = 4096;
>+        surf_man->hw_info.allow_2d = 0;
>+        break;
>     }
>     return 0;
> }
>-- 
>1.7.7.5
>

Actions: View | Splinter Review

Attachments on bug 43448: 54048 | 54049 | 54077 | 54078 | 62157 | 62158 | 62159 | 62246 | 62672 | 62674 | 63053

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.