From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Zimmermann Subject: [PATCH 3/4] drm/nouveau: Replace drm_gem_object_unreference_unlocked with put function Date: Mon, 18 Jun 2018 14:53:11 +0200 Message-ID: <20180618125312.14687-4-tdz@users.sourceforge.net> References: <20180618125312.14687-1-tdz@users.sourceforge.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180618125312.14687-1-tdz@users.sourceforge.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: nouveau@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org, Thomas Zimmermann , bskeggs@redhat.com List-Id: dri-devel@lists.freedesktop.org VGhpcyBwYXRjaCB1bmlmaWVzIHRoZSBuYW1pbmcgb2YgRFJNIGZ1bmN0aW9ucyBmb3IgcmVmZXJl bmNlIGNvdW50aW5nCm9mIHN0cnVjdCBkcm1fZ2VtX29iamVjdC4gVGhlIHJlc3VsdGluZyBjb2Rl IGlzIG1vcmUgYWxpZ25lZCB3aXRoIHRoZQpyZXN0IG9mIHRoZSBMaW51eCBrZXJuZWwgaW50ZXJm YWNlcy4KClNpZ25lZC1vZmYtYnk6IFRob21hcyBaaW1tZXJtYW5uIDx0ZHpAdXNlcnMuc291cmNl Zm9yZ2UubmV0PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L2Rpc3BudjA0L2NydGMuYyAg IHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfYWJpMTYuYyAgIHwgIDIg Ky0KIGRyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfZGlzcGxheS5jIHwgIDggKysrKy0t LS0KIGRyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfZ2VtLmMgICAgIHwgMTQgKysrKysr Ky0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvZGlzcG52MDQvY3J0Yy5j IGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvZGlzcG52MDQvY3J0Yy5jCmluZGV4IDZhYTZlZTE2 ZGNiZC4uMmM1NjllMjY0ZGYzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9k aXNwbnYwNC9jcnRjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvZGlzcG52MDQvY3J0 Yy5jCkBAIC0xMDE3LDcgKzEwMTcsNyBAQCBudjA0X2NydGNfY3Vyc29yX3NldChzdHJ1Y3QgZHJt X2NydGMgKmNydGMsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2LAogCW52X2NydGMtPmN1cnNv ci5zZXRfb2Zmc2V0KG52X2NydGMsIG52X2NydGMtPmN1cnNvci5vZmZzZXQpOwogCW52X2NydGMt PmN1cnNvci5zaG93KG52X2NydGMsIHRydWUpOwogb3V0OgotCWRybV9nZW1fb2JqZWN0X3VucmVm ZXJlbmNlX3VubG9ja2VkKGdlbSk7CisJZHJtX2dlbV9vYmplY3RfcHV0X3VubG9ja2VkKGdlbSk7 CiAJcmV0dXJuIHJldDsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUv bm91dmVhdV9hYmkxNi5jIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9hYmkxNi5j CmluZGV4IGUyMjExYmIyY2Y3OS4uZTY3YTQ3MTMzMWI1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vbm91dmVhdS9ub3V2ZWF1X2FiaTE2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL25vdXZl YXUvbm91dmVhdV9hYmkxNi5jCkBAIC0xMzksNyArMTM5LDcgQEAgbm91dmVhdV9hYmkxNl9jaGFu X2Zpbmkoc3RydWN0IG5vdXZlYXVfYWJpMTYgKmFiaTE2LAogCWlmIChjaGFuLT5udGZ5KSB7CiAJ CW5vdXZlYXVfdm1hX2RlbCgmY2hhbi0+bnRmeV92bWEpOwogCQlub3V2ZWF1X2JvX3VucGluKGNo YW4tPm50ZnkpOwotCQlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZV91bmxvY2tlZCgmY2hhbi0+ bnRmeS0+Z2VtKTsKKwkJZHJtX2dlbV9vYmplY3RfcHV0X3VubG9ja2VkKCZjaGFuLT5udGZ5LT5n ZW0pOwogCX0KIAogCWlmIChjaGFuLT5oZWFwLmJsb2NrX3NpemUpCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9u b3V2ZWF1L25vdXZlYXVfZGlzcGxheS5jCmluZGV4IDc3NGI0MjkxNDJiYy4uZGZhMjM2MzcwNzI2 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2Rpc3BsYXkuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2Rpc3BsYXkuYwpAQCAtMjA1LDcg KzIwNSw3IEBAIG5vdXZlYXVfdXNlcl9mcmFtZWJ1ZmZlcl9kZXN0cm95KHN0cnVjdCBkcm1fZnJh bWVidWZmZXIgKmRybV9mYikKIAlzdHJ1Y3Qgbm91dmVhdV9mcmFtZWJ1ZmZlciAqZmIgPSBub3V2 ZWF1X2ZyYW1lYnVmZmVyKGRybV9mYik7CiAKIAlpZiAoZmItPm52Ym8pCi0JCWRybV9nZW1fb2Jq ZWN0X3VucmVmZXJlbmNlX3VubG9ja2VkKCZmYi0+bnZiby0+Z2VtKTsKKwkJZHJtX2dlbV9vYmpl Y3RfcHV0X3VubG9ja2VkKCZmYi0+bnZiby0+Z2VtKTsKIAogCWRybV9mcmFtZWJ1ZmZlcl9jbGVh bnVwKGRybV9mYik7CiAJa2ZyZWUoZmIpOwpAQCAtMjg3LDcgKzI4Nyw3IEBAIG5vdXZlYXVfdXNl cl9mcmFtZWJ1ZmZlcl9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlpZiAocmV0ID09 IDApCiAJCXJldHVybiAmZmItPmJhc2U7CiAKLQlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZV91 bmxvY2tlZChnZW0pOworCWRybV9nZW1fb2JqZWN0X3B1dF91bmxvY2tlZChnZW0pOwogCXJldHVy biBFUlJfUFRSKHJldCk7CiB9CiAKQEAgLTkzOSw3ICs5MzksNyBAQCBub3V2ZWF1X2Rpc3BsYXlf ZHVtYl9jcmVhdGUoc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYsIHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsCiAJCXJldHVybiByZXQ7CiAKIAlyZXQgPSBkcm1fZ2VtX2hhbmRsZV9jcmVhdGUoZmls ZV9wcml2LCAmYm8tPmdlbSwgJmFyZ3MtPmhhbmRsZSk7Ci0JZHJtX2dlbV9vYmplY3RfdW5yZWZl cmVuY2VfdW5sb2NrZWQoJmJvLT5nZW0pOworCWRybV9nZW1fb2JqZWN0X3B1dF91bmxvY2tlZCgm Ym8tPmdlbSk7CiAJcmV0dXJuIHJldDsKIH0KIApAQCAtOTU0LDcgKzk1NCw3IEBAIG5vdXZlYXVf ZGlzcGxheV9kdW1iX21hcF9vZmZzZXQoc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYsCiAJaWYg KGdlbSkgewogCQlzdHJ1Y3Qgbm91dmVhdV9ibyAqYm8gPSBub3V2ZWF1X2dlbV9vYmplY3QoZ2Vt KTsKIAkJKnBvZmZzZXQgPSBkcm1fdm1hX25vZGVfb2Zmc2V0X2FkZHIoJmJvLT5iby52bWFfbm9k ZSk7Ci0JCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlX3VubG9ja2VkKGdlbSk7CisJCWRybV9n ZW1fb2JqZWN0X3B1dF91bmxvY2tlZChnZW0pOwogCQlyZXR1cm4gMDsKIAl9CiAKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9k cm0vbm91dmVhdS9ub3V2ZWF1X2dlbS5jCmluZGV4IDMwMGRhZWU3NDIwOS4uZGY3M2JlYzM1NGU4 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2dlbS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfZ2VtLmMKQEAgLTI3NCw3ICsyNzQsNyBA QCBub3V2ZWF1X2dlbV9pb2N0bF9uZXcoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0 YSwKIAl9CiAKIAkvKiBkcm9wIHJlZmVyZW5jZSBmcm9tIGFsbG9jYXRlIC0gaGFuZGxlIGhvbGRz IGl0IG5vdyAqLwotCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlX3VubG9ja2VkKCZudmJvLT5n ZW0pOworCWRybV9nZW1fb2JqZWN0X3B1dF91bmxvY2tlZCgmbnZiby0+Z2VtKTsKIAlyZXR1cm4g cmV0OwogfQogCkBAIC0zNTQsNyArMzU0LDcgQEAgdmFsaWRhdGVfZmluaV9ub190aWNrZXQoc3Ry dWN0IHZhbGlkYXRlX29wICpvcCwgc3RydWN0IG5vdXZlYXVfZmVuY2UgKmZlbmNlLAogCQlsaXN0 X2RlbCgmbnZiby0+ZW50cnkpOwogCQludmJvLT5yZXNlcnZlZF9ieSA9IE5VTEw7CiAJCXR0bV9i b191bnJlc2VydmUoJm52Ym8tPmJvKTsKLQkJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2VfdW5s b2NrZWQoJm52Ym8tPmdlbSk7CisJCWRybV9nZW1fb2JqZWN0X3B1dF91bmxvY2tlZCgmbnZiby0+ Z2VtKTsKIAl9CiB9CiAKQEAgLTQwMCwxNCArNDAwLDE0IEBAIHZhbGlkYXRlX2luaXQoc3RydWN0 IG5vdXZlYXVfY2hhbm5lbCAqY2hhbiwgc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYsCiAJCW52 Ym8gPSBub3V2ZWF1X2dlbV9vYmplY3QoZ2VtKTsKIAkJaWYgKG52Ym8gPT0gcmVzX2JvKSB7CiAJ CQlyZXNfYm8gPSBOVUxMOwotCQkJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2VfdW5sb2NrZWQo Z2VtKTsKKwkJCWRybV9nZW1fb2JqZWN0X3B1dF91bmxvY2tlZChnZW0pOwogCQkJY29udGludWU7 CiAJCX0KIAogCQlpZiAobnZiby0+cmVzZXJ2ZWRfYnkgJiYgbnZiby0+cmVzZXJ2ZWRfYnkgPT0g ZmlsZV9wcml2KSB7CiAJCQlOVl9QUklOVEsoZXJyLCBjbGksICJtdWx0aXBsZSBpbnN0YW5jZXMg b2YgYnVmZmVyICVkIG9uICIKIAkJCQkgICAgICAidmFsaWRhdGlvbiBsaXN0XG4iLCBiLT5oYW5k bGUpOwotCQkJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2VfdW5sb2NrZWQoZ2VtKTsKKwkJCWRy bV9nZW1fb2JqZWN0X3B1dF91bmxvY2tlZChnZW0pOwogCQkJcmV0ID0gLUVJTlZBTDsKIAkJCWJy ZWFrOwogCQl9CkBAIC04OTQsNyArODk0LDcgQEAgbm91dmVhdV9nZW1faW9jdGxfY3B1X3ByZXAo c3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJcmV0ID0gbHJldDsKIAogCW5v dXZlYXVfYm9fc3luY19mb3JfY3B1KG52Ym8pOwotCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNl X3VubG9ja2VkKGdlbSk7CisJZHJtX2dlbV9vYmplY3RfcHV0X3VubG9ja2VkKGdlbSk7CiAKIAly ZXR1cm4gcmV0OwogfQpAQCAtOTEzLDcgKzkxMyw3IEBAIG5vdXZlYXVfZ2VtX2lvY3RsX2NwdV9m aW5pKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJbnZibyA9IG5vdXZlYXVf Z2VtX29iamVjdChnZW0pOwogCiAJbm91dmVhdV9ib19zeW5jX2Zvcl9kZXZpY2UobnZibyk7Ci0J ZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2VfdW5sb2NrZWQoZ2VtKTsKKwlkcm1fZ2VtX29iamVj dF9wdXRfdW5sb2NrZWQoZ2VtKTsKIAlyZXR1cm4gMDsKIH0KIApAQCAtOTMwLDcgKzkzMCw3IEBA IG5vdXZlYXVfZ2VtX2lvY3RsX2luZm8oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0 YSwKIAkJcmV0dXJuIC1FTk9FTlQ7CiAKIAlyZXQgPSBub3V2ZWF1X2dlbV9pbmZvKGZpbGVfcHJp diwgZ2VtLCByZXEpOwotCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlX3VubG9ja2VkKGdlbSk7 CisJZHJtX2dlbV9vYmplY3RfcHV0X3VubG9ja2VkKGdlbSk7CiAJcmV0dXJuIHJldDsKIH0KIAot LSAKMi4xNC40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK