From mboxrd@z Thu Jan  1 00:00:00 1970
From: =?UTF-8?q?Micha=C5=82=20Winiarski?= <michal.winiarski@intel.com>
Subject: [PATCH v2 11/14] drm/i915: Rename helpers used for
	unwinding, use macro for can_preempt
Date: Thu, 19 Oct 2017 20:36:16 +0200
Message-ID: <20171019183619.6235-12-michal.winiarski@intel.com>
References: <20171019183619.6235-1-michal.winiarski@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 mga05.intel.com (mga05.intel.com [192.55.52.43])
 by gabe.freedesktop.org (Postfix) with ESMTPS id E9F7E6EB45
 for <intel-gfx@lists.freedesktop.org>; Thu, 19 Oct 2017 18:40:04 +0000 (UTC)
In-Reply-To: <20171019183619.6235-1-michal.winiarski@intel.com>
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

V2Ugd291bGQgYWxzbyBsaWtlIHRvIG1ha2UgdXNlIG9mIGV4ZWNsaXN0X2NhbmNlbF9wb3J0X3Jl
cXVlc3RzIGFuZAp1bndpbmRfaW5jb21wbGV0ZV9yZXF1ZXN0cyBpbiBHdUMgcHJlZW1wdGlvbiBi
YWNrZW5kLgpMZXQncyByZW5hbWUgdGhlIGZ1bmN0aW9ucyB0byB1c2UgdGhlIGNvcnJlY3QgcHJl
Zml4ZXMsIHNvIHRoYXQgd2UgY2FuCnNpbXBseSBhZGQgdGhlIGRlY2xhcmF0aW9ucyBpbiB0aGUg
Zm9sbG93aW5nIHBhdGNoLgpTaW1pbGFyIHRoaW5nIGZvciBhcHBsaWVzIGZvciBjYW5fcHJlZW1w
dCwgZXhjZXB0IHdlJ3JlIGludHJvZHVjaW5nCkhBU19MT0dJQ0FMX1JJTkdfUFJFRU1QVElPTiBt
YWNybyBpbnN0YWQsIGNvbnZlcnRpbmcgb3RoZXIgdXNlcnMgdGhhdAp3ZXJlIHByZXZpb3VzbHkg
dG91Y2hpbmcgZGV2aWNlIGluZm8gZGlyZWN0bHkuCgp2Mjogcy9pbnRlbF9lbmdpbmUvZXhlY2xp
c3RzIGFuZCBwYXNzIGV4ZWNsaXN0cyB0byB1bndpbmQgKENocmlzKQoKU2lnbmVkLW9mZi1ieTog
TWljaGHFgiBXaW5pYXJza2kgPG1pY2hhbC53aW5pYXJza2lAaW50ZWwuY29tPgpDYzogQ2hyaXMg
V2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBKb29uYXMgTGFodGluZW4gPGpv
b25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+CkNjOiBNaWNoYWwgV2FqZGVjemtvIDxtaWNo
YWwud2FqZGVjemtvQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry
di5jICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAg
ICB8ICAyICsrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYyB8ICA2ICsr
Ky0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgfCAyNCArKysrKysr
KysrKy0tLS0tLS0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgMTcg
ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu
YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggM2RiNTg1MTc1NmYwLi43
Yjg3MTgwMmFlMzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMK
KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtMzcyLDcgKzM3Miw3IEBA
IHN0YXRpYyBpbnQgaTkxNV9nZXRwYXJhbShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpk
YXRhLAogCQkJdmFsdWUgfD0gSTkxNV9TQ0hFRFVMRVJfQ0FQX0VOQUJMRUQ7CiAJCQl2YWx1ZSB8
PSBJOTE1X1NDSEVEVUxFUl9DQVBfUFJJT1JJVFk7CiAKLQkJCWlmIChJTlRFTF9JTkZPKGRldl9w
cml2KS0+aGFzX2xvZ2ljYWxfcmluZ19wcmVlbXB0aW9uICYmCisJCQlpZiAoSEFTX0xPR0lDQUxf
UklOR19QUkVFTVBUSU9OKGRldl9wcml2KSAmJgogCQkJICAgIGk5MTVfbW9kcGFyYW1zLmVuYWJs
ZV9leGVjbGlzdHMgJiYKIAkJCSAgICAhaTkxNV9tb2RwYXJhbXMuZW5hYmxlX2d1Y19zdWJtaXNz
aW9uKQogCQkJCXZhbHVlIHw9IEk5MTVfU0NIRURVTEVSX0NBUF9QUkVFTVBUSU9OOwpkaWZmIC0t
Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2k5MTVfZHJ2LmgKaW5kZXggM2MyNjQ5YzI3Zjg4Li5jYWE4ZTc5YjM4YjIgMTAwNjQ0Ci0t
LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaTkxNV9kcnYuaApAQCAtMzEzNSw2ICszMTM1LDggQEAgaW50ZWxfaW5mbyhjb25zdCBz
dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKICNkZWZpbmUgSEFTX0xPR0lDQUxf
UklOR19DT05URVhUUyhkZXZfcHJpdikgXAogCQkoKGRldl9wcml2KS0+aW5mby5oYXNfbG9naWNh
bF9yaW5nX2NvbnRleHRzKQorI2RlZmluZSBIQVNfTE9HSUNBTF9SSU5HX1BSRUVNUFRJT04oZGV2
X3ByaXYpIFwKKwkJKChkZXZfcHJpdiktPmluZm8uaGFzX2xvZ2ljYWxfcmluZ19wcmVlbXB0aW9u
KQogI2RlZmluZSBVU0VTX1BQR1RUKGRldl9wcml2KQkJKGk5MTVfbW9kcGFyYW1zLmVuYWJsZV9w
cGd0dCkKICNkZWZpbmUgVVNFU19GVUxMX1BQR1RUKGRldl9wcml2KQkoaTkxNV9tb2RwYXJhbXMu
ZW5hYmxlX3BwZ3R0ID49IDIpCiAjZGVmaW5lIFVTRVNfRlVMTF80OEJJVF9QUEdUVChkZXZfcHJp
dikJKGk5MTVfbW9kcGFyYW1zLmVuYWJsZV9wcGd0dCA9PSAzKQpkaWZmIC0tZ2l0IGEvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9lbmdpbmVfY3MuYwppbmRleCBhNDdhOWM2YmVhNTIuLmRiNTkwZDM0ZWQ0OCAxMDA2NDQK
LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKKysrIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKQEAgLTYyMCw3ICs2MjAsNyBAQCBpbnQg
aW50ZWxfZW5naW5lX2luaXRfY29tbW9uKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkK
IAkgKiBTaW1pbGFybHkgdGhlIHByZWVtcHQgY29udGV4dCBtdXN0IGFsd2F5cyBiZSBhdmFpbGFi
bGUgc28gdGhhdAogCSAqIHdlIGNhbiBpbnRlcnJ1cHQgdGhlIGVuZ2luZSBhdCBhbnkgdGltZS4K
IAkgKi8KLQlpZiAoSU5URUxfSU5GTyhlbmdpbmUtPmk5MTUpLT5oYXNfbG9naWNhbF9yaW5nX3By
ZWVtcHRpb24pIHsKKwlpZiAoSEFTX0xPR0lDQUxfUklOR19QUkVFTVBUSU9OKGVuZ2luZS0+aTkx
NSkpIHsKIAkJcmluZyA9IGVuZ2luZS0+Y29udGV4dF9waW4oZW5naW5lLAogCQkJCQkgICBlbmdp
bmUtPmk5MTUtPnByZWVtcHRfY29udGV4dCk7CiAJCWlmIChJU19FUlIocmluZykpIHsKQEAgLTY1
MSw3ICs2NTEsNyBAQCBpbnQgaW50ZWxfZW5naW5lX2luaXRfY29tbW9uKHN0cnVjdCBpbnRlbF9l
bmdpbmVfY3MgKmVuZ2luZSkKIGVycl9icmVhZGNydW1iczoKIAlpbnRlbF9lbmdpbmVfZmluaV9i
cmVhZGNydW1icyhlbmdpbmUpOwogZXJyX3VucGluX3ByZWVtcHQ6Ci0JaWYgKElOVEVMX0lORk8o
ZW5naW5lLT5pOTE1KS0+aGFzX2xvZ2ljYWxfcmluZ19wcmVlbXB0aW9uKQorCWlmIChIQVNfTE9H
SUNBTF9SSU5HX1BSRUVNUFRJT04oZW5naW5lLT5pOTE1KSkKIAkJZW5naW5lLT5jb250ZXh0X3Vu
cGluKGVuZ2luZSwgZW5naW5lLT5pOTE1LT5wcmVlbXB0X2NvbnRleHQpOwogZXJyX3VucGluX2tl
cm5lbDoKIAllbmdpbmUtPmNvbnRleHRfdW5waW4oZW5naW5lLCBlbmdpbmUtPmk5MTUtPmtlcm5l
bF9jb250ZXh0KTsKQEAgLTY3OSw3ICs2NzksNyBAQCB2b2lkIGludGVsX2VuZ2luZV9jbGVhbnVw
X2NvbW1vbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJaW50ZWxfZW5naW5lX2Ns
ZWFudXBfY21kX3BhcnNlcihlbmdpbmUpOwogCWk5MTVfZ2VtX2JhdGNoX3Bvb2xfZmluaSgmZW5n
aW5lLT5iYXRjaF9wb29sKTsKIAotCWlmIChJTlRFTF9JTkZPKGVuZ2luZS0+aTkxNSktPmhhc19s
b2dpY2FsX3JpbmdfcHJlZW1wdGlvbikKKwlpZiAoSEFTX0xPR0lDQUxfUklOR19QUkVFTVBUSU9O
KGVuZ2luZS0+aTkxNSkpCiAJCWVuZ2luZS0+Y29udGV4dF91bnBpbihlbmdpbmUsIGVuZ2luZS0+
aTkxNS0+cHJlZW1wdF9jb250ZXh0KTsKIAllbmdpbmUtPmNvbnRleHRfdW5waW4oZW5naW5lLCBl
bmdpbmUtPmk5MTUtPmtlcm5lbF9jb250ZXh0KTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMK
aW5kZXggZjk4NTJjNDIyZWEwLi5kZDQ3MDg5MDRjODUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy
Yy5jCkBAIC0zNTQsOCArMzU0LDExIEBAIHN0YXRpYyB2b2lkIHVud2luZF93YV90YWlsKHN0cnVj
dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEpCiAJYXNzZXJ0X3JpbmdfdGFpbF92YWxpZChycS0+
cmluZywgcnEtPnRhaWwpOwogfQogCi1zdGF0aWMgdm9pZCB1bndpbmRfaW5jb21wbGV0ZV9yZXF1
ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCitzdGF0aWMgdm9pZCBleGVjbGlz
dHNfdW53aW5kX2luY29tcGxldGVfcmVxdWVzdHMoCisJCWNvbnN0IHN0cnVjdCBpbnRlbF9lbmdp
bmVfZXhlY2xpc3RzICogY29uc3QgZXhlY2xpc3RzKQogeworCXN0cnVjdCBpbnRlbF9lbmdpbmVf
Y3MgKmVuZ2luZSA9CisJCWNvbnRhaW5lcl9vZihleGVjbGlzdHMsIHR5cGVvZigqZW5naW5lKSwg
ZXhlY2xpc3RzKTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxLCAqcm47CiAJc3Ry
dWN0IGk5MTVfcHJpb2xpc3QgKnVuaW5pdGlhbGl6ZWRfdmFyKHApOwogCWludCBsYXN0X3ByaW8g
PSBJOTE1X1BSSU9SSVRZX0lOVkFMSUQ7CkBAIC01MTUsMTEgKzUxOCw2IEBAIHN0YXRpYyB2b2lk
IGluamVjdF9wcmVlbXB0X2NvbnRleHQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQog
CWVsc3Bfd3JpdGUoY2UtPmxyY19kZXNjLCBlbHNwKTsKIH0KIAotc3RhdGljIGJvb2wgY2FuX3By
ZWVtcHQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQotewotCXJldHVybiBJTlRFTF9J
TkZPKGVuZ2luZS0+aTkxNSktPmhhc19sb2dpY2FsX3JpbmdfcHJlZW1wdGlvbjsKLX0KLQogc3Rh
dGljIHZvaWQgZXhlY2xpc3RzX2RlcXVldWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l
KQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3RzICogY29uc3QgZXhlY2xpc3RzID0g
JmVuZ2luZS0+ZXhlY2xpc3RzOwpAQCAtNTY3LDcgKzU2NSw3IEBAIHN0YXRpYyB2b2lkIGV4ZWNs
aXN0c19kZXF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkJaWYgKHBvcnRf
Y291bnQoJnBvcnRbMF0pID4gMSkKIAkJCWdvdG8gdW5sb2NrOwogCi0JCWlmIChjYW5fcHJlZW1w
dChlbmdpbmUpICYmCisJCWlmIChIQVNfTE9HSUNBTF9SSU5HX1BSRUVNUFRJT04oZW5naW5lLT5p
OTE1KSAmJgogCQkgICAgcmJfZW50cnkocmIsIHN0cnVjdCBpOTE1X3ByaW9saXN0LCBub2RlKS0+
cHJpb3JpdHkgPgogCQkgICAgbWF4KGxhc3QtPnByaW90cmVlLnByaW9yaXR5LCAwKSkgewogCQkJ
LyoKQEAgLTY4OCw3ICs2ODYsNyBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfZGVxdWV1ZShzdHJ1
Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB9CiAKIHN0YXRpYyB2b2lkCi1leGVjbGlzdF9j
YW5jZWxfcG9ydF9yZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0cyAqZXhlY2xp
c3RzKQorZXhlY2xpc3RzX2NhbmNlbF9wb3J0X3JlcXVlc3RzKHN0cnVjdCBpbnRlbF9lbmdpbmVf
ZXhlY2xpc3RzICogY29uc3QgZXhlY2xpc3RzKQogewogCXN0cnVjdCBleGVjbGlzdF9wb3J0ICpw
b3J0ID0gZXhlY2xpc3RzLT5wb3J0OwogCXVuc2lnbmVkIGludCBudW1fcG9ydHMgPSBleGVjbGlz
dHNfbnVtX3BvcnRzKGV4ZWNsaXN0cyk7CkBAIC03MTQsNyArNzEyLDcgQEAgc3RhdGljIHZvaWQg
ZXhlY2xpc3RzX2NhbmNlbF9yZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp
CiAJc3Bpbl9sb2NrX2lycXNhdmUoJmVuZ2luZS0+dGltZWxpbmUtPmxvY2ssIGZsYWdzKTsKIAog
CS8qIENhbmNlbCB0aGUgcmVxdWVzdHMgb24gdGhlIEhXIGFuZCBjbGVhciB0aGUgRUxTUCB0cmFj
a2VyLiAqLwotCWV4ZWNsaXN0X2NhbmNlbF9wb3J0X3JlcXVlc3RzKGV4ZWNsaXN0cyk7CisJZXhl
Y2xpc3RzX2NhbmNlbF9wb3J0X3JlcXVlc3RzKGV4ZWNsaXN0cyk7CiAKIAkvKiBNYXJrIGFsbCBl
eGVjdXRpbmcgcmVxdWVzdHMgYXMgc2tpcHBlZC4gKi8KIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHJx
LCAmZW5naW5lLT50aW1lbGluZS0+cmVxdWVzdHMsIGxpbmspIHsKQEAgLTg1NSwxMCArODUzLDEw
IEBAIHN0YXRpYyB2b2lkIGludGVsX2xyY19pcnFfaGFuZGxlcih1bnNpZ25lZCBsb25nIGRhdGEp
CiAKIAkJCWlmIChzdGF0dXMgJiBHRU44X0NUWF9TVEFUVVNfQUNUSVZFX0lETEUgJiYKIAkJCSAg
ICBidWZbMipoZWFkICsgMV0gPT0gUFJFRU1QVF9JRCkgewotCQkJCWV4ZWNsaXN0X2NhbmNlbF9w
b3J0X3JlcXVlc3RzKGV4ZWNsaXN0cyk7CisJCQkJZXhlY2xpc3RzX2NhbmNlbF9wb3J0X3JlcXVl
c3RzKGV4ZWNsaXN0cyk7CiAKIAkJCQlzcGluX2xvY2tfaXJxKCZlbmdpbmUtPnRpbWVsaW5lLT5s
b2NrKTsKLQkJCQl1bndpbmRfaW5jb21wbGV0ZV9yZXF1ZXN0cyhlbmdpbmUpOworCQkJCWV4ZWNs
aXN0c191bndpbmRfaW5jb21wbGV0ZV9yZXF1ZXN0cyhleGVjbGlzdHMpOwogCQkJCXNwaW5fdW5s
b2NrX2lycSgmZW5naW5lLT50aW1lbGluZS0+bG9jayk7CiAKIAkJCQlHRU1fQlVHX09OKCFleGVj
bGlzdHMtPnByZWVtcHQpOwpAQCAtMTUyMCwxMCArMTUxOCwxMCBAQCBzdGF0aWMgdm9pZCByZXNl
dF9jb21tb25fcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJICogZ3Vlc3Np
bmcgdGhlIG1pc3NlZCBjb250ZXh0LXN3aXRjaCBldmVudHMgYnkgbG9va2luZyBhdCB3aGF0CiAJ
ICogcmVxdWVzdHMgd2VyZSBjb21wbGV0ZWQuCiAJICovCi0JZXhlY2xpc3RfY2FuY2VsX3BvcnRf
cmVxdWVzdHMoZXhlY2xpc3RzKTsKKwlleGVjbGlzdHNfY2FuY2VsX3BvcnRfcmVxdWVzdHMoZXhl
Y2xpc3RzKTsKIAogCS8qIFB1c2ggYmFjayBhbnkgaW5jb21wbGV0ZSByZXF1ZXN0cyBmb3IgcmVw
bGF5IGFmdGVyIHRoZSByZXNldC4gKi8KLQl1bndpbmRfaW5jb21wbGV0ZV9yZXF1ZXN0cyhlbmdp
bmUpOworCWV4ZWNsaXN0c191bndpbmRfaW5jb21wbGV0ZV9yZXF1ZXN0cyhleGVjbGlzdHMpOwog
CiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmZW5naW5lLT50aW1lbGluZS0+bG9jaywgZmxhZ3Mp
OwogCi0tIAoyLjEzLjYKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w
Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs
LWdmeAo=