From: Peter Antoine Subject: [PATCH v4 2/6] drm/i915/huc: Unified css_header struct for GuC and HuC Date: Thu, 4 Aug 2016 09:16:53 +0100 Message-ID: <1470298617-25848-3-git-send-email-peter.antoine@intel.com> References: <1470298617-25848-1-git-send-email-peter.antoine@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 ESMTP id 970996E72B for ; Thu, 4 Aug 2016 08:17:15 +0000 (UTC) In-Reply-To: <1470298617-25848-1-git-send-email-peter.antoine@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 List-Id: intel-gfx@lists.freedesktop.org SHVDIGZpcm13YXJlIGNzcyBoZWFkZXIgaGFzIGFsbW9zdCBleGFjdGx5IHNhbWUgZGVmaW5pdGlv biBhcyBHdUMKZmlybXdhcmUgZXhjZXB0IGZvciB0aGUgc3dfdmVyc2lvbi4gQWxzbywgYWRkIGEg bmV3IG1lbWJlciBmd190eXBlCmludG8gaW50ZWxfdWNfZncgdG8gaW5kaWNhdGUgd2hhdCBraW5k IG9mIGZ3IGl0IGlzLiBTbywgdGhlIGxvYWRlcgp3aWxsIHB1bGwgcmlnaHQgc3dfdmVyc2lvbiBm cm9tIGhlYWRlci4KCnYyOiByZWJhc2VkIG9uLXRvcCBvZiBkcm0taW50ZWwtbmlnaHRseQp2Mzog cmViYXNlZCBvbi10b3Agb2YgZHJtLWludGVsLW5pZ2h0bHkgKGFnYWluKS4KClNpZ25lZC1vZmYt Ynk6IEFsZXggRGFpIDx5dS5kYWlAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBQZXRlciBBbnRv aW5lIDxwZXRlci5hbnRvaW5lQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9ndWMuaCAgICAgICAgfCAgNCArKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWNfZndpZi5oICAgfCAxNiArKysrKysrKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWNfbG9hZGVyLmMgfCA0MCArKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIDMg ZmlsZXMgY2hhbmdlZCwgNDQgaW5zZXJ0aW9ucygrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ndWMuaAppbmRleCAwMmFkY2ZjLi5lYmY5YzhkIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9ndWMuaApAQCAtOTcsNiArOTcsOSBAQCBlbnVtIGludGVsX3VjX2Z3X3N0YXR1cyB7CiAJ VUNfRklSTVdBUkVfU1VDQ0VTUwogfTsKIAorI2RlZmluZSBVQ19GV19UWVBFX0dVQwkJMAorI2Rl ZmluZSBVQ19GV19UWVBFX0hVQwkJMQorCiAvKgogICogVGhpcyBzdHJ1Y3R1cmUgZW5jYXBzdWxh dGVzIGFsbCB0aGUgZGF0YSBuZWVkZWQgZHVyaW5nIHRoZSBwcm9jZXNzCiAgKiBvZiBmZXRjaGlu ZywgY2FjaGluZywgYW5kIGxvYWRpbmcgdGhlIGZpcm13YXJlIGltYWdlIGludG8gdGhlIEd1Qy4K QEAgLTExNCw2ICsxMTcsNyBAQCBzdHJ1Y3QgaW50ZWxfdWNfZncgewogCXVpbnQxNl90IG1ham9y X3Zlcl9mb3VuZDsKIAl1aW50MTZfdCBtaW5vcl92ZXJfZm91bmQ7CiAKKwl1aW50MzJfdCBmd190 eXBlOwogCXVpbnQzMl90IGhlYWRlcl9zaXplOwogCXVpbnQzMl90IGhlYWRlcl9vZmZzZXQ7CiAJ dWludDMyX3QgcnNhX3NpemU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWNfZndpZi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3aWYuaAppbmRl eCA5NDQ3ODZkLi5hNjllZTM2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWNfZndpZi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19md2lmLmgK QEAgLTE1NCw3ICsxNTQsNyBAQAogICogVGhlIEd1QyBmaXJtd2FyZSBsYXlvdXQgbG9va3MgbGlr ZSB0aGlzOgogICoKICAqICAgICArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSsKLSAq ICAgICB8ICAgICAgICBndWNfY3NzX2hlYWRlciAgICAgICAgIHwKKyAqICAgICB8ICAgICAgICAg dWNfY3NzX2hlYWRlciAgICAgICAgIHwKICAqICAgICB8IGNvbnRhaW5zIG1ham9yL21pbm9yIHZl cnNpb24gIHwKICAqICAgICArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSsKICAqICAg ICB8ICAgICAgICAgICAgIHVDb2RlICAgICAgICAgICAgIHwKQEAgLTE4MCw5ICsxODAsMTYgQEAK ICAqIDMuIExlbmd0aCBpbmZvIG9mIGVhY2ggY29tcG9uZW50IGNhbiBiZSBmb3VuZCBpbiBoZWFk ZXIsIGluIGR3b3Jkcy4KICAqIDQuIE1vZHVsdXMgYW5kIGV4cG9uZW50IGtleSBhcmUgbm90IHJl cXVpcmVkIGJ5IGRyaXZlci4gVGhleSBtYXkgbm90IGFwcGVhcgogICogaW4gZncuIFNvIGRyaXZl ciB3aWxsIGxvYWQgYSB0cnVuY2F0ZWQgZmlybXdhcmUgaW4gdGhpcyBjYXNlLgorICoKKyAqIEh1 QyBmaXJtd2FyZSBsYXlvdXQgaXMgc2FtZSBhcyBHdUMgZmlybXdhcmUuCisgKgorICogSHVDIGZp cm13YXJlIGNzcyBoZWFkZXIgaXMgZGlmZmVyZW50LiBIb3dldmVyLCB0aGUgb25seSBkaWZmZXJl bmNlIGlzIHdoZXJlCisgKiB0aGUgdmVyc2lvbiBpbmZvcm1hdGlvbiBpcyBzYXZlZC4gVGhlIHVj X2Nzc19oZWFkZXIgaXMgdW5pZmllZCB0byBzdXBwb3J0CisgKiBib3RoLiBEcml2ZXIgc2hvdWxk IGdldCBIdUMgdmVyc2lvbiBmcm9tIHVjX2Nzc19oZWFkZXIuaHVjX3N3X3ZlcnNpb24sIHdoaWxl CisgKiB1Y19jc3NfaGVhZGVyLmd1Y19zd192ZXJzaW9uIGZvciBHdUMuCiAgKi8KIAotc3RydWN0 IGd1Y19jc3NfaGVhZGVyIHsKK3N0cnVjdCB1Y19jc3NfaGVhZGVyIHsKIAl1aW50MzJfdCBtb2R1 bGVfdHlwZTsKIAkvKiBoZWFkZXJfc2l6ZSBpbmNsdWRlcyBhbGwgbm9uLXVDb2RlIGJpdHMsIGlu Y2x1ZGluZyBjc3NfaGVhZGVyLCByc2EKIAkgKiBrZXksIG1vZHVsdXMga2V5IGFuZCBleHBvbmVu dCBkYXRhLiAqLwpAQCAtMjEzLDcgKzIyMCwxMCBAQCBzdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIgewog CiAJY2hhciB1c2VybmFtZVs4XTsKIAljaGFyIGJ1aWxkbnVtYmVyWzEyXTsKLQl1aW50MzJfdCBk ZXZpY2VfaWQ7CisJdW5pb24geworCQl1aW50MzJfdCBkZXZpY2VfaWQ7CisJCXVpbnQzMl90IGh1 Y19zd192ZXJzaW9uOworCX07CiAJdWludDMyX3QgZ3VjX3N3X3ZlcnNpb247CiAJdWludDMyX3Qg cHJvZF9wcmVwcm9kX2Z3OwogCXVpbnQzMl90IHJlc2VydmVkWzEyXTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Y19sb2FkZXIuYwppbmRleCAyNWM5YTkxLi5kMjQ4Y2NkIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCkBAIC01NTUsNyArNTU1LDcgQEAgdm9pZCBp bnRlbF91Y19md19mZXRjaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfdWNf ZncgKnVjX2Z3KQogewogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAJY29uc3Qg c3RydWN0IGZpcm13YXJlICpmdzsKLQlzdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIgKmNzczsKKwlzdHJ1 Y3QgdWNfY3NzX2hlYWRlciAqY3NzOwogCXNpemVfdCBzaXplOwogCWludCBlcnI7CiAKQEAgLTU3 MiwxOSArNTcyLDE5IEBAIHZvaWQgaW50ZWxfdWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgc3RydWN0IGludGVsX3VjX2Z3ICp1Y19mdykKIAkJdWNfZnctPnVjX2Z3X3BhdGgsIGZ3 KTsKIAogCS8qIENoZWNrIHRoZSBzaXplIG9mIHRoZSBibG9iIGJlZm9yZSBleGFtaW5pbmcgYnVm ZmVyIGNvbnRlbnRzICovCi0JaWYgKGZ3LT5zaXplIDwgc2l6ZW9mKHN0cnVjdCBndWNfY3NzX2hl YWRlcikpIHsKKwlpZiAoZnctPnNpemUgPCBzaXplb2Yoc3RydWN0IHVjX2Nzc19oZWFkZXIpKSB7 CiAJCURSTV9FUlJPUigiRmlybXdhcmUgaGVhZGVyIGlzIG1pc3NpbmdcbiIpOwogCQlnb3RvIGZh aWw7CiAJfQogCi0JY3NzID0gKHN0cnVjdCBndWNfY3NzX2hlYWRlciAqKWZ3LT5kYXRhOworCWNz cyA9IChzdHJ1Y3QgdWNfY3NzX2hlYWRlciAqKWZ3LT5kYXRhOwogCiAJLyogRmlybXdhcmUgYml0 cyBhbHdheXMgc3RhcnQgZnJvbSBoZWFkZXIgKi8KIAl1Y19mdy0+aGVhZGVyX29mZnNldCA9IDA7 CiAJdWNfZnctPmhlYWRlcl9zaXplID0gKGNzcy0+aGVhZGVyX3NpemVfZHcgLSBjc3MtPm1vZHVs dXNfc2l6ZV9kdyAtCiAJCWNzcy0+a2V5X3NpemVfZHcgLSBjc3MtPmV4cG9uZW50X3NpemVfZHcp ICogc2l6ZW9mKHUzMik7CiAKLQlpZiAodWNfZnctPmhlYWRlcl9zaXplICE9IHNpemVvZihzdHJ1 Y3QgZ3VjX2Nzc19oZWFkZXIpKSB7CisJaWYgKHVjX2Z3LT5oZWFkZXJfc2l6ZSAhPSBzaXplb2Yo c3RydWN0IHVjX2Nzc19oZWFkZXIpKSB7CiAJCURSTV9FUlJPUigiQ1NTIGhlYWRlciBkZWZpbml0 aW9uIG1pc21hdGNoXG4iKTsKIAkJZ290byBmYWlsOwogCX0KQEAgLTYwOCwyMSArNjA4LDM1IEBA IHZvaWQgaW50ZWxfdWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGlu dGVsX3VjX2Z3ICp1Y19mdykKIAkJZ290byBmYWlsOwogCX0KIAotCS8qIEhlYWRlciBhbmQgdUNv ZGUgd2lsbCBiZSBsb2FkZWQgdG8gV09QQ00uIFNpemUgb2YgdGhlIHR3by4gKi8KLQlzaXplID0g dWNfZnctPmhlYWRlcl9zaXplICsgdWNfZnctPnVjb2RlX3NpemU7Ci0JaWYgKHNpemUgPiBndWNf d29wY21fc2l6ZSh0b19pOTE1KGRldikpKSB7Ci0JCURSTV9FUlJPUigiRmlybXdhcmUgaXMgdG9v IGxhcmdlIHRvIGZpdCBpbiBXT1BDTVxuIik7Ci0JCWdvdG8gZmFpbDsKLQl9Ci0KIAkvKgogCSAq IFRoZSBHdUMgZmlybXdhcmUgaW1hZ2UgaGFzIHRoZSB2ZXJzaW9uIG51bWJlciBlbWJlZGRlZCBh dCBhIHdlbGwta25vd24KIAkgKiBvZmZzZXQgd2l0aGluIHRoZSBmaXJtd2FyZSBibG9iOyBub3Rl IHRoYXQgbWFqb3IgLyBtaW5vciB2ZXJzaW9uIGFyZQogCSAqIFRXTyBieXRlcyBlYWNoIChpLmUu IHUxNiksIGFsdGhvdWdoIGFsbCBwb2ludGVycyBhbmQgb2Zmc2V0cyBhcmUgZGVmaW5lZAogCSAq IGluIHRlcm1zIG9mIGJ5dGVzICh1OCkuCiAJICovCi0JdWNfZnctPm1ham9yX3Zlcl9mb3VuZCA9 IGNzcy0+Z3VjX3N3X3ZlcnNpb24gPj4gMTY7Ci0JdWNfZnctPm1pbm9yX3Zlcl9mb3VuZCA9IGNz cy0+Z3VjX3N3X3ZlcnNpb24gJiAweEZGRkY7CisJc3dpdGNoICh1Y19mdy0+ZndfdHlwZSkgewor CWNhc2UgVUNfRldfVFlQRV9HVUM6CisJCS8qIEhlYWRlciBhbmQgdUNvZGUgd2lsbCBiZSBsb2Fk ZWQgdG8gV09QQ00uIFNpemUgb2YgdGhlIHR3by4gKi8KKwkJc2l6ZSA9IHVjX2Z3LT5oZWFkZXJf c2l6ZSArIHVjX2Z3LT51Y29kZV9zaXplOworCisJCS8qIFRvcCAzMmsgb2YgV09QQ00gaXMgcmVz ZXJ2ZWQgKDhLIHN0YWNrICsgMjRrIFJDNiBjb250ZXh0KS4gKi8KKwkJaWYgKHNpemUgPiBndWNf d29wY21fc2l6ZSh0b19pOTE1KGRldikpKSB7CisJCQlEUk1fRVJST1IoIkZpcm13YXJlIGlzIHRv byBsYXJnZSB0byBmaXQgaW4gV09QQ01cbiIpOworCQkJZ290byBmYWlsOworCQl9CisKKwkJdWNf ZnctPm1ham9yX3Zlcl9mb3VuZCA9IGNzcy0+Z3VjX3N3X3ZlcnNpb24gPj4gMTY7CisJCXVjX2Z3 LT5taW5vcl92ZXJfZm91bmQgPSBjc3MtPmd1Y19zd192ZXJzaW9uICYgMHhGRkZGOworCQlicmVh azsKKwljYXNlIFVDX0ZXX1RZUEVfSFVDOgorCQl1Y19mdy0+bWFqb3JfdmVyX2ZvdW5kID0gY3Nz LT5odWNfc3dfdmVyc2lvbiA+PiAxNjsKKwkJdWNfZnctPm1pbm9yX3Zlcl9mb3VuZCA9IGNzcy0+ aHVjX3N3X3ZlcnNpb24gJiAweEZGRkY7CisJCWJyZWFrOworCWRlZmF1bHQ6CisJCURSTV9FUlJP UigiVW5rbm93biBmaXJtd2FyZSB0eXBlICVkXG4iLCB1Y19mdy0+ZndfdHlwZSk7CisJCWVyciA9 IC1FTk9FWEVDOworCQlnb3RvIGZhaWw7CisJfQogCiAJaWYgKHVjX2Z3LT5tYWpvcl92ZXJfZm91 bmQgIT0gdWNfZnctPm1ham9yX3Zlcl93YW50ZWQgfHwKIAkgICAgdWNfZnctPm1pbm9yX3Zlcl9m b3VuZCA8IHVjX2Z3LT5taW5vcl92ZXJfd2FudGVkKSB7Ci0tIAoxLjkuMQoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==