From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [PATCH 8/9] drm/i915: give stolen_usable_size a more suitable home Date: Thu, 7 Dec 2017 12:28:38 +0000 Message-ID: <20171207122839.29925-9-matthew.auld@intel.com> References: <20171207122839.29925-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 412286E7FF for ; Thu, 7 Dec 2017 12:28:58 +0000 (UTC) In-Reply-To: <20171207122839.29925-1-matthew.auld@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org S2ljayBpdCBvdXQgb2YgaTkxNV9nZ3R0IGFuZCBrZWVwIGl0IGdyb3VwZWQgd2l0aCBkc20gYW5k IGRzbV9yZXNlcnZlZCwKd2hlcmUgaXQgbWFrZXMgdGhlIG1vc3Qgc2Vuc2UuCgpTaWduZWQtb2Zm LWJ5OiBNYXR0aGV3IEF1bGQgPG1hdHRoZXcuYXVsZEBpbnRlbC5jb20+CkNjOiBKb29uYXMgTGFo dGluZW4gPGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24g PGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IFBhdWxvIFphbm9uaSA8cGF1bG8uci56YW5v bmlAaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxz b24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgfCAx MyArKysrKysrKysrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCAgICB8 IDEwIC0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jIHwg IDUgKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgIHwgIDMgKy0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jICAgICB8ICAzICstLQogNSBmaWxl cyBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaAppbmRleCA0MDE3MWE3ZGE5ZDkuLjU3YmRhNGEzNzBmNiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCkBAIC0yMjUzLDcgKzIyNTMsNyBAQCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSB7CiAJLyoqCiAJICogRGF0YSBTdG9sZW4gTWVtb3J5IC0gYWthICJpOTE1IHN0b2xlbiBtZW1v cnkiIGdpdmVzIHVzIHRoZSBzdGFydCBhbmQKIAkgKiBlbmQgb2Ygc3RvbGVuIHdoaWNoIHdlIGNh biBvcHRpb25hbGx5IHVzZSB0byBjcmVhdGUgR0VNIG9iamVjdHMKLQkgKiBiYWNrZWQgYnkgc3Rv bGVuIG1lbW9yeS4gTm90ZSB0aGF0IGdndHQtPnN0b2xlbl91c2FibGVfc2l6ZSB0ZWxscyB1cwor CSAqIGJhY2tlZCBieSBzdG9sZW4gbWVtb3J5LiBOb3RlIHRoYXQgc3RvbGVuX3VzYWJsZV9zaXpl IHRlbGxzIHVzCiAJICogZXhhY3RseSBob3cgbXVjaCBvZiB0aGlzIHdlIGFyZSBhY3R1YWxseSBh bGxvd2VkIHRvIHVzZSwgZ2l2ZW4gdGhhdAogCSAqIHNvbWUgcG9ydGlvbiBvZiBpdCBpcyBpbiBm YWN0IHJlc2VydmVkIGZvciB1c2UgYnkgaGFyZHdhcmUgZnVuY3Rpb25zLgogCSAqLwpAQCAtMjI2 Myw2ICsyMjYzLDE3IEBAIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlIHsKIAkgKi8KIAlzdHJ1Y3Qg cmVzb3VyY2UgZHNtX3Jlc2VydmVkOwogCisJLyoKKwkgKiBTdG9sZW4gbWVtb3J5IGlzIHNlZ21l bnRlZCBpbiBoYXJkd2FyZSB3aXRoIGRpZmZlcmVudCBwb3J0aW9ucworCSAqIG9mZmxpbWl0cyB0 byBjZXJ0YWluIGZ1bmN0aW9ucy4KKwkgKgorCSAqIFRoZSBkcm1fbW0gaXMgaW5pdGlhbGlzZWQg dG8gdGhlIHRvdGFsIGFjY2Vzc2libGUgcmFuZ2UsIGFzIGZvdW5kCisJICogZnJvbSB0aGUgUENJ IGNvbmZpZy4gT24gQnJvYWR3ZWxsKywgdGhpcyBpcyBmdXJ0aGVyIHJlc3RyaWN0ZWQgdG8KKwkg KiBhdm9pZCB0aGUgZmlyc3QgcGFnZSEgVGhlIHVwcGVyIGVuZCBvZiBzdG9sZW4gbWVtb3J5IGlz IHJlc2VydmVkIGZvcgorCSAqIGhhcmR3YXJlIGZ1bmN0aW9ucyBhbmQgc2ltaWxhcmx5IHJlbW92 ZWQgZnJvbSB0aGUgYWNjZXNzaWJsZSByYW5nZS4KKwkgKi8KKwl1MzIgc3RvbGVuX3VzYWJsZV9z aXplOwkvKiBUb3RhbCBzaXplIG1pbnVzIHJlc2VydmVkIHJhbmdlcyAqLworCiAJdm9pZCBfX2lv bWVtICpyZWdzOwogCiAJc3RydWN0IGludGVsX3VuY29yZSB1bmNvcmU7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2d0dC5oCmluZGV4IDRhMTdjZTM2MjgxYS4uZTVhYTA3Y2ViNjI3IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuaApAQCAtMzczLDE2ICszNzMsNiBAQCBzdHJ1Y3QgaTkx NV9nZ3R0IHsKIAlzdHJ1Y3QgcmVzb3VyY2UgZ21hZHI7ICAgICAgICAgIC8qIEdNQURSIHJlc291 cmNlICovCiAJdTY0IG1hcHBhYmxlX2VuZDsJCS8qIEVuZCBvZmZzZXQgdGhhdCB3ZSBjYW4gQ1BV IG1hcCAqLwogCi0JLyogU3RvbGVuIG1lbW9yeSBpcyBzZWdtZW50ZWQgaW4gaGFyZHdhcmUgd2l0 aCBkaWZmZXJlbnQgcG9ydGlvbnMKLQkgKiBvZmZsaW1pdHMgdG8gY2VydGFpbiBmdW5jdGlvbnMu Ci0JICoKLQkgKiBUaGUgZHJtX21tIGlzIGluaXRpYWxpc2VkIHRvIHRoZSB0b3RhbCBhY2Nlc3Np YmxlIHJhbmdlLCBhcyBmb3VuZAotCSAqIGZyb20gdGhlIFBDSSBjb25maWcuIE9uIEJyb2Fkd2Vs bCssIHRoaXMgaXMgZnVydGhlciByZXN0cmljdGVkIHRvCi0JICogYXZvaWQgdGhlIGZpcnN0IHBh Z2UhIFRoZSB1cHBlciBlbmQgb2Ygc3RvbGVuIG1lbW9yeSBpcyByZXNlcnZlZCBmb3IKLQkgKiBo YXJkd2FyZSBmdW5jdGlvbnMgYW5kIHNpbWlsYXJseSByZW1vdmVkIGZyb20gdGhlIGFjY2Vzc2li bGUgcmFuZ2UuCi0JICovCi0JdTMyIHN0b2xlbl91c2FibGVfc2l6ZTsJLyogVG90YWwgc2l6ZSBt aW51cyByZXNlcnZlZCByYW5nZXMgKi8KLQogCS8qKiAiR3JhcGhpY3MgU3RvbGVuIE1lbW9yeSIg aG9sZHMgdGhlIGdsb2JhbCBQVEVzICovCiAJdm9pZCBfX2lvbWVtICpnc207CiAJdm9pZCAoKmlu dmFsaWRhdGUpKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCmluZGV4IDFjMGQ3NmY3MzM2My4uMzQ2YTFjYzdkNzk0 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYwpAQCAtMzIwLDcgKzMyMCw2 IEBAIHN0YXRpYyB2b2lkIGJkd19nZXRfc3RvbGVuX3Jlc2VydmVkKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKIAogaW50IGk5MTVfZ2VtX2luaXRfc3RvbGVuKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlzdHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0ID0gJmRl dl9wcml2LT5nZ3R0OwogCWRtYV9hZGRyX3QgcmVzZXJ2ZWRfYmFzZSwgc3RvbGVuX3RvcDsKIAl1 MzIgcmVzZXJ2ZWRfdG90YWwsIHJlc2VydmVkX3NpemU7CiAJdTMyIHN0b2xlbl91c2FibGVfc3Rh cnQ7CkBAIC00MTEsMTIgKzQxMCwxMiBAQCBpbnQgaTkxNV9nZW1faW5pdF9zdG9sZW4oc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49 IDgpCiAJCXN0b2xlbl91c2FibGVfc3RhcnQgPSA0MDk2OwogCi0JZ2d0dC0+c3RvbGVuX3VzYWJs ZV9zaXplID0KKwlkZXZfcHJpdi0+c3RvbGVuX3VzYWJsZV9zaXplID0KIAkJcmVzb3VyY2Vfc2l6 ZSgmZGV2X3ByaXYtPmRzbSkgLSByZXNlcnZlZF90b3RhbCAtIHN0b2xlbl91c2FibGVfc3RhcnQ7 CiAKIAkvKiBCYXNpYyBtZW1yYW5nZSBhbGxvY2F0b3IgZm9yIHN0b2xlbiBzcGFjZS4gKi8KIAlk cm1fbW1faW5pdCgmZGV2X3ByaXYtPm1tLnN0b2xlbiwgc3RvbGVuX3VzYWJsZV9zdGFydCwKLQkJ ICAgIGdndHQtPnN0b2xlbl91c2FibGVfc2l6ZSk7CisJCSAgICBkZXZfcHJpdi0+c3RvbGVuX3Vz YWJsZV9zaXplKTsKIAogCXJldHVybiAwOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCmluZGV4IDAwOTg3MzhkMzc0MC4uZjFlMGU4MzhiMmE3IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCkBAIC0yNjM5LDcgKzI2MzksNiBAQCBpbnRlbF9hbGxvY19pbml0aWFs X3BsYW5lX29iaihzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIHsKIAlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gdG9faTkxNShkZXYpOwotCXN0cnVjdCBpOTE1X2dndHQgKmdndHQgPSAmZGV2X3ByaXYt PmdndHQ7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IE5VTEw7CiAJc3RydWN0 IGRybV9tb2RlX2ZiX2NtZDIgbW9kZV9jbWQgPSB7IDAgfTsKIAlzdHJ1Y3QgZHJtX2ZyYW1lYnVm ZmVyICpmYiA9ICZwbGFuZV9jb25maWctPmZiLT5iYXNlOwpAQCAtMjY1NSw3ICsyNjU0LDcgQEAg aW50ZWxfYWxsb2NfaW5pdGlhbF9wbGFuZV9vYmooc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJ LyogSWYgdGhlIEZCIGlzIHRvbyBiaWcsIGp1c3QgZG9uJ3QgdXNlIGl0IHNpbmNlIGZiZGV2IGlz IG5vdCB2ZXJ5CiAJICogaW1wb3J0YW50IGFuZCB3ZSBzaG91bGQgcHJvYmFibHkgdXNlIHRoYXQg c3BhY2Ugd2l0aCBGQkMgb3Igb3RoZXIKIAkgKiBmZWF0dXJlcy4gKi8KLQlpZiAoc2l6ZV9hbGln bmVkICogMiA+IGdndHQtPnN0b2xlbl91c2FibGVfc2l6ZSkKKwlpZiAoc2l6ZV9hbGlnbmVkICog MiA+IGRldl9wcml2LT5zdG9sZW5fdXNhYmxlX3NpemUpCiAJCXJldHVybiBmYWxzZTsKIAogCW11 dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2ZiZGV2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5j CmluZGV4IGVhOTY2ODI1NjhlOC4uZGE0OGFmMTFlYjZiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2ZiZGV2LmMKQEAgLTExNSw3ICsxMTUsNiBAQCBzdGF0aWMgaW50IGludGVsZmJfYWxsb2Moc3Ry dWN0IGRybV9mYl9oZWxwZXIgKmhlbHBlciwKIAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYjsK IAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaGVscGVyLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwotCXN0cnVjdCBpOTE1X2dndHQgKmdn dHQgPSAmZGV2X3ByaXYtPmdndHQ7CiAJc3RydWN0IGRybV9tb2RlX2ZiX2NtZDIgbW9kZV9jbWQg PSB7fTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwogCWludCBzaXplLCByZXQ7 CkBAIC0xMzksNyArMTM4LDcgQEAgc3RhdGljIGludCBpbnRlbGZiX2FsbG9jKHN0cnVjdCBkcm1f ZmJfaGVscGVyICpoZWxwZXIsCiAJICogaW1wb3J0YW50IGFuZCB3ZSBzaG91bGQgcHJvYmFibHkg dXNlIHRoYXQgc3BhY2Ugd2l0aCBGQkMgb3Igb3RoZXIKIAkgKiBmZWF0dXJlcy4gKi8KIAlvYmog PSBOVUxMOwotCWlmIChzaXplICogMiA8IGdndHQtPnN0b2xlbl91c2FibGVfc2l6ZSkKKwlpZiAo c2l6ZSAqIDIgPCBkZXZfcHJpdi0+c3RvbGVuX3VzYWJsZV9zaXplKQogCQlvYmogPSBpOTE1X2dl bV9vYmplY3RfY3JlYXRlX3N0b2xlbihkZXZfcHJpdiwgc2l6ZSk7CiAJaWYgKG9iaiA9PSBOVUxM KQogCQlvYmogPSBpOTE1X2dlbV9vYmplY3RfY3JlYXRlKGRldl9wcml2LCBzaXplKTsKLS0gCjIu MTQuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==