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, 4 Jan 2017 05:27:24 -0800 Message-ID: <1483536450-4536-3-git-send-email-anusha.srivatsa@intel.com> References: <1483536450-4536-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 mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id EE09A6E264 for ; Wed, 4 Jan 2017 13:30:44 +0000 (UTC) In-Reply-To: <1483536450-4536-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 bmlvbiB3aXRoIHR3byBzdHJ1Y3RzLgp2MTU6IHJlYmFzZWQuCnYxNjogcmViYXNlZC4gQ2hhbmdl IGZ3X3R5cGUgdG8gZW51bS4KClRlc3RlZC1ieTogWGlhbmcgSGFpaGFvIDxoYWloYW8ueGlhbmdA aW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBBbnVzaGEgU3JpdmF0c2EgPGFudXNoYS5zcml2YXRz YUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEFsZXggRGFpIDx5dS5kYWlAaW50ZWwuY29tPgpT aWduZWQtb2ZmLWJ5OiBQZXRlciBBbnRvaW5lIDxwZXRlci5hbnRvaW5lQGludGVsLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oICAgfCAyMyArKysrKysrKysr KysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyB8IDQxICsr KysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfdWMuaCAgICAgICAgIHwgIDYgKysrKysKIDMgZmlsZXMgY2hhbmdlZCwgNTMgaW5zZXJ0aW9u cygrKSwgMTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZ3VjX2Z3aWYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19md2lmLmgK aW5kZXggMzIwMmIzMi4uZWQxYWI0MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZ3VjX2Z3aWYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndp Zi5oCkBAIC0xNDUsNyArMTQ1LDcgQEAKICAqIFRoZSBHdUMgZmlybXdhcmUgbGF5b3V0IGxvb2tz IGxpa2UgdGhpczoKICAqCiAgKiAgICAgKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0r Ci0gKiAgICAgfCAgICAgICAgZ3VjX2Nzc19oZWFkZXIgICAgICAgICB8CisgKiAgICAgfCAgICAg ICAgIHVjX2Nzc19oZWFkZXIgICAgICAgICB8CiAgKiAgICAgfCAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB8CiAgKiAgICAgfCBjb250YWlucyBtYWpvci9taW5vciB2ZXJzaW9uICB8CiAg KiAgICAgKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0rCkBAIC0xNzIsOSArMTcyLDE2 IEBACiAgKiAzLiBMZW5ndGggaW5mbyBvZiBlYWNoIGNvbXBvbmVudCBjYW4gYmUgZm91bmQgaW4g aGVhZGVyLCBpbiBkd29yZHMuCiAgKiA0LiBNb2R1bHVzIGFuZCBleHBvbmVudCBrZXkgYXJlIG5v dCByZXF1aXJlZCBieSBkcml2ZXIuIFRoZXkgbWF5IG5vdCBhcHBlYXIKICAqICAgIGluIGZ3LiBT byBkcml2ZXIgd2lsbCBsb2FkIGEgdHJ1bmNhdGVkIGZpcm13YXJlIGluIHRoaXMgY2FzZS4KKyAq CisgKiBIdUMgZmlybXdhcmUgbGF5b3V0IGlzIHNhbWUgYXMgR3VDIGZpcm13YXJlLgorICoKKyAq IEh1QyBmaXJtd2FyZSBjc3MgaGVhZGVyIGlzIGRpZmZlcmVudC4gSG93ZXZlciwgdGhlIG9ubHkg ZGlmZmVyZW5jZSBpcyB3aGVyZQorICogdGhlIHZlcnNpb24gaW5mb3JtYXRpb24gaXMgc2F2ZWQu IFRoZSB1Y19jc3NfaGVhZGVyIGlzIHVuaWZpZWQgdG8gc3VwcG9ydAorICogYm90aC4gRHJpdmVy IHNob3VsZCBnZXQgSHVDIHZlcnNpb24gZnJvbSB1Y19jc3NfaGVhZGVyLmh1Y19zd192ZXJzaW9u LCB3aGlsZQorICogdWNfY3NzX2hlYWRlci5ndWNfc3dfdmVyc2lvbiBmb3IgR3VDLgogICovCiAK LXN0cnVjdCBndWNfY3NzX2hlYWRlciB7CitzdHJ1Y3QgdWNfY3NzX2hlYWRlciB7CiAJdWludDMy X3QgbW9kdWxlX3R5cGU7CiAJLyogaGVhZGVyX3NpemUgaW5jbHVkZXMgYWxsIG5vbi11Q29kZSBi aXRzLCBpbmNsdWRpbmcgY3NzX2hlYWRlciwgcnNhCiAJICoga2V5LCBtb2R1bHVzIGtleSBhbmQg ZXhwb25lbnQgZGF0YS4gKi8KQEAgLTIwNSw4ICsyMTIsMTYgQEAgc3RydWN0IGd1Y19jc3NfaGVh ZGVyIHsKIAogCWNoYXIgdXNlcm5hbWVbOF07CiAJY2hhciBidWlsZG51bWJlclsxMl07Ci0JdWlu dDMyX3QgZGV2aWNlX2lkOwotCXVpbnQzMl90IGd1Y19zd192ZXJzaW9uOworCXVuaW9uIHsKKwkJ c3RydWN0IHsKKwkJCXVpbnQzMl90IGJyYW5jaF9jbGllbnRfdmVyc2lvbjsKKwkJCXVpbnQzMl90 IHN3X3ZlcnNpb247CisJfSBndWM7CisJCXN0cnVjdCB7CisJCQl1aW50MzJfdCBzd192ZXJzaW9u OworCQkJdWludDMyX3QgcmVzZXJ2ZWQ7CisJfSBodWM7CisJfTsKIAl1aW50MzJfdCBwcm9kX3By ZXByb2RfZnc7CiAJdWludDMyX3QgcmVzZXJ2ZWRbMTJdOwogCXVpbnQzMl90IGhlYWRlcl9pbmZv OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCmluZGV4IDE1MjE1YjcuLmE0 MTk2ZTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKQEAgLTU5Myw3 ICs1OTMsNyBAQCB2b2lkIGludGVsX3VjX2Z3X2ZldGNoKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAlzdHJ1Y3QgcGNpX2RldiAqcGRldiA9IGRldl9wcml2LT5kcm0ucGRldjsK IAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwogCWNvbnN0IHN0cnVjdCBmaXJtd2Fy ZSAqZncgPSBOVUxMOwotCXN0cnVjdCBndWNfY3NzX2hlYWRlciAqY3NzOworCXN0cnVjdCB1Y19j c3NfaGVhZGVyICpjc3M7CiAJc2l6ZV90IHNpemU7CiAJaW50IGVycjsKIApAQCAtNjEwLDE5ICs2 MTAsMTkgQEAgdm9pZCBpbnRlbF91Y19md19mZXRjaChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYsCiAJCXVjX2Z3LT51Y19md19wYXRoLCBmdyk7CiAKIAkvKiBDaGVjayB0aGUgc2l6 ZSBvZiB0aGUgYmxvYiBiZWZvcmUgZXhhbWluaW5nIGJ1ZmZlciBjb250ZW50cyAqLwotCWlmIChm dy0+c2l6ZSA8IHNpemVvZihzdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIpKSB7CisJaWYgKGZ3LT5zaXpl IDwgc2l6ZW9mKHN0cnVjdCB1Y19jc3NfaGVhZGVyKSkgewogCQlEUk1fTk9URSgiRmlybXdhcmUg aGVhZGVyIGlzIG1pc3NpbmdcbiIpOwogCQlnb3RvIGZhaWw7CiAJfQogCi0JY3NzID0gKHN0cnVj dCBndWNfY3NzX2hlYWRlciAqKWZ3LT5kYXRhOworCWNzcyA9IChzdHJ1Y3QgdWNfY3NzX2hlYWRl ciAqKWZ3LT5kYXRhOwogCiAJLyogRmlybXdhcmUgYml0cyBhbHdheXMgc3RhcnQgZnJvbSBoZWFk ZXIgKi8KIAl1Y19mdy0+aGVhZGVyX29mZnNldCA9IDA7CiAJdWNfZnctPmhlYWRlcl9zaXplID0g KGNzcy0+aGVhZGVyX3NpemVfZHcgLSBjc3MtPm1vZHVsdXNfc2l6ZV9kdyAtCiAJCWNzcy0+a2V5 X3NpemVfZHcgLSBjc3MtPmV4cG9uZW50X3NpemVfZHcpICogc2l6ZW9mKHUzMik7CiAKLQlpZiAo dWNfZnctPmhlYWRlcl9zaXplICE9IHNpemVvZihzdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIpKSB7CisJ aWYgKHVjX2Z3LT5oZWFkZXJfc2l6ZSAhPSBzaXplb2Yoc3RydWN0IHVjX2Nzc19oZWFkZXIpKSB7 CiAJCURSTV9OT1RFKCJDU1MgaGVhZGVyIGRlZmluaXRpb24gbWlzbWF0Y2hcbiIpOwogCQlnb3Rv IGZhaWw7CiAJfQpAQCAtNjQ2LDIxICs2NDYsMzYgQEAgdm9pZCBpbnRlbF91Y19md19mZXRjaChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCWdvdG8gZmFpbDsKIAl9CiAKLQkv KiBIZWFkZXIgYW5kIHVDb2RlIHdpbGwgYmUgbG9hZGVkIHRvIFdPUENNLiBTaXplIG9mIHRoZSB0 d28uICovCi0Jc2l6ZSA9IHVjX2Z3LT5oZWFkZXJfc2l6ZSArIHVjX2Z3LT51Y29kZV9zaXplOwot CWlmIChzaXplID4gZ3VjX3dvcGNtX3NpemUoZGV2X3ByaXYpKSB7Ci0JCURSTV9OT1RFKCJGaXJt d2FyZSBpcyB0b28gbGFyZ2UgdG8gZml0IGluIFdPUENNXG4iKTsKLQkJZ290byBmYWlsOwotCX0K LQogCS8qCiAJICogVGhlIEd1QyBmaXJtd2FyZSBpbWFnZSBoYXMgdGhlIHZlcnNpb24gbnVtYmVy IGVtYmVkZGVkIGF0IGEgd2VsbC1rbm93bgogCSAqIG9mZnNldCB3aXRoaW4gdGhlIGZpcm13YXJl IGJsb2I7IG5vdGUgdGhhdCBtYWpvciAvIG1pbm9yIHZlcnNpb24gYXJlCiAJICogVFdPIGJ5dGVz IGVhY2ggKGkuZS4gdTE2KSwgYWx0aG91Z2ggYWxsIHBvaW50ZXJzIGFuZCBvZmZzZXRzIGFyZSBk ZWZpbmVkCiAJICogaW4gdGVybXMgb2YgYnl0ZXMgKHU4KS4KIAkgKi8KLQl1Y19mdy0+bWFqb3Jf dmVyX2ZvdW5kID0gY3NzLT5ndWNfc3dfdmVyc2lvbiA+PiAxNjsKLQl1Y19mdy0+bWlub3JfdmVy X2ZvdW5kID0gY3NzLT5ndWNfc3dfdmVyc2lvbiAmIDB4RkZGRjsKKwlzd2l0Y2ggKHVjX2Z3LT5m dykgeworCWNhc2UgSU5URUxfVUNfRldfVFlQRV9HVUM6CisJCS8qIEhlYWRlciBhbmQgdUNvZGUg d2lsbCBiZSBsb2FkZWQgdG8gV09QQ00uIFNpemUgb2YgdGhlIHR3by4gKi8KKwkJc2l6ZSA9IHVj X2Z3LT5oZWFkZXJfc2l6ZSArIHVjX2Z3LT51Y29kZV9zaXplOworCisJCS8qIFRvcCAzMmsgb2Yg V09QQ00gaXMgcmVzZXJ2ZWQgKDhLIHN0YWNrICsgMjRrIFJDNiBjb250ZXh0KS4gKi8KKwkJaWYg KHNpemUgPiBndWNfd29wY21fc2l6ZShkZXZfcHJpdikpIHsKKwkJCURSTV9FUlJPUigiRmlybXdh cmUgaXMgdG9vIGxhcmdlIHRvIGZpdCBpbiBXT1BDTVxuIik7CisJCQlnb3RvIGZhaWw7CisJCX0K KwkJdWNfZnctPm1ham9yX3Zlcl9mb3VuZCA9IGNzcy0+Z3VjLnN3X3ZlcnNpb24gPj4gMTY7CisJ CXVjX2Z3LT5taW5vcl92ZXJfZm91bmQgPSBjc3MtPmd1Yy5zd192ZXJzaW9uICYgMHhGRkZGOwor CQlicmVhazsKKworCWNhc2UgSU5URUxfVUNfRldfVFlQRV9IVUM6CisJCXVjX2Z3LT5tYWpvcl92 ZXJfZm91bmQgPSBjc3MtPmh1Yy5zd192ZXJzaW9uID4+IDE2OworCQl1Y19mdy0+bWlub3JfdmVy X2ZvdW5kID0gY3NzLT5odWMuc3dfdmVyc2lvbiAmIDB4RkZGRjsKKwkJYnJlYWs7CisKKwlkZWZh dWx0OgorCQlEUk1fRVJST1IoIlVua25vd24gZmlybXdhcmUgdHlwZSAlZFxuIiwgdWNfZnctPmZ3 KTsKKwkJZXJyID0gLUVOT0VYRUM7CisJCWdvdG8gZmFpbDsKKwl9CiAKIAlpZiAodWNfZnctPm1h am9yX3Zlcl9mb3VuZCAhPSB1Y19mdy0+bWFqb3JfdmVyX3dhbnRlZCB8fAogCSAgICB1Y19mdy0+ bWlub3JfdmVyX2ZvdW5kIDwgdWNfZnctPm1pbm9yX3Zlcl93YW50ZWQpIHsKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3VjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF91Yy5oCmluZGV4IDc5ODZmMjIuLmVmYzEyNWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3VjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMu aApAQCAtMTAwLDYgKzEwMCwxMSBAQCBlbnVtIGludGVsX3VjX2Z3X3N0YXR1cyB7CiAJSU5URUxf VUNfRklSTVdBUkVfU1VDQ0VTUwogfTsKIAorZW51bSBmd190eXBleworCUlOVEVMX1VDX0ZXX1RZ UEVfR1VDLAorCUlOVEVMX1VDX0ZXX1RZUEVfSFVDCit9OworCiAvKgogICogVGhpcyBzdHJ1Y3R1 cmUgZW5jYXBzdWxhdGVzIGFsbCB0aGUgZGF0YSBuZWVkZWQgZHVyaW5nIHRoZSBwcm9jZXNzCiAg KiBvZiBmZXRjaGluZywgY2FjaGluZywgYW5kIGxvYWRpbmcgdGhlIGZpcm13YXJlIGltYWdlIGlu dG8gdGhlIEd1Qy4KQEAgLTExNiw2ICsxMjEsNyBAQCBzdHJ1Y3QgaW50ZWxfdWNfZncgewogCXVp bnQxNl90IG1ham9yX3Zlcl9mb3VuZDsKIAl1aW50MTZfdCBtaW5vcl92ZXJfZm91bmQ7CiAKKwll bnVtIGZ3X3R5cGUgZnc7CiAJdWludDMyX3QgaGVhZGVyX3NpemU7CiAJdWludDMyX3QgaGVhZGVy X29mZnNldDsKIAl1aW50MzJfdCByc2Ffc2l6ZTsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK