From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH 1/9] drm/i915: SAGV is not SKL-only, so rename a few things Date: Tue, 13 Sep 2016 21:38:14 -0300 Message-ID: <1473813502-16844-2-git-send-email-paulo.r.zanoni@intel.com> References: <1473813502-16844-1-git-send-email-paulo.r.zanoni@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 8C0AA6E5D6 for ; Wed, 14 Sep 2016 00:38:34 +0000 (UTC) In-Reply-To: <1473813502-16844-1-git-send-email-paulo.r.zanoni@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 VGhlIHBsYW4gaXMgdG8gaW50cm9kdWNlIGludGVsX2hhc19zYWd2KCkgYW5kIHRoZW4gdXNlIGl0 IHRvIGRpc2NvdmVyCndoaWNoIHBsYXRmb3JtcyBhY3R1YWxseSBzdXBwb3J0IGl0LgoKSSB0aG91 Z2h0IGFib3V0IGtlZXBpbmcgdGhlIGZ1bmN0aW9ucyB3aXRoIHRoZWlyIGN1cnJlbnQgc2tsIG5h bWVzLApidXQgZm91bmQgdHdvIHByb2JsZW1zOiAoaSkgc2tsX2hhc19zYWd2KCkgd291bGQgYmVj b21lIGEgdmVyeQpjb25mdXNpbmcgbmFtZSwgYW5kIChpaSkgaW50ZWxfYXRvbWljX2NvbW1pdF90 YWlsKCkgZG9lc24ndCBzZWVtIHRvIGJlCmNhbGxpbmcgYW55IGZ1bmN0aW9ucyB3aG9zZSBuYW1l IHN0YXJ0IHdpdGggYSBwbGF0Zm9ybSBuYW1lLCBzbyB0aGUKImludGVsXyIgbmFtaW5nIHNjaGVt ZSBzZWVtcyBtYWtlIG1vcmUgc2Vuc2UgdGhhbiB0aGUgImZpcnN0cGxhdG9ybV8iCm5hbWluZyBz Y2hlbWUgaGVyZS4KClJldmlld2VkLWJ5OiBMeXVkZSA8Y3BhdWxAcmVkaGF0LmNvbT4KU2lnbmVk LW9mZi1ieTogUGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBpbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgIHwgMTAgKysrKystLS0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgIDggKysrKy0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICA2ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYyAgICAgIHwgMjYgKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDQgZmls ZXMgY2hhbmdlZCwgMjUgaW5zZXJ0aW9ucygrKSwgMjUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKaW5kZXggNWIxYzI0MS4uMzVjNWVhOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCkBAIC0xOTg1LDExICsxOTg1LDExIEBAIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlIHsKIAlz dHJ1Y3Qgdmx2X3MwaXhfc3RhdGUgdmx2X3MwaXhfc3RhdGU7CiAKIAllbnVtIHsKLQkJSTkxNV9T S0xfU0FHVl9VTktOT1dOID0gMCwKLQkJSTkxNV9TS0xfU0FHVl9ESVNBQkxFRCwKLQkJSTkxNV9T S0xfU0FHVl9FTkFCTEVELAotCQlJOTE1X1NLTF9TQUdWX05PVF9DT05UUk9MTEVECi0JfSBza2xf c2Fndl9zdGF0dXM7CisJCUk5MTVfU0FHVl9VTktOT1dOID0gMCwKKwkJSTkxNV9TQUdWX0RJU0FC TEVELAorCQlJOTE1X1NBR1ZfRU5BQkxFRCwKKwkJSTkxNV9TQUdWX05PVF9DT05UUk9MTEVECisJ fSBzYWd2X3N0YXR1czsKIAogCXN0cnVjdCB7CiAJCS8qCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMKaW5kZXggZDA0NWIyYi4uZTJiMzk3OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rpc3BsYXkuYwpAQCAtMTQzNjQsOCArMTQzNjQsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9hdG9t aWNfY29tbWl0X3RhaWwoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQkgKiBTS0wg d29ya2Fyb3VuZDogYnNwZWMgcmVjb21tZW5kcyB3ZSBkaXNhYmxlIHRoZSBTQUdWIHdoZW4gd2UK IAkJICogaGF2ZSBtb3JlIHRoZW4gb25lIHBpcGUgZW5hYmxlZAogCQkgKi8KLQkJaWYgKElTX1NL WUxBS0UoZGV2X3ByaXYpICYmICFza2xfY2FuX2VuYWJsZV9zYWd2KHN0YXRlKSkKLQkJCXNrbF9k aXNhYmxlX3NhZ3YoZGV2X3ByaXYpOworCQlpZiAoSVNfU0tZTEFLRShkZXZfcHJpdikgJiYgIWlu dGVsX2Nhbl9lbmFibGVfc2FndihzdGF0ZSkpCisJCQlpbnRlbF9kaXNhYmxlX3NhZ3YoZGV2X3By aXYpOwogCiAJCWludGVsX21vZGVzZXRfdmVyaWZ5X2Rpc2FibGVkKGRldik7CiAJfQpAQCAtMTQ0 MjMsOCArMTQ0MjMsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9hdG9taWNfY29tbWl0X3RhaWwoc3Ry dWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCX0KIAogCWlmIChJU19TS1lMQUtFKGRldl9w cml2KSAmJiBpbnRlbF9zdGF0ZS0+bW9kZXNldCAmJgotCSAgICBza2xfY2FuX2VuYWJsZV9zYWd2 KHN0YXRlKSkKLQkJc2tsX2VuYWJsZV9zYWd2KGRldl9wcml2KTsKKwkgICAgaW50ZWxfY2FuX2Vu YWJsZV9zYWd2KHN0YXRlKSkKKwkJaW50ZWxfZW5hYmxlX3NhZ3YoZGV2X3ByaXYpOwogCiAJZHJt X2F0b21pY19oZWxwZXJfY29tbWl0X2h3X2RvbmUoc3RhdGUpOwogCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rydi5oCmluZGV4IDBkMDU3MTIuLjVhYzE4YTQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o CkBAIC0xNzM4LDkgKzE3MzgsOSBAQCB2b2lkIGlsa193bV9nZXRfaHdfc3RhdGUoc3RydWN0IGRy bV9kZXZpY2UgKmRldik7CiB2b2lkIHNrbF93bV9nZXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZp Y2UgKmRldik7CiB2b2lkIHNrbF9kZGJfZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwKIAkJCSAgc3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqZGRiIC8qIG91 dCAqLyk7Ci1ib29sIHNrbF9jYW5fZW5hYmxlX3NhZ3Yoc3RydWN0IGRybV9hdG9taWNfc3RhdGUg KnN0YXRlKTsKLWludCBza2xfZW5hYmxlX3NhZ3Yoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KTsKLWludCBza2xfZGlzYWJsZV9zYWd2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdik7Citib29sIGludGVsX2Nhbl9lbmFibGVfc2FndihzdHJ1Y3QgZHJtX2F0b21pY19z dGF0ZSAqc3RhdGUpOworaW50IGludGVsX2VuYWJsZV9zYWd2KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdik7CitpbnQgaW50ZWxfZGlzYWJsZV9zYWd2KHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdik7CiBib29sIHNrbF9kZGJfYWxsb2NhdGlvbl9lcXVhbHMoY29uc3Qg c3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiAqb2xkLAogCQkJICAgICAgIGNvbnN0IHN0cnVjdCBz a2xfZGRiX2FsbG9jYXRpb24gKm5ldywKIAkJCSAgICAgICBlbnVtIHBpcGUgcGlwZSk7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcG0uYwppbmRleCA2YWY0MzhmLi5lZDU3MzhmIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BtLmMKQEAgLTI4OTYsMTIgKzI4OTYsMTIgQEAgc2tsX3dtX3BsYW5lX2lkKGNvbnN0IHN0 cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUpCiAgKiAgLSBXZSdyZSBub3QgdXNpbmcgYW4gaW50ZXJs YWNlZCBkaXNwbGF5IGNvbmZpZ3VyYXRpb24KICAqLwogaW50Ci1za2xfZW5hYmxlX3NhZ3Yoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQoraW50ZWxfZW5hYmxlX3NhZ3Yoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCWludCByZXQ7CiAKLQlpZiAoZGV2X3By aXYtPnNrbF9zYWd2X3N0YXR1cyA9PSBJOTE1X1NLTF9TQUdWX05PVF9DT05UUk9MTEVEIHx8Ci0J ICAgIGRldl9wcml2LT5za2xfc2Fndl9zdGF0dXMgPT0gSTkxNV9TS0xfU0FHVl9FTkFCTEVEKQor CWlmIChkZXZfcHJpdi0+c2Fndl9zdGF0dXMgPT0gSTkxNV9TQUdWX05PVF9DT05UUk9MTEVEIHx8 CisJICAgIGRldl9wcml2LT5zYWd2X3N0YXR1cyA9PSBJOTE1X1NBR1ZfRU5BQkxFRCkKIAkJcmV0 dXJuIDA7CiAKIAlEUk1fREVCVUdfS01TKCJFbmFibGluZyB0aGUgU0FHVlxuIik7CkBAIC0yOTE5 LDE5ICsyOTE5LDE5IEBAIHNrbF9lbmFibGVfc2FndihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiAJICovCiAJaWYgKHJldCA9PSAtRU5YSU8pIHsKIAkJRFJNX0RFQlVHX0RSSVZF UigiTm8gU0FHViBmb3VuZCBvbiBzeXN0ZW0sIGlnbm9yaW5nXG4iKTsKLQkJZGV2X3ByaXYtPnNr bF9zYWd2X3N0YXR1cyA9IEk5MTVfU0tMX1NBR1ZfTk9UX0NPTlRST0xMRUQ7CisJCWRldl9wcml2 LT5zYWd2X3N0YXR1cyA9IEk5MTVfU0FHVl9OT1RfQ09OVFJPTExFRDsKIAkJcmV0dXJuIDA7CiAJ fSBlbHNlIGlmIChyZXQgPCAwKSB7CiAJCURSTV9FUlJPUigiRmFpbGVkIHRvIGVuYWJsZSB0aGUg U0FHVlxuIik7CiAJCXJldHVybiByZXQ7CiAJfQogCi0JZGV2X3ByaXYtPnNrbF9zYWd2X3N0YXR1 cyA9IEk5MTVfU0tMX1NBR1ZfRU5BQkxFRDsKKwlkZXZfcHJpdi0+c2Fndl9zdGF0dXMgPSBJOTE1 X1NBR1ZfRU5BQkxFRDsKIAlyZXR1cm4gMDsKIH0KIAogc3RhdGljIGludAotc2tsX2RvX3NhZ3Zf ZGlzYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCitpbnRlbF9kb19zYWd2 X2Rpc2FibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCWludCByZXQ7 CiAJdWludDMyX3QgdGVtcCA9IEdFTjlfU0FHVl9ESVNBQkxFOwpAQCAtMjk0NSwxOSArMjk0NSwx OSBAQCBza2xfZG9fc2Fndl9kaXNhYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKIH0KIAogaW50Ci1za2xfZGlzYWJsZV9zYWd2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKK2ludGVsX2Rpc2FibGVfc2FndihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiB7CiAJaW50IHJldCwgcmVzdWx0OwogCi0JaWYgKGRldl9wcml2LT5za2xfc2Fndl9z dGF0dXMgPT0gSTkxNV9TS0xfU0FHVl9OT1RfQ09OVFJPTExFRCB8fAotCSAgICBkZXZfcHJpdi0+ c2tsX3NhZ3Zfc3RhdHVzID09IEk5MTVfU0tMX1NBR1ZfRElTQUJMRUQpCisJaWYgKGRldl9wcml2 LT5zYWd2X3N0YXR1cyA9PSBJOTE1X1NBR1ZfTk9UX0NPTlRST0xMRUQgfHwKKwkgICAgZGV2X3By aXYtPnNhZ3Zfc3RhdHVzID09IEk5MTVfU0FHVl9ESVNBQkxFRCkKIAkJcmV0dXJuIDA7CiAKIAlE Uk1fREVCVUdfS01TKCJEaXNhYmxpbmcgdGhlIFNBR1ZcbiIpOwogCW11dGV4X2xvY2soJmRldl9w cml2LT5ycHMuaHdfbG9jayk7CiAKIAkvKiBic3BlYyBzYXlzIHRvIGtlZXAgcmV0cnlpbmcgZm9y IGF0IGxlYXN0IDEgbXMgKi8KLQlyZXQgPSB3YWl0X2ZvcihyZXN1bHQgPSBza2xfZG9fc2Fndl9k aXNhYmxlKGRldl9wcml2KSwgMSk7CisJcmV0ID0gd2FpdF9mb3IocmVzdWx0ID0gaW50ZWxfZG9f c2Fndl9kaXNhYmxlKGRldl9wcml2KSwgMSk7CiAJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+cnBz Lmh3X2xvY2spOwogCiAJaWYgKHJldCA9PSAtRVRJTUVET1VUKSB7CkBAIC0yOTcxLDE4ICsyOTcx LDE4IEBAIHNrbF9kaXNhYmxlX3NhZ3Yoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogCSAqLwogCWlmIChyZXN1bHQgPT0gLUVOWElPKSB7CiAJCURSTV9ERUJVR19EUklWRVIoIk5v IFNBR1YgZm91bmQgb24gc3lzdGVtLCBpZ25vcmluZ1xuIik7Ci0JCWRldl9wcml2LT5za2xfc2Fn dl9zdGF0dXMgPSBJOTE1X1NLTF9TQUdWX05PVF9DT05UUk9MTEVEOworCQlkZXZfcHJpdi0+c2Fn dl9zdGF0dXMgPSBJOTE1X1NBR1ZfTk9UX0NPTlRST0xMRUQ7CiAJCXJldHVybiAwOwogCX0gZWxz ZSBpZiAocmVzdWx0IDwgMCkgewogCQlEUk1fRVJST1IoIkZhaWxlZCB0byBkaXNhYmxlIHRoZSBT QUdWXG4iKTsKIAkJcmV0dXJuIHJlc3VsdDsKIAl9CiAKLQlkZXZfcHJpdi0+c2tsX3NhZ3Zfc3Rh dHVzID0gSTkxNV9TS0xfU0FHVl9ESVNBQkxFRDsKKwlkZXZfcHJpdi0+c2Fndl9zdGF0dXMgPSBJ OTE1X1NBR1ZfRElTQUJMRUQ7CiAJcmV0dXJuIDA7CiB9CiAKLWJvb2wgc2tsX2Nhbl9lbmFibGVf c2FndihzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCitib29sIGludGVsX2Nhbl9lbmFi bGVfc2FndihzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiB7CiAJc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9IHN0YXRlLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gdG9faTkxNShkZXYpOwotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeAo=