From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anusha Srivatsa Subject: [PATCH 2/8] drm/i915/huc: Unified css_header struct for GuC and HuC Date: Wed, 30 Nov 2016 15:31:28 -0800 Message-ID: <1480548694-23000-3-git-send-email-anusha.srivatsa@intel.com> References: <1480548694-23000-1-git-send-email-anusha.srivatsa@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 613646E436 for ; Wed, 30 Nov 2016 23:31:37 +0000 (UTC) In-Reply-To: <1480548694-23000-1-git-send-email-anusha.srivatsa@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 , Peter Antoine List-Id: intel-gfx@lists.freedesktop.org RnJvbTogUGV0ZXIgQW50b2luZSA8cGV0ZXIuYW50b2luZUBpbnRlbC5jb20+CgpIdUMgZmlybXdh cmUgY3NzIGhlYWRlciBoYXMgYWxtb3N0IGV4YWN0bHkgc2FtZSBkZWZpbml0aW9uIGFzIEd1Qwpm aXJtd2FyZSBleGNlcHQgZm9yIHRoZSBzd192ZXJzaW9uLiBBbHNvLCBhZGQgYSBuZXcgbWVtYmVy IGZ3X3R5cGUKaW50byBpbnRlbF91Y19mdyB0byBpbmRpY2F0ZSB3aGF0IGtpbmQgb2YgZncgaXQg aXMuIFNvLCB0aGUgbG9hZGVyCndpbGwgcHVsbCByaWdodCBzd192ZXJzaW9uIGZyb20gaGVhZGVy LgoKdjI6IHJlYmFzZWQgb24tdG9wIG9mIGRybS1pbnRlbC1uaWdodGx5CnYzOiByZWJhc2VkIG9u LXRvcCBvZiBkcm0taW50ZWwtbmlnaHRseSAoYWdhaW4pLgp2NDogcmViYXNlZCArIHNwYWNlcy4K djc6IHJlYmFzZWQuCnY4OiByZWJhc2VkLgp2OTogcmViYXNlZC4gUmVuYW1lIGRldmljZV9pZCB0 byBndWNfYnJhbmNoX2NsaWVudF92ZXJzaW9uLAptYWtlIGd1Y19zd192ZXJzaW9uIGEgdW5pb24u IDxKZWZmIE1jZ2VlPi4gUHV0IFVDX0ZXX1RZUEVfR1VDCmFuZCBVQ19GV19UWVBFX0hVQyBpbnRv IGFuIGVudW0uCnYxMDogcmViYXNlZC4KdjExOiByZWJhc2VkLgp2MTI6IHJlYmFzZWQgb24gdG9w IG9mIGRybS10aXAuCgpUZXN0ZWQtYnk6IFhpYW5nIEhhaWhhbyA8aGFpaGFvLnhpYW5nQGludGVs LmNvbT4KU2lnbmVkLW9mZi1ieTogQW51c2hhIFNyaXZhdHNhIDxhbnVzaGEuc3JpdmF0c2FAaW50 ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERhaSA8eXUuZGFpQGludGVsLmNvbT4KU2lnbmVk LW9mZi1ieTogUGV0ZXIgQW50b2luZSA8cGV0ZXIuYW50b2luZUBpbnRlbC5jb20+ClJldmlld2Vk LWJ5OiBEYXZlIEdvcmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTog SmVmZiBNY0dlZSA8amVmZi5tY2dlZUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZ3VjX2Z3aWYuaCAgIHwgMjEgKysrKysrKysrKysrKy0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2d1Y19sb2FkZXIuYyB8IDQxICsrKysrKysrKysrKysrKysrKysrKyst LS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaCAgICAgICAgIHwgIDUg KysrKwogMyBmaWxlcyBjaGFuZ2VkLCA1MCBpbnNlcnRpb25zKCspLCAxNyBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3aWYuaAppbmRleCAwMGNhMGRmLi5jMDdkOWRh IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19md2lmLmgKQEAgLTE1NCw3ICsxNTQsNyBA QAogICogVGhlIEd1QyBmaXJtd2FyZSBsYXlvdXQgbG9va3MgbGlrZSB0aGlzOgogICoKICAqICAg ICArLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLSsKLSAqICAgICB8ICAgICAgICBndWNf Y3NzX2hlYWRlciAgICAgICAgIHwKKyAqICAgICB8ICAgICAgICAgdWNfY3NzX2hlYWRlciAgICAg ICAgIHwKICAqICAgICB8ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwKICAqICAgICB8 IGNvbnRhaW5zIG1ham9yL21pbm9yIHZlcnNpb24gIHwKICAqICAgICArLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLSsKQEAgLTE4MSw5ICsxODEsMTYgQEAKICAqIDMuIExlbmd0aCBpbmZv IG9mIGVhY2ggY29tcG9uZW50IGNhbiBiZSBmb3VuZCBpbiBoZWFkZXIsIGluIGR3b3Jkcy4KICAq IDQuIE1vZHVsdXMgYW5kIGV4cG9uZW50IGtleSBhcmUgbm90IHJlcXVpcmVkIGJ5IGRyaXZlci4g VGhleSBtYXkgbm90IGFwcGVhcgogICogICAgaW4gZncuIFNvIGRyaXZlciB3aWxsIGxvYWQgYSB0 cnVuY2F0ZWQgZmlybXdhcmUgaW4gdGhpcyBjYXNlLgorICoKKyAqIEh1QyBmaXJtd2FyZSBsYXlv dXQgaXMgc2FtZSBhcyBHdUMgZmlybXdhcmUuCisgKgorICogSHVDIGZpcm13YXJlIGNzcyBoZWFk ZXIgaXMgZGlmZmVyZW50LiBIb3dldmVyLCB0aGUgb25seSBkaWZmZXJlbmNlIGlzIHdoZXJlCisg KiB0aGUgdmVyc2lvbiBpbmZvcm1hdGlvbiBpcyBzYXZlZC4gVGhlIHVjX2Nzc19oZWFkZXIgaXMg dW5pZmllZCB0byBzdXBwb3J0CisgKiBib3RoLiBEcml2ZXIgc2hvdWxkIGdldCBIdUMgdmVyc2lv biBmcm9tIHVjX2Nzc19oZWFkZXIuaHVjX3N3X3ZlcnNpb24sIHdoaWxlCisgKiB1Y19jc3NfaGVh ZGVyLmd1Y19zd192ZXJzaW9uIGZvciBHdUMuCiAgKi8KIAotc3RydWN0IGd1Y19jc3NfaGVhZGVy IHsKK3N0cnVjdCB1Y19jc3NfaGVhZGVyIHsKIAl1aW50MzJfdCBtb2R1bGVfdHlwZTsKIAkvKiBo ZWFkZXJfc2l6ZSBpbmNsdWRlcyBhbGwgbm9uLXVDb2RlIGJpdHMsIGluY2x1ZGluZyBjc3NfaGVh ZGVyLCByc2EKIAkgKiBrZXksIG1vZHVsdXMga2V5IGFuZCBleHBvbmVudCBkYXRhLiAqLwpAQCAt MjE0LDggKzIyMSwxNCBAQCBzdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIgewogCiAJY2hhciB1c2VybmFt ZVs4XTsKIAljaGFyIGJ1aWxkbnVtYmVyWzEyXTsKLQl1aW50MzJfdCBkZXZpY2VfaWQ7Ci0JdWlu dDMyX3QgZ3VjX3N3X3ZlcnNpb247CisJdW5pb24geworCQl1aW50MzJfdCBndWNfYnJhbmNoX2Ns aWVudF92ZXJzaW9uOworCQl1aW50MzJfdCBodWNfc3dfdmVyc2lvbjsKKwl9OworCXVuaW9uIHsK KwkJdWludDMyX3QgZ3VjX3N3X3ZlcnNpb247CisJCXVpbnQzMl90IGh1Y19yZXNlcnZlZDsKKwl9 OwogCXVpbnQzMl90IHByb2RfcHJlcHJvZF9mdzsKIAl1aW50MzJfdCByZXNlcnZlZFsxMl07CiAJ dWludDMyX3QgaGVhZGVyX2luZm87CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9ndWNfbG9hZGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVy LmMKaW5kZXggZTU1ZWMyYy4uNTU3ZDRiNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZ3VjX2xvYWRlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Y19sb2FkZXIuYwpAQCAtNTkzLDcgKzU5Myw3IEBAIHZvaWQgaW50ZWxfdWNfZndfZmV0Y2goc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGludGVsX3VjX2Z3ICp1Y19mdykKIAlzdHJ1Y3Qg cGNpX2RldiAqcGRldiA9IGRldi0+cGRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq b2JqOwogCWNvbnN0IHN0cnVjdCBmaXJtd2FyZSAqZncgPSBOVUxMOwotCXN0cnVjdCBndWNfY3Nz X2hlYWRlciAqY3NzOworCXN0cnVjdCB1Y19jc3NfaGVhZGVyICpjc3M7CiAJc2l6ZV90IHNpemU7 CiAJaW50IGVycjsKIApAQCAtNjEwLDE5ICs2MTAsMTkgQEAgdm9pZCBpbnRlbF91Y19md19mZXRj aChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfdWNfZncgKnVjX2Z3KQogCQl1 Y19mdy0+dWNfZndfcGF0aCwgZncpOwogCiAJLyogQ2hlY2sgdGhlIHNpemUgb2YgdGhlIGJsb2Ig YmVmb3JlIGV4YW1pbmluZyBidWZmZXIgY29udGVudHMgKi8KLQlpZiAoZnctPnNpemUgPCBzaXpl b2Yoc3RydWN0IGd1Y19jc3NfaGVhZGVyKSkgeworCWlmIChmdy0+c2l6ZSA8IHNpemVvZihzdHJ1 Y3QgdWNfY3NzX2hlYWRlcikpIHsKIAkJRFJNX05PVEUoIkZpcm13YXJlIGhlYWRlciBpcyBtaXNz aW5nXG4iKTsKIAkJZ290byBmYWlsOwogCX0KIAotCWNzcyA9IChzdHJ1Y3QgZ3VjX2Nzc19oZWFk ZXIgKilmdy0+ZGF0YTsKKwljc3MgPSAoc3RydWN0IHVjX2Nzc19oZWFkZXIgKilmdy0+ZGF0YTsK IAogCS8qIEZpcm13YXJlIGJpdHMgYWx3YXlzIHN0YXJ0IGZyb20gaGVhZGVyICovCiAJdWNfZnct PmhlYWRlcl9vZmZzZXQgPSAwOwogCXVjX2Z3LT5oZWFkZXJfc2l6ZSA9IChjc3MtPmhlYWRlcl9z aXplX2R3IC0gY3NzLT5tb2R1bHVzX3NpemVfZHcgLQogCQljc3MtPmtleV9zaXplX2R3IC0gY3Nz LT5leHBvbmVudF9zaXplX2R3KSAqIHNpemVvZih1MzIpOwogCi0JaWYgKHVjX2Z3LT5oZWFkZXJf c2l6ZSAhPSBzaXplb2Yoc3RydWN0IGd1Y19jc3NfaGVhZGVyKSkgeworCWlmICh1Y19mdy0+aGVh ZGVyX3NpemUgIT0gc2l6ZW9mKHN0cnVjdCB1Y19jc3NfaGVhZGVyKSkgewogCQlEUk1fTk9URSgi Q1NTIGhlYWRlciBkZWZpbml0aW9uIG1pc21hdGNoXG4iKTsKIAkJZ290byBmYWlsOwogCX0KQEAg LTY0NiwyMSArNjQ2LDM2IEBAIHZvaWQgaW50ZWxfdWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZp Y2UgKmRldiwgc3RydWN0IGludGVsX3VjX2Z3ICp1Y19mdykKIAkJZ290byBmYWlsOwogCX0KIAot CS8qIEhlYWRlciBhbmQgdUNvZGUgd2lsbCBiZSBsb2FkZWQgdG8gV09QQ00uIFNpemUgb2YgdGhl IHR3by4gKi8KLQlzaXplID0gdWNfZnctPmhlYWRlcl9zaXplICsgdWNfZnctPnVjb2RlX3NpemU7 Ci0JaWYgKHNpemUgPiBndWNfd29wY21fc2l6ZSh0b19pOTE1KGRldikpKSB7Ci0JCURSTV9OT1RF 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+bWlub3JfdmVyX3dhbnRlZCkgewpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3VjLmgKaW5kZXggYTFjNzcxZi4uMTYxNmNhYyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdWMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF91Yy5oCkBAIC05OCw2ICs5OCwxMSBAQCBlbnVtIGludGVsX3VjX2Z3X3N0YXR1cyB7CiAJ VUNfRklSTVdBUkVfU1VDQ0VTUwogfTsKIAorZW51bSB7CisJVUNfRldfVFlQRV9HVUMsCisJVUNf RldfVFlQRV9IVUMKK307CisKIC8qCiAgKiBUaGlzIHN0cnVjdHVyZSBlbmNhcHN1bGF0ZXMgYWxs IHRoZSBkYXRhIG5lZWRlZCBkdXJpbmcgdGhlIHByb2Nlc3MKICAqIG9mIGZldGNoaW5nLCBjYWNo aW5nLCBhbmQgbG9hZGluZyB0aGUgZmlybXdhcmUgaW1hZ2UgaW50byB0aGUgR3VDLgotLSAKMi43 LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=