From mboxrd@z Thu Jan 1 00:00:00 1970 From: yu.dai@intel.com Subject: [PATCH v2 3/6] drm/i915/huc: Unified css_header struct for GuC and HuC Date: Mon, 8 Feb 2016 15:02:50 -0800 Message-ID: <1454972573-16290-4-git-send-email-yu.dai@intel.com> References: <1454972573-16290-1-git-send-email-yu.dai@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 825046E4A6 for ; Mon, 8 Feb 2016 15:07:35 -0800 (PST) In-Reply-To: <1454972573-16290-1-git-send-email-yu.dai@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 RnJvbTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+CgpIdUMgZmlybXdhcmUgY3NzIGhlYWRl ciBoYXMgYWxtb3N0IGV4YWN0bHkgc2FtZSBkZWZpbml0aW9uIGFzIEd1QwpmaXJtd2FyZSBleGNl cHQgZm9yIHRoZSBzd192ZXJzaW9uLiBBbHNvLCBhZGQgYSBuZXcgbWVtYmVyIGZ3X3R5cGUKaW50 byBpbnRlbF91Y19mdyB0byBpbmRpY2F0ZSB3aGF0IGtpbmQgb2YgZncgaXQgaXMuIFNvLCB0aGUg bG9hZGVyCndpbGwgcHVsbCByaWdodCBzd192ZXJzaW9uIGZyb20gaGVhZGVyLgoKU2lnbmVkLW9m Zi1ieTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IFBldGVyIEFu dG9pbmUgPHBldGVyLmFudG9pbmVAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Yy5oICAgICAgICB8ICA0ICsrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2d1Y19md2lmLmggICB8IDE2ICsrKysrKysrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Y19sb2FkZXIuYyB8IDQyICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLQog MyBmaWxlcyBjaGFuZ2VkLCA0NCBpbnNlcnRpb25zKCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Yy5oCmluZGV4IDRlMjBiMGMuLjNiMjZlMTMgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Yy5oCkBAIC01OSw2ICs1OSw5IEBAIGVudW0gaW50ZWxfdWNfZndfc3RhdHVzIHsK IAlVQ19GSVJNV0FSRV9TVUNDRVNTCiB9OwogCisjZGVmaW5lIFVDX0ZXX1RZUEVfR1VDCQkwCisj ZGVmaW5lIFVDX0ZXX1RZUEVfSFVDCQkxCisKIC8qCiAgKiBUaGlzIHN0cnVjdHVyZSBlbmNhcHN1 bGF0ZXMgYWxsIHRoZSBkYXRhIG5lZWRlZCBkdXJpbmcgdGhlIHByb2Nlc3MKICAqIG9mIGZldGNo aW5nLCBjYWNoaW5nLCBhbmQgbG9hZGluZyB0aGUgZmlybXdhcmUgaW1hZ2UgaW50byB0aGUgR3VD LgpAQCAtNzYsNiArNzksNyBAQCBzdHJ1Y3QgaW50ZWxfdWNfZncgewogCXVpbnQxNl90IG1ham9y X3Zlcl9mb3VuZDsKIAl1aW50MTZfdCBtaW5vcl92ZXJfZm91bmQ7CiAKKwl1aW50MzJfdCBmd190 eXBlOwogCXVpbnQzMl90IGhlYWRlcl9zaXplOwogCXVpbnQzMl90IGhlYWRlcl9vZmZzZXQ7CiAJ dWludDMyX3QgcnNhX3NpemU7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWNfZndpZi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3aWYuaAppbmRl eCAyZGU1N2ZmLi5hN2JlZGM4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWNfZndpZi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19md2lmLmgK QEAgLTE1Myw3ICsxNTMsNyBAQAogICogVGhlIEd1QyBmaXJtd2FyZSBsYXlvdXQgbG9va3MgbGlr ZSB0aGlzOgogICoKICAqICAgICArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSsKLSAq ICAgICB8ICAgICAgICBndWNfY3NzX2hlYWRlciAgICAgICAgIHwKKyAqICAgICB8ICAgICAgICAg dWNfY3NzX2hlYWRlciAgICAgICAgIHwKICAqICAgICB8IGNvbnRhaW5zIG1ham9yL21pbm9yIHZl cnNpb24gIHwKICAqICAgICArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSsKICAqICAg ICB8ICAgICAgICAgICAgIHVDb2RlICAgICAgICAgICAgIHwKQEAgLTE3OSw5ICsxNzksMTYgQEAK ICAqIDMuIExlbmd0aCBpbmZvIG9mIGVhY2ggY29tcG9uZW50IGNhbiBiZSBmb3VuZCBpbiBoZWFk ZXIsIGluIGR3b3Jkcy4KICAqIDQuIE1vZHVsdXMgYW5kIGV4cG9uZW50IGtleSBhcmUgbm90IHJl cXVpcmVkIGJ5IGRyaXZlci4gVGhleSBtYXkgbm90IGFwcGVhcgogICogaW4gZncuIFNvIGRyaXZl ciB3aWxsIGxvYWQgYSB0cnVuY2F0ZWQgZmlybXdhcmUgaW4gdGhpcyBjYXNlLgorICoKKyAqIEh1 QyBmaXJtd2FyZSBsYXlvdXQgaXMgc2FtZSBhcyBHdUMgZmlybXdhcmUuCisgKgorICogSHVDIGZp cm13YXJlIGNzcyBoZWFkZXIgaXMgZGlmZmVyZW50LiBIb3dldmVyLCB0aGUgb25seSBkaWZmZXJl bmNlIGlzIHdoZXJlCisgKiB0aGUgdmVyc2lvbiBpbmZvcm1hdGlvbiBpcyBzYXZlZC4gVGhlIHVj X2Nzc19oZWFkZXIgaXMgdW5pZmllZCB0byBzdXBwb3J0CisgKiBib3RoLiBEcml2ZXIgc2hvdWxk IGdldCBIdUMgdmVyc2lvbiBmcm9tIHVjX2Nzc19oZWFkZXIuaHVjX3N3X3ZlcnNpb24sIHdoaWxl CisgKiB1Y19jc3NfaGVhZGVyLmd1Y19zd192ZXJzaW9uIGZvciBHdUMuCiAgKi8KIAotc3RydWN0 IGd1Y19jc3NfaGVhZGVyIHsKK3N0cnVjdCB1Y19jc3NfaGVhZGVyIHsKIAl1aW50MzJfdCBtb2R1 bGVfdHlwZTsKIAkvKiBoZWFkZXJfc2l6ZSBpbmNsdWRlcyBhbGwgbm9uLXVDb2RlIGJpdHMsIGlu Y2x1ZGluZyBjc3NfaGVhZGVyLCByc2EKIAkgKiBrZXksIG1vZHVsdXMga2V5IGFuZCBleHBvbmVu dCBkYXRhLiAqLwpAQCAtMjEyLDcgKzIxOSwxMCBAQCBzdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIgewog CiAJY2hhciB1c2VybmFtZVs4XTsKIAljaGFyIGJ1aWxkbnVtYmVyWzEyXTsKLQl1aW50MzJfdCBk ZXZpY2VfaWQ7CisJdW5pb24geworCQl1aW50MzJfdCBkZXZpY2VfaWQ7CisJCXVpbnQzMl90IGh1 Y19zd192ZXJzaW9uOworCX07CiAJdWludDMyX3QgZ3VjX3N3X3ZlcnNpb247CiAJdWludDMyX3Qg cHJvZF9wcmVwcm9kX2Z3OwogCXVpbnQzMl90IHJlc2VydmVkWzEyXTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Y19sb2FkZXIuYwppbmRleCA0ODJhNWU0Li4yNjFhZTViIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCkBAIC00NjUsNyArNDY1LDcgQEAgdm9pZCBp bnRlbF91Y19md19mZXRjaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfdWNf ZncgKnVjX2Z3KQogewogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAJY29uc3Qg c3RydWN0IGZpcm13YXJlICpmdzsKLQlzdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIgKmNzczsKKwlzdHJ1 Y3QgdWNfY3NzX2hlYWRlciAqY3NzOwogCXNpemVfdCBzaXplOwogCWludCBlcnI7CiAKQEAgLTQ4 MiwxOSArNDgyLDE5IEBAIHZvaWQgaW50ZWxfdWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgc3RydWN0IGludGVsX3VjX2Z3ICp1Y19mdykKIAkJdWNfZnctPnVjX2Z3X3BhdGgsIGZ3 KTsKIAogCS8qIENoZWNrIHRoZSBzaXplIG9mIHRoZSBibG9iIGJlZm9yZSBleGFtaW5pbmcgYnVm ZmVyIGNvbnRlbnRzICovCi0JaWYgKGZ3LT5zaXplIDwgc2l6ZW9mKHN0cnVjdCBndWNfY3NzX2hl YWRlcikpIHsKKwlpZiAoZnctPnNpemUgPCBzaXplb2Yoc3RydWN0IHVjX2Nzc19oZWFkZXIpKSB7 CiAJCURSTV9FUlJPUigiRmlybXdhcmUgaGVhZGVyIGlzIG1pc3NpbmdcbiIpOwogCQlnb3RvIGZh aWw7CiAJfQogCi0JY3NzID0gKHN0cnVjdCBndWNfY3NzX2hlYWRlciAqKWZ3LT5kYXRhOworCWNz cyA9IChzdHJ1Y3QgdWNfY3NzX2hlYWRlciAqKWZ3LT5kYXRhOwogCiAJLyogRmlybXdhcmUgYml0 cyBhbHdheXMgc3RhcnQgZnJvbSBoZWFkZXIgKi8KIAl1Y19mdy0+aGVhZGVyX29mZnNldCA9IDA7 CiAJdWNfZnctPmhlYWRlcl9zaXplID0gKGNzcy0+aGVhZGVyX3NpemVfZHcgLSBjc3MtPm1vZHVs dXNfc2l6ZV9kdyAtCiAJCWNzcy0+a2V5X3NpemVfZHcgLSBjc3MtPmV4cG9uZW50X3NpemVfZHcp ICogc2l6ZW9mKHUzMik7CiAKLQlpZiAodWNfZnctPmhlYWRlcl9zaXplICE9IHNpemVvZihzdHJ1 Y3QgZ3VjX2Nzc19oZWFkZXIpKSB7CisJaWYgKHVjX2Z3LT5oZWFkZXJfc2l6ZSAhPSBzaXplb2Yo c3RydWN0IHVjX2Nzc19oZWFkZXIpKSB7CiAJCURSTV9FUlJPUigiQ1NTIGhlYWRlciBkZWZpbml0 aW9uIG1pc21hdGNoXG4iKTsKIAkJZ290byBmYWlsOwogCX0KQEAgLTUxOCwyMyArNTE4LDM1IEBA IHZvaWQgaW50ZWxfdWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGlu dGVsX3VjX2Z3ICp1Y19mdykKIAkJZ290byBmYWlsOwogCX0KIAotCS8qIEhlYWRlciBhbmQgdUNv ZGUgd2lsbCBiZSBsb2FkZWQgdG8gV09QQ00uIFNpemUgb2YgdGhlIHR3by4gKi8KLQlzaXplID0g dWNfZnctPmhlYWRlcl9zaXplICsgdWNfZnctPnVjb2RlX3NpemU7Ci0KLQkvKiBUb3AgMzJrIG9m IFdPUENNIGlzIHJlc2VydmVkICg4SyBzdGFjayArIDI0ayBSQzYgY29udGV4dCkuICovCi0JaWYg KHNpemUgPiBHVUNfV09QQ01fU0laRV9WQUxVRSAtIDB4ODAwMCkgewotCQlEUk1fRVJST1IoIkZp cm13YXJlIGlzIHRvbyBsYXJnZSB0byBmaXQgaW4gV09QQ01cbiIpOwotCQlnb3RvIGZhaWw7Ci0J fQotCiAJLyoKIAkgKiBUaGUgdUMgZmlybXdhcmUgaW1hZ2UgaGFzIHRoZSB2ZXJzaW9uIG51bWJl ciBlbWJlZGRlZCBhdCBhIHdlbGwta25vd24KIAkgKiBvZmZzZXQgd2l0aGluIHRoZSBmaXJtd2Fy ZSBibG9iOyBub3RlIHRoYXQgbWFqb3IgLyBtaW5vciB2ZXJzaW9uIGFyZQogCSAqIFRXTyBieXRl cyBlYWNoIChpLmUuIHUxNiksIGFsdGhvdWdoIGFsbCBwb2ludGVycyBhbmQgb2Zmc2V0cyBhcmUg ZGVmaW5lZAogCSAqIGluIHRlcm1zIG9mIGJ5dGVzICh1OCkuCiAJICovCi0JdWNfZnctPm1ham9y X3Zlcl9mb3VuZCA9IGNzcy0+Z3VjX3N3X3ZlcnNpb24gPj4gMTY7Ci0JdWNfZnctPm1pbm9yX3Zl cl9mb3VuZCA9IGNzcy0+Z3VjX3N3X3ZlcnNpb24gJiAweEZGRkY7CisJc3dpdGNoICh1Y19mdy0+ ZndfdHlwZSkgeworCWNhc2UgVUNfRldfVFlQRV9HVUM6CisJCS8qIEhlYWRlciBhbmQgdUNvZGUg d2lsbCBiZSBsb2FkZWQgdG8gV09QQ00uIFNpemUgb2YgdGhlIHR3by4gKi8KKwkJc2l6ZSA9IHVj X2Z3LT5oZWFkZXJfc2l6ZSArIHVjX2Z3LT51Y29kZV9zaXplOworCisJCS8qIFRvcCAzMmsgb2Yg V09QQ00gaXMgcmVzZXJ2ZWQgKDhLIHN0YWNrICsgMjRrIFJDNiBjb250ZXh0KS4gKi8KKwkJaWYg KHNpemUgPiBHVUNfV09QQ01fU0laRV9WQUxVRSAtIDB4ODAwMCkgeworCQkJRFJNX0VSUk9SKCJG aXJtd2FyZSBpcyB0b28gbGFyZ2UgdG8gZml0IGluIFdPUENNXG4iKTsKKwkJCWdvdG8gZmFpbDsK KwkJfQorCisJCXVjX2Z3LT5tYWpvcl92ZXJfZm91bmQgPSBjc3MtPmd1Y19zd192ZXJzaW9uID4+ IDE2OworCQl1Y19mdy0+bWlub3JfdmVyX2ZvdW5kID0gY3NzLT5ndWNfc3dfdmVyc2lvbiAmIDB4 RkZGRjsKKwkJYnJlYWs7CisJY2FzZSBVQ19GV19UWVBFX0hVQzoKKwkJdWNfZnctPm1ham9yX3Zl cl9mb3VuZCA9IGNzcy0+aHVjX3N3X3ZlcnNpb24gPj4gMTY7CisJCXVjX2Z3LT5taW5vcl92ZXJf Zm91bmQgPSBjc3MtPmh1Y19zd192ZXJzaW9uICYgMHhGRkZGOworCQlicmVhazsKKwlkZWZhdWx0 OgorCQlEUk1fRVJST1IoIlVua25vd24gZmlybXdhcmUgdHlwZSAlZFxuIiwgdWNfZnctPmZ3X3R5 cGUpOworCQllcnIgPSAtRU5PRVhFQzsKKwkJZ290byBmYWlsOworCX0KIAogCWlmICh1Y19mdy0+ bWFqb3JfdmVyX2ZvdW5kICE9IHVjX2Z3LT5tYWpvcl92ZXJfd2FudGVkIHx8CiAJICAgIHVjX2Z3 LT5taW5vcl92ZXJfZm91bmQgPCB1Y19mdy0+bWlub3JfdmVyX3dhbnRlZCkgewotLSAKMi41LjAK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=