diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/rv770.c')
-rw-r--r-- | drivers/gpu/drm/radeon/rv770.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index c9320e727986..3ecd138815d8 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c | |||
@@ -516,15 +516,19 @@ static void rv770_gpu_init(struct radeon_device *rdev) | |||
516 | switch (rdev->config.rv770.max_tile_pipes) { | 516 | switch (rdev->config.rv770.max_tile_pipes) { |
517 | case 1: | 517 | case 1: |
518 | gb_tiling_config |= PIPE_TILING(0); | 518 | gb_tiling_config |= PIPE_TILING(0); |
519 | rdev->config.rv770.tiling_npipes = 1; | ||
519 | break; | 520 | break; |
520 | case 2: | 521 | case 2: |
521 | gb_tiling_config |= PIPE_TILING(1); | 522 | gb_tiling_config |= PIPE_TILING(1); |
523 | rdev->config.rv770.tiling_npipes = 2; | ||
522 | break; | 524 | break; |
523 | case 4: | 525 | case 4: |
524 | gb_tiling_config |= PIPE_TILING(2); | 526 | gb_tiling_config |= PIPE_TILING(2); |
527 | rdev->config.rv770.tiling_npipes = 4; | ||
525 | break; | 528 | break; |
526 | case 8: | 529 | case 8: |
527 | gb_tiling_config |= PIPE_TILING(3); | 530 | gb_tiling_config |= PIPE_TILING(3); |
531 | rdev->config.rv770.tiling_npipes = 8; | ||
528 | break; | 532 | break; |
529 | default: | 533 | default: |
530 | break; | 534 | break; |
@@ -534,8 +538,10 @@ static void rv770_gpu_init(struct radeon_device *rdev) | |||
534 | gb_tiling_config |= BANK_TILING(1); | 538 | gb_tiling_config |= BANK_TILING(1); |
535 | else | 539 | else |
536 | gb_tiling_config |= BANK_TILING((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT); | 540 | gb_tiling_config |= BANK_TILING((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT); |
541 | rdev->config.rv770.tiling_nbanks = 4 << ((gb_tiling_config >> 4) & 0x3); | ||
537 | 542 | ||
538 | gb_tiling_config |= GROUP_SIZE(0); | 543 | gb_tiling_config |= GROUP_SIZE(0); |
544 | rdev->config.rv770.tiling_group_size = 256; | ||
539 | 545 | ||
540 | if (((mc_arb_ramcfg & NOOFROWS_MASK) >> NOOFROWS_SHIFT) > 3) { | 546 | if (((mc_arb_ramcfg & NOOFROWS_MASK) >> NOOFROWS_SHIFT) > 3) { |
541 | gb_tiling_config |= ROW_TILING(3); | 547 | gb_tiling_config |= ROW_TILING(3); |