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, 15 Dec 2016 14:29:44 -0800 Message-ID: <1481840990-31191-3-git-send-email-anusha.srivatsa@intel.com> References: <1481840990-31191-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id C3D4C6E0F9 for ; Thu, 15 Dec 2016 22:29:52 +0000 (UTC) In-Reply-To: <1481840990-31191-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 X3VjX2Z3X2ZldGNoCnYxNDogcmViYXNlZC4gQWRkIElOVEVMXyBwcmVmaXggdG8gYW4gZW51bS4g QWRkIGZ3X3R5cGUgZGVjbGFyYXRpb24KZnJvbSBwYXRjaCAxLkNvbWJpbmUgdHdvIGRpZmZlcmVu dCB1bmlvbnMgZm9yIGh1YyBhbmQgZ3VjIHZlcnNpb24sCnJlc2VydmVkIGV0YyBpbnRvIG9uZSB1 bmlvbiB3aXRoIHR3byBzdHJ1Y3RzLgoKVGVzdGVkLWJ5OiBYaWFuZyBIYWloYW8gPGhhaWhhby54 aWFuZ0BpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEFudXNoYSBTcml2YXRzYSA8YW51c2hhLnNy aXZhdHNhQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5j b20+ClNpZ25lZC1vZmYtYnk6IFBldGVyIEFudG9pbmUgPHBldGVyLmFudG9pbmVAaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19md2lmLmggICB8IDIzICsrKysr KysrKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIHwg NDEgKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF91Yy5oICAgICAgICAgfCAgNiArKysrKwogMyBmaWxlcyBjaGFuZ2VkLCA1MyBpbnNl cnRpb25zKCspLCAxNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ndWNfZndpZi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3 aWYuaAppbmRleCAzMjAyYjMyLi5lZDFhYjQwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ndWNfZndpZi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Y19md2lmLmgKQEAgLTE0NSw3ICsxNDUsNyBAQAogICogVGhlIEd1QyBmaXJtd2FyZSBsYXlvdXQg bG9va3MgbGlrZSB0aGlzOgogICoKICAqICAgICArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLSsKLSAqICAgICB8ICAgICAgICBndWNfY3NzX2hlYWRlciAgICAgICAgIHwKKyAqICAgICB8 ICAgICAgICAgdWNfY3NzX2hlYWRlciAgICAgICAgIHwKICAqICAgICB8ICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHwKICAqICAgICB8IGNvbnRhaW5zIG1ham9yL21pbm9yIHZlcnNpb24g IHwKICAqICAgICArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSsKQEAgLTE3Miw5ICsx NzIsMTYgQEAKICAqIDMuIExlbmd0aCBpbmZvIG9mIGVhY2ggY29tcG9uZW50IGNhbiBiZSBmb3Vu ZCBpbiBoZWFkZXIsIGluIGR3b3Jkcy4KICAqIDQuIE1vZHVsdXMgYW5kIGV4cG9uZW50IGtleSBh cmUgbm90IHJlcXVpcmVkIGJ5IGRyaXZlci4gVGhleSBtYXkgbm90IGFwcGVhcgogICogICAgaW4g ZncuIFNvIGRyaXZlciB3aWxsIGxvYWQgYSB0cnVuY2F0ZWQgZmlybXdhcmUgaW4gdGhpcyBjYXNl LgorICoKKyAqIEh1QyBmaXJtd2FyZSBsYXlvdXQgaXMgc2FtZSBhcyBHdUMgZmlybXdhcmUuCisg KgorICogSHVDIGZpcm13YXJlIGNzcyBoZWFkZXIgaXMgZGlmZmVyZW50LiBIb3dldmVyLCB0aGUg b25seSBkaWZmZXJlbmNlIGlzIHdoZXJlCisgKiB0aGUgdmVyc2lvbiBpbmZvcm1hdGlvbiBpcyBz YXZlZC4gVGhlIHVjX2Nzc19oZWFkZXIgaXMgdW5pZmllZCB0byBzdXBwb3J0CisgKiBib3RoLiBE cml2ZXIgc2hvdWxkIGdldCBIdUMgdmVyc2lvbiBmcm9tIHVjX2Nzc19oZWFkZXIuaHVjX3N3X3Zl cnNpb24sIHdoaWxlCisgKiB1Y19jc3NfaGVhZGVyLmd1Y19zd192ZXJzaW9uIGZvciBHdUMuCiAg Ki8KIAotc3RydWN0IGd1Y19jc3NfaGVhZGVyIHsKK3N0cnVjdCB1Y19jc3NfaGVhZGVyIHsKIAl1 aW50MzJfdCBtb2R1bGVfdHlwZTsKIAkvKiBoZWFkZXJfc2l6ZSBpbmNsdWRlcyBhbGwgbm9uLXVD b2RlIGJpdHMsIGluY2x1ZGluZyBjc3NfaGVhZGVyLCByc2EKIAkgKiBrZXksIG1vZHVsdXMga2V5 IGFuZCBleHBvbmVudCBkYXRhLiAqLwpAQCAtMjA1LDggKzIxMiwxNiBAQCBzdHJ1Y3QgZ3VjX2Nz c19oZWFkZXIgewogCiAJY2hhciB1c2VybmFtZVs4XTsKIAljaGFyIGJ1aWxkbnVtYmVyWzEyXTsK LQl1aW50MzJfdCBkZXZpY2VfaWQ7Ci0JdWludDMyX3QgZ3VjX3N3X3ZlcnNpb247CisJdW5pb24g eworCQlzdHJ1Y3QgeworCQkJdWludDMyX3QgYnJhbmNoX2NsaWVudF92ZXJzaW9uOworCQkJdWlu dDMyX3Qgc3dfdmVyc2lvbjsKKwl9IGd1YzsKKwkJc3RydWN0IHsKKwkJCXVpbnQzMl90IHN3X3Zl cnNpb247CisJCQl1aW50MzJfdCByZXNlcnZlZDsKKwl9IGh1YzsKKwl9OwogCXVpbnQzMl90IHBy b2RfcHJlcHJvZF9mdzsKIAl1aW50MzJfdCByZXNlcnZlZFsxMl07CiAJdWludDMyX3QgaGVhZGVy X2luZm87CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVy LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKaW5kZXggOWIzZGJl YS4uMDllNDYzYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xv YWRlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYwpAQCAt NTkzLDcgKzU5Myw3IEBAIHZvaWQgaW50ZWxfdWNfZndfZmV0Y2goc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LAogCXN0cnVjdCBwY2lfZGV2ICpwZGV2ID0gZGV2X3ByaXYtPmRybS5w ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAJY29uc3Qgc3RydWN0IGZp cm13YXJlICpmdyA9IE5VTEw7Ci0Jc3RydWN0IGd1Y19jc3NfaGVhZGVyICpjc3M7CisJc3RydWN0 IHVjX2Nzc19oZWFkZXIgKmNzczsKIAlzaXplX3Qgc2l6ZTsKIAlpbnQgZXJyOwogCkBAIC02MTAs MTkgKzYxMCwxOSBAQCB2b2lkIGludGVsX3VjX2Z3X2ZldGNoKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwKIAkJdWNfZnctPnVjX2Z3X3BhdGgsIGZ3KTsKIAogCS8qIENoZWNrIHRo ZSBzaXplIG9mIHRoZSBibG9iIGJlZm9yZSBleGFtaW5pbmcgYnVmZmVyIGNvbnRlbnRzICovCi0J aWYgKGZ3LT5zaXplIDwgc2l6ZW9mKHN0cnVjdCBndWNfY3NzX2hlYWRlcikpIHsKKwlpZiAoZnct PnNpemUgPCBzaXplb2Yoc3RydWN0IHVjX2Nzc19oZWFkZXIpKSB7CiAJCURSTV9OT1RFKCJGaXJt d2FyZSBoZWFkZXIgaXMgbWlzc2luZ1xuIik7CiAJCWdvdG8gZmFpbDsKIAl9CiAKLQljc3MgPSAo c3RydWN0IGd1Y19jc3NfaGVhZGVyICopZnctPmRhdGE7CisJY3NzID0gKHN0cnVjdCB1Y19jc3Nf aGVhZGVyICopZnctPmRhdGE7CiAKIAkvKiBGaXJtd2FyZSBiaXRzIGFsd2F5cyBzdGFydCBmcm9t IGhlYWRlciAqLwogCXVjX2Z3LT5oZWFkZXJfb2Zmc2V0ID0gMDsKIAl1Y19mdy0+aGVhZGVyX3Np emUgPSAoY3NzLT5oZWFkZXJfc2l6ZV9kdyAtIGNzcy0+bW9kdWx1c19zaXplX2R3IC0KIAkJY3Nz LT5rZXlfc2l6ZV9kdyAtIGNzcy0+ZXhwb25lbnRfc2l6ZV9kdykgKiBzaXplb2YodTMyKTsKIAot CWlmICh1Y19mdy0+aGVhZGVyX3NpemUgIT0gc2l6ZW9mKHN0cnVjdCBndWNfY3NzX2hlYWRlcikp IHsKKwlpZiAodWNfZnctPmhlYWRlcl9zaXplICE9IHNpemVvZihzdHJ1Y3QgdWNfY3NzX2hlYWRl cikpIHsKIAkJRFJNX05PVEUoIkNTUyBoZWFkZXIgZGVmaW5pdGlvbiBtaXNtYXRjaFxuIik7CiAJ CWdvdG8gZmFpbDsKIAl9CkBAIC02NDYsMjEgKzY0NiwzNiBAQCB2b2lkIGludGVsX3VjX2Z3X2Zl dGNoKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJZ290byBmYWlsOwogCX0K IAotCS8qIEhlYWRlciBhbmQgdUNvZGUgd2lsbCBiZSBsb2FkZWQgdG8gV09QQ00uIFNpemUgb2Yg dGhlIHR3by4gKi8KLQlzaXplID0gdWNfZnctPmhlYWRlcl9zaXplICsgdWNfZnctPnVjb2RlX3Np emU7Ci0JaWYgKHNpemUgPiBndWNfd29wY21fc2l6ZShkZXZfcHJpdikpIHsKLQkJRFJNX05PVEUo IkZpcm13YXJlIGlzIHRvbyBsYXJnZSB0byBmaXQgaW4gV09QQ01cbiIpOwotCQlnb3RvIGZhaWw7 Ci0JfQotCiAJLyoKIAkgKiBUaGUgR3VDIGZpcm13YXJlIGltYWdlIGhhcyB0aGUgdmVyc2lvbiBu dW1iZXIgZW1iZWRkZWQgYXQgYSB3ZWxsLWtub3duCiAJICogb2Zmc2V0IHdpdGhpbiB0aGUgZmly bXdhcmUgYmxvYjsgbm90ZSB0aGF0IG1ham9yIC8gbWlub3IgdmVyc2lvbiBhcmUKIAkgKiBUV08g Ynl0ZXMgZWFjaCAoaS5lLiB1MTYpLCBhbHRob3VnaCBhbGwgcG9pbnRlcnMgYW5kIG9mZnNldHMg YXJlIGRlZmluZWQKIAkgKiBpbiB0ZXJtcyBvZiBieXRlcyAodTgpLgogCSAqLwotCXVjX2Z3LT5t YWpvcl92ZXJfZm91bmQgPSBjc3MtPmd1Y19zd192ZXJzaW9uID4+IDE2OwotCXVjX2Z3LT5taW5v cl92ZXJfZm91bmQgPSBjc3MtPmd1Y19zd192ZXJzaW9uICYgMHhGRkZGOworCXN3aXRjaCAodWNf ZnctPmZ3X3R5cGUpIHsKKwljYXNlIElOVEVMX1VDX0ZXX1RZUEVfR1VDOgorCQkvKiBIZWFkZXIg YW5kIHVDb2RlIHdpbGwgYmUgbG9hZGVkIHRvIFdPUENNLiBTaXplIG9mIHRoZSB0d28uICovCisJ CXNpemUgPSB1Y19mdy0+aGVhZGVyX3NpemUgKyB1Y19mdy0+dWNvZGVfc2l6ZTsKKworCQkvKiBU b3AgMzJrIG9mIFdPUENNIGlzIHJlc2VydmVkICg4SyBzdGFjayArIDI0ayBSQzYgY29udGV4dCku ICovCisJCWlmIChzaXplID4gZ3VjX3dvcGNtX3NpemUoZGV2X3ByaXYpKSB7CisJCQlEUk1fRVJS T1IoIkZpcm13YXJlIGlzIHRvbyBsYXJnZSB0byBmaXQgaW4gV09QQ01cbiIpOworCQkJZ290byBm YWlsOworCQl9CisJCXVjX2Z3LT5tYWpvcl92ZXJfZm91bmQgPSBjc3MtPmd1Yy5zd192ZXJzaW9u ID4+IDE2OworCQl1Y19mdy0+bWlub3JfdmVyX2ZvdW5kID0gY3NzLT5ndWMuc3dfdmVyc2lvbiAm IDB4RkZGRjsKKwkJYnJlYWs7CisKKwljYXNlIElOVEVMX1VDX0ZXX1RZUEVfSFVDOgorCQl1Y19m dy0+bWFqb3JfdmVyX2ZvdW5kID0gY3NzLT5odWMuc3dfdmVyc2lvbiA+PiAxNjsKKwkJdWNfZnct Pm1pbm9yX3Zlcl9mb3VuZCA9IGNzcy0+aHVjLnN3X3ZlcnNpb24gJiAweEZGRkY7CisJCWJyZWFr OworCisJZGVmYXVsdDoKKwkJRFJNX0VSUk9SKCJVbmtub3duIGZpcm13YXJlIHR5cGUgJWRcbiIs IHVjX2Z3LT5md190eXBlKTsKKwkJZXJyID0gLUVOT0VYRUM7CisJCWdvdG8gZmFpbDsKKwl9CiAK IAlpZiAodWNfZnctPm1ham9yX3Zlcl9mb3VuZCAhPSB1Y19mdy0+bWFqb3JfdmVyX3dhbnRlZCB8 fAogCSAgICB1Y19mdy0+bWlub3JfdmVyX2ZvdW5kIDwgdWNfZnctPm1pbm9yX3Zlcl93YW50ZWQp IHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF91Yy5oCmluZGV4IDg5M2JjZWMuLmFkMTQwZTIgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfdWMuaApAQCAtOTgsNiArOTgsMTEgQEAgZW51bSBpbnRlbF91Y19md19zdGF0 dXMgewogCUlOVEVMX1VDX0ZJUk1XQVJFX1NVQ0NFU1MKIH07CiAKK2VudW0geworCUlOVEVMX1VD X0ZXX1RZUEVfR1VDLAorCUlOVEVMX1VDX0ZXX1RZUEVfSFVDCit9OworCiAvKgogICogVGhpcyBz dHJ1Y3R1cmUgZW5jYXBzdWxhdGVzIGFsbCB0aGUgZGF0YSBuZWVkZWQgZHVyaW5nIHRoZSBwcm9j ZXNzCiAgKiBvZiBmZXRjaGluZywgY2FjaGluZywgYW5kIGxvYWRpbmcgdGhlIGZpcm13YXJlIGlt YWdlIGludG8gdGhlIEd1Qy4KQEAgLTExNCw2ICsxMTksNyBAQCBzdHJ1Y3QgaW50ZWxfdWNfZncg ewogCXVpbnQxNl90IG1ham9yX3Zlcl9mb3VuZDsKIAl1aW50MTZfdCBtaW5vcl92ZXJfZm91bmQ7 CiAKKwl1aW50MzJfdCBmd190eXBlOwogCXVpbnQzMl90IGhlYWRlcl9zaXplOwogCXVpbnQzMl90 IGhlYWRlcl9vZmZzZXQ7CiAJdWludDMyX3QgcnNhX3NpemU7Ci0tIAoyLjcuNAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==