From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Antoine Subject: [PATCH v5 2/6] drm/i915/huc: Unified css_header struct for GuC and HuC Date: Fri, 12 Aug 2016 09:09:51 +0100 Message-ID: <1470989395-32517-3-git-send-email-peter.antoine@intel.com> References: <1470989395-32517-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 90BDC6EAB8 for ; Fri, 12 Aug 2016 08:10:19 +0000 (UTC) In-Reply-To: <1470989395-32517-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 cmViYXNlZCBvbi10b3Agb2YgZHJtLWludGVsLW5pZ2h0bHkgKGFnYWluKS4KdjQ6IHJlYmFzZWQg KyBzcGFjZXMuCgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERhaSA8eXUuZGFpQGludGVsLmNvbT4KU2ln bmVkLW9mZi1ieTogUGV0ZXIgQW50b2luZSA8cGV0ZXIuYW50b2luZUBpbnRlbC5jb20+ClJldmll d2VkLWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oICAgICAgICB8ICA0ICsrKysKIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2d1Y19md2lmLmggICB8IDE2ICsrKysrKysrKystLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyB8IDQxICsrKysrKysrKysrKysrKysrKysr KystLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA0NSBpbnNlcnRpb25zKCspLCAxNiBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCmluZGV4IGIwNDM4MTUuLmRkZmQ1Yjcg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCkBAIC05Niw2ICs5Niw5IEBAIGVudW0gaW50ZWxf dWNfZndfc3RhdHVzIHsKIAlVQ19GSVJNV0FSRV9TVUNDRVNTCiB9OwogCisjZGVmaW5lIFVDX0ZX X1RZUEVfR1VDCQkwCisjZGVmaW5lIFVDX0ZXX1RZUEVfSFVDCQkxCisKIC8qCiAgKiBUaGlzIHN0 cnVjdHVyZSBlbmNhcHN1bGF0ZXMgYWxsIHRoZSBkYXRhIG5lZWRlZCBkdXJpbmcgdGhlIHByb2Nl c3MKICAqIG9mIGZldGNoaW5nLCBjYWNoaW5nLCBhbmQgbG9hZGluZyB0aGUgZmlybXdhcmUgaW1h Z2UgaW50byB0aGUgR3VDLgpAQCAtMTEzLDYgKzExNiw3IEBAIHN0cnVjdCBpbnRlbF91Y19mdyB7 CiAJdWludDE2X3QgbWFqb3JfdmVyX2ZvdW5kOwogCXVpbnQxNl90IG1pbm9yX3Zlcl9mb3VuZDsK IAorCXVpbnQzMl90IGZ3X3R5cGU7CiAJdWludDMyX3QgaGVhZGVyX3NpemU7CiAJdWludDMyX3Qg aGVhZGVyX29mZnNldDsKIAl1aW50MzJfdCByc2Ffc2l6ZTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2d1Y19md2lmLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWNfZndpZi5oCmluZGV4IDk0NDc4NmQuLmE2OWVlMzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2d1Y19md2lmLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZ3VjX2Z3aWYuaApAQCAtMTU0LDcgKzE1NCw3IEBACiAgKiBUaGUgR3VDIGZpcm13YXJl IGxheW91dCBsb29rcyBsaWtlIHRoaXM6CiAgKgogICogICAgICstLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tKwotICogICAgIHwgICAgICAgIGd1Y19jc3NfaGVhZGVyICAgICAgICAgfAor ICogICAgIHwgICAgICAgICB1Y19jc3NfaGVhZGVyICAgICAgICAgfAogICogICAgIHwgY29udGFp bnMgbWFqb3IvbWlub3IgdmVyc2lvbiAgfAogICogICAgICstLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tKwogICogICAgIHwgICAgICAgICAgICAgdUNvZGUgICAgICAgICAgICAgfApAQCAt MTgwLDkgKzE4MCwxNiBAQAogICogMy4gTGVuZ3RoIGluZm8gb2YgZWFjaCBjb21wb25lbnQgY2Fu IGJlIGZvdW5kIGluIGhlYWRlciwgaW4gZHdvcmRzLgogICogNC4gTW9kdWx1cyBhbmQgZXhwb25l bnQga2V5IGFyZSBub3QgcmVxdWlyZWQgYnkgZHJpdmVyLiBUaGV5IG1heSBub3QgYXBwZWFyCiAg KiBpbiBmdy4gU28gZHJpdmVyIHdpbGwgbG9hZCBhIHRydW5jYXRlZCBmaXJtd2FyZSBpbiB0aGlz IGNhc2UuCisgKgorICogSHVDIGZpcm13YXJlIGxheW91dCBpcyBzYW1lIGFzIEd1QyBmaXJtd2Fy ZS4KKyAqCisgKiBIdUMgZmlybXdhcmUgY3NzIGhlYWRlciBpcyBkaWZmZXJlbnQuIEhvd2V2ZXIs IHRoZSBvbmx5IGRpZmZlcmVuY2UgaXMgd2hlcmUKKyAqIHRoZSB2ZXJzaW9uIGluZm9ybWF0aW9u IGlzIHNhdmVkLiBUaGUgdWNfY3NzX2hlYWRlciBpcyB1bmlmaWVkIHRvIHN1cHBvcnQKKyAqIGJv dGguIERyaXZlciBzaG91bGQgZ2V0IEh1QyB2ZXJzaW9uIGZyb20gdWNfY3NzX2hlYWRlci5odWNf c3dfdmVyc2lvbiwgd2hpbGUKKyAqIHVjX2Nzc19oZWFkZXIuZ3VjX3N3X3ZlcnNpb24gZm9yIEd1 Qy4KICAqLwogCi1zdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIgeworc3RydWN0IHVjX2Nzc19oZWFkZXIg ewogCXVpbnQzMl90IG1vZHVsZV90eXBlOwogCS8qIGhlYWRlcl9zaXplIGluY2x1ZGVzIGFsbCBu b24tdUNvZGUgYml0cywgaW5jbHVkaW5nIGNzc19oZWFkZXIsIHJzYQogCSAqIGtleSwgbW9kdWx1 cyBrZXkgYW5kIGV4cG9uZW50IGRhdGEuICovCkBAIC0yMTMsNyArMjIwLDEwIEBAIHN0cnVjdCBn dWNfY3NzX2hlYWRlciB7CiAKIAljaGFyIHVzZXJuYW1lWzhdOwogCWNoYXIgYnVpbGRudW1iZXJb MTJdOwotCXVpbnQzMl90IGRldmljZV9pZDsKKwl1bmlvbiB7CisJCXVpbnQzMl90IGRldmljZV9p ZDsKKwkJdWludDMyX3QgaHVjX3N3X3ZlcnNpb247CisJfTsKIAl1aW50MzJfdCBndWNfc3dfdmVy c2lvbjsKIAl1aW50MzJfdCBwcm9kX3ByZXByb2RfZnc7CiAJdWludDMyX3QgcmVzZXJ2ZWRbMTJd OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCmluZGV4IGZiMTQxMzUuLmM0 ZmQ4MjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKQEAgLTU2Nyw3 ICs1NjcsNyBAQCB2b2lkIGludGVsX3VjX2Z3X2ZldGNoKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHN0cnVjdCBpbnRlbF91Y19mdyAqdWNfZncpCiB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmpl Y3QgKm9iajsKIAljb25zdCBzdHJ1Y3QgZmlybXdhcmUgKmZ3OwotCXN0cnVjdCBndWNfY3NzX2hl YWRlciAqY3NzOworCXN0cnVjdCB1Y19jc3NfaGVhZGVyICpjc3M7CiAJc2l6ZV90IHNpemU7CiAJ aW50IGVycjsKIApAQCAtNTg0LDE5ICs1ODQsMTkgQEAgdm9pZCBpbnRlbF91Y19md19mZXRjaChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfdWNfZncgKnVjX2Z3KQogCQl1Y19m dy0+dWNfZndfcGF0aCwgZncpOwogCiAJLyogQ2hlY2sgdGhlIHNpemUgb2YgdGhlIGJsb2IgYmVm b3JlIGV4YW1pbmluZyBidWZmZXIgY29udGVudHMgKi8KLQlpZiAoZnctPnNpemUgPCBzaXplb2Yo c3RydWN0IGd1Y19jc3NfaGVhZGVyKSkgeworCWlmIChmdy0+c2l6ZSA8IHNpemVvZihzdHJ1Y3Qg dWNfY3NzX2hlYWRlcikpIHsKIAkJRFJNX0VSUk9SKCJGaXJtd2FyZSBoZWFkZXIgaXMgbWlzc2lu Z1xuIik7CiAJCWdvdG8gZmFpbDsKIAl9CiAKLQljc3MgPSAoc3RydWN0IGd1Y19jc3NfaGVhZGVy ICopZnctPmRhdGE7CisJY3NzID0gKHN0cnVjdCB1Y19jc3NfaGVhZGVyICopZnctPmRhdGE7CiAK IAkvKiBGaXJtd2FyZSBiaXRzIGFsd2F5cyBzdGFydCBmcm9tIGhlYWRlciAqLwogCXVjX2Z3LT5o ZWFkZXJfb2Zmc2V0ID0gMDsKIAl1Y19mdy0+aGVhZGVyX3NpemUgPSAoY3NzLT5oZWFkZXJfc2l6 ZV9kdyAtIGNzcy0+bW9kdWx1c19zaXplX2R3IC0KIAkJY3NzLT5rZXlfc2l6ZV9kdyAtIGNzcy0+ ZXhwb25lbnRfc2l6ZV9kdykgKiBzaXplb2YodTMyKTsKIAotCWlmICh1Y19mdy0+aGVhZGVyX3Np emUgIT0gc2l6ZW9mKHN0cnVjdCBndWNfY3NzX2hlYWRlcikpIHsKKwlpZiAodWNfZnctPmhlYWRl cl9zaXplICE9IHNpemVvZihzdHJ1Y3QgdWNfY3NzX2hlYWRlcikpIHsKIAkJRFJNX0VSUk9SKCJD U1MgaGVhZGVyIGRlZmluaXRpb24gbWlzbWF0Y2hcbiIpOwogCQlnb3RvIGZhaWw7CiAJfQpAQCAt NjIwLDIxICs2MjAsMzYgQEAgdm9pZCBpbnRlbF91Y19md19mZXRjaChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfdWNfZncgKnVjX2Z3KQogCQlnb3RvIGZhaWw7CiAJfQogCi0J LyogSGVhZGVyIGFuZCB1Q29kZSB3aWxsIGJlIGxvYWRlZCB0byBXT1BDTS4gU2l6ZSBvZiB0aGUg dHdvLiAqLwotCXNpemUgPSB1Y19mdy0+aGVhZGVyX3NpemUgKyB1Y19mdy0+dWNvZGVfc2l6ZTsK LQlpZiAoc2l6ZSA+IGd1Y193b3BjbV9zaXplKHRvX2k5MTUoZGV2KSkpIHsKLQkJRFJNX0VSUk9S KCJGaXJtd2FyZSBpcyB0b28gbGFyZ2UgdG8gZml0IGluIFdPUENNXG4iKTsKLQkJZ290byBmYWls OwotCX0KLQogCS8qCiAJICogVGhlIEd1QyBmaXJtd2FyZSBpbWFnZSBoYXMgdGhlIHZlcnNpb24g bnVtYmVyIGVtYmVkZGVkIGF0IGEgd2VsbC1rbm93bgogCSAqIG9mZnNldCB3aXRoaW4gdGhlIGZp cm13YXJlIGJsb2I7IG5vdGUgdGhhdCBtYWpvciAvIG1pbm9yIHZlcnNpb24gYXJlCiAJICogVFdP IGJ5dGVzIGVhY2ggKGkuZS4gdTE2KSwgYWx0aG91Z2ggYWxsIHBvaW50ZXJzIGFuZCBvZmZzZXRz IGFyZSBkZWZpbmVkCiAJICogaW4gdGVybXMgb2YgYnl0ZXMgKHU4KS4KIAkgKi8KLQl1Y19mdy0+ bWFqb3JfdmVyX2ZvdW5kID0gY3NzLT5ndWNfc3dfdmVyc2lvbiA+PiAxNjsKLQl1Y19mdy0+bWlu b3JfdmVyX2ZvdW5kID0gY3NzLT5ndWNfc3dfdmVyc2lvbiAmIDB4RkZGRjsKKwlzd2l0Y2ggKHVj X2Z3LT5md190eXBlKSB7CisJY2FzZSBVQ19GV19UWVBFX0dVQzoKKwkJLyogSGVhZGVyIGFuZCB1 Q29kZSB3aWxsIGJlIGxvYWRlZCB0byBXT1BDTS4gU2l6ZSBvZiB0aGUgdHdvLiAqLworCQlzaXpl ID0gdWNfZnctPmhlYWRlcl9zaXplICsgdWNfZnctPnVjb2RlX3NpemU7CisKKwkJLyogVG9wIDMy ayBvZiBXT1BDTSBpcyByZXNlcnZlZCAoOEsgc3RhY2sgKyAyNGsgUkM2IGNvbnRleHQpLiAqLwor CQlpZiAoc2l6ZSA+IGd1Y193b3BjbV9zaXplKHRvX2k5MTUoZGV2KSkpIHsKKwkJCURSTV9FUlJP UigiRmlybXdhcmUgaXMgdG9vIGxhcmdlIHRvIGZpdCBpbiBXT1BDTVxuIik7CisJCQlnb3RvIGZh aWw7CisJCX0KKwkJdWNfZnctPm1ham9yX3Zlcl9mb3VuZCA9IGNzcy0+Z3VjX3N3X3ZlcnNpb24g Pj4gMTY7CisJCXVjX2Z3LT5taW5vcl92ZXJfZm91bmQgPSBjc3MtPmd1Y19zd192ZXJzaW9uICYg MHhGRkZGOworCQlicmVhazsKKworCWNhc2UgVUNfRldfVFlQRV9IVUM6CisJCXVjX2Z3LT5tYWpv cl92ZXJfZm91bmQgPSBjc3MtPmh1Y19zd192ZXJzaW9uID4+IDE2OworCQl1Y19mdy0+bWlub3Jf dmVyX2ZvdW5kID0gY3NzLT5odWNfc3dfdmVyc2lvbiAmIDB4RkZGRjsKKwkJYnJlYWs7CisKKwlk ZWZhdWx0OgorCQlEUk1fRVJST1IoIlVua25vd24gZmlybXdhcmUgdHlwZSAlZFxuIiwgdWNfZnct PmZ3X3R5cGUpOworCQllcnIgPSAtRU5PRVhFQzsKKwkJZ290byBmYWlsOworCX0KIAogCWlmICh1 Y19mdy0+bWFqb3JfdmVyX2ZvdW5kICE9IHVjX2Z3LT5tYWpvcl92ZXJfd2FudGVkIHx8CiAJICAg IHVjX2Z3LT5taW5vcl92ZXJfZm91bmQgPCB1Y19mdy0+bWlub3JfdmVyX3dhbnRlZCkgewotLSAK MS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=