From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [RFC 25/28] drm/i915: Compartmentalize i915_gem_init_ggtt Date: Thu, 13 Jun 2019 16:19:01 +0100 Message-ID: <20190613151904.16256-2-tvrtko.ursulin@linux.intel.com> References: <20190613133539.12620-1-tvrtko.ursulin@linux.intel.com> <20190613151904.16256-1-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9E22889B38 for ; Thu, 13 Jun 2019 15:19:12 +0000 (UTC) In-Reply-To: <20190613151904.16256-1-tvrtko.ursulin@linux.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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkNvbnRpbnVp bmcgb24gdGhlIHRoZW1lIG9mIGJldHRlciBsb2dpY2FsIG9yZ2FuaXphdGlvbiBvZiBvdXIgY29k ZSwgbWFrZQp0aGUgZmlyc3Qgc3RlcCB0b3dhcmRzIG1ha2luZyB0aGUgZ2d0dCBjb2RlIGJldHRl ciBpc29sYXRlZCBmcm9tIHdpZGVyCnN0cnVjdCBkcm1faTkxNV9wcml2YXRlLgoKU2lnbmVkLW9m Zi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyB8IDQwICsrKysrKysrKysrKysrKysrKyst LS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjYgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCAyODVhN2EwMmMwMTUuLmVh Mjc2ZWQ5MDIxYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0 LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTI4NzMsNyAr Mjg3MywxMyBAQCBzdGF0aWMgdm9pZCBnZ3R0X3JlbGVhc2VfZ3VjX3RvcChzdHJ1Y3QgaTkxNV9n Z3R0ICpnZ3R0KQogCQlkcm1fbW1fcmVtb3ZlX25vZGUoJmdndHQtPnVjX2Z3KTsKIH0KIAotaW50 IGk5MTVfZ2VtX2luaXRfZ2d0dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCitz dGF0aWMgdm9pZCBjbGVhbnVwX2luaXRfZ2d0dChzdHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0KQorewor CWdndHRfcmVsZWFzZV9ndWNfdG9wKGdndHQpOworCWRybV9tbV9yZW1vdmVfbm9kZSgmZ2d0dC0+ ZXJyb3JfY2FwdHVyZSk7Cit9CisKK3N0YXRpYyBpbnQgaW5pdF9nZ3R0KHN0cnVjdCBpOTE1X2dn dHQgKmdndHQpCiB7CiAJLyogTGV0IEdFTSBNYW5hZ2UgYWxsIG9mIHRoZSBhcGVydHVyZS4KIAkg KgpAQCAtMjg4NCw3ICsyODkwLDYgQEAgaW50IGk5MTVfZ2VtX2luaXRfZ2d0dChzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJICogYXBlcnR1cmUuICBPbmUgcGFnZSBzaG91bGQg YmUgZW5vdWdoIHRvIGtlZXAgYW55IHByZWZldGNoaW5nIGluc2lkZQogCSAqIG9mIHRoZSBhcGVy dHVyZS4KIAkgKi8KLQlzdHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0ID0gJmRldl9wcml2LT5nZ3R0Owog CXN0cnVjdCBpOTE1X2FkZHJlc3Nfc3BhY2UgKnZtID0gJmdndHQtPnZtOwogCXVuc2lnbmVkIGxv bmcgaG9sZV9zdGFydCwgaG9sZV9lbmQ7CiAJc3RydWN0IGRybV9tbV9ub2RlICplbnRyeTsKQEAg LTI4OTcsNyArMjkwMiw3IEBAIGludCBpOTE1X2dlbV9pbml0X2dndHQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogCSAqIHdoeS4KIAkgKi8KIAlnZ3R0LT5waW5fYmlhcyA9IG1h eF90KHUzMiwgSTkxNV9HVFRfUEFHRV9TSVpFLAotCQkJICAgICAgIGludGVsX3dvcGNtX2d1Y19z aXplKCZkZXZfcHJpdi0+d29wY20pKTsKKwkJCSAgICAgICBpbnRlbF93b3BjbV9ndWNfc2l6ZSgm dm0tPmk5MTUtPndvcGNtKSk7CiAKIAlyZXQgPSBpbnRlbF92Z3RfYmFsbG9vbihnZ3R0KTsKIAlp ZiAocmV0KQpAQCAtMjkxNyw4ICsyOTIyLDEwIEBAIGludCBpOTE1X2dlbV9pbml0X2dndHQoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCSAqIEdHVFQgYXMgaXQgY2FuIGNvbWZv cnRhYmx5IGhvbGQgR3VDL0h1QyBmaXJtd2FyZSBpbWFnZXMuCiAJICovCiAJcmV0ID0gZ2d0dF9y ZXNlcnZlX2d1Y190b3AoZ2d0dCk7Ci0JaWYgKHJldCkKLQkJZ290byBlcnJfcmVzZXJ2ZTsKKwlp ZiAocmV0KSB7CisJCWNsZWFudXBfaW5pdF9nZ3R0KGdndHQpOworCQlyZXR1cm4gcmV0OworCX0K IAogCS8qIENsZWFyIGFueSBub24tcHJlYWxsb2NhdGVkIGJsb2NrcyAqLwogCWRybV9tbV9mb3Jf ZWFjaF9ob2xlKGVudHJ5LCAmdm0tPm1tLCBob2xlX3N0YXJ0LCBob2xlX2VuZCkgewpAQCAtMjkz MCwxOSArMjkzNywyNCBAQCBpbnQgaTkxNV9nZW1faW5pdF9nZ3R0KHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKIAkvKiBBbmQgZmluYWxseSBjbGVhciB0aGUgcmVzZXJ2ZWQgZ3Vh cmQgcGFnZSAqLwogCXZtLT5jbGVhcl9yYW5nZSh2bSwgdm0tPnRvdGFsIC0gUEFHRV9TSVpFLCBQ QUdFX1NJWkUpOwogCi0JaWYgKElOVEVMX1BQR1RUKGRldl9wcml2KSA9PSBJTlRFTF9QUEdUVF9B TElBU0lORykgewotCQlyZXQgPSBpbml0X2FsaWFzaW5nX3BwZ3R0KGRldl9wcml2KTsKKwlyZXR1 cm4gMDsKK30KKworaW50IGk5MTVfZ2VtX2luaXRfZ2d0dChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqaTkxNSkKK3sKKwlpbnQgcmV0OworCisJcmV0ID0gaW5pdF9nZ3R0KCZpOTE1LT5nZ3R0KTsK KwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCisJaWYgKElOVEVMX1BQR1RUKGk5MTUpID09IElO VEVMX1BQR1RUX0FMSUFTSU5HKSB7CisJCXJldCA9IGluaXRfYWxpYXNpbmdfcHBndHQoaTkxNSk7 CiAJCWlmIChyZXQpCi0JCQlnb3RvIGVycl9hcHBndHQ7CisJCQljbGVhbnVwX2luaXRfZ2d0dCgm aTkxNS0+Z2d0dCk7CiAJfQogCiAJcmV0dXJuIDA7Ci0KLWVycl9hcHBndHQ6Ci0JZ2d0dF9yZWxl YXNlX2d1Y190b3AoZ2d0dCk7Ci1lcnJfcmVzZXJ2ZToKLQlkcm1fbW1fcmVtb3ZlX25vZGUoJmdn dHQtPmVycm9yX2NhcHR1cmUpOwotCXJldHVybiByZXQ7CiB9CiAKIHN0YXRpYyB2b2lkIGdndHRf Y2xlYW51cF9odyhzdHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0KQotLSAKMi4yMC4xCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=