From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [RFC 17/28] drm/i915: Compartmentalize i915_ggtt_init_hw Date: Thu, 13 Jun 2019 14:35:28 +0100 Message-ID: <20190613133539.12620-18-tvrtko.ursulin@linux.intel.com> References: <20190613133539.12620-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 mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id A44B589745 for ; Thu, 13 Jun 2019 13:40:59 +0000 (UTC) In-Reply-To: <20190613133539.12620-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkhhdmluZyBt YWRlIHN0YXJ0IHRvIGJldHRlciBjb2RlIGNvbXBhcnRtZW50YWxpemF0aW9uIGJ5IGludHJvZHVj aW5nCnN0cnVjdCBpbnRlbF9ndCwgY29udGludWUgdGhlIHRoZW1lIGVsc2V3aGVyZSBpbiBjb2Rl IGJ5IG1ha2luZyBmdW5jdGlvbnMKdGFrZSBwYXJhbWV0ZXJzIHRha2Ugd2hhdCBsb2dpY2FsbHkg bWFrZXMgbW9zdCBzZW5zZSBmb3IgdGhlbSBpbnN0ZWFkIG9mCnRoZSBnbG9iYWwgc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUuCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVy c3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5j IHwgNjQgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0MiBp bnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0 dC5jCmluZGV4IGM4ODIxM2ZhMThhZi4uMjIzMmJkNTZlOTEyIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9ndHQuYwpAQCAtMzU2Niw0NSArMzU2Niw2NSBAQCBpbnQgaTkxNV9nZ3R0X3Byb2Jl X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogCXJldHVybiAwOwogfQogCi0vKioK LSAqIGk5MTVfZ2d0dF9pbml0X2h3IC0gSW5pdGlhbGl6ZSBHR1RUIGhhcmR3YXJlCi0gKiBAZGV2 X3ByaXY6IGk5MTUgZGV2aWNlCi0gKi8KLWludCBpOTE1X2dndHRfaW5pdF9odyhzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCitzdGF0aWMgdm9pZCBnZ3R0X2NsZWFudXBfaHcoc3Ry dWN0IGk5MTVfZ2d0dCAqZ2d0dCkKIHsKLQlzdHJ1Y3QgaTkxNV9nZ3R0ICpnZ3R0ID0gJmRldl9w cml2LT5nZ3R0OwotCWludCByZXQ7CisJZ2d0dC0+dm0uY2xlYW51cCgmZ2d0dC0+dm0pOworfQog Ci0Jc3Rhc2hfaW5pdCgmZGV2X3ByaXYtPm1tLndjX3N0YXNoKTsKK3N0YXRpYyBpbnQgZ2d0dF9p bml0X2h3KHN0cnVjdCBpOTE1X2dndHQgKmdndHQpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmk5MTUgPSBnZ3R0LT52bS5pOTE1OworCWludCByZXQgPSAwOworCisJbXV0ZXhfbG9jaygm aTkxNS0+ZHJtLnN0cnVjdF9tdXRleCk7CiAKLQkvKiBOb3RlIHRoYXQgd2UgdXNlIHBhZ2UgY29s b3VyaW5nIHRvIGVuZm9yY2UgYSBndWFyZCBwYWdlIGF0IHRoZQotCSAqIGVuZCBvZiB0aGUgYWRk cmVzcyBzcGFjZS4gVGhpcyBpcyByZXF1aXJlZCBhcyB0aGUgQ1MgbWF5IHByZWZldGNoCi0JICog YmV5b25kIHRoZSBlbmQgb2YgdGhlIGJhdGNoIGJ1ZmZlciwgYWNyb3NzIHRoZSBwYWdlIGJvdW5k YXJ5LAotCSAqIGFuZCBiZXlvbmQgdGhlIGVuZCBvZiB0aGUgR1RUIGlmIHdlIGRvIG5vdCBwcm92 aWRlIGEgZ3VhcmQuCi0JICovCi0JbXV0ZXhfbG9jaygmZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0 ZXgpOwogCWk5MTVfYWRkcmVzc19zcGFjZV9pbml0KCZnZ3R0LT52bSwgVk1fQ0xBU1NfR0dUVCk7 CiAKIAlnZ3R0LT52bS5pc19nZ3R0ID0gdHJ1ZTsKIAogCS8qIE9ubHkgVkxWIHN1cHBvcnRzIHJl YWQtb25seSBHR1RUIG1hcHBpbmdzICovCi0JZ2d0dC0+dm0uaGFzX3JlYWRfb25seSA9IElTX1ZB TExFWVZJRVcoZGV2X3ByaXYpOworCWdndHQtPnZtLmhhc19yZWFkX29ubHkgPSBJU19WQUxMRVlW SUVXKGk5MTUpOwogCi0JaWYgKCFIQVNfTExDKGRldl9wcml2KSAmJiAhSEFTX1BQR1RUKGRldl9w cml2KSkKKwlpZiAoIUhBU19MTEMoaTkxNSkgJiYgIUhBU19QUEdUVChpOTE1KSkKIAkJZ2d0dC0+ dm0ubW0uY29sb3JfYWRqdXN0ID0gaTkxNV9ndHRfY29sb3JfYWRqdXN0OwotCW11dGV4X3VubG9j aygmZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0ZXgpOwogCi0JaWYgKCFpb19tYXBwaW5nX2luaXRf d2MoJmRldl9wcml2LT5nZ3R0LmlvbWFwLAotCQkJCWRldl9wcml2LT5nZ3R0LmdtYWRyLnN0YXJ0 LAotCQkJCWRldl9wcml2LT5nZ3R0Lm1hcHBhYmxlX2VuZCkpIHsKKwlpZiAoIWlvX21hcHBpbmdf aW5pdF93YygmZ2d0dC0+aW9tYXAsCisJCQkJZ2d0dC0+Z21hZHIuc3RhcnQsCisJCQkJZ2d0dC0+ bWFwcGFibGVfZW5kKSkgeworCQlnZ3R0X2NsZWFudXBfaHcoZ2d0dCk7CiAJCXJldCA9IC1FSU87 Ci0JCWdvdG8gb3V0X2d0dF9jbGVhbnVwOworCQlnb3RvIG91dDsKIAl9CiAKIAlnZ3R0LT5tdHJy ID0gYXJjaF9waHlzX3djX2FkZChnZ3R0LT5nbWFkci5zdGFydCwgZ2d0dC0+bWFwcGFibGVfZW5k KTsKIAogCWk5MTVfZ2d0dF9pbml0X2ZlbmNlcyhnZ3R0KTsKIAorb3V0OgorCW11dGV4X3VubG9j aygmaTkxNS0+ZHJtLnN0cnVjdF9tdXRleCk7CisKKwlyZXR1cm4gcmV0OworfQorCisvKioKKyAq IGk5MTVfZ2d0dF9pbml0X2h3IC0gSW5pdGlhbGl6ZSBHR1RUIGhhcmR3YXJlCisgKiBAZGV2X3By aXY6IGk5MTUgZGV2aWNlCisgKi8KK2ludCBpOTE1X2dndHRfaW5pdF9odyhzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJaW50IHJldDsKKworCXN0YXNoX2luaXQoJmRldl9w cml2LT5tbS53Y19zdGFzaCk7CisKKwkvKiBOb3RlIHRoYXQgd2UgdXNlIHBhZ2UgY29sb3VyaW5n IHRvIGVuZm9yY2UgYSBndWFyZCBwYWdlIGF0IHRoZQorCSAqIGVuZCBvZiB0aGUgYWRkcmVzcyBz cGFjZS4gVGhpcyBpcyByZXF1aXJlZCBhcyB0aGUgQ1MgbWF5IHByZWZldGNoCisJICogYmV5b25k IHRoZSBlbmQgb2YgdGhlIGJhdGNoIGJ1ZmZlciwgYWNyb3NzIHRoZSBwYWdlIGJvdW5kYXJ5LAor CSAqIGFuZCBiZXlvbmQgdGhlIGVuZCBvZiB0aGUgR1RUIGlmIHdlIGRvIG5vdCBwcm92aWRlIGEg Z3VhcmQuCisJICovCisJcmV0ID0gZ2d0dF9pbml0X2h3KCZkZXZfcHJpdi0+Z2d0dCk7CisJaWYg KHJldCkKKwkJcmV0dXJuIHJldDsKKwogCS8qCiAJICogSW5pdGlhbGlzZSBzdG9sZW4gZWFybHkg c28gdGhhdCB3ZSBtYXkgcmVzZXJ2ZSBwcmVhbGxvY2F0ZWQKIAkgKiBvYmplY3RzIGZvciB0aGUg QklPUyB0byBLTVMgdHJhbnNpdGlvbi4KQEAgLTM2MTYsNyArMzYzNiw3IEBAIGludCBpOTE1X2dn dHRfaW5pdF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJcmV0dXJuIDA7 CiAKIG91dF9ndHRfY2xlYW51cDoKLQlnZ3R0LT52bS5jbGVhbnVwKCZnZ3R0LT52bSk7CisJZ2d0 dF9jbGVhbnVwX2h3KCZkZXZfcHJpdi0+Z2d0dCk7CiAJcmV0dXJuIHJldDsKIH0KIAotLSAKMi4y MC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=