From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthew Auld <matthew.auld@intel.com>
Subject: [PATCH] drm/i915: tidy up gen8_init_scratch
Date: Tue, 26 Apr 2016 10:27:19 +0100
Message-ID: <1461662839-14690-1-git-send-email-matthew.auld@intel.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 mga01.intel.com (mga01.intel.com [192.55.52.88])
 by gabe.freedesktop.org (Postfix) with ESMTP id 0D5916E78F
 for <intel-gfx@lists.freedesktop.org>; Tue, 26 Apr 2016 09:28:02 +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
List-Id: intel-gfx@lists.freedesktop.org

VXNlIGdvdG8gdGVhcmRvd24gcGF0aCBhbmQgYWxzbyBlbnN1cmUgd2UgcmVzZXQgYW55IHN0cnVj
dCBtZW1iZXJzIHdoaWNoCndvdWxkIG90aGVyd2lzZSBjb250YWluIGFuIGVycm9yIGVuY29kZWQg
cG9pbnRlciwgYW5kIGNvdWxkIGJlIG1pc3Rha2VuCmZvciBhIHZhbGlkIGFkZHJlc3MuCgpDYzog
Sm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpTaWduZWQt
b2ZmLWJ5OiBNYXR0aGV3IEF1bGQgPG1hdHRoZXcuYXVsZEBpbnRlbC5jb20+Ci0tLQogZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgfCAzNiArKysrKysrKysrKysrKysrKysrKysr
KysrLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNSBpbnNlcnRpb25zKCspLCAxMSBkZWxl
dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQu
YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IDBkNjY2YjMuLmE3
MjNiNzQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisr
KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC04NjYsMzEgKzg2Niwz
MSBAQCBzdGF0aWMgdm9pZCBnZW44X2ZyZWVfcGFnZV90YWJsZXMoc3RydWN0IGRybV9kZXZpY2Ug
KmRldiwKIHN0YXRpYyBpbnQgZ2VuOF9pbml0X3NjcmF0Y2goc3RydWN0IGk5MTVfYWRkcmVzc19z
cGFjZSAqdm0pCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHZtLT5kZXY7CisJaW50IHJl
dDsKIAogCXZtLT5zY3JhdGNoX3BhZ2UgPSBhbGxvY19zY3JhdGNoX3BhZ2UoZGV2KTsKLQlpZiAo
SVNfRVJSKHZtLT5zY3JhdGNoX3BhZ2UpKQotCQlyZXR1cm4gUFRSX0VSUih2bS0+c2NyYXRjaF9w
YWdlKTsKKwlpZiAoSVNfRVJSKHZtLT5zY3JhdGNoX3BhZ2UpKSB7CisJCXJldCA9IFBUUl9FUlIo
dm0tPnNjcmF0Y2hfcGFnZSk7CisJCWdvdG8gZmFpbF9zY3JhdGNoOworCX0KIAogCXZtLT5zY3Jh
dGNoX3B0ID0gYWxsb2NfcHQoZGV2KTsKIAlpZiAoSVNfRVJSKHZtLT5zY3JhdGNoX3B0KSkgewot
CQlmcmVlX3NjcmF0Y2hfcGFnZShkZXYsIHZtLT5zY3JhdGNoX3BhZ2UpOwotCQlyZXR1cm4gUFRS
X0VSUih2bS0+c2NyYXRjaF9wdCk7CisJCXJldCA9IFBUUl9FUlIodm0tPnNjcmF0Y2hfcHQpOwor
CQlnb3RvIGZhaWxfcHQ7CiAJfQogCiAJdm0tPnNjcmF0Y2hfcGQgPSBhbGxvY19wZChkZXYpOwog
CWlmIChJU19FUlIodm0tPnNjcmF0Y2hfcGQpKSB7Ci0JCWZyZWVfcHQoZGV2LCB2bS0+c2NyYXRj
aF9wdCk7Ci0JCWZyZWVfc2NyYXRjaF9wYWdlKGRldiwgdm0tPnNjcmF0Y2hfcGFnZSk7Ci0JCXJl
dHVybiBQVFJfRVJSKHZtLT5zY3JhdGNoX3BkKTsKKwkJcmV0ID0gUFRSX0VSUih2bS0+c2NyYXRj
aF9wZCk7CisJCWdvdG8gZmFpbF9wZDsKIAl9CiAKIAlpZiAoVVNFU19GVUxMXzQ4QklUX1BQR1RU
KGRldikpIHsKIAkJdm0tPnNjcmF0Y2hfcGRwID0gYWxsb2NfcGRwKGRldik7CiAJCWlmIChJU19F
UlIodm0tPnNjcmF0Y2hfcGRwKSkgewotCQkJZnJlZV9wZChkZXYsIHZtLT5zY3JhdGNoX3BkKTsK
LQkJCWZyZWVfcHQoZGV2LCB2bS0+c2NyYXRjaF9wdCk7Ci0JCQlmcmVlX3NjcmF0Y2hfcGFnZShk
ZXYsIHZtLT5zY3JhdGNoX3BhZ2UpOwotCQkJcmV0dXJuIFBUUl9FUlIodm0tPnNjcmF0Y2hfcGRw
KTsKKwkJCXJldCA9IFBUUl9FUlIodm0tPnNjcmF0Y2hfcGRwKTsKKwkJCWdvdG8gZmFpbF9wZHA7
CiAJCX0KIAl9CiAKQEAgLTkwMCw2ICs5MDAsMjAgQEAgc3RhdGljIGludCBnZW44X2luaXRfc2Ny
YXRjaChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSkKIAkJZ2VuOF9pbml0aWFsaXplX3Bk
cCh2bSwgdm0tPnNjcmF0Y2hfcGRwKTsKIAogCXJldHVybiAwOworCitmYWlsX3BkcDoKKwl2bS0+
c2NyYXRjaF9wZHAgPSBOVUxMOworCWZyZWVfcGQoZGV2LCB2bS0+c2NyYXRjaF9wZCk7CitmYWls
X3BkOgorCXZtLT5zY3JhdGNoX3BkID0gTlVMTDsKKwlmcmVlX3B0KGRldiwgdm0tPnNjcmF0Y2hf
cHQpOworZmFpbF9wdDoKKwl2bS0+c2NyYXRjaF9wdCA9IE5VTEw7CisJZnJlZV9zY3JhdGNoX3Bh
Z2UoZGV2LCB2bS0+c2NyYXRjaF9wYWdlKTsKK2ZhaWxfc2NyYXRjaDoKKwl2bS0+c2NyYXRjaF9w
YWdlID0gTlVMTDsKKworCXJldHVybiByZXQ7CiB9CiAKIHN0YXRpYyBpbnQgZ2VuOF9wcGd0dF9u
b3RpZnlfdmd0KHN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCwgYm9vbCBjcmVhdGUpCi0tIAoy
LjQuMTEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu
dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw
czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=