From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Airlie Subject: [PATCH 3/4] drm/gem: cleanup prime lock issue with drm_gem_handle_create_tail Date: Thu, 15 Oct 2015 11:51:40 +1000 Message-ID: <1444873901-32043-4-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 DF0936EDA9 for ; Wed, 14 Oct 2015 18:51:46 -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 93EA1C0BFD02 for ; Thu, 15 Oct 2015 01:51:46 +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 t9F1pg6L026886 for ; Wed, 14 Oct 2015 21:51:45 -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 RnJvbTogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KClRoaXMgcGF0Y2ggY2xlYW5z IHVwIG9uZSBsb2NraW5nIG9yZGVyIGlzc3VlIHdpdGggYSBkZWFkbG9jayBvbgp0aGUgcHJpbWUg bG9jay4KCkl0IGF2b2lkcyBjYWxsaW5nIHRoZSBwcmltZSBkZWxldGUgZnVuY3Rpb24gZnJvbSBk cm1fZ2VtX2hhbmRsZV9jcmVhdGVfdGFpbCwKYW5kIGluc3RlYWQgb3BlbiBjb2RlcyB0aGUgZXhp dCBwYXRocywgaXQgYWxzbyBzcGxpdHMgdGhlIGNvbW1vbiBjb2RlCm91dCBmb3IgdGhlIGV4aXQg cGF0aCB3aGljaCBjYW4gdXNlIGl0LgoKVGhpcyBtZWFucyB0aGUgY2FsbGVlIGhhcyB0byBjYWxs IHRoZSBwcmltZSBjbGVhbnVwIHBhdGhzLCB3aGljaCBpcyBmaW5lCnNpbmNlIHRoaXMgaXMgb25s eSB0aGUgcHJpbWUgY29kZSBhbmQgaXQgaG9sZHMgdGhlIGxvY2sgYWxyZWFkeS4KClRoaXMgaXMg YmFzZWQgb24gYW4gcGF0Y2gvaWRlYSBieSBEYW5pZWwgVmV0dGVyLCBidXQgSSd2ZSBjbGVhbmVk IGl0IHVwCmFuZCByZXdvcmtlZCBpdC4KClNpZ25lZC1vZmYtYnk6IERhdmUgQWlybGllIDxhaXJs aWVkQHJlZGhhdC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9nZW0uYyAgIHwgNTUgKysr KysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vZHJtX3ByaW1lLmMgfCAgMyArKysKIDIgZmlsZXMgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygr KSwgMjIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9nZW0u YyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZ2VtLmMKaW5kZXggMTJkMGRjNy4uNDkzNTRkNyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0v ZHJtX2dlbS5jCkBAIC0yMzksMTQgKzIzOSwxMiBAQCBkcm1fZ2VtX29iamVjdF9oYW5kbGVfdW5y ZWZlcmVuY2VfdW5sb2NrZWQoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmopCiAJZHJtX2dlbV9v YmplY3RfdW5yZWZlcmVuY2VfdW5sb2NrZWQob2JqKTsKIH0KIAorLyogdXNlIGZvciBkZWxldGlv biBhbmQgZmFpbHVyZSBpbiBhbGxvY2F0aW9uICovCiBzdGF0aWMgdm9pZAotZHJtX2dlbV9oYW5k bGVfZGVsZXRlX3RhaWwoc3RydWN0IGRybV9maWxlICpmaWxwLAotCQkJICAgc3RydWN0IGRybV9n ZW1fb2JqZWN0ICpvYmopCitkcm1fZ2VtX2hhbmRsZV9jbGVhbnVwKHN0cnVjdCBkcm1fZmlsZSAq ZmlscCwKKwkJICAgICAgIHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKQogewogCXN0cnVjdCBk cm1fZGV2aWNlICpkZXYgPSBvYmotPmRldjsKLQotCWlmIChkcm1fY29yZV9jaGVja19mZWF0dXJl KGRldiwgRFJJVkVSX1BSSU1FKSkKLQkJZHJtX2dlbV9yZW1vdmVfcHJpbWVfaGFuZGxlcyhvYmos IGZpbHApOwogCWRybV92bWFfbm9kZV9yZXZva2UoJm9iai0+dm1hX25vZGUsIGZpbHAtPmZpbHAp OwogCiAJaWYgKGRldi0+ZHJpdmVyLT5nZW1fY2xvc2Vfb2JqZWN0KQpAQCAtMjU0LDYgKzI1Miwx NyBAQCBkcm1fZ2VtX2hhbmRsZV9kZWxldGVfdGFpbChzdHJ1Y3QgZHJtX2ZpbGUgKmZpbHAsCiAJ ZHJtX2dlbV9vYmplY3RfaGFuZGxlX3VucmVmZXJlbmNlX3VubG9ja2VkKG9iaik7CiB9CiAKK3N0 YXRpYyB2b2lkCitkcm1fZ2VtX2hhbmRsZV9kZWxldGVfdGFpbF9wcmltZShzdHJ1Y3QgZHJtX2Zp bGUgKmZpbHAsCisJCQkJIHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKQoreworCXN0cnVjdCBk cm1fZGV2aWNlICpkZXYgPSBvYmotPmRldjsKKworCWlmIChkcm1fY29yZV9jaGVja19mZWF0dXJl KGRldiwgRFJJVkVSX1BSSU1FKSkKKwkJZHJtX2dlbV9yZW1vdmVfcHJpbWVfaGFuZGxlcyhvYmos IGZpbHApOworCWRybV9nZW1faGFuZGxlX2NsZWFudXAoZmlscCwgb2JqKTsKK30KKwogLyoqCiAg KiBkcm1fZ2VtX2hhbmRsZV9kZWxldGUgLSBkZWxldGVzIHRoZSBnaXZlbiBmaWxlLXByaXZhdGUg aGFuZGxlCiAgKiBAZmlscDogZHJtIGZpbGUtcHJpdmF0ZSBzdHJ1Y3R1cmUgdG8gdXNlIGZvciB0 aGUgaGFuZGxlIGxvb2sgdXAKQEAgLTI5MSw3ICszMDAsNyBAQCBkcm1fZ2VtX2hhbmRsZV9kZWxl dGUoc3RydWN0IGRybV9maWxlICpmaWxwLCB1MzIgaGFuZGxlKQogCWlkcl9yZW1vdmUoJmZpbHAt Pm9iamVjdF9pZHIsIGhhbmRsZSk7CiAJc3Bpbl91bmxvY2soJmZpbHAtPnRhYmxlX2xvY2spOwog Ci0JZHJtX2dlbV9oYW5kbGVfZGVsZXRlX3RhaWwoZmlscCwgb2JqKTsKKwlkcm1fZ2VtX2hhbmRs ZV9kZWxldGVfdGFpbF9wcmltZShmaWxwLCBvYmopOwogCXJldHVybiAwOwogfQogRVhQT1JUX1NZ TUJPTChkcm1fZ2VtX2hhbmRsZV9kZWxldGUpOwpAQCAtMzMzLDYgKzM0MiwxNyBAQCBkcm1fZ2Vt X2hhbmRsZV9jcmVhdGVfdGFpbChzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdiwKIAogCVdBUk5f T04oIW11dGV4X2lzX2xvY2tlZCgmZGV2LT5vYmplY3RfbmFtZV9sb2NrKSk7CiAKKwlyZXQgPSBk cm1fdm1hX25vZGVfYWxsb3coJm9iai0+dm1hX25vZGUsIGZpbGVfcHJpdi0+ZmlscCk7CisJaWYg KHJldCkgeworCQlnb3RvIG91dF91bmxvY2s7CisJfQorCisJaWYgKGRldi0+ZHJpdmVyLT5nZW1f b3Blbl9vYmplY3QpIHsKKwkJcmV0ID0gZGV2LT5kcml2ZXItPmdlbV9vcGVuX29iamVjdChvYmos IGZpbGVfcHJpdik7CisJCWlmIChyZXQpCisJCQlnb3RvIG91dF92bWE7CisJfQorCiAJLyoKIAkg KiBHZXQgdGhlIHVzZXItdmlzaWJsZSBoYW5kbGUgdXNpbmcgaWRyLiAgUHJlbG9hZCBhbmQgcGVy Zm9ybQogCSAqIGFsbG9jYXRpb24gdW5kZXIgb3VyIHNwaW5sb2NrLgpAQCAtMzQ3LDI2ICszNjcs MTcgQEAgZHJtX2dlbV9oYW5kbGVfY3JlYXRlX3RhaWwoc3RydWN0IGRybV9maWxlICpmaWxlX3By aXYsCiAJaWRyX3ByZWxvYWRfZW5kKCk7CiAJbXV0ZXhfdW5sb2NrKCZkZXYtPm9iamVjdF9uYW1l X2xvY2spOwogCWlmIChyZXQgPCAwKSB7Ci0JCWRybV9nZW1fb2JqZWN0X2hhbmRsZV91bnJlZmVy ZW5jZV91bmxvY2tlZChvYmopOworCQlkcm1fZ2VtX2hhbmRsZV9jbGVhbnVwKGZpbGVfcHJpdiwg b2JqKTsKIAkJcmV0dXJuIHJldDsKIAl9CiAJKmhhbmRsZXAgPSByZXQ7CiAKLQlyZXQgPSBkcm1f dm1hX25vZGVfYWxsb3coJm9iai0+dm1hX25vZGUsIGZpbGVfcHJpdi0+ZmlscCk7Ci0JaWYgKHJl dCkgewotCQlkcm1fZ2VtX2hhbmRsZV9kZWxldGUoZmlsZV9wcml2LCAqaGFuZGxlcCk7Ci0JCXJl dHVybiByZXQ7Ci0JfQotCi0JaWYgKGRldi0+ZHJpdmVyLT5nZW1fb3Blbl9vYmplY3QpIHsKLQkJ cmV0ID0gZGV2LT5kcml2ZXItPmdlbV9vcGVuX29iamVjdChvYmosIGZpbGVfcHJpdik7Ci0JCWlm IChyZXQpIHsKLQkJCWRybV9nZW1faGFuZGxlX2RlbGV0ZShmaWxlX3ByaXYsICpoYW5kbGVwKTsK LQkJCXJldHVybiByZXQ7Ci0JCX0KLQl9Ci0KIAlyZXR1cm4gMDsKK291dF92bWE6CisJZHJtX3Zt YV9ub2RlX3Jldm9rZSgmb2JqLT52bWFfbm9kZSwgZmlsZV9wcml2LT5maWxwKTsKK291dF91bmxv Y2s6CisJbXV0ZXhfdW5sb2NrKCZkZXYtPm9iamVjdF9uYW1lX2xvY2spOworCXJldHVybiByZXQ7 CiB9CiAKIC8qKgpAQCAtNzE3LDcgKzcyOCw3IEBAIGRybV9nZW1fb2JqZWN0X3JlbGVhc2VfaGFu ZGxlKGludCBpZCwgdm9pZCAqcHRyLCB2b2lkICpkYXRhKQogCXN0cnVjdCBkcm1fZmlsZSAqZmls ZV9wcml2ID0gZGF0YTsKIAlzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiA9IHB0cjsKIAotCWRy bV9nZW1faGFuZGxlX2RlbGV0ZV90YWlsKGZpbGVfcHJpdiwgb2JqKTsKKwlkcm1fZ2VtX2hhbmRs ZV9kZWxldGVfdGFpbF9wcmltZShmaWxlX3ByaXYsIG9iaik7CiAJcmV0dXJuIDA7CiB9CiAKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcHJpbWUuYyBiL2RyaXZlcnMvZ3B1L2RybS9k cm1fcHJpbWUuYwppbmRleCBkMjJjZTgzLi44OGMwMDRlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vZHJtX3ByaW1lLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9wcmltZS5jCkBAIC01 OTAsNiArNTkwLDkgQEAgaW50IGRybV9nZW1fcHJpbWVfZmRfdG9faGFuZGxlKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsCiAKIAkvKiBkcm1fZ2VtX2hhbmRsZV9jcmVhdGVfdGFpbCB1bmxvY2tzIGRl di0+b2JqZWN0X25hbWVfbG9jay4gKi8KIAlyZXQgPSBkcm1fZ2VtX2hhbmRsZV9jcmVhdGVfdGFp bChmaWxlX3ByaXYsIG9iaiwgaGFuZGxlKTsKKwlpZiAocmV0KQorCQlkcm1fcHJpbWVfcmVtb3Zl X2J1Zl9oYW5kbGVfbG9ja2VkKCZmaWxlX3ByaXYtPnByaW1lLAorCQkJCQkJICAgb2JqLT5kbWFf YnVmKTsKIAlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZV91bmxvY2tlZChvYmopOwogCWlmIChy ZXQpCiAJCWdvdG8gb3V0X3B1dDsKLS0gCjIuNS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2RyaS1kZXZlbAo=