From: Frans Gu <frans.gu@amd.com>
Date: Thu, 10 Mar 2016 07:24:00 +0000 (-0500)
Subject: amdgpu/addrlib: do some tile mode conversions to display surface
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ed1aca8e8f8a33f28323c16688880979d2165378;p=mesa.git

amdgpu/addrlib: do some tile mode conversions to display surface
---

diff --git a/src/amd/addrlib/core/addrlib1.cpp b/src/amd/addrlib/core/addrlib1.cpp
index 516229a3f17..9cdc459867b 100644
--- a/src/amd/addrlib/core/addrlib1.cpp
+++ b/src/amd/addrlib/core/addrlib1.cpp
@@ -3564,7 +3564,6 @@ VOID Lib::OptimizeTileMode(
     // Optimization can only be done on level 0 and samples <= 1
     if ((doOpt == TRUE)                     &&
         (pInOut->mipLevel == 0)             &&
-        (pInOut->flags.display == FALSE)    &&
         (IsPrtTileMode(tileMode) == FALSE)  &&
         (pInOut->flags.prt == FALSE))
     {
@@ -3587,7 +3586,9 @@ VOID Lib::OptimizeTileMode(
 
         if (macroTiledOK)
         {
-            if ((pInOut->flags.opt4Space == TRUE) && (pInOut->numSamples <= 1))
+            if ((pInOut->flags.display == FALSE) &&
+                (pInOut->flags.opt4Space == TRUE) &&
+                (pInOut->numSamples <= 1))
             {
                 // Check if linear mode is optimal
                 if ((pInOut->height == 1) &&