From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH 1/8] drm/i915: SAGV is not SKL-only, so rename a few things Date: Tue, 6 Sep 2016 21:52:12 -0300 Message-ID: <1473209539-6689-2-git-send-email-paulo.r.zanoni@intel.com> References: <1473209539-6689-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 64B826E809 for ; Wed, 7 Sep 2016 00:52:35 +0000 (UTC) In-Reply-To: <1473209539-6689-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 Y2hlbWUgaGVyZS4KClNpZ25lZC1vZmYtYnk6IFBhdWxvIFphbm9uaSA8cGF1bG8uci56YW5vbmlA aW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICB8IDEw ICsrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8ICA4ICsr KystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgNiArKystLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgICAgICB8IDI2ICsrKysrKysrKysrKyst LS0tLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDI1IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDA1M2EzNDcuLjUwM2M2OWQgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMTk3MiwxMSArMTk3MiwxMSBAQCBzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSB7CiAJc3RydWN0IHZsdl9zMGl4X3N0YXRlIHZsdl9zMGl4X3N0YXRlOwog CiAJZW51bSB7Ci0JCUk5MTVfU0tMX1NBR1ZfVU5LTk9XTiA9IDAsCi0JCUk5MTVfU0tMX1NBR1Zf RElTQUJMRUQsCi0JCUk5MTVfU0tMX1NBR1ZfRU5BQkxFRCwKLQkJSTkxNV9TS0xfU0FHVl9OT1Rf Q09OVFJPTExFRAotCX0gc2tsX3NhZ3Zfc3RhdHVzOworCQlJOTE1X1NBR1ZfVU5LTk9XTiA9IDAs CisJCUk5MTVfU0FHVl9ESVNBQkxFRCwKKwkJSTkxNV9TQUdWX0VOQUJMRUQsCisJCUk5MTVfU0FH Vl9OT1RfQ09OVFJPTExFRAorCX0gc2Fndl9zdGF0dXM7CiAKIAlzdHJ1Y3QgewogCQkvKgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDZiNGQ3YWMuLjRkZDQ5NjEgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTE0Mzc5LDggKzE0Mzc5LDggQEAgc3Rh dGljIHZvaWQgaW50ZWxfYXRvbWljX2NvbW1pdF90YWlsKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRl ICpzdGF0ZSkKIAkJICogU0tMIHdvcmthcm91bmQ6IGJzcGVjIHJlY29tbWVuZHMgd2UgZGlzYWJs ZSB0aGUgU0FHViB3aGVuIHdlCiAJCSAqIGhhdmUgbW9yZSB0aGVuIG9uZSBwaXBlIGVuYWJsZWQK IAkJICovCi0JCWlmIChJU19TS1lMQUtFKGRldl9wcml2KSAmJiAhc2tsX2Nhbl9lbmFibGVfc2Fn dihzdGF0ZSkpCi0JCQlza2xfZGlzYWJsZV9zYWd2KGRldl9wcml2KTsKKwkJaWYgKElTX1NLWUxB S0UoZGV2X3ByaXYpICYmICFpbnRlbF9jYW5fZW5hYmxlX3NhZ3Yoc3RhdGUpKQorCQkJaW50ZWxf ZGlzYWJsZV9zYWd2KGRldl9wcml2KTsKIAogCQlpbnRlbF9tb2Rlc2V0X3ZlcmlmeV9kaXNhYmxl ZChkZXYpOwogCX0KQEAgLTE0NDM4LDggKzE0NDM4LDggQEAgc3RhdGljIHZvaWQgaW50ZWxfYXRv bWljX2NvbW1pdF90YWlsKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAl9CiAKIAlp ZiAoSVNfU0tZTEFLRShkZXZfcHJpdikgJiYgaW50ZWxfc3RhdGUtPm1vZGVzZXQgJiYKLQkgICAg c2tsX2Nhbl9lbmFibGVfc2FndihzdGF0ZSkpCi0JCXNrbF9lbmFibGVfc2FndihkZXZfcHJpdik7 CisJICAgIGludGVsX2Nhbl9lbmFibGVfc2FndihzdGF0ZSkpCisJCWludGVsX2VuYWJsZV9zYWd2 KGRldl9wcml2KTsKIAogCWRybV9hdG9taWNfaGVscGVyX2NvbW1pdF9od19kb25lKHN0YXRlKTsK IApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBkMDg0YzFiLi5iYjU1YjYxIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtMTc0MSw5ICsxNzQxLDkgQEAgdm9pZCBpbGtfd21fZ2V0 X2h3X3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBza2xfd21fZ2V0X2h3X3N0 YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBza2xfZGRiX2dldF9od19zdGF0ZShz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkgIHN0cnVjdCBza2xfZGRiX2Fs bG9jYXRpb24gKmRkYiAvKiBvdXQgKi8pOwotYm9vbCBza2xfY2FuX2VuYWJsZV9zYWd2KHN0cnVj dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSk7Ci1pbnQgc2tsX2VuYWJsZV9zYWd2KHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7Ci1pbnQgc2tsX2Rpc2FibGVfc2FndihzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOworYm9vbCBpbnRlbF9jYW5fZW5hYmxlX3NhZ3Yo c3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKTsKK2ludCBpbnRlbF9lbmFibGVfc2Fndihz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOworaW50IGludGVsX2Rpc2FibGVfc2Fn dihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogYm9vbCBza2xfZGRiX2FsbG9j YXRpb25fZXF1YWxzKGNvbnN0IHN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24gKm9sZCwKIAkJCSAg ICAgICBjb25zdCBzdHJ1Y3Qgc2tsX2RkYl9hbGxvY2F0aW9uICpuZXcsCiAJCQkgICAgICAgZW51 bSBwaXBlIHBpcGUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggNGY4MzNhMC4uMzI1ODhl MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0yODk2LDEyICsyODk2LDEyIEBAIHNrbF93 bV9wbGFuZV9pZChjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lKQogICogIC0gV2UncmUg bm90IHVzaW5nIGFuIGludGVybGFjZWQgZGlzcGxheSBjb25maWd1cmF0aW9uCiAgKi8KIGludAot c2tsX2VuYWJsZV9zYWd2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK2ludGVs X2VuYWJsZV9zYWd2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlpbnQg cmV0OwogCi0JaWYgKGRldl9wcml2LT5za2xfc2Fndl9zdGF0dXMgPT0gSTkxNV9TS0xfU0FHVl9O T1RfQ09OVFJPTExFRCB8fAotCSAgICBkZXZfcHJpdi0+c2tsX3NhZ3Zfc3RhdHVzID09IEk5MTVf U0tMX1NBR1ZfRU5BQkxFRCkKKwlpZiAoZGV2X3ByaXYtPnNhZ3Zfc3RhdHVzID09IEk5MTVfU0FH Vl9OT1RfQ09OVFJPTExFRCB8fAorCSAgICBkZXZfcHJpdi0+c2Fndl9zdGF0dXMgPT0gSTkxNV9T QUdWX0VOQUJMRUQpCiAJCXJldHVybiAwOwogCiAJRFJNX0RFQlVHX0tNUygiRW5hYmxpbmcgdGhl IFNBR1ZcbiIpOwpAQCAtMjkxOSwxOSArMjkxOSwxOSBAQCBza2xfZW5hYmxlX3NhZ3Yoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCSAqLwogCWlmIChyZXQgPT0gLUVOWElPKSB7 CiAJCURSTV9ERUJVR19EUklWRVIoIk5vIFNBR1YgZm91bmQgb24gc3lzdGVtLCBpZ25vcmluZ1xu Iik7Ci0JCWRldl9wcml2LT5za2xfc2Fndl9zdGF0dXMgPSBJOTE1X1NLTF9TQUdWX05PVF9DT05U Uk9MTEVEOworCQlkZXZfcHJpdi0+c2Fndl9zdGF0dXMgPSBJOTE1X1NBR1ZfTk9UX0NPTlRST0xM RUQ7CiAJCXJldHVybiAwOwogCX0gZWxzZSBpZiAocmV0IDwgMCkgewogCQlEUk1fRVJST1IoIkZh aWxlZCB0byBlbmFibGUgdGhlIFNBR1ZcbiIpOwogCQlyZXR1cm4gcmV0OwogCX0KIAotCWRldl9w cml2LT5za2xfc2Fndl9zdGF0dXMgPSBJOTE1X1NLTF9TQUdWX0VOQUJMRUQ7CisJZGV2X3ByaXYt PnNhZ3Zfc3RhdHVzID0gSTkxNV9TQUdWX0VOQUJMRUQ7CiAJcmV0dXJuIDA7CiB9CiAKIHN0YXRp YyBpbnQKLXNrbF9kb19zYWd2X2Rpc2FibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQoraW50ZWxfZG9fc2Fndl9kaXNhYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIHsKIAlpbnQgcmV0OwogCXVpbnQzMl90IHRlbXAgPSBHRU45X1NBR1ZfRElTQUJMRTsK QEAgLTI5NDUsMTkgKzI5NDUsMTkgQEAgc2tsX2RvX3NhZ3ZfZGlzYWJsZShzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB9CiAKIGludAotc2tsX2Rpc2FibGVfc2FndihzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCitpbnRlbF9kaXNhYmxlX3NhZ3Yoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCWludCByZXQsIHJlc3VsdDsKIAotCWlmIChk ZXZfcHJpdi0+c2tsX3NhZ3Zfc3RhdHVzID09IEk5MTVfU0tMX1NBR1ZfTk9UX0NPTlRST0xMRUQg fHwKLQkgICAgZGV2X3ByaXYtPnNrbF9zYWd2X3N0YXR1cyA9PSBJOTE1X1NLTF9TQUdWX0RJU0FC TEVEKQorCWlmIChkZXZfcHJpdi0+c2Fndl9zdGF0dXMgPT0gSTkxNV9TQUdWX05PVF9DT05UUk9M TEVEIHx8CisJICAgIGRldl9wcml2LT5zYWd2X3N0YXR1cyA9PSBJOTE1X1NBR1ZfRElTQUJMRUQp CiAJCXJldHVybiAwOwogCiAJRFJNX0RFQlVHX0tNUygiRGlzYWJsaW5nIHRoZSBTQUdWXG4iKTsK IAltdXRleF9sb2NrKCZkZXZfcHJpdi0+cnBzLmh3X2xvY2spOwogCiAJLyogYnNwZWMgc2F5cyB0 byBrZWVwIHJldHJ5aW5nIGZvciBhdCBsZWFzdCAxIG1zICovCi0JcmV0ID0gd2FpdF9mb3IocmVz dWx0ID0gc2tsX2RvX3NhZ3ZfZGlzYWJsZShkZXZfcHJpdiksIDEpOworCXJldCA9IHdhaXRfZm9y KHJlc3VsdCA9IGludGVsX2RvX3NhZ3ZfZGlzYWJsZShkZXZfcHJpdiksIDEpOwogCW11dGV4X3Vu bG9jaygmZGV2X3ByaXYtPnJwcy5od19sb2NrKTsKIAogCWlmIChyZXQgPT0gLUVUSU1FRE9VVCkg ewpAQCAtMjk3MSwxOCArMjk3MSwxOCBAQCBza2xfZGlzYWJsZV9zYWd2KHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIAkgKi8KIAlpZiAocmVzdWx0ID09IC1FTlhJTykgewogCQlE Uk1fREVCVUdfRFJJVkVSKCJObyBTQUdWIGZvdW5kIG9uIHN5c3RlbSwgaWdub3JpbmdcbiIpOwot CQlkZXZfcHJpdi0+c2tsX3NhZ3Zfc3RhdHVzID0gSTkxNV9TS0xfU0FHVl9OT1RfQ09OVFJPTExF RDsKKwkJZGV2X3ByaXYtPnNhZ3Zfc3RhdHVzID0gSTkxNV9TQUdWX05PVF9DT05UUk9MTEVEOwog CQlyZXR1cm4gMDsKIAl9IGVsc2UgaWYgKHJlc3VsdCA8IDApIHsKIAkJRFJNX0VSUk9SKCJGYWls ZWQgdG8gZGlzYWJsZSB0aGUgU0FHVlxuIik7CiAJCXJldHVybiByZXN1bHQ7CiAJfQogCi0JZGV2 X3ByaXYtPnNrbF9zYWd2X3N0YXR1cyA9IEk5MTVfU0tMX1NBR1ZfRElTQUJMRUQ7CisJZGV2X3By aXYtPnNhZ3Zfc3RhdHVzID0gSTkxNV9TQUdWX0RJU0FCTEVEOwogCXJldHVybiAwOwogfQogCi1i b29sIHNrbF9jYW5fZW5hYmxlX3NhZ3Yoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQor Ym9vbCBpbnRlbF9jYW5fZW5hYmxlX3NhZ3Yoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRl KQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBzdGF0ZS0+ZGV2OwogCXN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsKLS0gCjIuNy40CgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK