From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Airlie Subject: [PATCH 4/4] drm/prime: cleanup prime/gem locking interaction Date: Thu, 15 Oct 2015 11:51:41 +1000 Message-ID: <1444873901-32043-5-git-send-email-airlied@gmail.com> References: <1444873901-32043-1-git-send-email-airlied@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id 188F06EDAE for ; Wed, 14 Oct 2015 18:51:48 -0700 (PDT) Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id B9D11AB134 for ; Thu, 15 Oct 2015 01:51:47 +0000 (UTC) Received: from dreadlord-bne-redhat-com.bne.redhat.com. (dhcp-40-179.bne.redhat.com [10.64.40.179]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t9F1pg6M026886 for ; Wed, 14 Oct 2015 21:51:47 -0400 In-Reply-To: <1444873901-32043-1-git-send-email-airlied@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KCmNhbGxpbmcgZHJtX2dlbV9o YW5kbGVfZGVsZXRlIHdvdWxkIGNhdXNlIGFuIGF0dGVtcHQgdG8gcmV0YWtlCnRoZSBwcmltZSBs b2NrLgoKbW92ZSBjb2RlIGFyb3VuZCBzbyB3ZSBuZXZlciBuZWVkIHRvIGRvIHRoYXQuIFRoaXMg cGF0Y2ggYWxsb2NhdGVzCnRoZSBtZW1iZXIgc3RydWN0dXJlIGVhcmx5LCBzbyB0aGVyZSBpcyBu byBmYWlsdXJlIHBhdGggdGhhdApyZXF1aXJlcyBjYWxsaW5nIGRybV9nZW1faGFuZGxlX2RlbGV0 ZS4KClNpZ25lZC1vZmYtYnk6IERhdmUgQWlybGllIDxhaXJsaWVkQHJlZGhhdC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2RybV9wcmltZS5jIHwgNDkgKysrKysrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjQgaW5zZXJ0aW9ucygrKSwg MjUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9wcmltZS5j IGIvZHJpdmVycy9ncHUvZHJtL2RybV9wcmltZS5jCmluZGV4IDg4YzAwNGUuLjY5OTEzOTggMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcHJpbWUuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vZHJtX3ByaW1lLmMKQEAgLTcxLDIwICs3MSwxNCBAQCBzdHJ1Y3QgZHJtX3ByaW1lX2F0dGFj aG1lbnQgewogCWVudW0gZG1hX2RhdGFfZGlyZWN0aW9uIGRpcjsKIH07CiAKLXN0YXRpYyBpbnQg ZHJtX3ByaW1lX2FkZF9idWZfaGFuZGxlKHN0cnVjdCBkcm1fcHJpbWVfZmlsZV9wcml2YXRlICpw cmltZV9mcHJpdiwKLQkJCQkgICAgc3RydWN0IGRtYV9idWYgKmRtYV9idWYsIHVpbnQzMl90IGhh bmRsZSkKK3N0YXRpYyB2b2lkIGRybV9wcmltZV9hZGRfYnVmX2hhbmRsZShzdHJ1Y3QgZHJtX3By aW1lX2ZpbGVfcHJpdmF0ZSAqcHJpbWVfZnByaXYsCisJCQkJICAgICBzdHJ1Y3QgZHJtX3ByaW1l X21lbWJlciAqbWVtYmVyLAorCQkJCSAgICAgc3RydWN0IGRtYV9idWYgKmRtYV9idWYsIHVpbnQz Ml90IGhhbmRsZSkKIHsKLQlzdHJ1Y3QgZHJtX3ByaW1lX21lbWJlciAqbWVtYmVyOwotCi0JbWVt YmVyID0ga21hbGxvYyhzaXplb2YoKm1lbWJlciksIEdGUF9LRVJORUwpOwotCWlmICghbWVtYmVy KQotCQlyZXR1cm4gLUVOT01FTTsKLQogCWdldF9kbWFfYnVmKGRtYV9idWYpOwogCW1lbWJlci0+ ZG1hX2J1ZiA9IGRtYV9idWY7CiAJbWVtYmVyLT5oYW5kbGUgPSBoYW5kbGU7CiAJbGlzdF9hZGQo Jm1lbWJlci0+ZW50cnksICZwcmltZV9mcHJpdi0+aGVhZCk7Ci0JcmV0dXJuIDA7CiB9CiAKIHN0 YXRpYyBzdHJ1Y3QgZG1hX2J1ZiAqZHJtX3ByaW1lX2xvb2t1cF9idWZfYnlfaGFuZGxlKHN0cnVj dCBkcm1fcHJpbWVfZmlsZV9wcml2YXRlICpwcmltZV9mcHJpdiwKQEAgLTQwOSw2ICs0MDMsNyBA QCBpbnQgZHJtX2dlbV9wcmltZV9oYW5kbGVfdG9fZmQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwK IAlzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iajsKIAlpbnQgcmV0ID0gMDsKIAlzdHJ1Y3QgZG1h X2J1ZiAqZG1hYnVmOworCXN0cnVjdCBkcm1fcHJpbWVfbWVtYmVyICptZW1iZXI7CiAKIAltdXRl eF9sb2NrKCZmaWxlX3ByaXYtPnByaW1lLmxvY2spOwogCW9iaiA9IGRybV9nZW1fb2JqZWN0X2xv b2t1cChkZXYsIGZpbGVfcHJpdiwgaGFuZGxlKTsKQEAgLTQxNyw2ICs0MTIsMTIgQEAgaW50IGRy bV9nZW1fcHJpbWVfaGFuZGxlX3RvX2ZkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWdvdG8g b3V0X3VubG9jazsKIAl9CiAKKwltZW1iZXIgPSBrbWFsbG9jKHNpemVvZigqbWVtYmVyKSwgR0ZQ X0tFUk5FTCk7CisJaWYgKCFtZW1iZXIpIHsKKwkJcmV0ID0gLUVOT01FTTsKKwkJZ290byBvdXRf dW5sb2NrOworCX0KKwogCWRtYWJ1ZiA9IGRybV9wcmltZV9sb29rdXBfYnVmX2J5X2hhbmRsZSgm ZmlsZV9wcml2LT5wcmltZSwgaGFuZGxlKTsKIAlpZiAoZG1hYnVmKSB7CiAJCWdldF9kbWFfYnVm KGRtYWJ1Zik7CkBAIC00MzcsNiArNDM4LDcgQEAgaW50IGRybV9nZW1fcHJpbWVfaGFuZGxlX3Rv X2ZkKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCQkJICovCiAJCQkJcmV0ID0gUFRSX0VSUihk bWFidWYpOwogCQkJCW11dGV4X3VubG9jaygmZGV2LT5vYmplY3RfbmFtZV9sb2NrKTsKKwkJCQlr ZnJlZShtZW1iZXIpOwogCQkJCWdvdG8gb3V0OwogCQkJfQogCQl9CkBAIC00NDcsMTMgKzQ0OSw5 IEBAIGludCBkcm1fZ2VtX3ByaW1lX2hhbmRsZV90b19mZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAogCQkgKiBwcm90ZWN0aW9uIG9mIGRldi0+b2JqZWN0X25hbWVfbG9jayB0byBlbnN1cmUgdGhh dCBhIHJhY2luZyBnZW0gY2xvc2UKIAkJICogaW9jdGwgZG9lc24ndCBtaXNzIHRvIHJlbW92ZSB0 aGlzIGJ1ZmZlciBoYW5kbGUgZnJvbSB0aGUgY2FjaGUuCiAJCSAqLwotCQlyZXQgPSBkcm1fcHJp bWVfYWRkX2J1Zl9oYW5kbGUoJmZpbGVfcHJpdi0+cHJpbWUsCi0JCQkJCSAgICAgICBkbWFidWYs IGhhbmRsZSk7CisJCWRybV9wcmltZV9hZGRfYnVmX2hhbmRsZSgmZmlsZV9wcml2LT5wcmltZSwK KwkJCQkJIG1lbWJlciwgZG1hYnVmLCBoYW5kbGUpOwogCQltdXRleF91bmxvY2soJmRldi0+b2Jq ZWN0X25hbWVfbG9jayk7Ci0JCWlmIChyZXQpIHsKLQkJCWRtYV9idWZfcHV0KGRtYWJ1Zik7Ci0J CQlnb3RvIG91dDsKLQkJfQogCX0KIAogCXJldCA9IGRtYV9idWZfZmQoZG1hYnVmLCBmbGFncyk7 CkBAIC01NjAsNiArNTU4LDcgQEAgaW50IGRybV9nZW1fcHJpbWVfZmRfdG9faGFuZGxlKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsCiB7CiAJc3RydWN0IGRtYV9idWYgKmRtYV9idWY7CiAJc3RydWN0 IGRybV9nZW1fb2JqZWN0ICpvYmo7CisJc3RydWN0IGRybV9wcmltZV9tZW1iZXIgKm1lbWJlcjsK IAlpbnQgcmV0OwogCiAJZG1hX2J1ZiA9IGRtYV9idWZfZ2V0KHByaW1lX2ZkKTsKQEAgLTU3Myw2 ICs1NzIsMTEgQEAgaW50IGRybV9nZW1fcHJpbWVfZmRfdG9faGFuZGxlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsCiAJaWYgKHJldCA9PSAwKQogCQlnb3RvIG91dF9wdXQ7CiAKKwltZW1iZXIgPSBr bWFsbG9jKHNpemVvZigqbWVtYmVyKSwgR0ZQX0tFUk5FTCk7CisJaWYgKCFtZW1iZXIpIHsKKwkJ cmV0ID0gLUVOT01FTTsKKwkJZ290byBvdXRfcHV0OworCX0KIAkvKiBuZXZlciBzZWVuIHRoaXMg b25lLCBuZWVkIHRvIGltcG9ydCAqLwogCW11dGV4X2xvY2soJmRldi0+b2JqZWN0X25hbWVfbG9j ayk7CiAJb2JqID0gZGV2LT5kcml2ZXItPmdlbV9wcmltZV9pbXBvcnQoZGV2LCBkbWFfYnVmKTsK QEAgLTU5NSwxMiArNTk5LDEwIEBAIGludCBkcm1fZ2VtX3ByaW1lX2ZkX3RvX2hhbmRsZShzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJCQkJICAgb2JqLT5kbWFfYnVmKTsKIAlkcm1fZ2VtX29i amVjdF91bnJlZmVyZW5jZV91bmxvY2tlZChvYmopOwogCWlmIChyZXQpCi0JCWdvdG8gb3V0X3B1 dDsKKwkJZ290byBvdXRfbWVtYmVyOwogCi0JcmV0ID0gZHJtX3ByaW1lX2FkZF9idWZfaGFuZGxl KCZmaWxlX3ByaXYtPnByaW1lLAotCQkJZG1hX2J1ZiwgKmhhbmRsZSk7Ci0JaWYgKHJldCkKLQkJ Z290byBmYWlsOworCWRybV9wcmltZV9hZGRfYnVmX2hhbmRsZSgmZmlsZV9wcml2LT5wcmltZSwK KwkJCQkgbWVtYmVyLCBkbWFfYnVmLCAqaGFuZGxlKTsKIAogCW11dGV4X3VubG9jaygmZmlsZV9w cml2LT5wcmltZS5sb2NrKTsKIApAQCAtNjA4LDEzICs2MTAsMTAgQEAgaW50IGRybV9nZW1fcHJp bWVfZmRfdG9faGFuZGxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAlyZXR1cm4gMDsKIAot ZmFpbDoKLQkvKiBobW0sIGlmIGRyaXZlciBhdHRhY2hlZCwgd2UgYXJlIHJlbHlpbmcgb24gdGhl IGZyZWUtb2JqZWN0IHBhdGgKLQkgKiB0byBkZXRhY2guLiB3aGljaCBzZWVtcyBvay4uCi0JICov Ci0JZHJtX2dlbV9oYW5kbGVfZGVsZXRlKGZpbGVfcHJpdiwgKmhhbmRsZSk7CiBvdXRfdW5sb2Nr OgogCW11dGV4X3VubG9jaygmZGV2LT5vYmplY3RfbmFtZV9sb2NrKTsKK291dF9tZW1iZXI6CisJ a2ZyZWUobWVtYmVyKTsKIG91dF9wdXQ6CiAJZG1hX2J1Zl9wdXQoZG1hX2J1Zik7CiAJbXV0ZXhf dW5sb2NrKCZmaWxlX3ByaXYtPnByaW1lLmxvY2spOwotLSAKMi41LjAKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QK ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==