1 files changed, 20 insertions, 4 deletions

diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 83378c39d0e..83490c2b506 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -686,7 +686,15 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
                         r100_cs_dump_packet(p, pkt);
                         return r;
                 }
-                ib[idx] = idx_value + ((u32)reloc->lobj.gpu_offset);
+
+                if (reloc->lobj.tiling_flags & RADEON_TILING_MACRO)
+                        tile_flags |= R300_TXO_MACRO_TILE;
+                if (reloc->lobj.tiling_flags & RADEON_TILING_MICRO)
+                        tile_flags |= R300_TXO_MICRO_TILE;
+
+                tmp = idx_value + ((u32)reloc->lobj.gpu_offset);
+                tmp |= tile_flags;
+                ib[idx] = tmp;
                 track->textures[i].robj = reloc->robj;
                 break;
         /* Tracked registers */
@@ -852,7 +860,6 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
                 case R300_TX_FORMAT_Z6Y5X5:
                 case R300_TX_FORMAT_W4Z4Y4X4:
                 case R300_TX_FORMAT_W1Z5Y5X5:
-                case R300_TX_FORMAT_DXT1:
                 case R300_TX_FORMAT_D3DMFT_CxV8U8:
                 case R300_TX_FORMAT_B8G8_B8G8:
                 case R300_TX_FORMAT_G8R8_G8B8:
@@ -866,8 +873,6 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
                 case 0x17:
                 case R300_TX_FORMAT_FL_I32:
                 case 0x1e:
-                case R300_TX_FORMAT_DXT3:
-                case R300_TX_FORMAT_DXT5:
                         track->textures[i].cpp = 4;
                         break;
                 case R300_TX_FORMAT_W16Z16Y16X16:
@@ -878,6 +883,15 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
                 case R300_TX_FORMAT_FL_R32G32B32A32:
                         track->textures[i].cpp = 16;
                         break;
+                case R300_TX_FORMAT_DXT1:
+                        track->textures[i].cpp = 1;
+                        track->textures[i].compress_format = R100_TRACK_COMP_DXT1;
+                        break;
+                case R300_TX_FORMAT_DXT3:
+                case R300_TX_FORMAT_DXT5:
+                        track->textures[i].cpp = 1;
+                        track->textures[i].compress_format = R100_TRACK_COMP_DXT35;
+                        break;
                 default:
                         DRM_ERROR("Invalid texture format %u\n",
                                   (idx_value & 0x1F));
@@ -1324,6 +1338,8 @@ int r300_init(struct radeon_device *rdev)
         r300_errata(rdev);
         /* Initialize clocks */
         radeon_get_clock_info(rdev->ddev);
+        /* Initialize power management */
+        radeon_pm_init(rdev);
         /* Get vram informations */
         r300_vram_info(rdev);
         /* Initialize memory controller (also test AGP) */