From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 24/64] drm/i915: Convert
	i915_semaphores_is_enabled over to early sanitize
Date: Thu,  7 Jul 2016 09:41:30 +0100
Message-ID: <1467880930-23082-24-git-send-email-chris@chris-wilson.co.uk>
References: <1467880930-23082-1-git-send-email-chris@chris-wilson.co.uk>
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 mail-wm0-x244.google.com (mail-wm0-x244.google.com
 [IPv6:2a00:1450:400c:c09::244])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 32F966E756
 for <intel-gfx@lists.freedesktop.org>; Thu,  7 Jul 2016 08:42:55 +0000 (UTC)
Received: by mail-wm0-x244.google.com with SMTP id 187so3802193wmz.1
 for <intel-gfx@lists.freedesktop.org>; Thu, 07 Jul 2016 01:42:55 -0700 (PDT)
In-Reply-To: <1467880930-23082-1-git-send-email-chris@chris-wilson.co.uk>
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

UmF0aGVyIHRoYW4gcmVjb21wdXRpbmcgd2hldGhlciBzZW1hcGhvcmVzIGFyZSBlbmFibGVkLCB3
ZSBjYW4gZG8gdGhhdApjb21wdXRhdGlvbiBvbmNlIGR1cmluZyBlYXJseSBpbml0aWFsaXNhdGlv
biBhcyB0aGUgaTkxNS5zZW1hcGhvcmVzCm1vZHVsZSBwYXJhbWV0ZXIgaXMgbm93IHJlYWQtb25s
eS4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVr
PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jICAgICB8ICAyICstCiBk
cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jICAgICAgICAgfCAyNSArKystLS0tLS0tLS0t
LS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgfCAg
MyArKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgICAgICB8IDIzICsrKysr
KysrKysrKysrKysrKysrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0
LmMgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYyAgIHwgIDIg
Ky0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8ICA2ICsrKy0tLQog
NyBmaWxlcyBjaGFuZ2VkLCAzMyBpbnNlcnRpb25zKCspLCAzMCBkZWxldGlvbnMoLSkKCmRpZmYg
LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IDc4ODE5YjZlNmY4ZS4uNzI5NTBiOWIzZTlj
IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYworKysgYi9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtMzIxOCw3ICszMjE4LDcgQEAg
c3RhdGljIGludCBpOTE1X3NlbWFwaG9yZV9zdGF0dXMoc3RydWN0IHNlcV9maWxlICptLCB2b2lk
ICp1bnVzZWQpCiAJZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7CiAJaW50IGosIHJldDsKIAotCWlm
ICghaTkxNV9zZW1hcGhvcmVfaXNfZW5hYmxlZChkZXZfcHJpdikpIHsKKwlpZiAoIWk5MTUuc2Vt
YXBob3JlcykgewogCQlzZXFfcHV0cyhtLCAiU2VtYXBob3JlcyBhcmUgZGlzYWJsZWRcbiIpOwog
CQlyZXR1cm4gMDsKIAl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry
di5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCAyNzM5NjAzZDU4NjIu
LjVmMmYwNjRiM2E0OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu
YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC0yMjQsMjcgKzIyNCw2
IEBAIHN0YXRpYyB2b2lkIGludGVsX2RldGVjdF9wY2goc3RydWN0IGRybV9kZXZpY2UgKmRldikK
IAlwY2lfZGV2X3B1dChwY2gpOwogfQogCi1ib29sIGk5MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQo
c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQotewotCWlmIChJTlRFTF9HRU4oZGV2
X3ByaXYpIDwgNikKLQkJcmV0dXJuIGZhbHNlOwotCi0JaWYgKGk5MTUuc2VtYXBob3JlcyA+PSAw
KQotCQlyZXR1cm4gaTkxNS5zZW1hcGhvcmVzOwotCi0JLyogVE9ETzogbWFrZSBzZW1hcGhvcmVz
IGFuZCBFeGVjbGlzdHMgcGxheSBuaWNlbHkgdG9nZXRoZXIgKi8KLQlpZiAoaTkxNS5lbmFibGVf
ZXhlY2xpc3RzKQotCQlyZXR1cm4gZmFsc2U7Ci0KLSNpZmRlZiBDT05GSUdfSU5URUxfSU9NTVUK
LQkvKiBFbmFibGUgc2VtYXBob3JlcyBvbiBTTkIgd2hlbiBJTyByZW1hcHBpbmcgaXMgb2ZmICov
Ci0JaWYgKElTX0dFTjYoZGV2X3ByaXYpICYmIGludGVsX2lvbW11X2dmeF9tYXBwZWQpCi0JCXJl
dHVybiBmYWxzZTsKLSNlbmRpZgotCi0JcmV0dXJuIHRydWU7Ci19Ci0KIHN0YXRpYyBpbnQgaTkx
NV9nZXRwYXJhbShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQkJIHN0cnVj
dCBkcm1fZmlsZSAqZmlsZV9wcml2KQogewpAQCAtMzIwLDcgKzI5OSw3IEBAIHN0YXRpYyBpbnQg
aTkxNV9nZXRwYXJhbShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQl2YWx1
ZSA9IDE7CiAJCWJyZWFrOwogCWNhc2UgSTkxNV9QQVJBTV9IQVNfU0VNQVBIT1JFUzoKLQkJdmFs
dWUgPSBpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRldl9wcml2KTsKKwkJdmFsdWUgPSBpOTE1
LnNlbWFwaG9yZXM7CiAJCWJyZWFrOwogCWNhc2UgSTkxNV9QQVJBTV9IQVNfUFJJTUVfVk1BUF9G
TFVTSDoKIAkJdmFsdWUgPSAxOwpAQCAtOTk1LDYgKzk3NCw4IEBAIHN0YXRpYyB2b2lkIGludGVs
X3Nhbml0aXplX29wdGlvbnMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWk5
MTUuZW5hYmxlX3BwZ3R0ID0KIAkJaW50ZWxfc2FuaXRpemVfZW5hYmxlX3BwZ3R0KGRldl9wcml2
LCBpOTE1LmVuYWJsZV9wcGd0dCk7CiAJRFJNX0RFQlVHX0RSSVZFUigicHBndHQgbW9kZTogJWlc
biIsIGk5MTUuZW5hYmxlX3BwZ3R0KTsKKworCWk5MTUuc2VtYXBob3JlcyA9IGludGVsX3Nhbml0
aXplX3NlbWFwaG9yZXMoZGV2X3ByaXYsIGk5MTUuc2VtYXBob3Jlcyk7CiB9CiAKIC8qKgpkaWZm
IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggNWU5MzIzYzFjNmE3Li4wOTkxZTU5YTVkMzcgMTAwNjQ0
Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjc5OCw2ICsyNzk4LDggQEAgZXh0ZXJuIGludCBpOTE1
X3Jlc3VtZV9zd2l0Y2hlcm9vKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogaW50IGludGVsX3Nh
bml0aXplX2VuYWJsZV9wcGd0dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJ
CQkgICAgICAgCWludCBlbmFibGVfcHBndHQpOwogCitib29sIGludGVsX3Nhbml0aXplX3NlbWFw
aG9yZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBpbnQgdmFsdWUpOworCiAv
KiBpOTE1X2Rydi5jICovCiB2b2lkIF9fcHJpbnRmKDMsIDQpCiBfX2k5MTVfcHJpbnRrKHN0cnVj
dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgY29uc3QgY2hhciAqbGV2ZWwsCkBAIC0zNjIz
LDcgKzM2MjUsNiBAQCBleHRlcm4gdm9pZCBpbnRlbF9zZXRfcnBzKHN0cnVjdCBkcm1faTkxNV9w
cml2YXRlICpkZXZfcHJpdiwgdTggdmFsKTsKIGV4dGVybiB2b2lkIGludGVsX3NldF9tZW1vcnlf
Y3hzcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJICBib29sIGVuYWJs
ZSk7CiAKLWV4dGVybiBib29sIGk5MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQoc3RydWN0IGRybV9p
OTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIGludCBpOTE1X3JlZ19yZWFkX2lvY3RsKHN0cnVjdCBk
cm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJCQlzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpOwog
CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCA1ZTdjYzAxYjU2NzMuLjMzNzI4MmM5YTA3MCAx
MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yODUxLDcgKzI4NTEsNyBAQCBfX2k5MTVfZ2Vt
X29iamVjdF9zeW5jKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJaWYgKGk5MTVf
Z2VtX3JlcXVlc3RfY29tcGxldGVkKGZyb21fcmVxKSkKIAkJcmV0dXJuIDA7CiAKLQlpZiAoIWk5
MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQodG9faTkxNShvYmotPmJhc2UuZGV2KSkpIHsKKwlpZiAo
IWk5MTUuc2VtYXBob3JlcykgewogCQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSA9IHRv
X2k5MTUob2JqLT5iYXNlLmRldik7CiAJCXJldCA9IF9faTkxNV93YWl0X3JlcXVlc3QoZnJvbV9y
ZXEsCiAJCQkJCSAgaTkxNS0+bW0uaW50ZXJydXB0aWJsZSwKQEAgLTQ1NDMsNiArNDU0MywyNyBA
QCBvdXQ6CiAJcmV0dXJuIHJldDsKIH0KIAorYm9vbCBpbnRlbF9zYW5pdGl6ZV9zZW1hcGhvcmVz
KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50IHZhbHVlKQoreworCWlmIChJ
TlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuIDwgNikKKwkJcmV0dXJuIGZhbHNlOworCisJLyogVE9E
TzogbWFrZSBzZW1hcGhvcmVzIGFuZCBFeGVjbGlzdHMgcGxheSBuaWNlbHkgdG9nZXRoZXIgKi8K
KwlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKQorCQlyZXR1cm4gZmFsc2U7CisKKwlpZiAodmFs
dWUgPj0gMCkKKwkJcmV0dXJuIHZhbHVlOworCisjaWZkZWYgQ09ORklHX0lOVEVMX0lPTU1VCisJ
LyogRW5hYmxlIHNlbWFwaG9yZXMgb24gU05CIHdoZW4gSU8gcmVtYXBwaW5nIGlzIG9mZiAqLwor
CWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuID09IDYgJiYgaW50ZWxfaW9tbXVfZ2Z4X21h
cHBlZCkKKwkJcmV0dXJuIGZhbHNlOworI2VuZGlmCisKKwlyZXR1cm4gdHJ1ZTsKK30KKwogaW50
IGk5MTVfZ2VtX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5
MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CmRpZmYgLS1naXQgYS9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X2dlbV9jb250ZXh0LmMKaW5kZXggNmFkODJhYjM1MTQ1Li44NDczMjU5ODcwMTMgMTAwNjQ0
Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYworKysgYi9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKQEAgLTU1Niw3ICs1NTYsNyBAQCBt
aV9zZXRfY29udGV4dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwgdTMyIGh3X2Zs
YWdzKQogCXUzMiBmbGFncyA9IGh3X2ZsYWdzIHwgTUlfTU1fU1BBQ0VfR1RUOwogCWNvbnN0IGlu
dCBudW1fcmluZ3MgPQogCQkvKiBVc2UgYW4gZXh0ZW5kZWQgdy9hIG9uIGl2YisgaWYgc2lnbmFs
bGluZyBmcm9tIG90aGVyIHJpbmdzICovCi0JCWk5MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQoZGV2
X3ByaXYpID8KKwkJaTkxNS5zZW1hcGhvcmVzID8KIAkJaHdlaWdodDMyKElOVEVMX0lORk8oZGV2
X3ByaXYpLT5yaW5nX21hc2spIC0gMSA6CiAJCTA7CiAJaW50IGxlbiwgcmV0OwpkaWZmIC0tZ2l0
IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYyBiL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKaW5kZXggNmRhYWY0ZWNkMmRhLi40ZDM5YzcyODQ2MDUg
MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKKysrIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwpAQCAtODYzLDcgKzg2Myw3IEBA
IHN0YXRpYyB2b2lkIGdlbjhfcmVjb3JkX3NlbWFwaG9yZV9zdGF0ZShzdHJ1Y3QgZHJtX2k5MTVf
cHJpdmF0ZSAqZGV2X3ByaXYsCiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqdG87CiAJZW51bSBp
bnRlbF9lbmdpbmVfaWQgaWQ7CiAKLQlpZiAoIWk5MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQoZGV2
X3ByaXYpKQorCWlmICghaTkxNS5zZW1hcGhvcmVzKQogCQlyZXR1cm47CiAKIAlpZiAoIWVycm9y
LT5zZW1hcGhvcmVfb2JqKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
cmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmlu
ZGV4IDE1MTU3ZDNiMjBlMy4uMWVhZjM2OGJjY2U5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfcmluZ2J1ZmZlci5jCkBAIC0yNjkyLDcgKzI2OTIsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9y
aW5nX2luaXRfc2VtYXBob3JlcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJ
c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKIAlpbnQgcmV0LCBpOwogCi0JaWYgKCFp
OTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRldl9wcml2KSkKKwlpZiAoIWk5MTUuc2VtYXBob3Jl
cykKIAkJcmV0dXJuOwogCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCAmJiAhZGV2X3By
aXYtPnNlbWFwaG9yZV9vYmopIHsKQEAgLTI3MTMsNyArMjcxMyw3IEBAIHN0YXRpYyB2b2lkIGlu
dGVsX3JpbmdfaW5pdF9zZW1hcGhvcmVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp
diwKIAkJfQogCX0KIAotCWlmICghaTkxNV9zZW1hcGhvcmVfaXNfZW5hYmxlZChkZXZfcHJpdikp
CisJaWYgKCFpOTE1LnNlbWFwaG9yZXMpCiAJCXJldHVybjsKIAogCWlmIChJTlRFTF9HRU4oZGV2
X3ByaXYpID49IDgpIHsKQEAgLTI4NTcsNyArMjg1Nyw3IEBAIGludCBpbnRlbF9pbml0X3JlbmRl
cl9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQllbmdpbmUtPmluaXRfY29u
dGV4dCA9IGludGVsX3Jjc19jdHhfaW5pdDsKIAkJZW5naW5lLT5hZGRfcmVxdWVzdCA9IGdlbjhf
cmVuZGVyX2FkZF9yZXF1ZXN0OwogCQllbmdpbmUtPmZsdXNoID0gZ2VuOF9yZW5kZXJfcmluZ19m
bHVzaDsKLQkJaWYgKGk5MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQoZGV2X3ByaXYpKQorCQlpZiAo
aTkxNS5zZW1hcGhvcmVzKQogCQkJZW5naW5lLT5zZW1hcGhvcmUuc2lnbmFsID0gZ2VuOF9yY3Nf
c2lnbmFsOwogCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA2KSB7CiAJCWVuZ2lu
ZS0+aW5pdF9jb250ZXh0ID0gaW50ZWxfcmNzX2N0eF9pbml0OwotLSAKMi44LjEKCl9fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n
IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk
ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=