From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH i-g-t 2/5] lib/kms: Handle fence interaction correctly WRT TEST_ONLY. Date: Thu, 6 Jul 2017 09:11:44 +0200 Message-ID: <20170706071147.15414-3-maarten.lankhorst@linux.intel.com> References: <20170706071147.15414-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 799E06E1C0 for ; Thu, 6 Jul 2017 07:12:06 +0000 (UTC) In-Reply-To: <20170706071147.15414-1-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: gustavo.padovan@collabora.co.uk List-Id: intel-gfx@lists.freedesktop.org QWxsIG90aGVyIGF0b21pYyBwcm9wZXJ0aWVzIGFyZSByZXNldCBpbiBkaXNwbGF5X2NvbW1pdF9j aGFuZ2VkLAp3aGljaCBpcyB0aGUgcmlnaHQgcGxhY2UgYmVjYXVzZSBURVNUX09OTFkgY29tbWl0 cyBkb24ndCBuZWVkIHRvCmJlIHJlc2V0LgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9y c3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBsaWIvaWd0X2ttcy5j IHwgMzggKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFu Z2VkLCAxNiBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWIv aWd0X2ttcy5jIGIvbGliL2lndF9rbXMuYwppbmRleCBmYWY5ZGYyZmNlZGYuLjhiZjU2ZmFmNDFl OSAxMDA2NDQKLS0tIGEvbGliL2lndF9rbXMuYworKysgYi9saWIvaWd0X2ttcy5jCkBAIC0yNTA1 LDcgKzI1MDUsNiBAQCBzdGF0aWMgdm9pZCBpZ3RfYXRvbWljX3ByZXBhcmVfY3J0Y19jb21taXQo aWd0X3BpcGVfdCAqcGlwZV9vYmosIGRybU1vZGVBdG9taWNSZQogCXBpcGVfb2JqLT5vdXRfZmVu Y2VfZmQgPSAtMTsKIAlpZiAocGlwZV9vYmotPm91dF9mZW5jZV9yZXF1ZXN0ZWQpCiAJewotCQlw aXBlX29iai0+b3V0X2ZlbmNlX3JlcXVlc3RlZCA9IGZhbHNlOwogCQlpZ3RfYXRvbWljX3BvcHVs YXRlX2NydGNfcmVxKHJlcSwgcGlwZV9vYmosIElHVF9DUlRDX09VVF9GRU5DRV9QVFIsCiAJCSAg ICAodWludDY0X3QpKHVpbnRwdHJfdCkgJnBpcGVfb2JqLT5vdXRfZmVuY2VfZmQpOwogCX0KQEAg LTI1ODYsMjcgKzI1ODUsNiBAQCBzdGF0aWMgaW50IGlndF9hdG9taWNfY29tbWl0KGlndF9kaXNw bGF5X3QgKmRpc3BsYXksIHVpbnQzMl90IGZsYWdzLCB2b2lkICp1c2VyXwogCX0KIAogCXJldCA9 IGRybU1vZGVBdG9taWNDb21taXQoZGlzcGxheS0+ZHJtX2ZkLCByZXEsIGZsYWdzLCB1c2VyX2Rh dGEpOwotCWlmICghcmV0KSB7Ci0KLQkJZm9yX2VhY2hfcGlwZShkaXNwbGF5LCBwaXBlKSB7Ci0J CQlpZ3RfcGlwZV90ICpwaXBlX29iaiA9ICZkaXNwbGF5LT5waXBlc1twaXBlXTsKLQkJCWlndF9w bGFuZV90ICpwbGFuZTsKLQotCQkJLyogcmVzZXQgZmVuY2VfZmQgdG8gcHJldmVudCBpdCBmcm9t IGJlaW5nIHNldCBmb3IgdGhlIG5leHQgY29tbWl0ICovCi0JCQlmb3JfZWFjaF9wbGFuZV9vbl9w aXBlKGRpc3BsYXksIHBpcGUsIHBsYW5lKSB7Ci0JCQkJaWd0X3BsYW5lX3NldF9mZW5jZV9mZChw bGFuZSwgLTEpOwotCQkJfQotCi0JCQlpZiAocGlwZV9vYmotPm91dF9mZW5jZV9mZCA9PSAtMSkK LQkJCQljb250aW51ZTsKLQotCQkJaWd0X2Fzc2VydChwaXBlX29iai0+b3V0X2ZlbmNlX2ZkID49 IDApOwotCQkJcmV0ID0gc3luY19mZW5jZV93YWl0KHBpcGVfb2JqLT5vdXRfZmVuY2VfZmQsIDEw MDApOwotCQkJaWd0X2Fzc2VydChyZXQgPT0gMCk7Ci0JCQljbG9zZShwaXBlX29iai0+b3V0X2Zl bmNlX2ZkKTsKLQkJCXBpcGVfb2JqLT5vdXRfZmVuY2VfZmQgPSAtMTsKLQkJfQotCX0KIAogCWRy bU1vZGVBdG9taWNGcmVlKHJlcSk7CiAJcmV0dXJuIHJldDsKQEAgLTI2MjksNiArMjYwNywxOCBA QCBkaXNwbGF5X2NvbW1pdF9jaGFuZ2VkKGlndF9kaXNwbGF5X3QgKmRpc3BsYXksIGVudW0gaWd0 X2NvbW1pdF9zdHlsZSBzKQogCQlpZiAocyAhPSBDT01NSVRfVU5JVkVSU0FMKQogCQkJcGlwZV9v YmotPm1vZGVfY2hhbmdlZCA9IGZhbHNlOwogCisJCWlmIChzID09IENPTU1JVF9BVE9NSUMpIHsK KwkJCXBpcGVfb2JqLT5vdXRfZmVuY2VfcmVxdWVzdGVkID0gZmFsc2U7CisKKwkJCWlmIChwaXBl X29iai0+b3V0X2ZlbmNlX2ZkID09IC0xKQorCQkJCWNvbnRpbnVlOworCisJCQlpZ3RfYXNzZXJ0 KHBpcGVfb2JqLT5vdXRfZmVuY2VfZmQgPj0gMCk7CisJCQlpZ3RfYXNzZXJ0X2VxKHN5bmNfZmVu Y2Vfd2FpdChwaXBlX29iai0+b3V0X2ZlbmNlX2ZkLCAxMDAwKSwgMCk7CisJCQljbG9zZShwaXBl X29iai0+b3V0X2ZlbmNlX2ZkKTsKKwkJCXBpcGVfb2JqLT5vdXRfZmVuY2VfZmQgPSAtMTsKKwkJ fQorCiAJCWZvcl9lYWNoX3BsYW5lX29uX3BpcGUoZGlzcGxheSwgcGlwZSwgcGxhbmUpIHsKIAkJ CXBsYW5lLT5mYl9jaGFuZ2VkID0gZmFsc2U7CiAJCQlwbGFuZS0+cG9zaXRpb25fY2hhbmdlZCA9 IGZhbHNlOwpAQCAtMjYzOCw2ICsyNjI4LDEwIEBAIGRpc3BsYXlfY29tbWl0X2NoYW5nZWQoaWd0 X2Rpc3BsYXlfdCAqZGlzcGxheSwgZW51bSBpZ3RfY29tbWl0X3N0eWxlIHMpCiAJCQkgICAgIShw bGFuZS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9QUklNQVJZIHx8CiAJCQkgICAgICBwbGFuZS0+ dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9DVVJTT1IpKQogCQkJCXBsYW5lLT5yb3RhdGlvbl9jaGFu Z2VkID0gZmFsc2U7CisKKwkJCWlmIChzID09IENPTU1JVF9BVE9NSUMpCisJCQkJLyogcmVzZXQg ZmVuY2VfZmQgdG8gcHJldmVudCBpdCBmcm9tIGJlaW5nIHNldCBmb3IgdGhlIG5leHQgY29tbWl0 ICovCisJCQkJaWd0X3BsYW5lX3NldF9mZW5jZV9mZChwbGFuZSwgLTEpOwogCQl9CiAJfQogCi0t IAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=