From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Hellstrom Subject: [PATCH 3/3] drm/ttm: Fix memory space allocation v2 Date: Tue, 15 Sep 2015 01:31:22 -0700 Message-ID: <1442305882-25898-3-git-send-email-thellstrom@vmware.com> References: <1442305882-25898-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 ESMTPS id DA2656E46D for ; Tue, 15 Sep 2015 01:31:45 -0700 (PDT) Received: from sc9-mailhost3.vmware.com (sc9-mailhost3.vmware.com [10.113.161.73]) by smtp-outbound-2.vmware.com (Postfix) with ESMTP id F1D3D285AE for ; Tue, 15 Sep 2015 01:31:45 -0700 (PDT) Received: from EX13-CAS-011.vmware.com (ex13-cas-011.vmware.com [10.113.191.63]) by sc9-mailhost3.vmware.com (Postfix) with ESMTP id 668BB40679 for ; Tue, 15 Sep 2015 01:31:45 -0700 (PDT) In-Reply-To: <1442305882-25898-1-git-send-email-thellstrom@vmware.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 Cc: Thomas Hellstrom List-Id: dri-devel@lists.freedesktop.org SW4gdGhlIGV2ZW50IHRoYXQgVFRNIGRvZXNuJ3QgZmluZCBhIGNvbXBhdGlibGUgbWVtb3J5IHR5 cGUgZm9yIHRoZQpkcml2ZXIncyBmaXJzdCBwbGFjZW1lbnQgY2hvaWNlIChwbGFjZW1lbnQgd2l0 aG91dCBldmljdGlvbiksIFRUTQpyZXR1cm5zIC1FSU5WQUwgd2l0aG91dCB0cnlpbmcgdGhlIGRy aXZlcidzIHNlY29uZCBjaG9pY2UuClRoaXMgY2F1c2VzIHByb2JsZW1zIG9uIHZtd2dmeCB3aGVu IFZSQU0gaXMgZGlzYWJsZWQgYmVmb3JlIGZpcnN0IG1vZGVzZXQKYW5kIGR1cmluZyBWVCBzd2l0 Y2hlcyB3aGVuIGZiZGV2IGlzIG5vdCBlbmFibGVkLgoKRml4IHRoaXMgYnkgYWxzbyB0cnlpbmcg dGhlIGRyaXZlcidzIHNlY29uZCBjaG9pY2UgYmVmb3JlIHJldHVybmluZwotRUlOVkFMLgoKdjI6 IEFsc28gY2hlY2sgdGhhdCBtYW4tPnVzZV90eXBlIGlzIHRydWUgZm9yIHRoZSBkcml2ZXIncyBz ZWNvbmQgY2hvaWNlLgpGaXhlcyBhIGJ1ZyB3aGVyZSBkaXNhbGxvd2VkIG1lbW9yeSB0eXBlcyBj b3VsZCBiZSB1c2VkLgoKU2lnbmVkLW9mZi1ieTogVGhvbWFzIEhlbGxzdHJvbSA8dGhlbGxzdHJv bUB2bXdhcmUuY29tPgpSZXZpZXdlZC1ieTogQnJpYW4gUGF1bCA8YnJpYW5wQHZtd2FyZS5jb20+ ClJldmlld2VkLWJ5OiBTaW5jbGFpciBZZWggPHN5ZWhAdm13YXJlLmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vdHRtL3R0bV9iby5jIHwgMjggKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS90dG0vdHRtX2JvLmMgYi9kcml2ZXJzL2dwdS9kcm0vdHRt L3R0bV9iby5jCmluZGV4IDhkOWI3ZGUuLjc0NWU5OTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS90dG0vdHRtX2JvLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fYm8uYwpAQCAt ODgyLDYgKzg4Miw4IEBAIGludCB0dG1fYm9fbWVtX3NwYWNlKHN0cnVjdCB0dG1fYnVmZmVyX29i amVjdCAqYm8sCiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCQltYW4gPSAmYmRldi0+bWFu W21lbV90eXBlXTsKKwkJaWYgKCFtYW4tPmhhc190eXBlIHx8ICFtYW4tPnVzZV90eXBlKQorCQkJ Y29udGludWU7CiAKIAkJdHlwZV9vayA9IHR0bV9ib19tdF9jb21wYXRpYmxlKG1hbiwgbWVtX3R5 cGUsIHBsYWNlLAogCQkJCQkJJmN1cl9mbGFncyk7CkBAIC04ODksNiArODkxLDcgQEAgaW50IHR0 bV9ib19tZW1fc3BhY2Uoc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICpibywKIAkJaWYgKCF0eXBl X29rKQogCQkJY29udGludWU7CiAKKwkJdHlwZV9mb3VuZCA9IHRydWU7CiAJCWN1cl9mbGFncyA9 IHR0bV9ib19zZWxlY3RfY2FjaGluZyhtYW4sIGJvLT5tZW0ucGxhY2VtZW50LAogCQkJCQkJICBj dXJfZmxhZ3MpOwogCQkvKgpAQCAtOTAxLDEyICs5MDQsMTAgQEAgaW50IHR0bV9ib19tZW1fc3Bh Y2Uoc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICpibywKIAkJaWYgKG1lbV90eXBlID09IFRUTV9Q TF9TWVNURU0pCiAJCQlicmVhazsKIAotCQlpZiAobWFuLT5oYXNfdHlwZSAmJiBtYW4tPnVzZV90 eXBlKSB7Ci0JCQl0eXBlX2ZvdW5kID0gdHJ1ZTsKLQkJCXJldCA9ICgqbWFuLT5mdW5jLT5nZXRf bm9kZSkobWFuLCBibywgcGxhY2UsIG1lbSk7Ci0JCQlpZiAodW5saWtlbHkocmV0KSkKLQkJCQly ZXR1cm4gcmV0OwotCQl9CisJCXJldCA9ICgqbWFuLT5mdW5jLT5nZXRfbm9kZSkobWFuLCBibywg cGxhY2UsIG1lbSk7CisJCWlmICh1bmxpa2VseShyZXQpKQorCQkJcmV0dXJuIHJldDsKKwkJCiAJ CWlmIChtZW0tPm1tX25vZGUpCiAJCQlicmVhazsKIAl9CkBAIC05MTcsOSArOTE4LDYgQEAgaW50 IHR0bV9ib19tZW1fc3BhY2Uoc3RydWN0IHR0bV9idWZmZXJfb2JqZWN0ICpibywKIAkJcmV0dXJu IDA7CiAJfQogCi0JaWYgKCF0eXBlX2ZvdW5kKQotCQlyZXR1cm4gLUVJTlZBTDsKLQogCWZvciAo aSA9IDA7IGkgPCBwbGFjZW1lbnQtPm51bV9idXN5X3BsYWNlbWVudDsgKytpKSB7CiAJCWNvbnN0 IHN0cnVjdCB0dG1fcGxhY2UgKnBsYWNlID0gJnBsYWNlbWVudC0+YnVzeV9wbGFjZW1lbnRbaV07 CiAKQEAgLTkyNywxMSArOTI1LDEyIEBAIGludCB0dG1fYm9fbWVtX3NwYWNlKHN0cnVjdCB0dG1f YnVmZmVyX29iamVjdCAqYm8sCiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCQltYW4gPSAm YmRldi0+bWFuW21lbV90eXBlXTsKLQkJaWYgKCFtYW4tPmhhc190eXBlKQorCQlpZiAoIW1hbi0+ aGFzX3R5cGUgfHwgIW1hbi0+dXNlX3R5cGUpCiAJCQljb250aW51ZTsKIAkJaWYgKCF0dG1fYm9f bXRfY29tcGF0aWJsZShtYW4sIG1lbV90eXBlLCBwbGFjZSwgJmN1cl9mbGFncykpCiAJCQljb250 aW51ZTsKIAorCQl0eXBlX2ZvdW5kID0gdHJ1ZTsKIAkJY3VyX2ZsYWdzID0gdHRtX2JvX3NlbGVj dF9jYWNoaW5nKG1hbiwgYm8tPm1lbS5wbGFjZW1lbnQsCiAJCQkJCQkgIGN1cl9mbGFncyk7CiAJ CS8qCkBAIC05NTcsOCArOTU2LDEzIEBAIGludCB0dG1fYm9fbWVtX3NwYWNlKHN0cnVjdCB0dG1f YnVmZmVyX29iamVjdCAqYm8sCiAJCWlmIChyZXQgPT0gLUVSRVNUQVJUU1lTKQogCQkJaGFzX2Vy ZXN0YXJ0c3lzID0gdHJ1ZTsKIAl9Ci0JcmV0ID0gKGhhc19lcmVzdGFydHN5cykgPyAtRVJFU1RB UlRTWVMgOiAtRU5PTUVNOwotCXJldHVybiByZXQ7CisKKwlpZiAoIXR5cGVfZm91bmQpIHsKKwkJ cHJpbnRrKEtFUk5fRVJSIFRUTV9QRlggIk5vIGNvbXBhdGlibGUgbWVtb3J5IHR5cGUgZm91bmQu XG4iKTsKKwkJcmV0dXJuIC1FSU5WQUw7CisJfQorCisJcmV0dXJuIChoYXNfZXJlc3RhcnRzeXMp ID8gLUVSRVNUQVJUU1lTIDogLUVOT01FTTsKIH0KIEVYUE9SVF9TWU1CT0wodHRtX2JvX21lbV9z cGFjZSk7CiAKLS0gCjIuMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ry aS1kZXZlbAo=