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: Mon, 3 Oct 2016 11:42:56 -0700 Message-ID: <1475520182-9224-3-git-send-email-anusha.srivatsa@intel.com> References: <1475520182-9224-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 393B46E59D for ; Mon, 3 Oct 2016 18:43:09 +0000 (UTC) In-Reply-To: <1475520182-9224-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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogUGV0ZXIgQW50b2luZSA8cGV0ZXIuYW50b2luZUBpbnRlbC5jb20+CgpIdUMgZmlybXdh cmUgY3NzIGhlYWRlciBoYXMgYWxtb3N0IGV4YWN0bHkgc2FtZSBkZWZpbml0aW9uIGFzIEd1Qwpm aXJtd2FyZSBleGNlcHQgZm9yIHRoZSBzd192ZXJzaW9uLiBBbHNvLCBhZGQgYSBuZXcgbWVtYmVy IGZ3X3R5cGUKaW50byBpbnRlbF91Y19mdyB0byBpbmRpY2F0ZSB3aGF0IGtpbmQgb2YgZncgaXQg aXMuIFNvLCB0aGUgbG9hZGVyCndpbGwgcHVsbCByaWdodCBzd192ZXJzaW9uIGZyb20gaGVhZGVy LgoKdjI6IHJlYmFzZWQgb24tdG9wIG9mIGRybS1pbnRlbC1uaWdodGx5CnYzOiByZWJhc2VkIG9u LXRvcCBvZiBkcm0taW50ZWwtbmlnaHRseSAoYWdhaW4pLgp2NDogcmViYXNlZCArIHNwYWNlcy4K djc6IHJlYmFzZWQuCnY4OiByZWJhc2VkLgoKVGVzdGVkLWJ5OiBYaWFuZyBIYWloYW8gPGhhaWhh by54aWFuZ0BpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEFudXNoYSBTcml2YXRzYSA8YW51c2hh LnNyaXZhdHNhQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogQWxleCBEYWkgPHl1LmRhaUBpbnRl bC5jb20+ClNpZ25lZC1vZmYtYnk6IFBldGVyIEFudG9pbmUgPHBldGVyLmFudG9pbmVAaW50ZWwu Y29tPgpSZXZpZXdlZC1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaCAgICAgICAgfCAgNCArKysrCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oICAgfCAxNiArKysrKysrKysrLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMgfCA0MSArKysrKysrKysr KysrKysrKysrKysrLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgNDUgaW5zZXJ0aW9ucygr KSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZ3VjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaAppbmRleCBiMTM0YTQx Li44MTJlNGNhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaApAQCAtOTgsNiArOTgsOSBAQCBl bnVtIGludGVsX3VjX2Z3X3N0YXR1cyB7CiAJVUNfRklSTVdBUkVfU1VDQ0VTUwogfTsKIAorI2Rl ZmluZSBVQ19GV19UWVBFX0dVQwkJMAorI2RlZmluZSBVQ19GV19UWVBFX0hVQwkJMQorCiAvKgog ICogVGhpcyBzdHJ1Y3R1cmUgZW5jYXBzdWxhdGVzIGFsbCB0aGUgZGF0YSBuZWVkZWQgZHVyaW5n IHRoZSBwcm9jZXNzCiAgKiBvZiBmZXRjaGluZywgY2FjaGluZywgYW5kIGxvYWRpbmcgdGhlIGZp cm13YXJlIGltYWdlIGludG8gdGhlIEd1Qy4KQEAgLTExNSw2ICsxMTgsNyBAQCBzdHJ1Y3QgaW50 ZWxfdWNfZncgewogCXVpbnQxNl90IG1ham9yX3Zlcl9mb3VuZDsKIAl1aW50MTZfdCBtaW5vcl92 ZXJfZm91bmQ7CiAKKwl1aW50MzJfdCBmd190eXBlOwogCXVpbnQzMl90IGhlYWRlcl9zaXplOwog CXVpbnQzMl90IGhlYWRlcl9vZmZzZXQ7CiAJdWludDMyX3QgcnNhX3NpemU7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZ3VjX2Z3aWYuaAppbmRleCBlNDBkYjJkLi5iMzhiNmI0IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2d1Y19md2lmLmgKQEAgLTE1NCw3ICsxNTQsNyBAQAogICogVGhlIEd1 QyBmaXJtd2FyZSBsYXlvdXQgbG9va3MgbGlrZSB0aGlzOgogICoKICAqICAgICArLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLSsKLSAqICAgICB8ICAgICAgICBndWNfY3NzX2hlYWRlciAg ICAgICAgIHwKKyAqICAgICB8ICAgICAgICAgdWNfY3NzX2hlYWRlciAgICAgICAgIHwKICAqICAg ICB8ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwKICAqICAgICB8IGNvbnRhaW5zIG1h am9yL21pbm9yIHZlcnNpb24gIHwKICAqICAgICArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLSsKQEAgLTE4MSw5ICsxODEsMTYgQEAKICAqIDMuIExlbmd0aCBpbmZvIG9mIGVhY2ggY29t cG9uZW50IGNhbiBiZSBmb3VuZCBpbiBoZWFkZXIsIGluIGR3b3Jkcy4KICAqIDQuIE1vZHVsdXMg YW5kIGV4cG9uZW50IGtleSBhcmUgbm90IHJlcXVpcmVkIGJ5IGRyaXZlci4gVGhleSBtYXkgbm90 IGFwcGVhcgogICogICAgaW4gZncuIFNvIGRyaXZlciB3aWxsIGxvYWQgYSB0cnVuY2F0ZWQgZmly bXdhcmUgaW4gdGhpcyBjYXNlLgorICoKKyAqIEh1QyBmaXJtd2FyZSBsYXlvdXQgaXMgc2FtZSBh cyBHdUMgZmlybXdhcmUuCisgKgorICogSHVDIGZpcm13YXJlIGNzcyBoZWFkZXIgaXMgZGlmZmVy ZW50LiBIb3dldmVyLCB0aGUgb25seSBkaWZmZXJlbmNlIGlzIHdoZXJlCisgKiB0aGUgdmVyc2lv biBpbmZvcm1hdGlvbiBpcyBzYXZlZC4gVGhlIHVjX2Nzc19oZWFkZXIgaXMgdW5pZmllZCB0byBz dXBwb3J0CisgKiBib3RoLiBEcml2ZXIgc2hvdWxkIGdldCBIdUMgdmVyc2lvbiBmcm9tIHVjX2Nz c19oZWFkZXIuaHVjX3N3X3ZlcnNpb24sIHdoaWxlCisgKiB1Y19jc3NfaGVhZGVyLmd1Y19zd192 ZXJzaW9uIGZvciBHdUMuCiAgKi8KIAotc3RydWN0IGd1Y19jc3NfaGVhZGVyIHsKK3N0cnVjdCB1 Y19jc3NfaGVhZGVyIHsKIAl1aW50MzJfdCBtb2R1bGVfdHlwZTsKIAkvKiBoZWFkZXJfc2l6ZSBp bmNsdWRlcyBhbGwgbm9uLXVDb2RlIGJpdHMsIGluY2x1ZGluZyBjc3NfaGVhZGVyLCByc2EKIAkg KiBrZXksIG1vZHVsdXMga2V5IGFuZCBleHBvbmVudCBkYXRhLiAqLwpAQCAtMjE0LDcgKzIyMSwx MCBAQCBzdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIgewogCiAJY2hhciB1c2VybmFtZVs4XTsKIAljaGFy IGJ1aWxkbnVtYmVyWzEyXTsKLQl1aW50MzJfdCBkZXZpY2VfaWQ7CisJdW5pb24geworCQl1aW50 MzJfdCBkZXZpY2VfaWQ7CisJCXVpbnQzMl90IGh1Y19zd192ZXJzaW9uOworCX07CiAJdWludDMy X3QgZ3VjX3N3X3ZlcnNpb247CiAJdWludDMyX3QgcHJvZF9wcmVwcm9kX2Z3OwogCXVpbnQzMl90 IHJlc2VydmVkWzEyXTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Y19sb2FkZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYwppbmRl eCA0OTMyOTVkLi4wYjg2M2ExIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWNfbG9hZGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRl ci5jCkBAIC01ODYsNyArNTg2LDcgQEAgdm9pZCBpbnRlbF91Y19md19mZXRjaChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfdWNfZncgKnVjX2Z3KQogCXN0cnVjdCBwY2lfZGV2 ICpwZGV2ID0gZGV2LT5wZGV2OwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAJ Y29uc3Qgc3RydWN0IGZpcm13YXJlICpmdzsKLQlzdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIgKmNzczsK KwlzdHJ1Y3QgdWNfY3NzX2hlYWRlciAqY3NzOwogCXNpemVfdCBzaXplOwogCWludCBlcnI7CiAK QEAgLTYwMywxOSArNjAzLDE5IEBAIHZvaWQgaW50ZWxfdWNfZndfZmV0Y2goc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgc3RydWN0IGludGVsX3VjX2Z3ICp1Y19mdykKIAkJdWNfZnctPnVjX2Z3X3Bh dGgsIGZ3KTsKIAogCS8qIENoZWNrIHRoZSBzaXplIG9mIHRoZSBibG9iIGJlZm9yZSBleGFtaW5p bmcgYnVmZmVyIGNvbnRlbnRzICovCi0JaWYgKGZ3LT5zaXplIDwgc2l6ZW9mKHN0cnVjdCBndWNf Y3NzX2hlYWRlcikpIHsKKwlpZiAoZnctPnNpemUgPCBzaXplb2Yoc3RydWN0IHVjX2Nzc19oZWFk ZXIpKSB7CiAJCURSTV9OT1RFKCJGaXJtd2FyZSBoZWFkZXIgaXMgbWlzc2luZ1xuIik7CiAJCWdv dG8gZmFpbDsKIAl9CiAKLQljc3MgPSAoc3RydWN0IGd1Y19jc3NfaGVhZGVyICopZnctPmRhdGE7 CisJY3NzID0gKHN0cnVjdCB1Y19jc3NfaGVhZGVyICopZnctPmRhdGE7CiAKIAkvKiBGaXJtd2Fy ZSBiaXRzIGFsd2F5cyBzdGFydCBmcm9tIGhlYWRlciAqLwogCXVjX2Z3LT5oZWFkZXJfb2Zmc2V0 ID0gMDsKIAl1Y19mdy0+aGVhZGVyX3NpemUgPSAoY3NzLT5oZWFkZXJfc2l6ZV9kdyAtIGNzcy0+ bW9kdWx1c19zaXplX2R3IC0KIAkJY3NzLT5rZXlfc2l6ZV9kdyAtIGNzcy0+ZXhwb25lbnRfc2l6 ZV9kdykgKiBzaXplb2YodTMyKTsKIAotCWlmICh1Y19mdy0+aGVhZGVyX3NpemUgIT0gc2l6ZW9m KHN0cnVjdCBndWNfY3NzX2hlYWRlcikpIHsKKwlpZiAodWNfZnctPmhlYWRlcl9zaXplICE9IHNp emVvZihzdHJ1Y3QgdWNfY3NzX2hlYWRlcikpIHsKIAkJRFJNX05PVEUoIkNTUyBoZWFkZXIgZGVm aW5pdGlvbiBtaXNtYXRjaFxuIik7CiAJCWdvdG8gZmFpbDsKIAl9CkBAIC02MzksMjEgKzYzOSwz NiBAQCB2b2lkIGludGVsX3VjX2Z3X2ZldGNoKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVj dCBpbnRlbF91Y19mdyAqdWNfZncpCiAJCWdvdG8gZmFpbDsKIAl9CiAKLQkvKiBIZWFkZXIgYW5k IHVDb2RlIHdpbGwgYmUgbG9hZGVkIHRvIFdPUENNLiBTaXplIG9mIHRoZSB0d28uICovCi0Jc2l6 ZSA9IHVjX2Z3LT5oZWFkZXJfc2l6ZSArIHVjX2Z3LT51Y29kZV9zaXplOwotCWlmIChzaXplID4g Z3VjX3dvcGNtX3NpemUodG9faTkxNShkZXYpKSkgewotCQlEUk1fTk9URSgiRmlybXdhcmUgaXMg dG9vIGxhcmdlIHRvIGZpdCBpbiBXT1BDTVxuIik7Ci0JCWdvdG8gZmFpbDsKLQl9Ci0KIAkvKgog CSAqIFRoZSBHdUMgZmlybXdhcmUgaW1hZ2UgaGFzIHRoZSB2ZXJzaW9uIG51bWJlciBlbWJlZGRl ZCBhdCBhIHdlbGwta25vd24KIAkgKiBvZmZzZXQgd2l0aGluIHRoZSBmaXJtd2FyZSBibG9iOyBu b3RlIHRoYXQgbWFqb3IgLyBtaW5vciB2ZXJzaW9uIGFyZQogCSAqIFRXTyBieXRlcyBlYWNoIChp LmUuIHUxNiksIGFsdGhvdWdoIGFsbCBwb2ludGVycyBhbmQgb2Zmc2V0cyBhcmUgZGVmaW5lZAog CSAqIGluIHRlcm1zIG9mIGJ5dGVzICh1OCkuCiAJICovCi0JdWNfZnctPm1ham9yX3Zlcl9mb3Vu ZCA9IGNzcy0+Z3VjX3N3X3ZlcnNpb24gPj4gMTY7Ci0JdWNfZnctPm1pbm9yX3Zlcl9mb3VuZCA9 IGNzcy0+Z3VjX3N3X3ZlcnNpb24gJiAweEZGRkY7CisJc3dpdGNoICh1Y19mdy0+ZndfdHlwZSkg eworCWNhc2UgVUNfRldfVFlQRV9HVUM6CisJCS8qIEhlYWRlciBhbmQgdUNvZGUgd2lsbCBiZSBs b2FkZWQgdG8gV09QQ00uIFNpemUgb2YgdGhlIHR3by4gKi8KKwkJc2l6ZSA9IHVjX2Z3LT5oZWFk ZXJfc2l6ZSArIHVjX2Z3LT51Y29kZV9zaXplOworCisJCS8qIFRvcCAzMmsgb2YgV09QQ00gaXMg cmVzZXJ2ZWQgKDhLIHN0YWNrICsgMjRrIFJDNiBjb250ZXh0KS4gKi8KKwkJaWYgKHNpemUgPiBn dWNfd29wY21fc2l6ZSh0b19pOTE1KGRldikpKSB7CisJCQlEUk1fRVJST1IoIkZpcm13YXJlIGlz IHRvbyBsYXJnZSB0byBmaXQgaW4gV09QQ01cbiIpOworCQkJZ290byBmYWlsOworCQl9CisJCXVj X2Z3LT5tYWpvcl92ZXJfZm91bmQgPSBjc3MtPmd1Y19zd192ZXJzaW9uID4+IDE2OworCQl1Y19m dy0+bWlub3JfdmVyX2ZvdW5kID0gY3NzLT5ndWNfc3dfdmVyc2lvbiAmIDB4RkZGRjsKKwkJYnJl YWs7CisKKwljYXNlIFVDX0ZXX1RZUEVfSFVDOgorCQl1Y19mdy0+bWFqb3JfdmVyX2ZvdW5kID0g Y3NzLT5odWNfc3dfdmVyc2lvbiA+PiAxNjsKKwkJdWNfZnctPm1pbm9yX3Zlcl9mb3VuZCA9IGNz cy0+aHVjX3N3X3ZlcnNpb24gJiAweEZGRkY7CisJCWJyZWFrOworCisJZGVmYXVsdDoKKwkJRFJN X0VSUk9SKCJVbmtub3duIGZpcm13YXJlIHR5cGUgJWRcbiIsIHVjX2Z3LT5md190eXBlKTsKKwkJ ZXJyID0gLUVOT0VYRUM7CisJCWdvdG8gZmFpbDsKKwl9CiAKIAlpZiAodWNfZnctPm1ham9yX3Zl cl9mb3VuZCAhPSB1Y19mdy0+bWFqb3JfdmVyX3dhbnRlZCB8fAogCSAgICB1Y19mdy0+bWlub3Jf dmVyX2ZvdW5kIDwgdWNfZnctPm1pbm9yX3Zlcl93YW50ZWQpIHsKLS0gCjIuNy40CgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK