From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Gordon <david.s.gordon@intel.com>
Subject: [PATCH v2,
	2/4] drm/i915: simplify testing for the global default context
Date: Wed, 23 Dec 2015 19:33:53 +0000
Message-ID: <1450899235-14463-3-git-send-email-david.s.gordon@intel.com>
References: <1450899235-14463-1-git-send-email-david.s.gordon@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 0170F6E699
 for <intel-gfx@lists.freedesktop.org>; Wed, 23 Dec 2015 11:34:09 -0800 (PST)
In-Reply-To: <1450899235-14463-1-git-send-email-david.s.gordon@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://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: <http://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: daniel.vetter@ffwll.ch
List-Id: intel-gfx@lists.freedesktop.org

VGhlcmUgYXJlIHF1aXRlIGEgbnVtYmVyIG9mIHBsYWNlcyB3aGVyZSB0aGUgZHJpdmVyIHRlc3Rz
IHdoZXRoZXIKYSBnaXZlbiBjb250ZXh0IGlzIG9yIGlzIG5vdCB0aGUgZ2xvYmFsIGRlZmF1bHQg
Y29udGV4dCwgdXN1YWxseSBieQpjaGVja2luZyB3aGV0aGVyIGFuIGVuZ2luZSdzIGRlZmF1bHRf
cG9pbnRlciBwb2ludHMgdG8gdGhlIGNvbnRleHQuCk5vdyB0aGF0IHdlIGhhdmUgYSAnaXNfZ2xv
YmFsX2RlZmF1bHQnIGZsYWcgaW4gdGhlIGNvbnRleHQgaXRzZWxmLAphbGwgdGhlc2UgdGVzdHMg
dGhlc2UgY2FuIGJlIHJld3JpdHRlbiB0byB1c2UgaXQuIFRoaXMgbWFrZXMgdGhlCmxvZ2ljIG1v
cmUgb2J2aW91cywgYW5kIHVzdWFsbHkgc2F2ZXMgYXQgbGVhc3Qgb25lIG1lbW9yeSByZWZlcmVu
Y2UuCkluIGFkZGl0aW9uLCB3aXRoIHRoZXNlIHVzZXMgZWxpbWluYXRlZCwgYSBmdXR1cmUgcGF0
Y2ggd2lsbCBiZSBhYmxlCnRvIGdldCByaWQgb2YgZW5naW5lOjpkZWZhdWx0X2NvbnRleHQgZW50
aXJlbHkuCgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwu
Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIHwgMTUgKysrKyst
LS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgICAgIHwgIDYgKystLS0t
CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICB8IDQwICsrKysrKysrKysrKysr
KysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMjUgaW5zZXJ0aW9ucygr
KSwgMzYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCAw
ZmMzOGJiLi41ZTZlMDJjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rl
YnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwpAQCAtMTk0
MiwxMSArMTk0Miw4IEBAIHN0YXRpYyBpbnQgaTkxNV9jb250ZXh0X3N0YXR1cyhzdHJ1Y3Qgc2Vx
X2ZpbGUgKm0sIHZvaWQgKnVudXNlZCkKIAogCQlzZXFfcHV0cyhtLCAiSFcgY29udGV4dCAiKTsK
IAkJZGVzY3JpYmVfY3R4KG0sIGN0eCk7Ci0JCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYs
IGkpIHsKLQkJCWlmIChyaW5nLT5kZWZhdWx0X2NvbnRleHQgPT0gY3R4KQotCQkJCXNlcV9wcmlu
dGYobSwgIihkZWZhdWx0IGNvbnRleHQgJXMpICIsCi0JCQkJCSAgIHJpbmctPm5hbWUpOwotCQl9
CisJCWlmIChjdHgtPmlzX2dsb2JhbF9kZWZhdWx0KQorCQkJc2VxX3ByaW50ZihtLCAiKGRlZmF1
bHQgY29udGV4dCkgIik7CiAKIAkJaWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0cykgewogCQkJc2Vx
X3B1dGMobSwgJ1xuJyk7CkBAIC0yMDM3LDEzICsyMDM0LDExIEBAIHN0YXRpYyBpbnQgaTkxNV9k
dW1wX2xyYyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKnVudXNlZCkKIAlpZiAocmV0KQogCQly
ZXR1cm4gcmV0OwogCi0JbGlzdF9mb3JfZWFjaF9lbnRyeShjdHgsICZkZXZfcHJpdi0+Y29udGV4
dF9saXN0LCBsaW5rKSB7Ci0JCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIGkpIHsKLQkJ
CWlmIChyaW5nLT5kZWZhdWx0X2NvbnRleHQgIT0gY3R4KQorCWxpc3RfZm9yX2VhY2hfZW50cnko
Y3R4LCAmZGV2X3ByaXYtPmNvbnRleHRfbGlzdCwgbGluaykKKwkJaWYgKCFjdHgtPmlzX2dsb2Jh
bF9kZWZhdWx0KQorCQkJZm9yX2VhY2hfcmluZyhyaW5nLCBkZXZfcHJpdiwgaSkKIAkJCQlpOTE1
X2R1bXBfbHJjX29iaihtLCByaW5nLAogCQkJCQkJICBjdHgtPmVuZ2luZVtpXS5zdGF0ZSk7Ci0J
CX0KLQl9CiAKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIApkaWZmIC0tZ2l0
IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfZ2VtLmMKaW5kZXggNmM2MGUwNC4uZDlhMzMwNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl
bS5jCkBAIC0yNjc3LDEwICsyNjc3LDggQEAgdm9pZCBpOTE1X2dlbV9yZXF1ZXN0X2ZyZWUoc3Ry
dWN0IGtyZWYgKnJlcV9yZWYpCiAJCWk5MTVfZ2VtX3JlcXVlc3RfcmVtb3ZlX2Zyb21fY2xpZW50
KHJlcSk7CiAKIAlpZiAoY3R4KSB7Ci0JCWlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMpIHsKLQkJ
CWlmIChjdHggIT0gcmVxLT5yaW5nLT5kZWZhdWx0X2NvbnRleHQpCi0JCQkJaW50ZWxfbHJfY29u
dGV4dF91bnBpbihyZXEpOwotCQl9CisJCWlmIChpOTE1LmVuYWJsZV9leGVjbGlzdHMgJiYgIWN0
eC0+aXNfZ2xvYmFsX2RlZmF1bHQpCisJCQlpbnRlbF9scl9jb250ZXh0X3VucGluKHJlcSk7CiAK
IAkJaTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5jZShjdHgpOwogCX0KZGlmZiAtLWdpdCBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfbHJjLmMKaW5kZXggM2FhNjE0Ny4uY2Y3NmQyOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJj
LmMKQEAgLTU3MSw3ICs1NzEsNyBAQCBzdGF0aWMgaW50IGV4ZWNsaXN0c19jb250ZXh0X3F1ZXVl
KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIAlzdHJ1Y3QgZHJtX2k5MTVf
Z2VtX3JlcXVlc3QgKmN1cnNvcjsKIAlpbnQgbnVtX2VsZW1lbnRzID0gMDsKIAotCWlmIChyZXF1
ZXN0LT5jdHggIT0gcmluZy0+ZGVmYXVsdF9jb250ZXh0KQorCWlmICghcmVxdWVzdC0+Y3R4LT5p
c19nbG9iYWxfZGVmYXVsdCkKIAkJaW50ZWxfbHJfY29udGV4dF9waW4ocmVxdWVzdCk7CiAKIAlp
OTE1X2dlbV9yZXF1ZXN0X3JlZmVyZW5jZShyZXF1ZXN0KTsKQEAgLTY2MCwxNyArNjYwLDE0IEBA
IHN0YXRpYyBpbnQgZXhlY2xpc3RzX21vdmVfdG9fZ3B1KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVx
dWVzdCAqcmVxLAogCiBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2FsbG9jX3JlcXVlc3RfZXh0cmFz
KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIHsKLQlpbnQgcmV0OworCWlu
dCByZXQgPSAwOwogCiAJcmVxdWVzdC0+cmluZ2J1ZiA9IHJlcXVlc3QtPmN0eC0+ZW5naW5lW3Jl
cXVlc3QtPnJpbmctPmlkXS5yaW5nYnVmOwogCi0JaWYgKHJlcXVlc3QtPmN0eCAhPSByZXF1ZXN0
LT5yaW5nLT5kZWZhdWx0X2NvbnRleHQpIHsKKwlpZiAoIXJlcXVlc3QtPmN0eC0+aXNfZ2xvYmFs
X2RlZmF1bHQpCiAJCXJldCA9IGludGVsX2xyX2NvbnRleHRfcGluKHJlcXVlc3QpOwotCQlpZiAo
cmV0KQotCQkJcmV0dXJuIHJldDsKLQl9CiAKLQlyZXR1cm4gMDsKKwlyZXR1cm4gcmV0OwogfQog
CiBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ193YWl0X2Zvcl9zcGFjZShzdHJ1Y3QgZHJtX2k5MTVf
Z2VtX3JlcXVlc3QgKnJlcSwKQEAgLTk2Nyw3ICs5NjQsNyBAQCB2b2lkIGludGVsX2V4ZWNsaXN0
c19yZXRpcmVfcmVxdWVzdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAkJc3RydWN0
IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmogPQogCQkJCWN0eC0+ZW5naW5lW3JpbmctPmlk
XS5zdGF0ZTsKIAotCQlpZiAoY3R4X29iaiAmJiAoY3R4ICE9IHJpbmctPmRlZmF1bHRfY29udGV4
dCkpCisJCWlmIChjdHhfb2JqICYmICFjdHgtPmlzX2dsb2JhbF9kZWZhdWx0KQogCQkJaW50ZWxf
bHJfY29udGV4dF91bnBpbihyZXEpOwogCQlsaXN0X2RlbCgmcmVxLT5leGVjbGlzdF9saW5rKTsK
IAkJaTkxNV9nZW1fcmVxdWVzdF91bnJlZmVyZW5jZShyZXEpOwpAQCAtMjM2NywyMiArMjM2NCwy
MSBAQCB2b2lkIGludGVsX2xyX2NvbnRleHRfZnJlZShzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4
KQogewogCWludCBpOwogCi0JZm9yIChpID0gMDsgaSA8IEk5MTVfTlVNX1JJTkdTOyBpKyspIHsK
Kwlmb3IgKGkgPSBJOTE1X05VTV9SSU5HUzsgLS1pID49IDA7ICkgeworCQlzdHJ1Y3QgaW50ZWxf
cmluZ2J1ZmZlciAqcmluZ2J1ZiA9IGN0eC0+ZW5naW5lW2ldLnJpbmdidWY7CiAJCXN0cnVjdCBk
cm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqID0gY3R4LT5lbmdpbmVbaV0uc3RhdGU7CiAKLQkJ
aWYgKGN0eF9vYmopIHsKLQkJCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmID0KLQkJ
CQkJY3R4LT5lbmdpbmVbaV0ucmluZ2J1ZjsKLQkJCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp
bmcgPSByaW5nYnVmLT5yaW5nOworCQlpZiAoIWN0eF9vYmopCisJCQljb250aW51ZTsKIAotCQkJ
aWYgKGN0eCA9PSByaW5nLT5kZWZhdWx0X2NvbnRleHQpIHsKLQkJCQlpbnRlbF91bnBpbl9yaW5n
YnVmZmVyX29iaihyaW5nYnVmKTsKLQkJCQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihjdHhf
b2JqKTsKLQkJCX0KLQkJCVdBUk5fT04oY3R4LT5lbmdpbmVbcmluZy0+aWRdLnBpbl9jb3VudCk7
Ci0JCQlpbnRlbF9yaW5nYnVmZmVyX2ZyZWUocmluZ2J1Zik7Ci0JCQlkcm1fZ2VtX29iamVjdF91
bnJlZmVyZW5jZSgmY3R4X29iai0+YmFzZSk7CisJCWlmIChjdHgtPmlzX2dsb2JhbF9kZWZhdWx0
KSB7CisJCQlpbnRlbF91bnBpbl9yaW5nYnVmZmVyX29iaihyaW5nYnVmKTsKKwkJCWk5MTVfZ2Vt
X29iamVjdF9nZ3R0X3VucGluKGN0eF9vYmopOwogCQl9CisKKwkJV0FSTl9PTihjdHgtPmVuZ2lu
ZVtpXS5waW5fY291bnQpOworCQlpbnRlbF9yaW5nYnVmZmVyX2ZyZWUocmluZ2J1Zik7CisJCWRy
bV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZjdHhfb2JqLT5iYXNlKTsKIAl9CiB9CiAKQEAgLTI0
NDMsNyArMjQzOSw3IEBAIHN0YXRpYyB2b2lkIGxyY19zZXR1cF9oYXJkd2FyZV9zdGF0dXNfcGFn
ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogICovCiAKIGludCBpbnRlbF9scl9jb250
ZXh0X2RlZmVycmVkX2FsbG9jKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCi0JCQkJICAgICBz
dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQorCQkJCSAgICBzdHJ1Y3QgaW50ZWxfZW5naW5l
X2NzICpyaW5nKQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByaW5nLT5kZXY7CiAJc3Ry
dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmo7CkBAIC0yNDgwLDcgKzI0NzYsNyBAQCBp
bnQgaW50ZWxfbHJfY29udGV4dF9kZWZlcnJlZF9hbGxvYyhzdHJ1Y3QgaW50ZWxfY29udGV4dCAq
Y3R4LAogCWN0eC0+ZW5naW5lW3JpbmctPmlkXS5yaW5nYnVmID0gcmluZ2J1ZjsKIAljdHgtPmVu
Z2luZVtyaW5nLT5pZF0uc3RhdGUgPSBjdHhfb2JqOwogCi0JaWYgKGN0eCAhPSByaW5nLT5kZWZh
dWx0X2NvbnRleHQgJiYgcmluZy0+aW5pdF9jb250ZXh0KSB7CisJaWYgKCFjdHgtPmlzX2dsb2Jh
bF9kZWZhdWx0ICYmIHJpbmctPmluaXRfY29udGV4dCkgewogCQlzdHJ1Y3QgZHJtX2k5MTVfZ2Vt
X3JlcXVlc3QgKnJlcTsKIAogCQlyZXQgPSBpOTE1X2dlbV9yZXF1ZXN0X2FsbG9jKHJpbmcsCi0t
IAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K
SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0
dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK