[Mesa-dev] [PATCH] r300g: set endian controls on big endian

[Marek Olšák]

On Mon, Apr 25, 2016 at 5:40 PM, Aaron Watry <awatry at gmail.com> wrote:
>
>
> On Sun, Apr 24, 2016 at 6:27 AM, Marek Olšák <maraeo at gmail.com> wrote:
>>
>> From: Marek Olšák <marek.olsak at amd.com>
>>
>> ---
>>  src/gallium/drivers/r300/r300_reg.h     | 20 +++++++----------
>>  src/gallium/drivers/r300/r300_texture.c | 38
>> ++++++++++++++++++++++++++++++---
>>  2 files changed, 43 insertions(+), 15 deletions(-)
>>
>> diff --git a/src/gallium/drivers/r300/r300_reg.h
>> b/src/gallium/drivers/r300/r300_reg.h
>> index 9c373c5..9c93b84 100644
>> --- a/src/gallium/drivers/r300/r300_reg.h
>> +++ b/src/gallium/drivers/r300/r300_reg.h
>> @@ -1700,10 +1700,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
>>  #define R300_TX_OFFSET_6                    0x4558
>>  #define R300_TX_OFFSET_7                    0x455C
>>
>> -#       define R300_TXO_ENDIAN_NO_SWAP           (0 << 0)
>> -#       define R300_TXO_ENDIAN_BYTE_SWAP         (1 << 0)
>> -#       define R300_TXO_ENDIAN_WORD_SWAP         (2 << 0)
>> -#       define R300_TXO_ENDIAN_HALFDW_SWAP       (3 << 0)
>> +#       define R300_TXO_ENDIAN(x)                ((x) << 0)
>>  #       define R300_TXO_MACRO_TILE_LINEAR        (0 << 2)
>>  #       define R300_TXO_MACRO_TILE_TILED         (1 << 2)
>>  #       define R300_TXO_MACRO_TILE(x)            ((x) << 2)
>> @@ -2418,10 +2415,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
>>  #       define R300_COLOR_MICROTILE_ENABLE        (1 << 17)
>>  #       define R300_COLOR_MICROTILE_ENABLE_SQUARE (2 << 17) /* Only
>> available in 16-bit */
>>  #       define R300_COLOR_MICROTILE(x)            ((x) << 17)
>> -#       define R300_COLOR_ENDIAN_NO_SWAP          (0 << 19)
>> -#       define R300_COLOR_ENDIAN_WORD_SWAP        (1 << 19)
>> -#       define R300_COLOR_ENDIAN_DWORD_SWAP       (2 << 19)
>> -#       define R300_COLOR_ENDIAN_HALF_DWORD_SWAP  (3 << 19)
>> +#       define R300_COLOR_ENDIAN(x)               ((x) << 19)
>>  #      define R500_COLOR_FORMAT_ARGB10101010     (0 << 21)
>>  #      define R500_COLOR_FORMAT_UV1010           (1 << 21)
>>  #      define R500_COLOR_FORMAT_CI8              (2 << 21) /* 2D only */
>> @@ -2693,10 +2687,12 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
>>  #       define R300_DEPTHMICROTILE_TILED        (1 << 17)
>>  #       define R300_DEPTHMICROTILE_TILED_SQUARE (2 << 17)
>>  #       define R300_DEPTHMICROTILE(x)           ((x) << 17)
>> -#       define R300_DEPTHENDIAN_NO_SWAP         (0 << 18)
>> -#       define R300_DEPTHENDIAN_WORD_SWAP       (1 << 18)
>> -#       define R300_DEPTHENDIAN_DWORD_SWAP      (2 << 18)
>> -#       define R300_DEPTHENDIAN_HALF_DWORD_SWAP (3 << 18)
>> +#       define R300_DEPTHENDIAN(x)              ((x) << 19)
>
>
> Was this an intentional switch to << 19, or just a copy/paste type-o from
> the R300_COLOR_ENDIAN hunk above?
>
> Not qualified to review this patch, but that looked odd as I was scanning
> it.

Yes, the definitions were wrong.

Marek