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: Wed, 27 Apr 2016 13:19:25 +0100
Message-ID: <1461759565-12086-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 mga03.intel.com (mga03.intel.com [134.134.136.65])
 by gabe.freedesktop.org (Postfix) with ESMTP id C281D6E905
 for <intel-gfx@lists.freedesktop.org>; Wed, 27 Apr 2016 12:19:55 +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

UHJlZmVyIGEgZ290byB0ZWFyZG93biBwYXRoIHRvIGRvIGFsbCB0aGUgcmVxdWlyZWQgY2xlYW51
cC4KCnYyOgooSm9vbmFzIExhaHRpbmVuKQogIC0gcmVtb3ZlIE5VTEwgYXNzaWdubWVudHMKICAt
IHJlbmFtZSBnb3RvIGxhYmVscwoKQ2M6IE1pa2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGlu
dXguaW50ZWwuY29tPgpDYzogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4K
Q2M6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KU2ln
bmVkLW9mZi1ieTogTWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRAaW50ZWwuY29tPgotLS0KIGRy
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIHwgMjUgKysrKysrKysrKysrKysrKy0t
LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0p
CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCAwZDY2NmIzLi44Nzk0N2VjIDEw
MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtODY2LDYgKzg2Niw3IEBAIHN0YXRp
YyB2b2lkIGdlbjhfZnJlZV9wYWdlX3RhYmxlcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogc3Rh
dGljIGludCBnZW44X2luaXRfc2NyYXRjaChzdHJ1Y3QgaTkxNV9hZGRyZXNzX3NwYWNlICp2bSkK
IHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gdm0tPmRldjsKKwlpbnQgcmV0OwogCiAJdm0t
PnNjcmF0Y2hfcGFnZSA9IGFsbG9jX3NjcmF0Y2hfcGFnZShkZXYpOwogCWlmIChJU19FUlIodm0t
PnNjcmF0Y2hfcGFnZSkpCkBAIC04NzMsMjQgKzg3NCwyMSBAQCBzdGF0aWMgaW50IGdlbjhfaW5p
dF9zY3JhdGNoKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKQogCiAJdm0tPnNjcmF0Y2hf
cHQgPSBhbGxvY19wdChkZXYpOwogCWlmIChJU19FUlIodm0tPnNjcmF0Y2hfcHQpKSB7Ci0JCWZy
ZWVfc2NyYXRjaF9wYWdlKGRldiwgdm0tPnNjcmF0Y2hfcGFnZSk7Ci0JCXJldHVybiBQVFJfRVJS
KHZtLT5zY3JhdGNoX3B0KTsKKwkJcmV0ID0gUFRSX0VSUih2bS0+c2NyYXRjaF9wdCk7CisJCWdv
dG8gZnJlZV9zY3JhdGNoX3BhZ2U7CiAJfQogCiAJdm0tPnNjcmF0Y2hfcGQgPSBhbGxvY19wZChk
ZXYpOwogCWlmIChJU19FUlIodm0tPnNjcmF0Y2hfcGQpKSB7Ci0JCWZyZWVfcHQoZGV2LCB2bS0+
c2NyYXRjaF9wdCk7Ci0JCWZyZWVfc2NyYXRjaF9wYWdlKGRldiwgdm0tPnNjcmF0Y2hfcGFnZSk7
Ci0JCXJldHVybiBQVFJfRVJSKHZtLT5zY3JhdGNoX3BkKTsKKwkJcmV0ID0gUFRSX0VSUih2bS0+
c2NyYXRjaF9wZCk7CisJCWdvdG8gZnJlZV9wdDsKIAl9CiAKIAlpZiAoVVNFU19GVUxMXzQ4QklU
X1BQR1RUKGRldikpIHsKIAkJdm0tPnNjcmF0Y2hfcGRwID0gYWxsb2NfcGRwKGRldik7CiAJCWlm
IChJU19FUlIodm0tPnNjcmF0Y2hfcGRwKSkgewotCQkJZnJlZV9wZChkZXYsIHZtLT5zY3JhdGNo
X3BkKTsKLQkJCWZyZWVfcHQoZGV2LCB2bS0+c2NyYXRjaF9wdCk7Ci0JCQlmcmVlX3NjcmF0Y2hf
cGFnZShkZXYsIHZtLT5zY3JhdGNoX3BhZ2UpOwotCQkJcmV0dXJuIFBUUl9FUlIodm0tPnNjcmF0
Y2hfcGRwKTsKKwkJCXJldCA9IFBUUl9FUlIodm0tPnNjcmF0Y2hfcGRwKTsKKwkJCWdvdG8gZnJl
ZV9wZDsKIAkJfQogCX0KIApAQCAtOTAwLDYgKzg5OCwxNSBAQCBzdGF0aWMgaW50IGdlbjhfaW5p
dF9zY3JhdGNoKHN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtKQogCQlnZW44X2luaXRpYWxp
emVfcGRwKHZtLCB2bS0+c2NyYXRjaF9wZHApOwogCiAJcmV0dXJuIDA7CisKK2ZyZWVfcGQ6CisJ
ZnJlZV9wZChkZXYsIHZtLT5zY3JhdGNoX3BkKTsKK2ZyZWVfcHQ6CisJZnJlZV9wdChkZXYsIHZt
LT5zY3JhdGNoX3B0KTsKK2ZyZWVfc2NyYXRjaF9wYWdlOgorCWZyZWVfc2NyYXRjaF9wYWdlKGRl
diwgdm0tPnNjcmF0Y2hfcGFnZSk7CisKKwlyZXR1cm4gcmV0OwogfQogCiBzdGF0aWMgaW50IGdl
bjhfcHBndHRfbm90aWZ5X3ZndChzdHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQsIGJvb2wgY3Jl
YXRlKQotLSAKMi40LjExCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv
cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl
bC1nZngK