From: Dave Airlie Subject: [PATCH] drm/gem: consolidate handle deletion code. Date: Wed, 14 Oct 2015 16:30:47 +1000 Message-ID: <1444804247-9745-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 585DF6E6AF for ; Tue, 13 Oct 2015 23:30:50 -0700 (PDT) Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id E8D8B3620B9 for ; Wed, 14 Oct 2015 06:30:49 +0000 (UTC) Received: from dreadlord-bne-redhat-com.bne.redhat.com. (dhcp-40-179.bne.redhat.com [10.64.40.179]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t9E6UmGw003304 for ; Wed, 14 Oct 2015 02:30:49 -0400 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 RnJvbTogRGF2ZSBBaXJsaWUgPGFpcmxpZWRAcmVkaGF0LmNvbT4KClRoaXMgY29kZSB3YXMgZHVw bGljYXRlZCwgbWFrZSBpdCBkZWNpZGVseQpsZXNzIGR1cGxpY2F0ZWQuCgpTaWduZWQtb2ZmLWJ5 OiBEYXZlIEFpcmxpZSA8YWlybGllZEByZWRoYXQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9k cm1fZ2VtLmMgfCAzNSArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9kcm1fZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2dlbS5jCmlu ZGV4IDNjMmQ0YWIuLjEyZDBkYzcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fZ2Vt LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9nZW0uYwpAQCAtMjM5LDYgKzIzOSwyMSBAQCBk cm1fZ2VtX29iamVjdF9oYW5kbGVfdW5yZWZlcmVuY2VfdW5sb2NrZWQoc3RydWN0IGRybV9nZW1f b2JqZWN0ICpvYmopCiAJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2VfdW5sb2NrZWQob2JqKTsK IH0KIAorc3RhdGljIHZvaWQKK2RybV9nZW1faGFuZGxlX2RlbGV0ZV90YWlsKHN0cnVjdCBkcm1f ZmlsZSAqZmlscCwKKwkJCSAgIHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKQoreworCXN0cnVj dCBkcm1fZGV2aWNlICpkZXYgPSBvYmotPmRldjsKKworCWlmIChkcm1fY29yZV9jaGVja19mZWF0 dXJlKGRldiwgRFJJVkVSX1BSSU1FKSkKKwkJZHJtX2dlbV9yZW1vdmVfcHJpbWVfaGFuZGxlcyhv YmosIGZpbHApOworCWRybV92bWFfbm9kZV9yZXZva2UoJm9iai0+dm1hX25vZGUsIGZpbHAtPmZp bHApOworCisJaWYgKGRldi0+ZHJpdmVyLT5nZW1fY2xvc2Vfb2JqZWN0KQorCQlkZXYtPmRyaXZl ci0+Z2VtX2Nsb3NlX29iamVjdChvYmosIGZpbHApOworCWRybV9nZW1fb2JqZWN0X2hhbmRsZV91 bnJlZmVyZW5jZV91bmxvY2tlZChvYmopOworfQorCiAvKioKICAqIGRybV9nZW1faGFuZGxlX2Rl bGV0ZSAtIGRlbGV0ZXMgdGhlIGdpdmVuIGZpbGUtcHJpdmF0ZSBoYW5kbGUKICAqIEBmaWxwOiBk cm0gZmlsZS1wcml2YXRlIHN0cnVjdHVyZSB0byB1c2UgZm9yIHRoZSBoYW5kbGUgbG9vayB1cApA QCAtMjc2LDE0ICsyOTEsNyBAQCBkcm1fZ2VtX2hhbmRsZV9kZWxldGUoc3RydWN0IGRybV9maWxl ICpmaWxwLCB1MzIgaGFuZGxlKQogCWlkcl9yZW1vdmUoJmZpbHAtPm9iamVjdF9pZHIsIGhhbmRs ZSk7CiAJc3Bpbl91bmxvY2soJmZpbHAtPnRhYmxlX2xvY2spOwogCi0JaWYgKGRybV9jb3JlX2No ZWNrX2ZlYXR1cmUoZGV2LCBEUklWRVJfUFJJTUUpKQotCQlkcm1fZ2VtX3JlbW92ZV9wcmltZV9o YW5kbGVzKG9iaiwgZmlscCk7Ci0JZHJtX3ZtYV9ub2RlX3Jldm9rZSgmb2JqLT52bWFfbm9kZSwg ZmlscC0+ZmlscCk7Ci0KLQlpZiAoZGV2LT5kcml2ZXItPmdlbV9jbG9zZV9vYmplY3QpCi0JCWRl di0+ZHJpdmVyLT5nZW1fY2xvc2Vfb2JqZWN0KG9iaiwgZmlscCk7Ci0JZHJtX2dlbV9vYmplY3Rf aGFuZGxlX3VucmVmZXJlbmNlX3VubG9ja2VkKG9iaik7Ci0KKwlkcm1fZ2VtX2hhbmRsZV9kZWxl dGVfdGFpbChmaWxwLCBvYmopOwogCXJldHVybiAwOwogfQogRVhQT1JUX1NZTUJPTChkcm1fZ2Vt X2hhbmRsZV9kZWxldGUpOwpAQCAtNzA4LDE3ICs3MTYsOCBAQCBkcm1fZ2VtX29iamVjdF9yZWxl YXNlX2hhbmRsZShpbnQgaWQsIHZvaWQgKnB0ciwgdm9pZCAqZGF0YSkKIHsKIAlzdHJ1Y3QgZHJt X2ZpbGUgKmZpbGVfcHJpdiA9IGRhdGE7CiAJc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmogPSBw dHI7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IG9iai0+ZGV2OwotCi0JaWYgKGRybV9jb3Jl X2NoZWNrX2ZlYXR1cmUoZGV2LCBEUklWRVJfUFJJTUUpKQotCQlkcm1fZ2VtX3JlbW92ZV9wcmlt ZV9oYW5kbGVzKG9iaiwgZmlsZV9wcml2KTsKLQlkcm1fdm1hX25vZGVfcmV2b2tlKCZvYmotPnZt YV9ub2RlLCBmaWxlX3ByaXYtPmZpbHApOwotCi0JaWYgKGRldi0+ZHJpdmVyLT5nZW1fY2xvc2Vf b2JqZWN0KQotCQlkZXYtPmRyaXZlci0+Z2VtX2Nsb3NlX29iamVjdChvYmosIGZpbGVfcHJpdik7 Ci0KLQlkcm1fZ2VtX29iamVjdF9oYW5kbGVfdW5yZWZlcmVuY2VfdW5sb2NrZWQob2JqKTsKIAor CWRybV9nZW1faGFuZGxlX2RlbGV0ZV90YWlsKGZpbGVfcHJpdiwgb2JqKTsKIAlyZXR1cm4gMDsK IH0KIAotLSAKMi41LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRl dmVsCg==