From: Peter Antoine Subject: [PATCH 2/6] drm/i915/huc: Unified css_header struct for GuC and HuC Date: Tue, 21 Jun 2016 19:11:21 +0100 Message-ID: <1466532685-5101-3-git-send-email-peter.antoine@intel.com> References: <1466532685-5101-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 86EF36E2CC for ; Tue, 21 Jun 2016 18:14:30 +0000 (UTC) In-Reply-To: <1466532685-5101-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: lawrence.t.li@intel.com, sean.v.kelley@intel.com, rodrigo.vivi@intel.com List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+CgpIdUMgZmlybXdhcmUgY3NzIGhlYWRl ciBoYXMgYWxtb3N0IGV4YWN0bHkgc2FtZSBkZWZpbml0aW9uIGFzIEd1QwpmaXJtd2FyZSBleGNl cHQgZm9yIHRoZSBzd192ZXJzaW9uLiBBbHNvLCBhZGQgYSBuZXcgbWVtYmVyIGZ3X3R5cGUKaW50 byBpbnRlbF91Y19mdyB0byBpbmRpY2F0ZSB3aGF0IGtpbmQgb2YgZncgaXQgaXMuIFNvLCB0aGUg bG9hZGVyCndpbGwgcHVsbCByaWdodCBzd192ZXJzaW9uIGZyb20gaGVhZGVyLgoKU2lnbmVkLW9m Zi1ieTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IFBldGVyIEFu dG9pbmUgPHBldGVyLmFudG9pbmVAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Yy5oICAgICAgICB8ICA0ICsrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2d1Y19md2lmLmggICB8IDE2ICsrKysrKysrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Y19sb2FkZXIuYyB8IDQyICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLQog MyBmaWxlcyBjaGFuZ2VkLCA0NCBpbnNlcnRpb25zKCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Yy5oCmluZGV4IDgzNjQyMGIuLjBiNGVkODggMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Yy5oCkBAIC05Nyw2ICs5Nyw5IEBAIGVudW0gaW50ZWxfdWNfZndfc3RhdHVzIHsK IAlVQ19GSVJNV0FSRV9TVUNDRVNTCiB9OwogCisjZGVmaW5lIFVDX0ZXX1RZUEVfR1VDCQkwCisj ZGVmaW5lIFVDX0ZXX1RZUEVfSFVDCQkxCisKIC8qCiAgKiBUaGlzIHN0cnVjdHVyZSBlbmNhcHN1 bGF0ZXMgYWxsIHRoZSBkYXRhIG5lZWRlZCBkdXJpbmcgdGhlIHByb2Nlc3MKICAqIG9mIGZldGNo aW5nLCBjYWNoaW5nLCBhbmQgbG9hZGluZyB0aGUgZmlybXdhcmUgaW1hZ2UgaW50byB0aGUgR3VD LgpAQCAtMTE0LDYgKzExNyw3IEBAIHN0cnVjdCBpbnRlbF91Y19mdyB7CiAJdWludDE2X3QgbWFq b3JfdmVyX2ZvdW5kOwogCXVpbnQxNl90IG1pbm9yX3Zlcl9mb3VuZDsKIAorCXVpbnQzMl90IGZ3 X3R5cGU7CiAJdWludDMyX3QgaGVhZGVyX3NpemU7CiAJdWludDMyX3QgaGVhZGVyX29mZnNldDsK IAl1aW50MzJfdCByc2Ffc2l6ZTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Y19md2lmLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oCmlu ZGV4IDk0NDc4NmQuLmE2OWVlMzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Y19md2lmLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3aWYu aApAQCAtMTU0LDcgKzE1NCw3IEBACiAgKiBUaGUgR3VDIGZpcm13YXJlIGxheW91dCBsb29rcyBs aWtlIHRoaXM6CiAgKgogICogICAgICstLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tKwot ICogICAgIHwgICAgICAgIGd1Y19jc3NfaGVhZGVyICAgICAgICAgfAorICogICAgIHwgICAgICAg ICB1Y19jc3NfaGVhZGVyICAgICAgICAgfAogICogICAgIHwgY29udGFpbnMgbWFqb3IvbWlub3Ig dmVyc2lvbiAgfAogICogICAgICstLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tKwogICog ICAgIHwgICAgICAgICAgICAgdUNvZGUgICAgICAgICAgICAgfApAQCAtMTgwLDkgKzE4MCwxNiBA QAogICogMy4gTGVuZ3RoIGluZm8gb2YgZWFjaCBjb21wb25lbnQgY2FuIGJlIGZvdW5kIGluIGhl YWRlciwgaW4gZHdvcmRzLgogICogNC4gTW9kdWx1cyBhbmQgZXhwb25lbnQga2V5IGFyZSBub3Qg cmVxdWlyZWQgYnkgZHJpdmVyLiBUaGV5IG1heSBub3QgYXBwZWFyCiAgKiBpbiBmdy4gU28gZHJp dmVyIHdpbGwgbG9hZCBhIHRydW5jYXRlZCBmaXJtd2FyZSBpbiB0aGlzIGNhc2UuCisgKgorICog SHVDIGZpcm13YXJlIGxheW91dCBpcyBzYW1lIGFzIEd1QyBmaXJtd2FyZS4KKyAqCisgKiBIdUMg ZmlybXdhcmUgY3NzIGhlYWRlciBpcyBkaWZmZXJlbnQuIEhvd2V2ZXIsIHRoZSBvbmx5IGRpZmZl cmVuY2UgaXMgd2hlcmUKKyAqIHRoZSB2ZXJzaW9uIGluZm9ybWF0aW9uIGlzIHNhdmVkLiBUaGUg dWNfY3NzX2hlYWRlciBpcyB1bmlmaWVkIHRvIHN1cHBvcnQKKyAqIGJvdGguIERyaXZlciBzaG91 bGQgZ2V0IEh1QyB2ZXJzaW9uIGZyb20gdWNfY3NzX2hlYWRlci5odWNfc3dfdmVyc2lvbiwgd2hp bGUKKyAqIHVjX2Nzc19oZWFkZXIuZ3VjX3N3X3ZlcnNpb24gZm9yIEd1Qy4KICAqLwogCi1zdHJ1 Y3QgZ3VjX2Nzc19oZWFkZXIgeworc3RydWN0IHVjX2Nzc19oZWFkZXIgewogCXVpbnQzMl90IG1v ZHVsZV90eXBlOwogCS8qIGhlYWRlcl9zaXplIGluY2x1ZGVzIGFsbCBub24tdUNvZGUgYml0cywg aW5jbHVkaW5nIGNzc19oZWFkZXIsIHJzYQogCSAqIGtleSwgbW9kdWx1cyBrZXkgYW5kIGV4cG9u ZW50IGRhdGEuICovCkBAIC0yMTMsNyArMjIwLDEwIEBAIHN0cnVjdCBndWNfY3NzX2hlYWRlciB7 CiAKIAljaGFyIHVzZXJuYW1lWzhdOwogCWNoYXIgYnVpbGRudW1iZXJbMTJdOwotCXVpbnQzMl90 IGRldmljZV9pZDsKKwl1bmlvbiB7CisJCXVpbnQzMl90IGRldmljZV9pZDsKKwkJdWludDMyX3Qg aHVjX3N3X3ZlcnNpb247CisJfTsKIAl1aW50MzJfdCBndWNfc3dfdmVyc2lvbjsKIAl1aW50MzJf dCBwcm9kX3ByZXByb2RfZnc7CiAJdWludDMyX3QgcmVzZXJ2ZWRbMTJdOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCmluZGV4IGZmMDU0ZjUuLjcwNTc1YmQgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKQEAgLTU3NCw3ICs1NzQsNyBAQCB2b2lk IGludGVsX3VjX2Z3X2ZldGNoKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpbnRlbF91 Y19mdyAqdWNfZncpCiB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKIAljb25z dCBzdHJ1Y3QgZmlybXdhcmUgKmZ3OwotCXN0cnVjdCBndWNfY3NzX2hlYWRlciAqY3NzOworCXN0 cnVjdCB1Y19jc3NfaGVhZGVyICpjc3M7CiAJc2l6ZV90IHNpemU7CiAJaW50IGVycjsKIApAQCAt NTkxLDE5ICs1OTEsMTkgQEAgdm9pZCBpbnRlbF91Y19md19mZXRjaChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfdWNfZncgKnVjX2Z3KQogCQl1Y19mdy0+dWNfZndfcGF0aCwg ZncpOwogCiAJLyogQ2hlY2sgdGhlIHNpemUgb2YgdGhlIGJsb2IgYmVmb3JlIGV4YW1pbmluZyBi dWZmZXIgY29udGVudHMgKi8KLQlpZiAoZnctPnNpemUgPCBzaXplb2Yoc3RydWN0IGd1Y19jc3Nf aGVhZGVyKSkgeworCWlmIChmdy0+c2l6ZSA8IHNpemVvZihzdHJ1Y3QgdWNfY3NzX2hlYWRlcikp IHsKIAkJRFJNX0VSUk9SKCJGaXJtd2FyZSBoZWFkZXIgaXMgbWlzc2luZ1xuIik7CiAJCWdvdG8g ZmFpbDsKIAl9CiAKLQljc3MgPSAoc3RydWN0IGd1Y19jc3NfaGVhZGVyICopZnctPmRhdGE7CisJ Y3NzID0gKHN0cnVjdCB1Y19jc3NfaGVhZGVyICopZnctPmRhdGE7CiAKIAkvKiBGaXJtd2FyZSBi aXRzIGFsd2F5cyBzdGFydCBmcm9tIGhlYWRlciAqLwogCXVjX2Z3LT5oZWFkZXJfb2Zmc2V0ID0g MDsKIAl1Y19mdy0+aGVhZGVyX3NpemUgPSAoY3NzLT5oZWFkZXJfc2l6ZV9kdyAtIGNzcy0+bW9k dWx1c19zaXplX2R3IC0KIAkJY3NzLT5rZXlfc2l6ZV9kdyAtIGNzcy0+ZXhwb25lbnRfc2l6ZV9k dykgKiBzaXplb2YodTMyKTsKIAotCWlmICh1Y19mdy0+aGVhZGVyX3NpemUgIT0gc2l6ZW9mKHN0 cnVjdCBndWNfY3NzX2hlYWRlcikpIHsKKwlpZiAodWNfZnctPmhlYWRlcl9zaXplICE9IHNpemVv ZihzdHJ1Y3QgdWNfY3NzX2hlYWRlcikpIHsKIAkJRFJNX0VSUk9SKCJDU1MgaGVhZGVyIGRlZmlu aXRpb24gbWlzbWF0Y2hcbiIpOwogCQlnb3RvIGZhaWw7CiAJfQpAQCAtNjI3LDIzICs2MjcsMzUg QEAgdm9pZCBpbnRlbF91Y19md19mZXRjaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3Qg aW50ZWxfdWNfZncgKnVjX2Z3KQogCQlnb3RvIGZhaWw7CiAJfQogCi0JLyogSGVhZGVyIGFuZCB1 Q29kZSB3aWxsIGJlIGxvYWRlZCB0byBXT1BDTS4gU2l6ZSBvZiB0aGUgdHdvLiAqLwotCXNpemUg PSB1Y19mdy0+aGVhZGVyX3NpemUgKyB1Y19mdy0+dWNvZGVfc2l6ZTsKLQotCS8qIFRvcCAzMmsg b2YgV09QQ00gaXMgcmVzZXJ2ZWQgKDhLIHN0YWNrICsgMjRrIFJDNiBjb250ZXh0KS4gKi8KLQlp ZiAoc2l6ZSA+IGd1Y193b3BjbV9zaXplKGRldi0+ZGV2X3ByaXZhdGUpKSB7Ci0JCURSTV9FUlJP UigiRmlybXdhcmUgaXMgdG9vIGxhcmdlIHRvIGZpdCBpbiBXT1BDTVxuIik7Ci0JCWdvdG8gZmFp bDsKLQl9Ci0KIAkvKgogCSAqIFRoZSB1QyBmaXJtd2FyZSBpbWFnZSBoYXMgdGhlIHZlcnNpb24g bnVtYmVyIGVtYmVkZGVkIGF0IGEgd2VsbC1rbm93bgogCSAqIG9mZnNldCB3aXRoaW4gdGhlIGZp cm13YXJlIGJsb2I7IG5vdGUgdGhhdCBtYWpvciAvIG1pbm9yIHZlcnNpb24gYXJlCiAJICogVFdP IGJ5dGVzIGVhY2ggKGkuZS4gdTE2KSwgYWx0aG91Z2ggYWxsIHBvaW50ZXJzIGFuZCBvZmZzZXRz IGFyZSBkZWZpbmVkCiAJICogaW4gdGVybXMgb2YgYnl0ZXMgKHU4KS4KIAkgKi8KLQl1Y19mdy0+ bWFqb3JfdmVyX2ZvdW5kID0gY3NzLT5ndWNfc3dfdmVyc2lvbiA+PiAxNjsKLQl1Y19mdy0+bWlu b3JfdmVyX2ZvdW5kID0gY3NzLT5ndWNfc3dfdmVyc2lvbiAmIDB4RkZGRjsKKwlzd2l0Y2ggKHVj X2Z3LT5md190eXBlKSB7CisJY2FzZSBVQ19GV19UWVBFX0dVQzoKKwkJLyogSGVhZGVyIGFuZCB1 Q29kZSB3aWxsIGJlIGxvYWRlZCB0byBXT1BDTS4gU2l6ZSBvZiB0aGUgdHdvLiAqLworCQlzaXpl ID0gdWNfZnctPmhlYWRlcl9zaXplICsgdWNfZnctPnVjb2RlX3NpemU7CisKKwkJLyogVG9wIDMy ayBvZiBXT1BDTSBpcyByZXNlcnZlZCAoOEsgc3RhY2sgKyAyNGsgUkM2IGNvbnRleHQpLiAqLwor CQlpZiAoc2l6ZSA+IGd1Y193b3BjbV9zaXplKGRldi0+ZGV2X3ByaXZhdGUpKSB7CisJCQlEUk1f RVJST1IoIkZpcm13YXJlIGlzIHRvbyBsYXJnZSB0byBmaXQgaW4gV09QQ01cbiIpOworCQkJZ290 byBmYWlsOworCQl9CisKKwkJdWNfZnctPm1ham9yX3Zlcl9mb3VuZCA9IGNzcy0+Z3VjX3N3X3Zl cnNpb24gPj4gMTY7CisJCXVjX2Z3LT5taW5vcl92ZXJfZm91bmQgPSBjc3MtPmd1Y19zd192ZXJz aW9uICYgMHhGRkZGOworCQlicmVhazsKKwljYXNlIFVDX0ZXX1RZUEVfSFVDOgorCQl1Y19mdy0+ bWFqb3JfdmVyX2ZvdW5kID0gY3NzLT5odWNfc3dfdmVyc2lvbiA+PiAxNjsKKwkJdWNfZnctPm1p bm9yX3Zlcl9mb3VuZCA9IGNzcy0+aHVjX3N3X3ZlcnNpb24gJiAweEZGRkY7CisJCWJyZWFrOwor CWRlZmF1bHQ6CisJCURSTV9FUlJPUigiVW5rbm93biBmaXJtd2FyZSB0eXBlICVkXG4iLCB1Y19m dy0+ZndfdHlwZSk7CisJCWVyciA9IC1FTk9FWEVDOworCQlnb3RvIGZhaWw7CisJfQogCiAJaWYg KHVjX2Z3LT5tYWpvcl92ZXJfZm91bmQgIT0gdWNfZnctPm1ham9yX3Zlcl93YW50ZWQgfHwKIAkg ICAgdWNfZnctPm1pbm9yX3Zlcl9mb3VuZCA8IHVjX2Z3LT5taW5vcl92ZXJfd2FudGVkKSB7Ci0t IAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==