aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/si.c
diff options
context:
space:
mode:
authorJerome Glisse <jglisse@redhat.com>2013-04-09 11:17:08 -0400
committerAlex Deucher <alexander.deucher@amd.com>2013-04-11 09:22:06 -0400
commit64d7b8bed851f55a17d15ec6cc60233c85f84357 (patch)
tree82cd8c562091e6fda2419fc49002398a0d094b1c /drivers/gpu/drm/radeon/si.c
parent902aaef6c698ce0f04a6acab2d5396519d5de330 (diff)
drm/radeon: add si tile mode array query v3
Allow userspace to query for the tile mode array so userspace can properly compute surface pitch and alignment requirement depending on tiling. v2: Make strict aliasing safer by casting to char when copying v3: merge fix from Christian Signed-off-by: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/si.c')
-rw-r--r--drivers/gpu/drm/radeon/si.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index 7eda8303379f..aa2c555ba877 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -1211,6 +1211,7 @@ static void si_tiling_mode_table_init(struct radeon_device *rdev)
1211 gb_tile_moden = 0; 1211 gb_tile_moden = 0;
1212 break; 1212 break;
1213 } 1213 }
1214 rdev->config.si.tile_mode_array[reg_offset] = gb_tile_moden;
1214 WREG32(GB_TILE_MODE0 + (reg_offset * 4), gb_tile_moden); 1215 WREG32(GB_TILE_MODE0 + (reg_offset * 4), gb_tile_moden);
1215 } 1216 }
1216 } else if ((rdev->family == CHIP_VERDE) || 1217 } else if ((rdev->family == CHIP_VERDE) ||
@@ -1451,6 +1452,7 @@ static void si_tiling_mode_table_init(struct radeon_device *rdev)
1451 gb_tile_moden = 0; 1452 gb_tile_moden = 0;
1452 break; 1453 break;
1453 } 1454 }
1455 rdev->config.si.tile_mode_array[reg_offset] = gb_tile_moden;
1454 WREG32(GB_TILE_MODE0 + (reg_offset * 4), gb_tile_moden); 1456 WREG32(GB_TILE_MODE0 + (reg_offset * 4), gb_tile_moden);
1455 } 1457 }
1456 } else 1458 } else