From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Hellstrom Subject: [PATCH 1/3] drm/vmwgfx: Don't use memory accounting for kernel-side fence objects Date: Tue, 2 Dec 2014 03:59:51 -0800 Message-ID: <1417521594-3437-1-git-send-email-thellstrom@vmware.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from smtp-outbound-2.vmware.com (smtp-outbound-2.vmware.com [208.91.2.13]) by gabe.freedesktop.org (Postfix) with ESMTP id ED8916E23E for ; Tue, 2 Dec 2014 04:00:29 -0800 (PST) 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 Cc: Thomas Hellstrom , stable@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org S2VybmVsIHNpZGUgZmVuY2Ugb2JqZWN0cyBhcmUgdXNlZCB3aGVuIHVuYmluZGluZyByZXNvdXJj ZXMgYW5kIG1heSB0aHVzIGJlCmNyZWF0ZWQgYXMgcGFydCBvZiBhIG1lbW9yeSByZWNsYWltIG9w ZXJhdGlvbi4gVGhpcyBtaWdodCB0cmlnZ2VyIHJlY3Vyc2l2ZQptZW1vcnkgcmVjbGFpbXMgYW5k IHJlc3VsdCBpbiB0aGUga2VybmVsIHJ1bm5pbmcgb3V0IG9mIHN0YWNrIHNwYWNlLgoKU28gYSBz aW1wbGUgd2F5IG91dCBpcyB0byBhdm9pZCBhY2NvdW50aW5nIG9mIHRoZXNlIGZlbmNlIG9iamVj dHMuCkluIHByaW5jaXBsZSB0aGlzIGlzIE9LIHNpbmNlIHdoaWxlIHVzZXItc3BhY2UgY2FuIHRy aWdnZXIgdGhlIGNyZWF0aW9uIG9mCnN1Y2ggb2JqZWN0cywgaXQgY2FuJ3QgcmVhbGx5IGhvbGQg b24gdG8gdGhlbS4gSG93ZXZlciwgdGhlaXIgbGlmZXRpbWUgaXMKcXVpdGUgbG9uZywgc28gc29t ZSBmb3JtIG9mIGFjY291bnRpbmcgc2hvdWxkIHBlcmhhcHMgYmUgaW1wbGVtZW50ZWQgaW4gdGhl CmZ1dHVyZS4KCkZpeGVzIGtlcm5lbCBjcmFzaGVzIHdoZW4gcnVubmluZywgZm9yIGV4YW1wbGUg dmlld3BlcmYxMSBlbnNpZ2h0LTA0IHRlc3QgMwp3aXRoIGxvdyBzeXN0ZW0gbWVtb3J5IHNldHRp bmdzLgoKQ2M6IDxzdGFibGVAdmdlci5rZXJuZWwub3JnPgpTaWduZWQtb2ZmLWJ5OiBUaG9tYXMg SGVsbHN0cm9tIDx0aGVsbHN0cm9tQHZtd2FyZS5jb20+ClJldmlld2VkLWJ5OiBKYWtvYiBCb3Ju ZWNyYW50eiA8amFrb2JAdm13YXJlLmNvbT4KUmV2aWV3ZWQtYnk6IFNpbmNsYWlyIFllaCA8c3ll aEB2bXdhcmUuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2ZlbmNlLmMg fCAyMiArKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRpb25z KCspLCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4 L3Ztd2dmeF9mZW5jZS5jIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZmVuY2UuYwpp bmRleCAxOTcxNjRmLi42NzczOTM4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4 L3Ztd2dmeF9mZW5jZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2ZlbmNl LmMKQEAgLTU0NSwzNSArNTQ1LDE5IEBAIHZvaWQgdm13X2ZlbmNlX29ial9mbHVzaChzdHJ1Y3Qg dm13X2ZlbmNlX29iaiAqZmVuY2UpCiAKIHN0YXRpYyB2b2lkIHZtd19mZW5jZV9kZXN0cm95KHN0 cnVjdCB2bXdfZmVuY2Vfb2JqICpmZW5jZSkKIHsKLQlzdHJ1Y3Qgdm13X2ZlbmNlX21hbmFnZXIg KmZtYW4gPSBmbWFuX2Zyb21fZmVuY2UoZmVuY2UpOwotCiAJZmVuY2VfZnJlZSgmZmVuY2UtPmJh c2UpOwotCi0JLyoKLQkgKiBGcmVlIGtlcm5lbCBzcGFjZSBhY2NvdW50aW5nLgotCSAqLwotCXR0 bV9tZW1fZ2xvYmFsX2ZyZWUodm13X21lbV9nbG9iKGZtYW4tPmRldl9wcml2KSwKLQkJCSAgICBm bWFuLT5mZW5jZV9zaXplKTsKIH0KIAogaW50IHZtd19mZW5jZV9jcmVhdGUoc3RydWN0IHZtd19m ZW5jZV9tYW5hZ2VyICpmbWFuLAogCQkgICAgIHVpbnQzMl90IHNlcW5vLAogCQkgICAgIHN0cnVj dCB2bXdfZmVuY2Vfb2JqICoqcF9mZW5jZSkKIHsKLQlzdHJ1Y3QgdHRtX21lbV9nbG9iYWwgKm1l bV9nbG9iID0gdm13X21lbV9nbG9iKGZtYW4tPmRldl9wcml2KTsKIAlzdHJ1Y3Qgdm13X2ZlbmNl X29iaiAqZmVuY2U7CiAJaW50IHJldDsKIAotCXJldCA9IHR0bV9tZW1fZ2xvYmFsX2FsbG9jKG1l bV9nbG9iLCBmbWFuLT5mZW5jZV9zaXplLAotCQkJCSAgIGZhbHNlLCBmYWxzZSk7Ci0JaWYgKHVu bGlrZWx5KHJldCAhPSAwKSkKLQkJcmV0dXJuIHJldDsKLQogCWZlbmNlID0ga3phbGxvYyhzaXpl b2YoKmZlbmNlKSwgR0ZQX0tFUk5FTCk7Ci0JaWYgKHVubGlrZWx5KGZlbmNlID09IE5VTEwpKSB7 Ci0JCXJldCA9IC1FTk9NRU07Ci0JCWdvdG8gb3V0X25vX29iamVjdDsKLQl9CisJaWYgKHVubGlr ZWx5KGZlbmNlID09IE5VTEwpKQorCQlyZXR1cm4gLUVOT01FTTsKIAogCXJldCA9IHZtd19mZW5j ZV9vYmpfaW5pdChmbWFuLCBmZW5jZSwgc2Vxbm8sCiAJCQkJIHZtd19mZW5jZV9kZXN0cm95KTsK QEAgLTU4NSw4ICs1NjksNiBAQCBpbnQgdm13X2ZlbmNlX2NyZWF0ZShzdHJ1Y3Qgdm13X2ZlbmNl X21hbmFnZXIgKmZtYW4sCiAKIG91dF9lcnJfaW5pdDoKIAlrZnJlZShmZW5jZSk7Ci1vdXRfbm9f b2JqZWN0OgotCXR0bV9tZW1fZ2xvYmFsX2ZyZWUobWVtX2dsb2IsIGZtYW4tPmZlbmNlX3NpemUp OwogCXJldHVybiByZXQ7CiB9CiAKLS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2RyaS1kZXZlbAo=