From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Antoine Subject: [PATCH v2 2/6] drm/i915/huc: Unified css_header struct for GuC and HuC Date: Fri, 1 Jul 2016 14:15:41 +0100 Message-ID: <1467378945-14274-3-git-send-email-peter.antoine@intel.com> References: <1467378945-14274-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 678FE6EA6E for ; Fri, 1 Jul 2016 13:15:57 +0000 (UTC) In-Reply-To: <1467378945-14274-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: rodrigo.vivi@intel.com List-Id: intel-gfx@lists.freedesktop.org SHVDIGZpcm13YXJlIGNzcyBoZWFkZXIgaGFzIGFsbW9zdCBleGFjdGx5IHNhbWUgZGVmaW5pdGlv biBhcyBHdUMKZmlybXdhcmUgZXhjZXB0IGZvciB0aGUgc3dfdmVyc2lvbi4gQWxzbywgYWRkIGEg bmV3IG1lbWJlciBmd190eXBlCmludG8gaW50ZWxfdWNfZncgdG8gaW5kaWNhdGUgd2hhdCBraW5k IG9mIGZ3IGl0IGlzLiBTbywgdGhlIGxvYWRlcgp3aWxsIHB1bGwgcmlnaHQgc3dfdmVyc2lvbiBm cm9tIGhlYWRlci4KCnYyOiByZWJhc2VkIG9uLXRvcCBvZiBkcm4taW50ZWwtbmlnaHRseQoKU2ln bmVkLW9mZi1ieTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IFBl dGVyIEFudG9pbmUgPHBldGVyLmFudG9pbmVAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Yy5oICAgICAgICB8ICA0ICsrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Y19md2lmLmggICB8IDE2ICsrKysrKysrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Y19sb2FkZXIuYyB8IDQwICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0t LS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA0NCBpbnNlcnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCmluZGV4IDAyYWRjZmMuLmViZjljOGQgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Yy5oCkBAIC05Nyw2ICs5Nyw5IEBAIGVudW0gaW50ZWxfdWNfZndfc3Rh dHVzIHsKIAlVQ19GSVJNV0FSRV9TVUNDRVNTCiB9OwogCisjZGVmaW5lIFVDX0ZXX1RZUEVfR1VD CQkwCisjZGVmaW5lIFVDX0ZXX1RZUEVfSFVDCQkxCisKIC8qCiAgKiBUaGlzIHN0cnVjdHVyZSBl bmNhcHN1bGF0ZXMgYWxsIHRoZSBkYXRhIG5lZWRlZCBkdXJpbmcgdGhlIHByb2Nlc3MKICAqIG9m IGZldGNoaW5nLCBjYWNoaW5nLCBhbmQgbG9hZGluZyB0aGUgZmlybXdhcmUgaW1hZ2UgaW50byB0 aGUgR3VDLgpAQCAtMTE0LDYgKzExNyw3IEBAIHN0cnVjdCBpbnRlbF91Y19mdyB7CiAJdWludDE2 X3QgbWFqb3JfdmVyX2ZvdW5kOwogCXVpbnQxNl90IG1pbm9yX3Zlcl9mb3VuZDsKIAorCXVpbnQz Ml90IGZ3X3R5cGU7CiAJdWludDMyX3QgaGVhZGVyX3NpemU7CiAJdWludDMyX3QgaGVhZGVyX29m ZnNldDsKIAl1aW50MzJfdCByc2Ffc2l6ZTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Y19md2lmLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndp Zi5oCmluZGV4IDk0NDc4NmQuLmE2OWVlMzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Y19md2lmLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3Vj X2Z3aWYuaApAQCAtMTU0LDcgKzE1NCw3IEBACiAgKiBUaGUgR3VDIGZpcm13YXJlIGxheW91dCBs b29rcyBsaWtlIHRoaXM6CiAgKgogICogICAgICstLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tKwotICogICAgIHwgICAgICAgIGd1Y19jc3NfaGVhZGVyICAgICAgICAgfAorICogICAgIHwg ICAgICAgICB1Y19jc3NfaGVhZGVyICAgICAgICAgfAogICogICAgIHwgY29udGFpbnMgbWFqb3Iv bWlub3IgdmVyc2lvbiAgfAogICogICAgICstLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t KwogICogICAgIHwgICAgICAgICAgICAgdUNvZGUgICAgICAgICAgICAgfApAQCAtMTgwLDkgKzE4 MCwxNiBAQAogICogMy4gTGVuZ3RoIGluZm8gb2YgZWFjaCBjb21wb25lbnQgY2FuIGJlIGZvdW5k IGluIGhlYWRlciwgaW4gZHdvcmRzLgogICogNC4gTW9kdWx1cyBhbmQgZXhwb25lbnQga2V5IGFy ZSBub3QgcmVxdWlyZWQgYnkgZHJpdmVyLiBUaGV5IG1heSBub3QgYXBwZWFyCiAgKiBpbiBmdy4g U28gZHJpdmVyIHdpbGwgbG9hZCBhIHRydW5jYXRlZCBmaXJtd2FyZSBpbiB0aGlzIGNhc2UuCisg KgorICogSHVDIGZpcm13YXJlIGxheW91dCBpcyBzYW1lIGFzIEd1QyBmaXJtd2FyZS4KKyAqCisg KiBIdUMgZmlybXdhcmUgY3NzIGhlYWRlciBpcyBkaWZmZXJlbnQuIEhvd2V2ZXIsIHRoZSBvbmx5 IGRpZmZlcmVuY2UgaXMgd2hlcmUKKyAqIHRoZSB2ZXJzaW9uIGluZm9ybWF0aW9uIGlzIHNhdmVk LiBUaGUgdWNfY3NzX2hlYWRlciBpcyB1bmlmaWVkIHRvIHN1cHBvcnQKKyAqIGJvdGguIERyaXZl ciBzaG91bGQgZ2V0IEh1QyB2ZXJzaW9uIGZyb20gdWNfY3NzX2hlYWRlci5odWNfc3dfdmVyc2lv biwgd2hpbGUKKyAqIHVjX2Nzc19oZWFkZXIuZ3VjX3N3X3ZlcnNpb24gZm9yIEd1Qy4KICAqLwog Ci1zdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIgeworc3RydWN0IHVjX2Nzc19oZWFkZXIgewogCXVpbnQz Ml90IG1vZHVsZV90eXBlOwogCS8qIGhlYWRlcl9zaXplIGluY2x1ZGVzIGFsbCBub24tdUNvZGUg Yml0cywgaW5jbHVkaW5nIGNzc19oZWFkZXIsIHJzYQogCSAqIGtleSwgbW9kdWx1cyBrZXkgYW5k IGV4cG9uZW50IGRhdGEuICovCkBAIC0yMTMsNyArMjIwLDEwIEBAIHN0cnVjdCBndWNfY3NzX2hl YWRlciB7CiAKIAljaGFyIHVzZXJuYW1lWzhdOwogCWNoYXIgYnVpbGRudW1iZXJbMTJdOwotCXVp bnQzMl90IGRldmljZV9pZDsKKwl1bmlvbiB7CisJCXVpbnQzMl90IGRldmljZV9pZDsKKwkJdWlu dDMyX3QgaHVjX3N3X3ZlcnNpb247CisJfTsKIAl1aW50MzJfdCBndWNfc3dfdmVyc2lvbjsKIAl1 aW50MzJfdCBwcm9kX3ByZXByb2RfZnc7CiAJdWludDMyX3QgcmVzZXJ2ZWRbMTJdOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCmluZGV4IDE0MjRjNDIuLjNlOGUxN2EgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKQEAgLTU1MCw3ICs1NTAsNyBA QCB2b2lkIGludGVsX3VjX2Z3X2ZldGNoKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBp bnRlbF91Y19mdyAqdWNfZncpCiB7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsK IAljb25zdCBzdHJ1Y3QgZmlybXdhcmUgKmZ3OwotCXN0cnVjdCBndWNfY3NzX2hlYWRlciAqY3Nz OworCXN0cnVjdCB1Y19jc3NfaGVhZGVyICpjc3M7CiAJc2l6ZV90IHNpemU7CiAJaW50IGVycjsK IApAQCAtNTY3LDE5ICs1NjcsMTkgQEAgdm9pZCBpbnRlbF91Y19md19mZXRjaChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfdWNfZncgKnVjX2Z3KQogCQl1Y19mdy0+dWNfZndf cGF0aCwgZncpOwogCiAJLyogQ2hlY2sgdGhlIHNpemUgb2YgdGhlIGJsb2IgYmVmb3JlIGV4YW1p bmluZyBidWZmZXIgY29udGVudHMgKi8KLQlpZiAoZnctPnNpemUgPCBzaXplb2Yoc3RydWN0IGd1 Y19jc3NfaGVhZGVyKSkgeworCWlmIChmdy0+c2l6ZSA8IHNpemVvZihzdHJ1Y3QgdWNfY3NzX2hl YWRlcikpIHsKIAkJRFJNX0VSUk9SKCJGaXJtd2FyZSBoZWFkZXIgaXMgbWlzc2luZ1xuIik7CiAJ CWdvdG8gZmFpbDsKIAl9CiAKLQljc3MgPSAoc3RydWN0IGd1Y19jc3NfaGVhZGVyICopZnctPmRh dGE7CisJY3NzID0gKHN0cnVjdCB1Y19jc3NfaGVhZGVyICopZnctPmRhdGE7CiAKIAkvKiBGaXJt d2FyZSBiaXRzIGFsd2F5cyBzdGFydCBmcm9tIGhlYWRlciAqLwogCXVjX2Z3LT5oZWFkZXJfb2Zm c2V0ID0gMDsKIAl1Y19mdy0+aGVhZGVyX3NpemUgPSAoY3NzLT5oZWFkZXJfc2l6ZV9kdyAtIGNz cy0+bW9kdWx1c19zaXplX2R3IC0KIAkJY3NzLT5rZXlfc2l6ZV9kdyAtIGNzcy0+ZXhwb25lbnRf c2l6ZV9kdykgKiBzaXplb2YodTMyKTsKIAotCWlmICh1Y19mdy0+aGVhZGVyX3NpemUgIT0gc2l6 ZW9mKHN0cnVjdCBndWNfY3NzX2hlYWRlcikpIHsKKwlpZiAodWNfZnctPmhlYWRlcl9zaXplICE9 IHNpemVvZihzdHJ1Y3QgdWNfY3NzX2hlYWRlcikpIHsKIAkJRFJNX0VSUk9SKCJDU1MgaGVhZGVy IGRlZmluaXRpb24gbWlzbWF0Y2hcbiIpOwogCQlnb3RvIGZhaWw7CiAJfQpAQCAtNjAzLDIxICs2 MDMsMzUgQEAgdm9pZCBpbnRlbF91Y19md19mZXRjaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBz dHJ1Y3QgaW50ZWxfdWNfZncgKnVjX2Z3KQogCQlnb3RvIGZhaWw7CiAJfQogCi0JLyogSGVhZGVy IGFuZCB1Q29kZSB3aWxsIGJlIGxvYWRlZCB0byBXT1BDTS4gU2l6ZSBvZiB0aGUgdHdvLiAqLwot CXNpemUgPSB1Y19mdy0+aGVhZGVyX3NpemUgKyB1Y19mdy0+dWNvZGVfc2l6ZTsKLQlpZiAoc2l6 ZSA+IGd1Y193b3BjbV9zaXplKGRldi0+ZGV2X3ByaXZhdGUpKSB7Ci0JCURSTV9FUlJPUigiRmly bXdhcmUgaXMgdG9vIGxhcmdlIHRvIGZpdCBpbiBXT1BDTVxuIik7Ci0JCWdvdG8gZmFpbDsKLQl9 Ci0KIAkvKgogCSAqIFRoZSBHdUMgZmlybXdhcmUgaW1hZ2UgaGFzIHRoZSB2ZXJzaW9uIG51bWJl ciBlbWJlZGRlZCBhdCBhIHdlbGwta25vd24KIAkgKiBvZmZzZXQgd2l0aGluIHRoZSBmaXJtd2Fy ZSBibG9iOyBub3RlIHRoYXQgbWFqb3IgLyBtaW5vciB2ZXJzaW9uIGFyZQogCSAqIFRXTyBieXRl cyBlYWNoIChpLmUuIHUxNiksIGFsdGhvdWdoIGFsbCBwb2ludGVycyBhbmQgb2Zmc2V0cyBhcmUg ZGVmaW5lZAogCSAqIGluIHRlcm1zIG9mIGJ5dGVzICh1OCkuCiAJICovCi0JdWNfZnctPm1ham9y X3Zlcl9mb3VuZCA9IGNzcy0+Z3VjX3N3X3ZlcnNpb24gPj4gMTY7Ci0JdWNfZnctPm1pbm9yX3Zl cl9mb3VuZCA9IGNzcy0+Z3VjX3N3X3ZlcnNpb24gJiAweEZGRkY7CisJc3dpdGNoICh1Y19mdy0+ ZndfdHlwZSkgeworCWNhc2UgVUNfRldfVFlQRV9HVUM6CisJCS8qIEhlYWRlciBhbmQgdUNvZGUg d2lsbCBiZSBsb2FkZWQgdG8gV09QQ00uIFNpemUgb2YgdGhlIHR3by4gKi8KKwkJc2l6ZSA9IHVj X2Z3LT5oZWFkZXJfc2l6ZSArIHVjX2Z3LT51Y29kZV9zaXplOworCisJCS8qIFRvcCAzMmsgb2Yg V09QQ00gaXMgcmVzZXJ2ZWQgKDhLIHN0YWNrICsgMjRrIFJDNiBjb250ZXh0KS4gKi8KKwkJaWYg KHNpemUgPiBndWNfd29wY21fc2l6ZShkZXYtPmRldl9wcml2YXRlKSkgeworCQkJRFJNX0VSUk9S KCJGaXJtd2FyZSBpcyB0b28gbGFyZ2UgdG8gZml0IGluIFdPUENNXG4iKTsKKwkJCWdvdG8gZmFp bDsKKwkJfQorCisJCXVjX2Z3LT5tYWpvcl92ZXJfZm91bmQgPSBjc3MtPmd1Y19zd192ZXJzaW9u ID4+IDE2OworCQl1Y19mdy0+bWlub3JfdmVyX2ZvdW5kID0gY3NzLT5ndWNfc3dfdmVyc2lvbiAm IDB4RkZGRjsKKwkJYnJlYWs7CisJY2FzZSBVQ19GV19UWVBFX0hVQzoKKwkJdWNfZnctPm1ham9y X3Zlcl9mb3VuZCA9IGNzcy0+aHVjX3N3X3ZlcnNpb24gPj4gMTY7CisJCXVjX2Z3LT5taW5vcl92 ZXJfZm91bmQgPSBjc3MtPmh1Y19zd192ZXJzaW9uICYgMHhGRkZGOworCQlicmVhazsKKwlkZWZh dWx0OgorCQlEUk1fRVJST1IoIlVua25vd24gZmlybXdhcmUgdHlwZSAlZFxuIiwgdWNfZnctPmZ3 X3R5cGUpOworCQllcnIgPSAtRU5PRVhFQzsKKwkJZ290byBmYWlsOworCX0KIAogCWlmICh1Y19m dy0+bWFqb3JfdmVyX2ZvdW5kICE9IHVjX2Z3LT5tYWpvcl92ZXJfd2FudGVkIHx8CiAJICAgIHVj X2Z3LT5taW5vcl92ZXJfZm91bmQgPCB1Y19mdy0+bWlub3JfdmVyX3dhbnRlZCkgewotLSAKMS45 LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=