From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH 3/6] drm/i915: Add the exclusive fence to plane_state. Date: Wed, 23 Mar 2016 14:24:29 +0100 Message-ID: <1458739472-6582-4-git-send-email-maarten.lankhorst@linux.intel.com> References: <1458739472-6582-1-git-send-email-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 [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 293836E857 for ; Wed, 23 Mar 2016 13:24:38 +0000 (UTC) In-Reply-To: <1458739472-6582-1-git-send-email-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 List-Id: intel-gfx@lists.freedesktop.org WFhYOiBXcml0ZSBtZSEKLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxh bmUuYyB8ICAxICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgICAgIHwg NTQgKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA0MiBp bnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2F0b21pY19wbGFuZS5jCmluZGV4IDdkZTc3MjFmNjViYy4uMmFiNDVmMTZmYTY1IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYwpAQCAtMTAyLDYgKzEwMiw3IEBA IGludGVsX3BsYW5lX2Rlc3Ryb3lfc3RhdGUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkg IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnN0YXRlKQogewogCVdBUk5fT04oc3RhdGUgJiYgdG9f aW50ZWxfcGxhbmVfc3RhdGUoc3RhdGUpLT53YWl0X3JlcSk7CisJV0FSTl9PTihzdGF0ZSAmJiBz dGF0ZS0+ZmVuY2UpOwogCWRybV9hdG9taWNfaGVscGVyX3BsYW5lX2Rlc3Ryb3lfc3RhdGUocGxh bmUsIHN0YXRlKTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGMx NWMwOGRjMjUxYy4uYzUyZWIxYmI0ZjI0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCkBAIC0xMzM0OSw2ICsxMzM0OSwxNSBAQCBzdGF0aWMgaW50IGludGVsX2F0b21pY19wcmVw YXJlX2NvbW1pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJc3RydWN0IGludGVsX3BsYW5l X3N0YXRlICppbnRlbF9wbGFuZV9zdGF0ZSA9CiAJCQkJdG9faW50ZWxfcGxhbmVfc3RhdGUocGxh bmVfc3RhdGUpOwogCisJCQlpZiAocGxhbmVfc3RhdGUtPmZlbmNlKSB7CisJCQkJbG9uZyBscmV0 ID0gZmVuY2Vfd2FpdChwbGFuZV9zdGF0ZS0+ZmVuY2UsIHRydWUpOworCisJCQkJaWYgKGxyZXQg PCAwKSB7CisJCQkJCXJldCA9IGxyZXQ7CisJCQkJCWJyZWFrOworCQkJCX0KKwkJCX0KKwogCQkJ aWYgKCFpbnRlbF9wbGFuZV9zdGF0ZS0+d2FpdF9yZXEpCiAJCQkJY29udGludWU7CiAKQEAgLTEz NjgxLDYgKzEzNjkwLDMzIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2NydGNfZnVuY3MgaW50 ZWxfY3J0Y19mdW5jcyA9IHsKIAkuYXRvbWljX2Rlc3Ryb3lfc3RhdGUgPSBpbnRlbF9jcnRjX2Rl c3Ryb3lfc3RhdGUsCiB9OwogCitzdGF0aWMgc3RydWN0IGZlbmNlICppbnRlbF9nZXRfZXhjbF9m ZW5jZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQoreworCXN0cnVjdCByZXNlcnZh dGlvbl9vYmplY3QgKnJlc3Y7CisKKworCWlmICghb2JqLT5iYXNlLmRtYV9idWYpCisJCXJldHVy biBOVUxMOworCisJcmVzdiA9IG9iai0+YmFzZS5kbWFfYnVmLT5yZXN2OworCisJLyogRm9yIGZy YW1lYnVmZmVyIGJhY2tlZCBieSBkbWFidWYsIHdhaXQgZm9yIGZlbmNlICovCisJd2hpbGUgKDEp IHsKKwkJc3RydWN0IGZlbmNlICpmZW5jZV9leGNsLCAqcmV0ID0gTlVMTDsKKworCQlyY3VfcmVh ZF9sb2NrKCk7CisKKwkJZmVuY2VfZXhjbCA9IHJjdV9kZXJlZmVyZW5jZShyZXN2LT5mZW5jZV9l eGNsKTsKKwkJaWYgKGZlbmNlX2V4Y2wpCisJCQlyZXQgPSBmZW5jZV9nZXRfcmN1KGZlbmNlX2V4 Y2wpOworCisJCXJjdV9yZWFkX3VubG9jaygpOworCisJCWlmIChyZXQgPT0gZmVuY2VfZXhjbCkK KwkJCXJldHVybiByZXQ7CisJfQorfQorCiAvKioKICAqIGludGVsX3ByZXBhcmVfcGxhbmVfZmIg LSBQcmVwYXJlIGZiIGZvciB1c2FnZSBvbiBwbGFuZQogICogQHBsYW5lOiBkcm0gcGxhbmUgdG8g cHJlcGFyZSBmb3IKQEAgLTEzNzMyLDE5ICsxMzc2OCw2IEBAIGludGVsX3ByZXBhcmVfcGxhbmVf ZmIoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQlyZXR1cm4gcmV0OwogCX0KIAotCS8qIEZv ciBmcmFtZWJ1ZmZlciBiYWNrZWQgYnkgZG1hYnVmLCB3YWl0IGZvciBmZW5jZSAqLwotCWlmIChv YmogJiYgb2JqLT5iYXNlLmRtYV9idWYpIHsKLQkJbG9uZyBscmV0OwotCi0JCWxyZXQgPSByZXNl cnZhdGlvbl9vYmplY3Rfd2FpdF90aW1lb3V0X3JjdShvYmotPmJhc2UuZG1hX2J1Zi0+cmVzdiwK LQkJCQkJCQkgICBmYWxzZSwgdHJ1ZSwKLQkJCQkJCQkgICBNQVhfU0NIRURVTEVfVElNRU9VVCk7 Ci0JCWlmIChscmV0ID09IC1FUkVTVEFSVFNZUykKLQkJCXJldHVybiBscmV0OwotCi0JCVdBUk4o bHJldCA8IDAsICJ3YWl0aW5nIHJldHVybnMgJWxpXG4iLCBscmV0KTsKLQl9Ci0KIAlpZiAoIW9i aikgewogCQlyZXQgPSAwOwogCX0gZWxzZSBpZiAocGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZ UEVfQ1VSU09SICYmCkBAIC0xMzc2NCw2ICsxMzc4Nyw4IEBAIGludGVsX3ByZXBhcmVfcGxhbmVf ZmIoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAKIAkJCWk5MTVfZ2VtX3JlcXVlc3RfYXNzaWdu KCZwbGFuZV9zdGF0ZS0+d2FpdF9yZXEsCiAJCQkJCQlvYmotPmxhc3Rfd3JpdGVfcmVxKTsKKwor CQkJcGxhbmVfc3RhdGUtPmJhc2UuZmVuY2UgPSBpbnRlbF9nZXRfZXhjbF9mZW5jZShvYmopOwog CQl9CiAKIAkJaTkxNV9nZW1fdHJhY2tfZmIob2xkX29iaiwgb2JqLCBpbnRlbF9wbGFuZS0+ZnJv bnRidWZmZXJfYml0KTsKQEAgLTEzODA2LDYgKzEzODMxLDkgQEAgaW50ZWxfY2xlYW51cF9wbGFu ZV9mYihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJaTkxNV9nZW1fdHJhY2tfZmIob2xkX29i aiwgb2JqLCBpbnRlbF9wbGFuZS0+ZnJvbnRidWZmZXJfYml0KTsKIAogCWk5MTVfZ2VtX3JlcXVl c3RfYXNzaWduKCZvbGRfaW50ZWxfc3RhdGUtPndhaXRfcmVxLCBOVUxMKTsKKworCWZlbmNlX3B1 dChvbGRfaW50ZWxfc3RhdGUtPmJhc2UuZmVuY2UpOworCW9sZF9pbnRlbF9zdGF0ZS0+YmFzZS5m ZW5jZSA9IE5VTEw7CiB9CiAKIGludAotLSAKMi4xLjAKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=