From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Stone <daniels@collabora.com>
Subject: [PATCH] Revert "i965: Always use Y-tiled buffers on
	SKL+"
Date: Mon,  2 May 2016 15:40:14 +0100
Message-ID: <1462200014-23888-1-git-send-email-daniels@collabora.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk
 [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 4F9D56E5D5
 for <intel-gfx@lists.freedesktop.org>; Mon,  2 May 2016 14:40:19 +0000 (UTC)
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
Cc: Ben Widawsky <ben@bwidawsk.net>, Kenneth Graunke <kenneth@whitecape.org>, Topi Pohjolainen <topi.pohjolainen@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

VGhpcyBjb21taXQgYnJva2UgV2VzdG9uL0tNUywgYW5kIHByZXN1bWFibHkgYWxzbyB4Zjg2LXZp
ZGVvLW1vZGVzZXR0aW5nLgoKSW4gb3JkZXIgdG8gdXNlIFktdGlsZWQgYnVmZmVycywgdGhlIGtl
cm5lbCByZXF1aXJlcyB0aGUgdGlsaW5nIG1vZGUgdG8KYmUgZXhwbGljaXRseSBuYW1lZCB0aHJv
dWdoIHRoZSBJOTE1X0ZPUk1BVF9NT0RfWV9USUxFRCBBZGRGQjIgbW9kaWZpZXI7Cml0IGRpc2Fs
bG93cyBhbnkgYXR0ZW1wdCB0byBpbmZlciB0aGUgYnVmZmVyJ3MgdGlsaW5nIG1vZGUuCgpBcyB0
aGUgR0JNIEFQSSBkb2VzIG5vdCBoYXZlIGEgd2F5IHRvIGV4dHJhY3QgbW9kaWZpZXJzIGZvciBh
IGJ1ZmZlciwKdGhpcyBjb21taXQgYnJva2UgYWxsIHVzZXJzIG9mIEdCTSBvbiBTS0wrLiBSZXZl
cnQgaXQgZm9yIG5vdywgdW50aWwgd2UKZ2V0IGEgd2F5IHRvIGV4dHJhY3QgbW9kaWZpZXIgaW5m
b3JtYXRpb24gZnJvbSBHQk0sIGFuZCBhbHNvIGxldCBHQk0KdXNlcnMgaW5mb3JtIHRoZSBpbXBs
ZW1lbnRhdGlvbiB0aGF0IGl0IGludGVuZHMgdG8gdXNlIHRoZSBtb2RpZmllcnMuCgpUaGlzIHJl
dmVydHMgY29tbWl0IDZhMGQwMzY0ODNjYWY4N2Q0M2ViZTJlZGQxOTA1ODczNDQ2Yzk1ODkuCgpT
aWduZWQtb2ZmLWJ5OiBEYW5pZWwgU3RvbmUgPGRhbmllbHNAY29sbGFib3JhLmNvbT4KQ2M6IEJl
biBXaWRhd3NreSA8YmVuQGJ3aWRhd3NrLm5ldD4KQ2M6IFRvcGkgUG9oam9sYWluZW4gPHRvcGku
cG9oam9sYWluZW5AaW50ZWwuY29tPgpDYzogS2VubmV0aCBHcmF1bmtlIDxrZW5uZXRoQHdoaXRl
Y2FwZS5vcmc+Ci0tLQogc3JjL21lc2EvZHJpdmVycy9kcmkvaTk2NS9icndfbWV0YV9mYXN0X2Ns
ZWFyLmMgfCAgNCArKy0tCiBzcmMvbWVzYS9kcml2ZXJzL2RyaS9pOTY1L2ludGVsX21pcG1hcF90
cmVlLmMgICB8IDEwICsrLS0tLS0tLS0KIHNyYy9tZXNhL2RyaXZlcnMvZHJpL2k5NjUvaW50ZWxf
bWlwbWFwX3RyZWUuaCAgIHwgIDMgKy0tCiBzcmMvbWVzYS9kcml2ZXJzL2RyaS9pOTY1L2ludGVs
X3NjcmVlbi5jICAgICAgICB8IDIxICsrKy0tLS0tLS0tLS0tLS0tLS0tLQogNCBmaWxlcyBjaGFu
Z2VkLCA4IGluc2VydGlvbnMoKyksIDMwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9t
ZXNhL2RyaXZlcnMvZHJpL2k5NjUvYnJ3X21ldGFfZmFzdF9jbGVhci5jIGIvc3JjL21lc2EvZHJp
dmVycy9kcmkvaTk2NS9icndfbWV0YV9mYXN0X2NsZWFyLmMKaW5kZXggNzc2MGNjZS4uNzY5ODhi
ZiAxMDA2NDQKLS0tIGEvc3JjL21lc2EvZHJpdmVycy9kcmkvaTk2NS9icndfbWV0YV9mYXN0X2Ns
ZWFyLmMKKysrIGIvc3JjL21lc2EvZHJpdmVycy9kcmkvaTk2NS9icndfbWV0YV9mYXN0X2NsZWFy
LmMKQEAgLTI0NCw3ICsyNDQsNyBAQCBicndfZ2V0X2Zhc3RfY2xlYXJfcmVjdChjb25zdCBzdHJ1
Y3QgYnJ3X2NvbnRleHQgKmJydywKICAgICAgICAqIGFsaWdubWVudCBzaXplIHJldHVybmVkIGJ5
IGludGVsX2dldF9ub25fbXNydF9tY3NfYWxpZ25tZW50KCksIGJ1dAogICAgICAgICogd2l0aCBY
IGFsaWdubWVudCBtdWx0aXBsaWVkIGJ5IDE2IGFuZCBZIGFsaWdubWVudCBtdWx0aXBsaWVkIGJ5
IDMyLgogICAgICAgICovCi0gICAgICBpbnRlbF9nZXRfbm9uX21zcnRfbWNzX2FsaWdubWVudChi
cncsIG10LCAmeF9hbGlnbiwgJnlfYWxpZ24pOworICAgICAgaW50ZWxfZ2V0X25vbl9tc3J0X21j
c19hbGlnbm1lbnQobXQsICZ4X2FsaWduLCAmeV9hbGlnbik7CiAgICAgICB4X2FsaWduICo9IDE2
OwogCiAgICAgICAvKiBTS0wrIGxpbmUgYWxpZ25tZW50IHJlcXVpcmVtZW50IGZvciBZLXRpbGVk
IGFyZSBoYWxmIHRob3NlIG9mIHRoZSBwcmlvcgpAQCAtODM4LDcgKzgzOCw3IEBAIGJyd19nZXRf
cmVzb2x2ZV9yZWN0KGNvbnN0IHN0cnVjdCBicndfY29udGV4dCAqYnJ3LAogICAgICogYnkgYSBm
YWN0b3Igb2YgMi4KICAgICAqLwogCi0gICBpbnRlbF9nZXRfbm9uX21zcnRfbWNzX2FsaWdubWVu
dChicncsIG10LCAmeF9hbGlnbiwgJnlfYWxpZ24pOworICAgaW50ZWxfZ2V0X25vbl9tc3J0X21j
c19hbGlnbm1lbnQobXQsICZ4X2FsaWduLCAmeV9hbGlnbik7CiAgICBpZiAoYnJ3LT5nZW4gPj0g
OSkgewogICAgICAgeF9zY2FsZWRvd24gPSB4X2FsaWduICogODsKICAgICAgIHlfc2NhbGVkb3du
ID0geV9hbGlnbiAqIDg7CmRpZmYgLS1naXQgYS9zcmMvbWVzYS9kcml2ZXJzL2RyaS9pOTY1L2lu
dGVsX21pcG1hcF90cmVlLmMgYi9zcmMvbWVzYS9kcml2ZXJzL2RyaS9pOTY1L2ludGVsX21pcG1h
cF90cmVlLmMKaW5kZXggM2Q4ZjQ4ZS4uOTRmNjMzMyAxMDA2NDQKLS0tIGEvc3JjL21lc2EvZHJp
dmVycy9kcmkvaTk2NS9pbnRlbF9taXBtYXBfdHJlZS5jCisrKyBiL3NyYy9tZXNhL2RyaXZlcnMv
ZHJpL2k5NjUvaW50ZWxfbWlwbWFwX3RyZWUuYwpAQCAtMTQ0LDggKzE0NCw3IEBAIGNvbXB1dGVf
bXNhYV9sYXlvdXQoc3RydWN0IGJyd19jb250ZXh0ICpicncsIG1lc2FfZm9ybWF0IGZvcm1hdCwK
ICAqICAgYnkgaGFsZiB0aGUgYmxvY2sgd2lkdGgsIGFuZCBZIGNvb3JkaW5hdGVzIGJ5IGhhbGYg
dGhlIGJsb2NrIGhlaWdodC4KICAqLwogdm9pZAotaW50ZWxfZ2V0X25vbl9tc3J0X21jc19hbGln
bm1lbnQoY29uc3Qgc3RydWN0IGJyd19jb250ZXh0ICpicncsCi0gICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICBjb25zdCBzdHJ1Y3QgaW50ZWxfbWlwbWFwX3RyZWUgKm10LAoraW50ZWxf
Z2V0X25vbl9tc3J0X21jc19hbGlnbm1lbnQoY29uc3Qgc3RydWN0IGludGVsX21pcG1hcF90cmVl
ICptdCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkICp3aWR0aF9w
eCwgdW5zaWduZWQgKmhlaWdodCkKIHsKICAgIHN3aXRjaCAobXQtPnRpbGluZykgewpAQCAtMTU3
LDExICsxNTYsNiBAQCBpbnRlbF9nZXRfbm9uX21zcnRfbWNzX2FsaWdubWVudChjb25zdCBzdHJ1
Y3QgYnJ3X2NvbnRleHQgKmJydywKICAgICAgICpoZWlnaHQgPSA0OwogICAgICAgYnJlYWs7CiAg
ICBjYXNlIEk5MTVfVElMSU5HX1g6Ci0gICAgICAvKiBUaGUgZG9jcyBhcmUgc29tZXdoYXQgY29u
ZnVzaW5nIHdpdGggdGhlIHdheSB0aGUgdGFibGVzIGFyZSBkaXNwbGF5ZWQuCi0gICAgICAgKiBI
b3dldmVyLCBpdCBkb2VzIGNsZWFybHkgc3RhdGU6ICJNQ1MgYW5kIExvc3NsZXNzIGNvbXByZXNz
aW9uIGlzCi0gICAgICAgKiBzdXBwb3J0ZWQgZm9yIFRpbGVkWS9UaWxlWXMvVGlsZVlmIG5vbi1N
U1JUcyBvbmx5LiIKLSAgICAgICAqLwotICAgICAgYXNzZXJ0KGJydy0+Z2VuIDwgOSk7CiAgICAg
ICAqd2lkdGhfcHggPSA2NCAvIG10LT5jcHA7CiAgICAgICAqaGVpZ2h0ID0gMjsKICAgIH0KQEAg
LTE1NTgsNyArMTU1Miw3IEBAIGludGVsX21pcHRyZWVfYWxsb2Nfbm9uX21zcnRfbWNzKHN0cnVj
dCBicndfY29udGV4dCAqYnJ3LAogICAgY29uc3QgbWVzYV9mb3JtYXQgZm9ybWF0ID0gTUVTQV9G
T1JNQVRfUl9VSU5UMzI7CiAgICB1bnNpZ25lZCBibG9ja193aWR0aF9weDsKICAgIHVuc2lnbmVk
IGJsb2NrX2hlaWdodDsKLSAgIGludGVsX2dldF9ub25fbXNydF9tY3NfYWxpZ25tZW50KGJydywg
bXQsICZibG9ja193aWR0aF9weCwgJmJsb2NrX2hlaWdodCk7CisgICBpbnRlbF9nZXRfbm9uX21z
cnRfbWNzX2FsaWdubWVudChtdCwgJmJsb2NrX3dpZHRoX3B4LCAmYmxvY2tfaGVpZ2h0KTsKICAg
IHVuc2lnbmVkIHdpZHRoX2Rpdmlzb3IgPSBibG9ja193aWR0aF9weCAqIDQ7CiAgICB1bnNpZ25l
ZCBoZWlnaHRfZGl2aXNvciA9IGJsb2NrX2hlaWdodCAqIDg7CiAKZGlmZiAtLWdpdCBhL3NyYy9t
ZXNhL2RyaXZlcnMvZHJpL2k5NjUvaW50ZWxfbWlwbWFwX3RyZWUuaCBiL3NyYy9tZXNhL2RyaXZl
cnMvZHJpL2k5NjUvaW50ZWxfbWlwbWFwX3RyZWUuaAppbmRleCAyMWU0NzE4Li43ODYyMTUyIDEw
MDY0NAotLS0gYS9zcmMvbWVzYS9kcml2ZXJzL2RyaS9pOTY1L2ludGVsX21pcG1hcF90cmVlLmgK
KysrIGIvc3JjL21lc2EvZHJpdmVycy9kcmkvaTk2NS9pbnRlbF9taXBtYXBfdHJlZS5oCkBAIC02
NjMsOCArNjYzLDcgQEAgc3RydWN0IGludGVsX21pcG1hcF90cmVlCiB9OwogCiB2b2lkCi1pbnRl
bF9nZXRfbm9uX21zcnRfbWNzX2FsaWdubWVudChjb25zdCBzdHJ1Y3QgYnJ3X2NvbnRleHQgKmJy
dywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHN0cnVjdCBpbnRlbF9t
aXBtYXBfdHJlZSAqbXQsCitpbnRlbF9nZXRfbm9uX21zcnRfbWNzX2FsaWdubWVudChjb25zdCBz
dHJ1Y3QgaW50ZWxfbWlwbWFwX3RyZWUgKm10LAogICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgdW5zaWduZWQgKndpZHRoX3B4LCB1bnNpZ25lZCAqaGVpZ2h0KTsKIAogYm9vbApkaWZm
IC0tZ2l0IGEvc3JjL21lc2EvZHJpdmVycy9kcmkvaTk2NS9pbnRlbF9zY3JlZW4uYyBiL3NyYy9t
ZXNhL2RyaXZlcnMvZHJpL2k5NjUvaW50ZWxfc2NyZWVuLmMKaW5kZXggODc4OTAxYS4uZGI5ZDk0
ZCAxMDA2NDQKLS0tIGEvc3JjL21lc2EvZHJpdmVycy9kcmkvaTk2NS9pbnRlbF9zY3JlZW4uYwor
KysgYi9zcmMvbWVzYS9kcml2ZXJzL2RyaS9pOTY1L2ludGVsX3NjcmVlbi5jCkBAIC01MTYsMTEg
KzUxNiw3IEBAIGludGVsX2NyZWF0ZV9pbWFnZShfX0RSSXNjcmVlbiAqc2NyZWVuLAogICAgaW50
IGNwcDsKICAgIHVuc2lnbmVkIGxvbmcgcGl0Y2g7CiAKLSAgIGlmIChpbnRlbFNjcmVlbi0+ZGV2
aW5mby0+Z2VuID49IDkpIHsKLSAgICAgIHRpbGluZyA9IEk5MTVfVElMSU5HX1k7Ci0gICB9IGVs
c2UgewotICAgICAgdGlsaW5nID0gSTkxNV9USUxJTkdfWDsKLSAgIH0KKyAgIHRpbGluZyA9IEk5
MTVfVElMSU5HX1g7CiAgICBpZiAodXNlICYgX19EUklfSU1BR0VfVVNFX0NVUlNPUikgewogICAg
ICAgaWYgKHdpZHRoICE9IDY0IHx8IGhlaWdodCAhPSA2NCkKIAkgcmV0dXJuIE5VTEw7CkBAIC0x
MTQ4LDE0ICsxMTQ0LDggQEAgaW50ZWxfZGV0ZWN0X3N3aXp6bGluZyhzdHJ1Y3QgaW50ZWxfc2Ny
ZWVuICpzY3JlZW4pCiAgICBkcm1faW50ZWxfYm8gKmJ1ZmZlcjsKICAgIHVuc2lnbmVkIGxvbmcg
ZmxhZ3MgPSAwOwogICAgdW5zaWduZWQgbG9uZyBhbGlnbmVkX3BpdGNoOworICAgdWludDMyX3Qg
dGlsaW5nID0gSTkxNV9USUxJTkdfWDsKICAgIHVpbnQzMl90IHN3aXp6bGVfbW9kZSA9IDA7Ci0g
ICB1aW50MzJfdCB0aWxpbmc7Ci0KLSAgIGlmIChzY3JlZW4tPmRldmluZm8tPmdlbiA+PSA5KSB7
Ci0gICAgICB0aWxpbmcgPSBJOTE1X1RJTElOR19ZOwotICAgfSBlbHNlIHsKLSAgICAgIHRpbGlu
ZyA9IEk5MTVfVElMSU5HX1g7Ci0gICB9CiAKICAgIGJ1ZmZlciA9IGRybV9pbnRlbF9ib19hbGxv
Y190aWxlZChzY3JlZW4tPmJ1Zm1nciwgInN3aXp6bGUgdGVzdCIsCiAJCQkJICAgICA2NCwgNjQs
IDQsCkBAIC0xNTgxLDEyICsxNTcxLDcgQEAgaW50ZWxBbGxvY2F0ZUJ1ZmZlcihfX0RSSXNjcmVl
biAqc2NyZWVuLAogICAgICAgcmV0dXJuIE5VTEw7CiAKICAgIC8qIFRoZSBmcm9udCBhbmQgYmFj
ayBidWZmZXJzIGFyZSBjb2xvciBidWZmZXJzLCB3aGljaCBhcmUgWCB0aWxlZC4gKi8KLSAgIHVp
bnQzMl90IHRpbGluZzsKLSAgIGlmIChpbnRlbFNjcmVlbi0+ZGV2aW5mby0+Z2VuID49IDkpIHsK
LSAgICAgIHRpbGluZyA9IEk5MTVfVElMSU5HX1k7Ci0gICB9IGVsc2UgewotICAgICAgdGlsaW5n
ID0gSTkxNV9USUxJTkdfWDsKLSAgIH0KKyAgIHVpbnQzMl90IHRpbGluZyA9IEk5MTVfVElMSU5H
X1g7CiAgICB1bnNpZ25lZCBsb25nIHBpdGNoOwogICAgaW50IGNwcCA9IGZvcm1hdCAvIDg7CiAg
ICBpbnRlbEJ1ZmZlci0+Ym8gPSBkcm1faW50ZWxfYm9fYWxsb2NfdGlsZWQoaW50ZWxTY3JlZW4t
PmJ1Zm1nciwKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz
a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p
bnRlbC1nZngK