From: Jani Nikula Subject: [PATCH] drm/i915/csr: restructure CSR firmware definition macros Date: Thu, 27 Sep 2018 10:53:11 +0300 Message-ID: <20180927075311.5076-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 36C5B8936E for ; Thu, 27 Sep 2018 07:57:37 +0000 (UTC) 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: Jani Nikula List-Id: intel-gfx@lists.freedesktop.org VXNlIHVuaWZvcm0gcHJlZml4ZXMgZm9yIGZpcm13YXJlIHBhdGgsIHZlcnNpb24gYW5kIHNpemUu IFVuaWZ5CmFsaWdubWVudHMuIE9yZGVyIG1hY3JvIGdyb3VwcyBhcyBpbiB0aGUgaWYgbGFkZGVy IHVzaW5nIHRoZW0uIEFkZApwbGF0Zm9ybSBzcGVjaWZpYyBtYXggZmlybXdhcmUgc2l6ZSBtYWNy b3MgZm9yIGFsbCBwbGF0Zm9ybXMgZm9yIGNsYXJpdHkKaW4gdGhlIGlmIGxhZGRlci4gUGxhY2Ug dGhlIG1heCBmaXJtd2FyZSBzaXplIG1hY3JvcyBpbiB0aGUgcGxhdGZvcm0Kc3BlY2lmaWMgbWFj cm8gZ3JvdXBzLgoKTm8gZnVuY3Rpb25hbCBjaGFuZ2VzLgoKU2lnbmVkLW9mZi1ieTogSmFuaSBO aWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9jc3IuYyB8IDU0ICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCAyOCBpbnNlcnRpb25zKCspLCAyNiBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jc3IuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Nzci5jCmluZGV4IDgxOTM1ZGE5Y2Q2Yi4uNzM1Y2UzZWQzMTU5IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jc3IuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9jc3IuYwpAQCAtMzQsMzMgKzM0LDM1IEBACiAgKiBsb3ctcG93ZXIg c3RhdGUgYW5kIGNvbWVzIGJhY2sgdG8gbm9ybWFsLgogICovCiAKLSNkZWZpbmUgSTkxNV9DU1Jf SUNMICJpOTE1L2ljbF9kbWNfdmVyMV8wNy5iaW4iCisjZGVmaW5lIElDTF9DU1JfUEFUSAkJCSJp OTE1L2ljbF9kbWNfdmVyMV8wNy5iaW4iCiAjZGVmaW5lIElDTF9DU1JfVkVSU0lPTl9SRVFVSVJF RAlDU1JfVkVSU0lPTigxLCA3KQorI2RlZmluZSBJQ0xfQ1NSX01BWF9GV19TSVpFCQkweDYwMDAK IAotI2RlZmluZSBJOTE1X0NTUl9HTEsgImk5MTUvZ2xrX2RtY192ZXIxXzA0LmJpbiIKLU1PRFVM RV9GSVJNV0FSRShJOTE1X0NTUl9HTEspOwotI2RlZmluZSBHTEtfQ1NSX1ZFUlNJT05fUkVRVUlS RUQJQ1NSX1ZFUlNJT04oMSwgNCkKLQotI2RlZmluZSBJOTE1X0NTUl9DTkwgImk5MTUvY25sX2Rt Y192ZXIxXzA3LmJpbiIKLU1PRFVMRV9GSVJNV0FSRShJOTE1X0NTUl9DTkwpOworI2RlZmluZSBD TkxfQ1NSX1BBVEgJCQkiaTkxNS9jbmxfZG1jX3ZlcjFfMDcuYmluIgogI2RlZmluZSBDTkxfQ1NS X1ZFUlNJT05fUkVRVUlSRUQJQ1NSX1ZFUlNJT04oMSwgNykKKyNkZWZpbmUgQ05MX0NTUl9NQVhf RldfU0laRQkJR0xLX0NTUl9NQVhfRldfU0laRQorTU9EVUxFX0ZJUk1XQVJFKENOTF9DU1JfUEFU SCk7CiAKLSNkZWZpbmUgSTkxNV9DU1JfS0JMICJpOTE1L2tibF9kbWNfdmVyMV8wNC5iaW4iCi1N T0RVTEVfRklSTVdBUkUoSTkxNV9DU1JfS0JMKTsKKyNkZWZpbmUgR0xLX0NTUl9QQVRICQkJImk5 MTUvZ2xrX2RtY192ZXIxXzA0LmJpbiIKKyNkZWZpbmUgR0xLX0NTUl9WRVJTSU9OX1JFUVVJUkVE CUNTUl9WRVJTSU9OKDEsIDQpCisjZGVmaW5lIEdMS19DU1JfTUFYX0ZXX1NJWkUJCTB4NDAwMAor TU9EVUxFX0ZJUk1XQVJFKEdMS19DU1JfUEFUSCk7CisKKyNkZWZpbmUgS0JMX0NTUl9QQVRICQkJ Imk5MTUva2JsX2RtY192ZXIxXzA0LmJpbiIKICNkZWZpbmUgS0JMX0NTUl9WRVJTSU9OX1JFUVVJ UkVECUNTUl9WRVJTSU9OKDEsIDQpCisjZGVmaW5lIEtCTF9DU1JfTUFYX0ZXX1NJWkUJCUJYVF9D U1JfTUFYX0ZXX1NJWkUKK01PRFVMRV9GSVJNV0FSRShLQkxfQ1NSX1BBVEgpOwogCi0jZGVmaW5l IEk5MTVfQ1NSX1NLTCAiaTkxNS9za2xfZG1jX3ZlcjFfMjcuYmluIgotTU9EVUxFX0ZJUk1XQVJF KEk5MTVfQ1NSX1NLTCk7CisjZGVmaW5lIFNLTF9DU1JfUEFUSAkJCSJpOTE1L3NrbF9kbWNfdmVy MV8yNy5iaW4iCiAjZGVmaW5lIFNLTF9DU1JfVkVSU0lPTl9SRVFVSVJFRAlDU1JfVkVSU0lPTigx LCAyNykKKyNkZWZpbmUgU0tMX0NTUl9NQVhfRldfU0laRQkJQlhUX0NTUl9NQVhfRldfU0laRQor TU9EVUxFX0ZJUk1XQVJFKFNLTF9DU1JfUEFUSCk7CiAKLSNkZWZpbmUgSTkxNV9DU1JfQlhUICJp OTE1L2J4dF9kbWNfdmVyMV8wNy5iaW4iCi1NT0RVTEVfRklSTVdBUkUoSTkxNV9DU1JfQlhUKTsK KyNkZWZpbmUgQlhUX0NTUl9QQVRICQkJImk5MTUvYnh0X2RtY192ZXIxXzA3LmJpbiIKICNkZWZp bmUgQlhUX0NTUl9WRVJTSU9OX1JFUVVJUkVECUNTUl9WRVJTSU9OKDEsIDcpCi0KLQogI2RlZmlu ZSBCWFRfQ1NSX01BWF9GV19TSVpFCQkweDMwMDAKLSNkZWZpbmUgR0xLX0NTUl9NQVhfRldfU0la RQkJMHg0MDAwCi0jZGVmaW5lIElDTF9DU1JfTUFYX0ZXX1NJWkUJCTB4NjAwMAorTU9EVUxFX0ZJ Uk1XQVJFKEJYVF9DU1JfUEFUSCk7CisKICNkZWZpbmUgQ1NSX0RFRkFVTFRfRldfT0ZGU0VUCQkw eEZGRkZGRkZGCiAKIHN0cnVjdCBpbnRlbF9jc3NfaGVhZGVyIHsKQEAgLTQ1NiwyNyArNDU4LDI3 IEBAIHZvaWQgaW50ZWxfY3NyX3Vjb2RlX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogCWludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0KGRldl9wcml2LCBQT1dFUl9ET01BSU5f SU5JVCk7CiAKIAlpZiAoSVNfSUNFTEFLRShkZXZfcHJpdikpIHsKLQkJY3NyLT5md19wYXRoID0g STkxNV9DU1JfSUNMOworCQljc3ItPmZ3X3BhdGggPSBJQ0xfQ1NSX1BBVEg7CiAJCWNzci0+cmVx dWlyZWRfdmVyc2lvbiA9IElDTF9DU1JfVkVSU0lPTl9SRVFVSVJFRDsKIAkJY3NyLT5tYXhfZndf c2l6ZSA9IElDTF9DU1JfTUFYX0ZXX1NJWkU7CiAJfSBlbHNlIGlmIChJU19DQU5OT05MQUtFKGRl dl9wcml2KSkgewotCQljc3ItPmZ3X3BhdGggPSBJOTE1X0NTUl9DTkw7CisJCWNzci0+ZndfcGF0 aCA9IENOTF9DU1JfUEFUSDsKIAkJY3NyLT5yZXF1aXJlZF92ZXJzaW9uID0gQ05MX0NTUl9WRVJT SU9OX1JFUVVJUkVEOwotCQljc3ItPm1heF9md19zaXplID0gR0xLX0NTUl9NQVhfRldfU0laRTsK KwkJY3NyLT5tYXhfZndfc2l6ZSA9IENOTF9DU1JfTUFYX0ZXX1NJWkU7CiAJfSBlbHNlIGlmIChJ U19HRU1JTklMQUtFKGRldl9wcml2KSkgewotCQljc3ItPmZ3X3BhdGggPSBJOTE1X0NTUl9HTEs7 CisJCWNzci0+ZndfcGF0aCA9IEdMS19DU1JfUEFUSDsKIAkJY3NyLT5yZXF1aXJlZF92ZXJzaW9u ID0gR0xLX0NTUl9WRVJTSU9OX1JFUVVJUkVEOwogCQljc3ItPm1heF9md19zaXplID0gR0xLX0NT Ul9NQVhfRldfU0laRTsKIAl9IGVsc2UgaWYgKElTX0tBQllMQUtFKGRldl9wcml2KSB8fCBJU19D T0ZGRUVMQUtFKGRldl9wcml2KSkgewotCQljc3ItPmZ3X3BhdGggPSBJOTE1X0NTUl9LQkw7CisJ CWNzci0+ZndfcGF0aCA9IEtCTF9DU1JfUEFUSDsKIAkJY3NyLT5yZXF1aXJlZF92ZXJzaW9uID0g S0JMX0NTUl9WRVJTSU9OX1JFUVVJUkVEOwotCQljc3ItPm1heF9md19zaXplID0gQlhUX0NTUl9N QVhfRldfU0laRTsKKwkJY3NyLT5tYXhfZndfc2l6ZSA9IEtCTF9DU1JfTUFYX0ZXX1NJWkU7CiAJ fSBlbHNlIGlmIChJU19TS1lMQUtFKGRldl9wcml2KSkgewotCQljc3ItPmZ3X3BhdGggPSBJOTE1 X0NTUl9TS0w7CisJCWNzci0+ZndfcGF0aCA9IFNLTF9DU1JfUEFUSDsKIAkJY3NyLT5yZXF1aXJl ZF92ZXJzaW9uID0gU0tMX0NTUl9WRVJTSU9OX1JFUVVJUkVEOwotCQljc3ItPm1heF9md19zaXpl ID0gQlhUX0NTUl9NQVhfRldfU0laRTsKKwkJY3NyLT5tYXhfZndfc2l6ZSA9IFNLTF9DU1JfTUFY X0ZXX1NJWkU7CiAJfSBlbHNlIGlmIChJU19CUk9YVE9OKGRldl9wcml2KSkgewotCQljc3ItPmZ3 X3BhdGggPSBJOTE1X0NTUl9CWFQ7CisJCWNzci0+ZndfcGF0aCA9IEJYVF9DU1JfUEFUSDsKIAkJ Y3NyLT5yZXF1aXJlZF92ZXJzaW9uID0gQlhUX0NTUl9WRVJTSU9OX1JFUVVJUkVEOwogCQljc3It Pm1heF9md19zaXplID0gQlhUX0NTUl9NQVhfRldfU0laRTsKIAl9IGVsc2UgewotLSAKMi4xMS4w CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK