From: Tvrtko Ursulin Subject: [PATCH v4] drm/i915: Use atomic waits for short non-atomic ones Date: Wed, 29 Jun 2016 10:45:55 +0100 Message-ID: <1467193555-29208-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1467130843-15239-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id F2DD56E6B2 for ; Wed, 29 Jun 2016 09:45:58 +0000 (UTC) In-Reply-To: <1467130843-15239-1-git-send-email-tvrtko.ursulin@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: Mika Kuoppala List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCnVzbGVlcF9y YW5nZSBpcyBub3QgcmVjb21tZW5kZWQgZm9yIHdhaXRzIHNob3J0ZW4gdGhhbiAxMHVzLgoKTWFr ZSB0aGUgd2FpdF9mb3JfdXMgdXNlIHRoZSBhdG9taWMgdmFyaWFudCBmb3Igc3VjaCB3YWl0cy4K ClRvIGRvIHNvIHdlIG5lZWQgdG8gcmVpbXBsZW1lbnQgdGhlIF93YWl0X2Zvcl9hdG9taWMgbWFj cm8gdG8KYmUgc2FmZSB3aXRoIHJlZ2FyZHMgdG8gcHJlZW1wdGlvbiBhbmQgaW50ZXJydXB0cy4K CnYyOiBSZWltcGxlbWVudCBfd2FpdF9mb3JfYXRvbWljIHRvIGJlIGlycSBhbmQgcHJlZW1wdGlv biBzYWZlLgogICAgKENocmlzIFdpbHNvbiBhbmQgSW1yZSBEZWFrKQoKdjM6IEZpeGVkIGluX2F0 b21pYyBjaGVjayBkdWUgcmViYXNlIGVycm9yLgp2NDogQnVpbGQgYnVnIG9uIG5vbi1jb25zdGFu dCB0aW1lb3V0cy4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxp bkBpbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4K Q2M6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KQ2M6IE1pa2EgS3VvcHBhbGEgPG1p a2Eua3VvcHBhbGFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry di5oIHwgNTcgKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDM4IGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmgKaW5kZXggMzE1NmQ4ZGY3OTIxLi4yMWZiMjk2ZGJiYTcgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oCkBAIC02OSwzOSArNjksNTggQEAKIH0pCiAKICNkZWZpbmUgd2FpdF9m b3IoQ09ORCwgTVMpCSAgCV93YWl0X2ZvcigoQ09ORCksIChNUykgKiAxMDAwLCAxMDAwKQotI2Rl ZmluZSB3YWl0X2Zvcl91cyhDT05ELCBVUykJICAJX3dhaXRfZm9yKChDT05EKSwgKFVTKSwgMSkK IAogLyogSWYgQ09ORklHX1BSRUVNUFRfQ09VTlQgaXMgZGlzYWJsZWQsIGluX2F0b21pYygpIGFs d2F5cyByZXBvcnRzIGZhbHNlLiAqLwogI2lmIGRlZmluZWQoQ09ORklHX0RSTV9JOTE1X0RFQlVH KSAmJiBkZWZpbmVkKENPTkZJR19QUkVFTVBUX0NPVU5UKQotIyBkZWZpbmUgX1dBSVRfRk9SX0FU T01JQ19DSEVDSyBXQVJOX09OX09OQ0UoIWluX2F0b21pYygpKQorIyBkZWZpbmUgX1dBSVRfRk9S X0FUT01JQ19DSEVDSyhBVE9NSUMpIFdBUk5fT05fT05DRSgoQVRPTUlDKSAmJiAhaW5fYXRvbWlj KCkpCiAjZWxzZQotIyBkZWZpbmUgX1dBSVRfRk9SX0FUT01JQ19DSEVDSyBkbyB7IH0gd2hpbGUg KDApCisjIGRlZmluZSBfV0FJVF9GT1JfQVRPTUlDX0NIRUNLKEFUT01JQykgZG8geyB9IHdoaWxl ICgwKQogI2VuZGlmCiAKLSNkZWZpbmUgX3dhaXRfZm9yX2F0b21pYyhDT05ELCBVUykgKHsgXAot CXVuc2lnbmVkIGxvbmcgZW5kX187IFwKLQlpbnQgcmV0X18gPSAwOyBcCi0JX1dBSVRfRk9SX0FU T01JQ19DSEVDSzsgXAorI2RlZmluZSBfd2FpdF9mb3JfYXRvbWljKENPTkQsIFVTLCBBVE9NSUMp IFwKKyh7IFwKKwlpbnQgY3B1LCByZXQsIHRpbWVvdXQgPSAoVVMpICogMTAwMDsgXAorCXU2NCBi YXNlOyBcCisJX1dBSVRfRk9SX0FUT01JQ19DSEVDSyhBVE9NSUMpOyBcCiAJQlVJTERfQlVHX09O KChVUykgPiA1MDAwMCk7IFwKLQllbmRfXyA9IChsb2NhbF9jbG9jaygpID4+IDEwKSArIChVUykg KyAxOyBcCi0Jd2hpbGUgKCEoQ09ORCkpIHsgXAotCQlpZiAodGltZV9hZnRlcigodW5zaWduZWQg bG9uZykobG9jYWxfY2xvY2soKSA+PiAxMCksIGVuZF9fKSkgeyBcCi0JCQkvKiBVbmxpa2UgdGhl IHJlZ3VsYXIgd2FpdF9mb3IoKSwgdGhpcyBhdG9taWMgdmFyaWFudCBcCi0JCQkgKiBjYW5ub3Qg YmUgcHJlZW1wdGVkIChhbmQgd2UnbGwganVzdCBpZ25vcmUgdGhlIGlzc3VlXAotCQkJICogb2Yg aXJxIGludGVycnVwdGlvbnMpIGFuZCBzbyB3ZSBrbm93IHRoYXQgbm8gdGltZSBcCi0JCQkgKiBo YXMgcGFzc2VkIHNpbmNlIHRoZSBsYXN0IGNoZWNrIG9mIENPTkQgYW5kIGNhbiBcCi0JCQkgKiBp bW1lZGlhdGVseSByZXBvcnQgdGhlIHRpbWVvdXQuIFwKLQkJCSAqLyBcCi0JCQlyZXRfXyA9IC1F VElNRURPVVQ7IFwKKwlwcmVlbXB0X2Rpc2FibGUoKTsgXAorCWNwdSA9IHNtcF9wcm9jZXNzb3Jf aWQoKTsgXAorCWJhc2UgPSBsb2NhbF9jbG9jaygpOyBcCisJZm9yICg7OykgeyBcCisJCXU2NCBu b3cgPSBsb2NhbF9jbG9jaygpOyBcCisJCXByZWVtcHRfZW5hYmxlKCk7IFwKKwkJaWYgKENPTkQp IHsgXAorCQkJcmV0ID0gMDsgXAorCQkJYnJlYWs7IFwKKwkJfSBcCisJCWlmIChub3cgLSBiYXNl ID49IHRpbWVvdXQpIHsgXAorCQkJcmV0ID0gLUVUSU1FRE9VVDsgXAogCQkJYnJlYWs7IFwKIAkJ fSBcCiAJCWNwdV9yZWxheCgpOyBcCisJCXByZWVtcHRfZGlzYWJsZSgpOyBcCisJCWlmICh1bmxp a2VseShjcHUgIT0gc21wX3Byb2Nlc3Nvcl9pZCgpKSkgeyBcCisJCQl0aW1lb3V0IC09IG5vdyAt IGJhc2U7IFwKKwkJCWNwdSA9IHNtcF9wcm9jZXNzb3JfaWQoKTsgXAorCQkJYmFzZSA9IGxvY2Fs X2Nsb2NrKCk7IFwKKwkJfSBcCiAJfSBcCisJcmV0OyBcCit9KQorCisjZGVmaW5lIHdhaXRfZm9y X3VzKENPTkQsIFVTKSBcCisoeyBcCisJaW50IHJldF9fOyBcCisJQlVJTERfQlVHX09OKCFfX2J1 aWx0aW5fY29uc3RhbnRfcChVUykpOyBcCisJaWYgKChVUykgPiAxMCkgXAorCQlyZXRfXyA9IF93 YWl0X2ZvcigoQ09ORCksIChVUyksIDEwKTsgXAorCWVsc2UgXAorCQlyZXRfXyA9IF93YWl0X2Zv cl9hdG9taWMoKENPTkQpLCAoVVMpLCAwKTsgXAogCXJldF9fOyBcCiB9KQogCi0jZGVmaW5lIHdh aXRfZm9yX2F0b21pYyhDT05ELCBNUykJX3dhaXRfZm9yX2F0b21pYygoQ09ORCksIChNUykgKiAx MDAwKQotI2RlZmluZSB3YWl0X2Zvcl9hdG9taWNfdXMoQ09ORCwgVVMpCV93YWl0X2Zvcl9hdG9t aWMoKENPTkQpLCAoVVMpKQorI2RlZmluZSB3YWl0X2Zvcl9hdG9taWMoQ09ORCwgTVMpCV93YWl0 X2Zvcl9hdG9taWMoKENPTkQpLCAoTVMpICogMTAwMCwgMSkKKyNkZWZpbmUgd2FpdF9mb3JfYXRv bWljX3VzKENPTkQsIFVTKQlfd2FpdF9mb3JfYXRvbWljKChDT05EKSwgKFVTKSwgMSkKIAogI2Rl ZmluZSBLSHooeCkgKDEwMDAgKiAoeCkpCiAjZGVmaW5lIE1Ieih4KSBLSHooMTAwMCAqICh4KSkK LS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK