From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 12/21] drm/i915: Convert i915_gem_init_swizzling to uncore Date: Thu, 6 Jun 2019 10:36:30 +0100 Message-ID: <20190606093639.9372-13-tvrtko.ursulin@linux.intel.com> References: <20190606093639.9372-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 mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2332E895E7 for ; Thu, 6 Jun 2019 09:37:04 +0000 (UTC) In-Reply-To: <20190606093639.9372-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCk1vcmUgcmVt b3ZhbCBvZiBpbXBsaWNpdCBkZXZfcHJpdiBmcm9tIHVzaW5nIG9sZCBtbWlvIGFjY2Vzc29ycy4K ClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyB8ICA0ICsrLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW0uYyB8IDM3ICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLQogMyBmaWxlcyBj aGFuZ2VkLCAyNyBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuYwppbmRleCA3MmFjZDViYzUxMDEuLjMxZTk3ZjMzOGQxNCAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5jCkBAIC0yOTMzLDcgKzI5MzMsNyBAQCBzdGF0aWMgaW50IGludGVsX3J1bnRpbWVf c3VzcGVuZChzdHJ1Y3QgZGV2aWNlICprZGV2KQogCiAJCWludGVsX3VjX3Jlc3VtZShkZXZfcHJp dik7CiAKLQkJaTkxNV9nZW1faW5pdF9zd2l6emxpbmcoZGV2X3ByaXYpOworCQlpOTE1X2dlbV9p bml0X3N3aXp6bGluZygmZGV2X3ByaXYtPnVuY29yZSk7CiAJCWk5MTVfZ2VtX3Jlc3RvcmVfZmVu Y2VzKGRldl9wcml2KTsKIAogCQllbmFibGVfcnBtX3dha2VyZWZfYXNzZXJ0cyhkZXZfcHJpdik7 CkBAIC0zMDM0LDcgKzMwMzQsNyBAQCBzdGF0aWMgaW50IGludGVsX3J1bnRpbWVfcmVzdW1lKHN0 cnVjdCBkZXZpY2UgKmtkZXYpCiAJICogTm8gcG9pbnQgb2Ygcm9sbGluZyBiYWNrIHRoaW5ncyBp biBjYXNlIG9mIGFuIGVycm9yLCBhcyB0aGUgYmVzdAogCSAqIHdlIGNhbiBkbyBpcyB0byBob3Bl IHRoYXQgdGhpbmdzIHdpbGwgc3RpbGwgd29yayAoYW5kIGRpc2FibGUgUlBNKS4KIAkgKi8KLQlp OTE1X2dlbV9pbml0X3N3aXp6bGluZyhkZXZfcHJpdik7CisJaTkxNV9nZW1faW5pdF9zd2l6emxp bmcoJmRldl9wcml2LT51bmNvcmUpOwogCWk5MTVfZ2VtX3Jlc3RvcmVfZmVuY2VzKGRldl9wcml2 KTsKIAogCS8qCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCA4OWJmMWUzNGZlYWEuLjRkZjRm OTZjOTc1ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yNjM5LDcgKzI2MzksNyBAQCBi b29sIGk5MTVfZ2VtX3Vuc2V0X3dlZGdlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpOwogdm9pZCBpOTE1X2dlbV9pbml0X21taW8oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5 MTUpOwogaW50IF9fbXVzdF9jaGVjayBpOTE1X2dlbV9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdik7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKLXZvaWQgaTkxNV9nZW1faW5pdF9zd2l6emxp bmcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKK3ZvaWQgaTkxNV9nZW1faW5p dF9zd2l6emxpbmcoc3RydWN0IGludGVsX3VuY29yZSAqdW5jb3JlKTsKIHZvaWQgaTkxNV9nZW1f ZmluaV9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpOTE1X2dl bV9maW5pKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CiBpbnQgaTkxNV9nZW1f d2FpdF9mb3JfaWRsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW0uYwppbmRleCA3NTEyYzgwNGQ0YjcuLmY1YmYxZmUyMDhhNiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jCkBAIC0xMTk5LDI1ICsxMTk5LDM2IEBAIHZvaWQgaTkxNV9nZW1fc2Fu aXRpemUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCiAJbXV0ZXhfdW5sb2NrKCZpOTE1 LT5kcm0uc3RydWN0X211dGV4KTsKIH0KIAotdm9pZCBpOTE1X2dlbV9pbml0X3N3aXp6bGluZyhz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit2b2lkIGk5MTVfZ2VtX2luaXRfc3dp enpsaW5nKHN0cnVjdCBpbnRlbF91bmNvcmUgKnVuY29yZSkKIHsKLQlpZiAoSU5URUxfR0VOKGRl dl9wcml2KSA8IDUgfHwKLQkgICAgZGV2X3ByaXYtPm1tLmJpdF82X3N3aXp6bGVfeCA9PSBJOTE1 X0JJVF82X1NXSVpaTEVfTk9ORSkKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSA9IHVu Y29yZV90b19pOTE1KHVuY29yZSk7CisKKwlpZiAoSU5URUxfR0VOKGk5MTUpIDwgNSB8fAorCSAg ICBpOTE1LT5tbS5iaXRfNl9zd2l6emxlX3ggPT0gSTkxNV9CSVRfNl9TV0laWkxFX05PTkUpCiAJ CXJldHVybjsKIAotCUk5MTVfV1JJVEUoRElTUF9BUkJfQ1RMLCBJOTE1X1JFQUQoRElTUF9BUkJf Q1RMKSB8Ci0JCQkJIERJU1BfVElMRV9TVVJGQUNFX1NXSVpaTElORyk7CisJaW50ZWxfdW5jb3Jl X3dyaXRlKHVuY29yZSwKKwkJCSAgIERJU1BfQVJCX0NUTCwKKwkJCSAgIGludGVsX3VuY29yZV9y ZWFkKHVuY29yZSwgRElTUF9BUkJfQ1RMKSB8CisJCQkgICBESVNQX1RJTEVfU1VSRkFDRV9TV0la WkxJTkcpOwogCi0JaWYgKElTX0dFTihkZXZfcHJpdiwgNSkpCisJaWYgKElTX0dFTihpOTE1LCA1 KSkKIAkJcmV0dXJuOwogCi0JSTkxNV9XUklURShUSUxFQ1RMLCBJOTE1X1JFQUQoVElMRUNUTCkg fCBUSUxFQ1RMX1NXWkNUTCk7Ci0JaWYgKElTX0dFTihkZXZfcHJpdiwgNikpCi0JCUk5MTVfV1JJ VEUoQVJCX01PREUsIF9NQVNLRURfQklUX0VOQUJMRShBUkJfTU9ERV9TV0laWkxFX1NOQikpOwot CWVsc2UgaWYgKElTX0dFTihkZXZfcHJpdiwgNykpCi0JCUk5MTVfV1JJVEUoQVJCX01PREUsIF9N QVNLRURfQklUX0VOQUJMRShBUkJfTU9ERV9TV0laWkxFX0lWQikpOworCWludGVsX3VuY29yZV93 cml0ZSh1bmNvcmUsCisJCQkgICBUSUxFQ1RMLAorCQkJICAgaW50ZWxfdW5jb3JlX3JlYWQodW5j b3JlLCBUSUxFQ1RMKSB8IFRJTEVDVExfU1daQ1RMKTsKKworCWlmIChJU19HRU4oaTkxNSwgNikp CisJCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsCisJCQkJICAgQVJCX01PREUsCisJCQkJICAg X01BU0tFRF9CSVRfRU5BQkxFKEFSQl9NT0RFX1NXSVpaTEVfU05CKSk7CisJZWxzZSBpZiAoSVNf R0VOKGk5MTUsIDcpKQorCQlpbnRlbF91bmNvcmVfd3JpdGUodW5jb3JlLAorCQkJCSAgIEFSQl9N T0RFLAorCQkJCSAgIF9NQVNLRURfQklUX0VOQUJMRShBUkJfTU9ERV9TV0laWkxFX0lWQikpOwog CWVsc2UKLQkJTUlTU0lOR19DQVNFKElOVEVMX0dFTihkZXZfcHJpdikpOworCQlNSVNTSU5HX0NB U0UoSU5URUxfR0VOKGk5MTUpKTsKIH0KIAogc3RhdGljIHZvaWQgaW5pdF91bnVzZWRfcmluZyhz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHUzMiBiYXNlKQpAQCAtMTI2Niw3ICsx Mjc3LDcgQEAgaW50IGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogCS8qIC4uLmFuZCBkZXRlcm1pbmUgd2hldGhlciB0aGV5IGFyZSBzdGlja2luZy4g Ki8KIAlpbnRlbF9ndF92ZXJpZnlfd29ya2Fyb3VuZHMoZGV2X3ByaXYsICJpbml0Iik7CiAKLQlp OTE1X2dlbV9pbml0X3N3aXp6bGluZyhkZXZfcHJpdik7CisJaTkxNV9nZW1faW5pdF9zd2l6emxp bmcoJmRldl9wcml2LT51bmNvcmUpOwogCiAJLyoKIAkgKiBBdCBsZWFzdCA4MzAgY2FuIGxlYXZl IHNvbWUgb2YgdGhlIHVudXNlZCByaW5ncwotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=