From mboxrd@z Thu Jan 1 00:00:00 1970 From: anushasr Subject: [PATCH 2/8] drm/i915/huc: Unified css_header struct for GuC and HuC Date: Thu, 8 Dec 2016 15:02:13 -0800 Message-ID: <1481238139-9509-3-git-send-email-anusha.srivatsa@intel.com> References: <1481238139-9509-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id CA84A6E890 for ; Thu, 8 Dec 2016 23:02:24 +0000 (UTC) In-Reply-To: <1481238139-9509-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 IGFuIGVudW0uCnYxMDogcmViYXNlZC4KdjExOiByZWJhc2VkLgp2MTI6IHJlYmFzZWQgb24gdG9w IG9mIGRybS10aXAuCnYxMzogcmViYXNlZC5VcGRhdGUgZGV2IHRvIGRldl9wcml2IGluIGludGVs X3VjX2Z3X2ZldGNoCgpUZXN0ZWQtYnk6IFhpYW5nIEhhaWhhbyA8aGFpaGFvLnhpYW5nQGludGVs LmNvbT4KU2lnbmVkLW9mZi1ieTogQW51c2hhIFNyaXZhdHNhIDxhbnVzaGEuc3JpdmF0c2FAaW50 ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERhaSA8eXUuZGFpQGludGVsLmNvbT4KU2lnbmVk LW9mZi1ieTogUGV0ZXIgQW50b2luZSA8cGV0ZXIuYW50b2luZUBpbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3aWYuaCAgIHwgMjEgKysrKysrKysrKysrKy0t LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyB8IDQxICsrKysrKysr KysrKysrKysrKysrKystLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMu aCAgICAgICAgIHwgIDUgKysrKwogMyBmaWxlcyBjaGFuZ2VkLCA1MCBpbnNlcnRpb25zKCspLCAx NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWNfZndpZi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3aWYuaAppbmRleCAz MjAyYjMyLi5jMWU3ZmFmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWNfZndpZi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19md2lmLmgKQEAg LTE0NSw3ICsxNDUsNyBAQAogICogVGhlIEd1QyBmaXJtd2FyZSBsYXlvdXQgbG9va3MgbGlrZSB0 aGlzOgogICoKICAqICAgICArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSsKLSAqICAg ICB8ICAgICAgICBndWNfY3NzX2hlYWRlciAgICAgICAgIHwKKyAqICAgICB8ICAgICAgICAgdWNf Y3NzX2hlYWRlciAgICAgICAgIHwKICAqICAgICB8ICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHwKICAqICAgICB8IGNvbnRhaW5zIG1ham9yL21pbm9yIHZlcnNpb24gIHwKICAqICAgICAr LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSsKQEAgLTE3Miw5ICsxNzIsMTYgQEAKICAq IDMuIExlbmd0aCBpbmZvIG9mIGVhY2ggY29tcG9uZW50IGNhbiBiZSBmb3VuZCBpbiBoZWFkZXIs IGluIGR3b3Jkcy4KICAqIDQuIE1vZHVsdXMgYW5kIGV4cG9uZW50IGtleSBhcmUgbm90IHJlcXVp cmVkIGJ5IGRyaXZlci4gVGhleSBtYXkgbm90IGFwcGVhcgogICogICAgaW4gZncuIFNvIGRyaXZl ciB3aWxsIGxvYWQgYSB0cnVuY2F0ZWQgZmlybXdhcmUgaW4gdGhpcyBjYXNlLgorICoKKyAqIEh1 QyBmaXJtd2FyZSBsYXlvdXQgaXMgc2FtZSBhcyBHdUMgZmlybXdhcmUuCisgKgorICogSHVDIGZp cm13YXJlIGNzcyBoZWFkZXIgaXMgZGlmZmVyZW50LiBIb3dldmVyLCB0aGUgb25seSBkaWZmZXJl bmNlIGlzIHdoZXJlCisgKiB0aGUgdmVyc2lvbiBpbmZvcm1hdGlvbiBpcyBzYXZlZC4gVGhlIHVj X2Nzc19oZWFkZXIgaXMgdW5pZmllZCB0byBzdXBwb3J0CisgKiBib3RoLiBEcml2ZXIgc2hvdWxk IGdldCBIdUMgdmVyc2lvbiBmcm9tIHVjX2Nzc19oZWFkZXIuaHVjX3N3X3ZlcnNpb24sIHdoaWxl CisgKiB1Y19jc3NfaGVhZGVyLmd1Y19zd192ZXJzaW9uIGZvciBHdUMuCiAgKi8KIAotc3RydWN0 IGd1Y19jc3NfaGVhZGVyIHsKK3N0cnVjdCB1Y19jc3NfaGVhZGVyIHsKIAl1aW50MzJfdCBtb2R1 bGVfdHlwZTsKIAkvKiBoZWFkZXJfc2l6ZSBpbmNsdWRlcyBhbGwgbm9uLXVDb2RlIGJpdHMsIGlu Y2x1ZGluZyBjc3NfaGVhZGVyLCByc2EKIAkgKiBrZXksIG1vZHVsdXMga2V5IGFuZCBleHBvbmVu dCBkYXRhLiAqLwpAQCAtMjA1LDggKzIxMiwxNCBAQCBzdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIgewog CiAJY2hhciB1c2VybmFtZVs4XTsKIAljaGFyIGJ1aWxkbnVtYmVyWzEyXTsKLQl1aW50MzJfdCBk ZXZpY2VfaWQ7Ci0JdWludDMyX3QgZ3VjX3N3X3ZlcnNpb247CisJdW5pb24geworCQl1aW50MzJf dCBndWNfYnJhbmNoX2NsaWVudF92ZXJzaW9uOworCQl1aW50MzJfdCBodWNfc3dfdmVyc2lvbjsK Kwl9OworCXVuaW9uIHsKKwkJdWludDMyX3QgZ3VjX3N3X3ZlcnNpb247CisJCXVpbnQzMl90IGh1 Y19yZXNlcnZlZDsKKwl9OwogCXVpbnQzMl90IHByb2RfcHJlcHJvZF9mdzsKIAl1aW50MzJfdCBy ZXNlcnZlZFsxMl07CiAJdWludDMyX3QgaGVhZGVyX2luZm87CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9ndWNfbG9hZGVyLmMKaW5kZXggOGYwNGY2ZS4uMjZhMTg0ZiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYwpAQCAtNTkzLDcgKzU5Myw3IEBAIHZvaWQgaW50ZWxf dWNfZndfZmV0Y2goc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCXN0cnVjdCBw Y2lfZGV2ICpwZGV2ID0gZGV2X3ByaXYtPmRybS5wZGV2OwogCXN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpvYmo7CiAJY29uc3Qgc3RydWN0IGZpcm13YXJlICpmdyA9IE5VTEw7Ci0Jc3RydWN0 IGd1Y19jc3NfaGVhZGVyICpjc3M7CisJc3RydWN0IHVjX2Nzc19oZWFkZXIgKmNzczsKIAlzaXpl X3Qgc2l6ZTsKIAlpbnQgZXJyOwogCkBAIC02MTAsMTkgKzYxMCwxOSBAQCB2b2lkIGludGVsX3Vj X2Z3X2ZldGNoKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJdWNfZnctPnVj X2Z3X3BhdGgsIGZ3KTsKIAogCS8qIENoZWNrIHRoZSBzaXplIG9mIHRoZSBibG9iIGJlZm9yZSBl eGFtaW5pbmcgYnVmZmVyIGNvbnRlbnRzICovCi0JaWYgKGZ3LT5zaXplIDwgc2l6ZW9mKHN0cnVj dCBndWNfY3NzX2hlYWRlcikpIHsKKwlpZiAoZnctPnNpemUgPCBzaXplb2Yoc3RydWN0IHVjX2Nz c19oZWFkZXIpKSB7CiAJCURSTV9OT1RFKCJGaXJtd2FyZSBoZWFkZXIgaXMgbWlzc2luZ1xuIik7 CiAJCWdvdG8gZmFpbDsKIAl9CiAKLQljc3MgPSAoc3RydWN0IGd1Y19jc3NfaGVhZGVyICopZnct PmRhdGE7CisJY3NzID0gKHN0cnVjdCB1Y19jc3NfaGVhZGVyICopZnctPmRhdGE7CiAKIAkvKiBG aXJtd2FyZSBiaXRzIGFsd2F5cyBzdGFydCBmcm9tIGhlYWRlciAqLwogCXVjX2Z3LT5oZWFkZXJf b2Zmc2V0ID0gMDsKIAl1Y19mdy0+aGVhZGVyX3NpemUgPSAoY3NzLT5oZWFkZXJfc2l6ZV9kdyAt IGNzcy0+bW9kdWx1c19zaXplX2R3IC0KIAkJY3NzLT5rZXlfc2l6ZV9kdyAtIGNzcy0+ZXhwb25l bnRfc2l6ZV9kdykgKiBzaXplb2YodTMyKTsKIAotCWlmICh1Y19mdy0+aGVhZGVyX3NpemUgIT0g c2l6ZW9mKHN0cnVjdCBndWNfY3NzX2hlYWRlcikpIHsKKwlpZiAodWNfZnctPmhlYWRlcl9zaXpl ICE9IHNpemVvZihzdHJ1Y3QgdWNfY3NzX2hlYWRlcikpIHsKIAkJRFJNX05PVEUoIkNTUyBoZWFk ZXIgZGVmaW5pdGlvbiBtaXNtYXRjaFxuIik7CiAJCWdvdG8gZmFpbDsKIAl9CkBAIC02NDYsMjEg KzY0NiwzNiBAQCB2b2lkIGludGVsX3VjX2Z3X2ZldGNoKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAkJZ290byBmYWlsOwogCX0KIAotCS8qIEhlYWRlciBhbmQgdUNvZGUgd2ls bCBiZSBsb2FkZWQgdG8gV09QQ00uIFNpemUgb2YgdGhlIHR3by4gKi8KLQlzaXplID0gdWNfZnct PmhlYWRlcl9zaXplICsgdWNfZnctPnVjb2RlX3NpemU7Ci0JaWYgKHNpemUgPiBndWNfd29wY21f c2l6ZShkZXZfcHJpdikpIHsKLQkJRFJNX05PVEUoIkZpcm13YXJlIGlzIHRvbyBsYXJnZSB0byBm aXQgaW4gV09QQ01cbiIpOwotCQlnb3RvIGZhaWw7Ci0JfQotCiAJLyoKIAkgKiBUaGUgR3VDIGZp cm13YXJlIGltYWdlIGhhcyB0aGUgdmVyc2lvbiBudW1iZXIgZW1iZWRkZWQgYXQgYSB3ZWxsLWtu b3duCiAJICogb2Zmc2V0IHdpdGhpbiB0aGUgZmlybXdhcmUgYmxvYjsgbm90ZSB0aGF0IG1ham9y IC8gbWlub3IgdmVyc2lvbiBhcmUKIAkgKiBUV08gYnl0ZXMgZWFjaCAoaS5lLiB1MTYpLCBhbHRo b3VnaCBhbGwgcG9pbnRlcnMgYW5kIG9mZnNldHMgYXJlIGRlZmluZWQKIAkgKiBpbiB0ZXJtcyBv ZiBieXRlcyAodTgpLgogCSAqLwotCXVjX2Z3LT5tYWpvcl92ZXJfZm91bmQgPSBjc3MtPmd1Y19z d192ZXJzaW9uID4+IDE2OwotCXVjX2Z3LT5taW5vcl92ZXJfZm91bmQgPSBjc3MtPmd1Y19zd192 ZXJzaW9uICYgMHhGRkZGOworCXN3aXRjaCAodWNfZnctPmZ3X3R5cGUpIHsKKwljYXNlIFVDX0ZX X1RZUEVfR1VDOgorCQkvKiBIZWFkZXIgYW5kIHVDb2RlIHdpbGwgYmUgbG9hZGVkIHRvIFdPUENN LiBTaXplIG9mIHRoZSB0d28uICovCisJCXNpemUgPSB1Y19mdy0+aGVhZGVyX3NpemUgKyB1Y19m dy0+dWNvZGVfc2l6ZTsKKworCQkvKiBUb3AgMzJrIG9mIFdPUENNIGlzIHJlc2VydmVkICg4SyBz dGFjayArIDI0ayBSQzYgY29udGV4dCkuICovCisJCWlmIChzaXplID4gZ3VjX3dvcGNtX3NpemUo ZGV2X3ByaXYpKSB7CisJCQlEUk1fRVJST1IoIkZpcm13YXJlIGlzIHRvbyBsYXJnZSB0byBmaXQg aW4gV09QQ01cbiIpOworCQkJZ290byBmYWlsOworCQl9CisJCXVjX2Z3LT5tYWpvcl92ZXJfZm91 bmQgPSBjc3MtPmd1Y19zd192ZXJzaW9uID4+IDE2OworCQl1Y19mdy0+bWlub3JfdmVyX2ZvdW5k ID0gY3NzLT5ndWNfc3dfdmVyc2lvbiAmIDB4RkZGRjsKKwkJYnJlYWs7CisKKwljYXNlIFVDX0ZX X1RZUEVfSFVDOgorCQl1Y19mdy0+bWFqb3JfdmVyX2ZvdW5kID0gY3NzLT5odWNfc3dfdmVyc2lv biA+PiAxNjsKKwkJdWNfZnctPm1pbm9yX3Zlcl9mb3VuZCA9IGNzcy0+aHVjX3N3X3ZlcnNpb24g JiAweEZGRkY7CisJCWJyZWFrOworCisJZGVmYXVsdDoKKwkJRFJNX0VSUk9SKCJVbmtub3duIGZp cm13YXJlIHR5cGUgJWRcbiIsIHVjX2Z3LT5md190eXBlKTsKKwkJZXJyID0gLUVOT0VYRUM7CisJ CWdvdG8gZmFpbDsKKwl9CiAKIAlpZiAodWNfZnctPm1ham9yX3Zlcl9mb3VuZCAhPSB1Y19mdy0+ bWFqb3JfdmVyX3dhbnRlZCB8fAogCSAgICB1Y19mdy0+bWlub3JfdmVyX2ZvdW5kIDwgdWNfZnct Pm1pbm9yX3Zlcl93YW50ZWQpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3VjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5oCmluZGV4IGY5ZjU5OGQu LmJlODlmMGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaApAQCAtOTgsNiArOTgsMTEgQEAgZW51 bSBpbnRlbF91Y19md19zdGF0dXMgewogCVVDX0ZJUk1XQVJFX1NVQ0NFU1MKIH07CiAKK2VudW0g eworCVVDX0ZXX1RZUEVfR1VDLAorCVVDX0ZXX1RZUEVfSFVDCit9OworCiAvKgogICogVGhpcyBz dHJ1Y3R1cmUgZW5jYXBzdWxhdGVzIGFsbCB0aGUgZGF0YSBuZWVkZWQgZHVyaW5nIHRoZSBwcm9j ZXNzCiAgKiBvZiBmZXRjaGluZywgY2FjaGluZywgYW5kIGxvYWRpbmcgdGhlIGZpcm13YXJlIGlt YWdlIGludG8gdGhlIEd1Qy4KLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK