From: Mika Kuoppala Subject: [CI 2/2] drm/i915: Use wait_for_atomic_us when waiting for gt fifo Date: Tue, 2 May 2017 15:33:50 +0300 Message-ID: <1493728430-14533-2-git-send-email-mika.kuoppala@intel.com> References: <1493728430-14533-1-git-send-email-mika.kuoppala@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 371DE6E130 for ; Tue, 2 May 2017 12:34:10 +0000 (UTC) In-Reply-To: <1493728430-14533-1-git-send-email-mika.kuoppala@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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogTWlrYSBLdW9wcGFsYSA8bWlrYS5rdW9wcGFsYUBsaW51eC5pbnRlbC5jb20+CgpSZXBs YWNlIHRoZSBoYW5kY3JhZnRlciBsb29wIHdoZW4gY2hlY2tpbmcgZm9yIGZpZm8gc2xvdHMKd2l0 aCBhdG9taWMgd2FpdCBmb3IuIFRoaXMgYnJpbmdzIHRoaXMgd2FpdCBpbiBsaW5lIHdpdGgKdGhl IG90aGVyIHdhaXRzIG9uIHJlZ2lzdGVyIGFjY2Vzcy4gV2UgYWxzbyBnZXQgYSByZWFkYWJsZQp0 aW1lb3V0IGNvbnN0cmFpbnQsIHNvIG1ha2UgaXQgdG8gZmFpbCBhZnRlciAxMG1zLgoKQ2hyaXMg c3VnZ2VzdGVkIHRoYXQgd2Ugc2hvdWxkIGZhaWwgc2lsZW50bHkgYXMgdGhlIGZpZm8gZGVidWcK aGFuZGxlciwgbm93IGF0dGFjaGVkIHRvIHVuY2xhaW1lZCBtbWlvIGhhbmRsaW5nLCB3aWxsIHRh a2UgY2FyZSBvZiB0aGUKcG9zc2libGUgZXJyb3JzIGF0IGxhdGVyIHN0YWdlLgoKTm90ZSB0aGF0 IHRoZSBkZWNpc2lvbiB0byB3YWl0IHdhcyBjaGFuZ2VkIHNvIHRoYXQgd2UgYXZvaWQKYWxsb2Nh dGluZyB0aGUgZmlyc3QgcmVzZXJ2ZWQgZW50cnkuIE5vciBkbyB3ZSByZWR1Y2UgdGhlIGNvdW50 CmlmIHdlIGZhaWwgdGhlIHdhaXQsIHJlbW92aW5nIHRoZSBwb3NzaWJsaXR5IHRvIHdyYXAgdGhl CmNvdW50IGlmIHRoZSBodyBmaWZvIHJldHVybmVkIHplcm8uCgp2MjogcmVtb3ZlIHVuY2xhaW1l ZCBjaGVjayBvbiB0aW1lb3V0IChDaHJpcykKClJlZmVyZW5jZXM6IGh0dHBzOi8vYnVncy5mcmVl ZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDI0NwpTaWduZWQtb2ZmLWJ5OiBNaWthIEt1 b3BwYWxhIDxtaWthLmt1b3BwYWxhQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IENocmlzIFdpbHNv biA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3VuY29yZS5jIHwgMjkgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCAxNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91bmNvcmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3VuY29yZS5jCmluZGV4IGJhN2U5ZTguLjA5MmUzZGQgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3VuY29yZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3VuY29yZS5jCkBAIC0yOSw2ICsyOSw3IEBACiAjaW5jbHVkZSA8bGludXgvcG1fcnVu dGltZS5oPgogCiAjZGVmaW5lIEZPUkNFV0FLRV9BQ0tfVElNRU9VVF9NUyA1MAorI2RlZmluZSBH VF9GSUZPX1RJTUVPVVRfTVMJIDEwCiAKICNkZWZpbmUgX19yYXdfcG9zdGluZ19yZWFkKGRldl9w cml2X18sIHJlZ19fKSAodm9pZClfX3Jhd19pOTE1X3JlYWQzMigoZGV2X3ByaXZfXyksIChyZWdf XykpCiAKQEAgLTE4MSwyOCArMTgyLDI2IEBAIHN0YXRpYyBpbmxpbmUgdTMyIGZpZm9fZnJlZV9l bnRyaWVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogc3RhdGljIGludCBf X2dlbjZfZ3Rfd2FpdF9mb3JfZmlmbyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiB7Ci0JaW50IHJldCA9IDA7CisJdTMyIG47CiAKIAkvKiBPbiBWTFYsIEZJRk8gd2lsbCBiZSBz aGFyZWQgYnkgYm90aCBTVyBhbmQgSFcuCiAJICogU28sIHdlIG5lZWQgdG8gcmVhZCB0aGUgRlJF RV9FTlRSSUVTIGV2ZXJ5dGltZSAqLwogCWlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSkKLQkJ ZGV2X3ByaXYtPnVuY29yZS5maWZvX2NvdW50ID0gZmlmb19mcmVlX2VudHJpZXMoZGV2X3ByaXYp OwotCi0JaWYgKGRldl9wcml2LT51bmNvcmUuZmlmb19jb3VudCA8IEdUX0ZJRk9fTlVNX1JFU0VS VkVEX0VOVFJJRVMpIHsKLQkJaW50IGxvb3AgPSA1MDA7Ci0JCXUzMiBmaWZvID0gZmlmb19mcmVl X2VudHJpZXMoZGV2X3ByaXYpOwotCi0JCXdoaWxlIChmaWZvIDw9IEdUX0ZJRk9fTlVNX1JFU0VS VkVEX0VOVFJJRVMgJiYgbG9vcC0tKSB7Ci0JCQl1ZGVsYXkoMTApOwotCQkJZmlmbyA9IGZpZm9f ZnJlZV9lbnRyaWVzKGRldl9wcml2KTsKKwkJbiA9IGZpZm9fZnJlZV9lbnRyaWVzKGRldl9wcml2 KTsKKwllbHNlCisJCW4gPSBkZXZfcHJpdi0+dW5jb3JlLmZpZm9fY291bnQ7CisKKwlpZiAobiA8 PSBHVF9GSUZPX05VTV9SRVNFUlZFRF9FTlRSSUVTKSB7CisJCWlmICh3YWl0X2Zvcl9hdG9taWMo KG4gPSBmaWZvX2ZyZWVfZW50cmllcyhkZXZfcHJpdikpID4KKwkJCQkgICAgR1RfRklGT19OVU1f UkVTRVJWRURfRU5UUklFUywKKwkJCQkgICAgR1RfRklGT19USU1FT1VUX01TKSkgeworCQkJRFJN X0RFQlVHKCJHVF9GSUZPIHRpbWVvdXQsIGVudHJpZXM6ICV1XG4iLCBuKTsKKwkJCXJldHVybiAt RUJVU1k7CiAJCX0KLQkJaWYgKFdBUk5fT04obG9vcCA8IDAgJiYgZmlmbyA8PSBHVF9GSUZPX05V TV9SRVNFUlZFRF9FTlRSSUVTKSkKLQkJCSsrcmV0OwotCQlkZXZfcHJpdi0+dW5jb3JlLmZpZm9f Y291bnQgPSBmaWZvOwogCX0KLQlkZXZfcHJpdi0+dW5jb3JlLmZpZm9fY291bnQtLTsKIAotCXJl dHVybiByZXQ7CisJZGV2X3ByaXYtPnVuY29yZS5maWZvX2NvdW50ID0gbiAtIDE7CisJcmV0dXJu IDA7CiB9CiAKIHN0YXRpYyBlbnVtIGhydGltZXJfcmVzdGFydAotLSAKMi43LjQKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=