From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anusha Srivatsa Subject: [PATCH 2/8] drm/i915/huc: Unified css_header struct for GuC and HuC Date: Wed, 9 Nov 2016 10:51:31 -0800 Message-ID: <1478717497-4485-2-git-send-email-anusha.srivatsa@intel.com> References: <1478717497-4485-1-git-send-email-anusha.srivatsa@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 7B1C36E6EC for ; Wed, 9 Nov 2016 18:51:40 +0000 (UTC) In-Reply-To: <1478717497-4485-1-git-send-email-anusha.srivatsa@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: Alex Dai , Peter Antoine List-Id: intel-gfx@lists.freedesktop.org RnJvbTogUGV0ZXIgQW50b2luZSA8cGV0ZXIuYW50b2luZUBpbnRlbC5jb20+CgpIdUMgZmlybXdh cmUgY3NzIGhlYWRlciBoYXMgYWxtb3N0IGV4YWN0bHkgc2FtZSBkZWZpbml0aW9uIGFzIEd1Qwpm aXJtd2FyZSBleGNlcHQgZm9yIHRoZSBzd192ZXJzaW9uLiBBbHNvLCBhZGQgYSBuZXcgbWVtYmVy IGZ3X3R5cGUKaW50byBpbnRlbF91Y19mdyB0byBpbmRpY2F0ZSB3aGF0IGtpbmQgb2YgZncgaXQg aXMuIFNvLCB0aGUgbG9hZGVyCndpbGwgcHVsbCByaWdodCBzd192ZXJzaW9uIGZyb20gaGVhZGVy LgoKdjI6IHJlYmFzZWQgb24tdG9wIG9mIGRybS1pbnRlbC1uaWdodGx5CnYzOiByZWJhc2VkIG9u LXRvcCBvZiBkcm0taW50ZWwtbmlnaHRseSAoYWdhaW4pLgp2NDogcmViYXNlZCArIHNwYWNlcy4K djc6IHJlYmFzZWQuCnY4OiByZWJhc2VkLgp2OTogcmViYXNlZC4gUmVuYW1lIGRldmljZV9pZCB0 byBndWNfYnJhbmNoX2NsaWVudF92ZXJzaW9uLAptYWtlIGd1Y19zd192ZXJzaW9uIGEgdW5pb24u IDxKZWZmIE1jZ2VlPi4gUHV0IFVDX0ZXX1RZUEVfR1VDCmFuZCBVQ19GV19UWVBFX0hVQyBpbnRv IGFuIGVudW0uCnYxMDogcmViYXNlZC4KClRlc3RlZC1ieTogWGlhbmcgSGFpaGFvIDxoYWloYW8u eGlhbmdAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBBbnVzaGEgU3JpdmF0c2EgPGFudXNoYS5z cml2YXRzYUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEFsZXggRGFpIDx5dS5kYWlAaW50ZWwu Y29tPgpTaWduZWQtb2ZmLWJ5OiBQZXRlciBBbnRvaW5lIDxwZXRlci5hbnRvaW5lQGludGVsLmNv bT4KUmV2aWV3ZWQtYnk6IERhdmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+ClJl dmlld2VkLWJ5OiBKZWZmIE1jR2VlIDxqZWZmLm1jZ2VlQGludGVsLmNvbT4KLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaCAgICAgICAgfCAgNiArKysrKwogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3aWYuaCAgIHwgMjEgKysrKysrKysrKysrKy0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyB8IDQxICsrKysrKysrKysrKysrKysr KysrKystLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA1MSBpbnNlcnRpb25zKCspLCAxNyBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMu aCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCmluZGV4IDZkYzMyOGYuLjQ1ZGZh NDAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCkBAIC05OCw2ICs5OCwxMSBAQCBlbnVtIGlu dGVsX3VjX2Z3X3N0YXR1cyB7CiAJVUNfRklSTVdBUkVfU1VDQ0VTUwogfTsKIAorZW51bSB7CisJ VUNfRldfVFlQRV9HVUMsCisJVUNfRldfVFlQRV9IVUMKK307CisKIC8qCiAgKiBUaGlzIHN0cnVj dHVyZSBlbmNhcHN1bGF0ZXMgYWxsIHRoZSBkYXRhIG5lZWRlZCBkdXJpbmcgdGhlIHByb2Nlc3MK ICAqIG9mIGZldGNoaW5nLCBjYWNoaW5nLCBhbmQgbG9hZGluZyB0aGUgZmlybXdhcmUgaW1hZ2Ug aW50byB0aGUgR3VDLgpAQCAtMTE1LDYgKzEyMCw3IEBAIHN0cnVjdCBpbnRlbF91Y19mdyB7CiAJ dWludDE2X3QgbWFqb3JfdmVyX2ZvdW5kOwogCXVpbnQxNl90IG1pbm9yX3Zlcl9mb3VuZDsKIAor CXVpbnQzMl90IGZ3X3R5cGU7CiAJdWludDMyX3QgaGVhZGVyX3NpemU7CiAJdWludDMyX3QgaGVh ZGVyX29mZnNldDsKIAl1aW50MzJfdCByc2Ffc2l6ZTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2d1Y19md2lmLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWNfZndpZi5oCmluZGV4IDMyNGVhOTAuLmMyYTdmZGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2d1Y19md2lmLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZ3VjX2Z3aWYuaApAQCAtMTU0LDcgKzE1NCw3IEBACiAgKiBUaGUgR3VDIGZpcm13YXJlIGxh eW91dCBsb29rcyBsaWtlIHRoaXM6CiAgKgogICogICAgICstLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tKwotICogICAgIHwgICAgICAgIGd1Y19jc3NfaGVhZGVyICAgICAgICAgfAorICog ICAgIHwgICAgICAgICB1Y19jc3NfaGVhZGVyICAgICAgICAgfAogICogICAgIHwgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgfAogICogICAgIHwgY29udGFpbnMgbWFqb3IvbWlub3IgdmVy c2lvbiAgfAogICogICAgICstLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tKwpAQCAtMTgx LDkgKzE4MSwxNiBAQAogICogMy4gTGVuZ3RoIGluZm8gb2YgZWFjaCBjb21wb25lbnQgY2FuIGJl IGZvdW5kIGluIGhlYWRlciwgaW4gZHdvcmRzLgogICogNC4gTW9kdWx1cyBhbmQgZXhwb25lbnQg a2V5IGFyZSBub3QgcmVxdWlyZWQgYnkgZHJpdmVyLiBUaGV5IG1heSBub3QgYXBwZWFyCiAgKiAg ICBpbiBmdy4gU28gZHJpdmVyIHdpbGwgbG9hZCBhIHRydW5jYXRlZCBmaXJtd2FyZSBpbiB0aGlz IGNhc2UuCisgKgorICogSHVDIGZpcm13YXJlIGxheW91dCBpcyBzYW1lIGFzIEd1QyBmaXJtd2Fy ZS4KKyAqCisgKiBIdUMgZmlybXdhcmUgY3NzIGhlYWRlciBpcyBkaWZmZXJlbnQuIEhvd2V2ZXIs IHRoZSBvbmx5IGRpZmZlcmVuY2UgaXMgd2hlcmUKKyAqIHRoZSB2ZXJzaW9uIGluZm9ybWF0aW9u IGlzIHNhdmVkLiBUaGUgdWNfY3NzX2hlYWRlciBpcyB1bmlmaWVkIHRvIHN1cHBvcnQKKyAqIGJv dGguIERyaXZlciBzaG91bGQgZ2V0IEh1QyB2ZXJzaW9uIGZyb20gdWNfY3NzX2hlYWRlci5odWNf c3dfdmVyc2lvbiwgd2hpbGUKKyAqIHVjX2Nzc19oZWFkZXIuZ3VjX3N3X3ZlcnNpb24gZm9yIEd1 Qy4KICAqLwogCi1zdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIgeworc3RydWN0IHVjX2Nzc19oZWFkZXIg ewogCXVpbnQzMl90IG1vZHVsZV90eXBlOwogCS8qIGhlYWRlcl9zaXplIGluY2x1ZGVzIGFsbCBu b24tdUNvZGUgYml0cywgaW5jbHVkaW5nIGNzc19oZWFkZXIsIHJzYQogCSAqIGtleSwgbW9kdWx1 cyBrZXkgYW5kIGV4cG9uZW50IGRhdGEuICovCkBAIC0yMTQsOCArMjIxLDE0IEBAIHN0cnVjdCBn dWNfY3NzX2hlYWRlciB7CiAKIAljaGFyIHVzZXJuYW1lWzhdOwogCWNoYXIgYnVpbGRudW1iZXJb MTJdOwotCXVpbnQzMl90IGRldmljZV9pZDsKLQl1aW50MzJfdCBndWNfc3dfdmVyc2lvbjsKKwl1 bmlvbiB7CisJCXVpbnQzMl90IGd1Y19icmFuY2hfY2xpZW50X3ZlcnNpb247CisJCXVpbnQzMl90 IGh1Y19zd192ZXJzaW9uOworCX07CisJdW5pb24geworCQl1aW50MzJfdCBndWNfc3dfdmVyc2lv bjsKKwkJdWludDMyX3QgaHVjX3Jlc2VydmVkOworCX07CiAJdWludDMyX3QgcHJvZF9wcmVwcm9k X2Z3OwogCXVpbnQzMl90IHJlc2VydmVkWzEyXTsKIAl1aW50MzJfdCBoZWFkZXJfaW5mbzsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYwppbmRleCA2NjgzYTg4Li5mZjI2ZDJj IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCkBAIC01OTMsNyArNTkz LDcgQEAgdm9pZCBpbnRlbF91Y19md19mZXRjaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1 Y3QgaW50ZWxfdWNfZncgKnVjX2Z3KQogCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gZGV2LT5wZGV2 OwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAJY29uc3Qgc3RydWN0IGZpcm13 YXJlICpmdzsKLQlzdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIgKmNzczsKKwlzdHJ1Y3QgdWNfY3NzX2hl YWRlciAqY3NzOwogCXNpemVfdCBzaXplOwogCWludCBlcnI7CiAKQEAgLTYxMCwxOSArNjEwLDE5 IEBAIHZvaWQgaW50ZWxfdWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0 IGludGVsX3VjX2Z3ICp1Y19mdykKIAkJdWNfZnctPnVjX2Z3X3BhdGgsIGZ3KTsKIAogCS8qIENo ZWNrIHRoZSBzaXplIG9mIHRoZSBibG9iIGJlZm9yZSBleGFtaW5pbmcgYnVmZmVyIGNvbnRlbnRz ICovCi0JaWYgKGZ3LT5zaXplIDwgc2l6ZW9mKHN0cnVjdCBndWNfY3NzX2hlYWRlcikpIHsKKwlp ZiAoZnctPnNpemUgPCBzaXplb2Yoc3RydWN0IHVjX2Nzc19oZWFkZXIpKSB7CiAJCURSTV9OT1RF KCJGaXJtd2FyZSBoZWFkZXIgaXMgbWlzc2luZ1xuIik7CiAJCWdvdG8gZmFpbDsKIAl9CiAKLQlj c3MgPSAoc3RydWN0IGd1Y19jc3NfaGVhZGVyICopZnctPmRhdGE7CisJY3NzID0gKHN0cnVjdCB1 Y19jc3NfaGVhZGVyICopZnctPmRhdGE7CiAKIAkvKiBGaXJtd2FyZSBiaXRzIGFsd2F5cyBzdGFy dCBmcm9tIGhlYWRlciAqLwogCXVjX2Z3LT5oZWFkZXJfb2Zmc2V0ID0gMDsKIAl1Y19mdy0+aGVh ZGVyX3NpemUgPSAoY3NzLT5oZWFkZXJfc2l6ZV9kdyAtIGNzcy0+bW9kdWx1c19zaXplX2R3IC0K IAkJY3NzLT5rZXlfc2l6ZV9kdyAtIGNzcy0+ZXhwb25lbnRfc2l6ZV9kdykgKiBzaXplb2YodTMy KTsKIAotCWlmICh1Y19mdy0+aGVhZGVyX3NpemUgIT0gc2l6ZW9mKHN0cnVjdCBndWNfY3NzX2hl YWRlcikpIHsKKwlpZiAodWNfZnctPmhlYWRlcl9zaXplICE9IHNpemVvZihzdHJ1Y3QgdWNfY3Nz X2hlYWRlcikpIHsKIAkJRFJNX05PVEUoIkNTUyBoZWFkZXIgZGVmaW5pdGlvbiBtaXNtYXRjaFxu Iik7CiAJCWdvdG8gZmFpbDsKIAl9CkBAIC02NDYsMjEgKzY0NiwzNiBAQCB2b2lkIGludGVsX3Vj X2Z3X2ZldGNoKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpbnRlbF91Y19mdyAqdWNf ZncpCiAJCWdvdG8gZmFpbDsKIAl9CiAKLQkvKiBIZWFkZXIgYW5kIHVDb2RlIHdpbGwgYmUgbG9h ZGVkIHRvIFdPUENNLiBTaXplIG9mIHRoZSB0d28uICovCi0Jc2l6ZSA9IHVjX2Z3LT5oZWFkZXJf c2l6ZSArIHVjX2Z3LT51Y29kZV9zaXplOwotCWlmIChzaXplID4gZ3VjX3dvcGNtX3NpemUodG9f aTkxNShkZXYpKSkgewotCQlEUk1fTk9URSgiRmlybXdhcmUgaXMgdG9vIGxhcmdlIHRvIGZpdCBp biBXT1BDTVxuIik7Ci0JCWdvdG8gZmFpbDsKLQl9Ci0KIAkvKgogCSAqIFRoZSBHdUMgZmlybXdh cmUgaW1hZ2UgaGFzIHRoZSB2ZXJzaW9uIG51bWJlciBlbWJlZGRlZCBhdCBhIHdlbGwta25vd24K IAkgKiBvZmZzZXQgd2l0aGluIHRoZSBmaXJtd2FyZSBibG9iOyBub3RlIHRoYXQgbWFqb3IgLyBt aW5vciB2ZXJzaW9uIGFyZQogCSAqIFRXTyBieXRlcyBlYWNoIChpLmUuIHUxNiksIGFsdGhvdWdo IGFsbCBwb2ludGVycyBhbmQgb2Zmc2V0cyBhcmUgZGVmaW5lZAogCSAqIGluIHRlcm1zIG9mIGJ5 dGVzICh1OCkuCiAJICovCi0JdWNfZnctPm1ham9yX3Zlcl9mb3VuZCA9IGNzcy0+Z3VjX3N3X3Zl cnNpb24gPj4gMTY7Ci0JdWNfZnctPm1pbm9yX3Zlcl9mb3VuZCA9IGNzcy0+Z3VjX3N3X3ZlcnNp b24gJiAweEZGRkY7CisJc3dpdGNoICh1Y19mdy0+ZndfdHlwZSkgeworCWNhc2UgVUNfRldfVFlQ RV9HVUM6CisJCS8qIEhlYWRlciBhbmQgdUNvZGUgd2lsbCBiZSBsb2FkZWQgdG8gV09QQ00uIFNp emUgb2YgdGhlIHR3by4gKi8KKwkJc2l6ZSA9IHVjX2Z3LT5oZWFkZXJfc2l6ZSArIHVjX2Z3LT51 Y29kZV9zaXplOworCisJCS8qIFRvcCAzMmsgb2YgV09QQ00gaXMgcmVzZXJ2ZWQgKDhLIHN0YWNr ICsgMjRrIFJDNiBjb250ZXh0KS4gKi8KKwkJaWYgKHNpemUgPiBndWNfd29wY21fc2l6ZSh0b19p OTE1KGRldikpKSB7CisJCQlEUk1fRVJST1IoIkZpcm13YXJlIGlzIHRvbyBsYXJnZSB0byBmaXQg aW4gV09QQ01cbiIpOworCQkJZ290byBmYWlsOworCQl9CisJCXVjX2Z3LT5tYWpvcl92ZXJfZm91 bmQgPSBjc3MtPmd1Y19zd192ZXJzaW9uID4+IDE2OworCQl1Y19mdy0+bWlub3JfdmVyX2ZvdW5k ID0gY3NzLT5ndWNfc3dfdmVyc2lvbiAmIDB4RkZGRjsKKwkJYnJlYWs7CisKKwljYXNlIFVDX0ZX X1RZUEVfSFVDOgorCQl1Y19mdy0+bWFqb3JfdmVyX2ZvdW5kID0gY3NzLT5odWNfc3dfdmVyc2lv biA+PiAxNjsKKwkJdWNfZnctPm1pbm9yX3Zlcl9mb3VuZCA9IGNzcy0+aHVjX3N3X3ZlcnNpb24g JiAweEZGRkY7CisJCWJyZWFrOworCisJZGVmYXVsdDoKKwkJRFJNX0VSUk9SKCJVbmtub3duIGZp cm13YXJlIHR5cGUgJWRcbiIsIHVjX2Z3LT5md190eXBlKTsKKwkJZXJyID0gLUVOT0VYRUM7CisJ CWdvdG8gZmFpbDsKKwl9CiAKIAlpZiAodWNfZnctPm1ham9yX3Zlcl9mb3VuZCAhPSB1Y19mdy0+ bWFqb3JfdmVyX3dhbnRlZCB8fAogCSAgICB1Y19mdy0+bWlub3JfdmVyX2ZvdW5kIDwgdWNfZnct Pm1pbm9yX3Zlcl93YW50ZWQpIHsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK