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, 23 Nov 2016 14:27:37 -0800 Message-ID: <1479940063-2961-3-git-send-email-anusha.srivatsa@intel.com> References: <1479940063-2961-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 mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1DB3C6E026 for ; Wed, 23 Nov 2016 22:27:52 +0000 (UTC) In-Reply-To: <1479940063-2961-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 IGFuIGVudW0uCnYxMDogcmViYXNlZC4KdjExOiByZWJhc2VkLgoKVGVzdGVkLWJ5OiBYaWFuZyBI YWloYW8gPGhhaWhhby54aWFuZ0BpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEFudXNoYSBTcml2 YXRzYSA8YW51c2hhLnNyaXZhdHNhQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogQWxleCBEYWkg PHl1LmRhaUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IFBldGVyIEFudG9pbmUgPHBldGVyLmFu dG9pbmVAaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogRGF2ZSBHb3Jkb24gPGRhdmlkLnMuZ29yZG9u QGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IEplZmYgTWNHZWUgPGplZmYubWNnZWVAaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oICAgICAgICB8ICA2ICsrKysr CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oICAgfCAyMSArKysrKysrKysr KysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jIHwgNDEgKysr KysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDUxIGluc2Vy dGlvbnMoKyksIDE3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Yy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKaW5kZXgg NmRjMzI4Zi4uNDVkZmE0MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Z3VjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKQEAgLTk4LDYgKzk4 LDExIEBAIGVudW0gaW50ZWxfdWNfZndfc3RhdHVzIHsKIAlVQ19GSVJNV0FSRV9TVUNDRVNTCiB9 OwogCitlbnVtIHsKKwlVQ19GV19UWVBFX0dVQywKKwlVQ19GV19UWVBFX0hVQworfTsKKwogLyoK ICAqIFRoaXMgc3RydWN0dXJlIGVuY2Fwc3VsYXRlcyBhbGwgdGhlIGRhdGEgbmVlZGVkIGR1cmlu ZyB0aGUgcHJvY2VzcwogICogb2YgZmV0Y2hpbmcsIGNhY2hpbmcsIGFuZCBsb2FkaW5nIHRoZSBm aXJtd2FyZSBpbWFnZSBpbnRvIHRoZSBHdUMuCkBAIC0xMTUsNiArMTIwLDcgQEAgc3RydWN0IGlu dGVsX3VjX2Z3IHsKIAl1aW50MTZfdCBtYWpvcl92ZXJfZm91bmQ7CiAJdWludDE2X3QgbWlub3Jf dmVyX2ZvdW5kOwogCisJdWludDMyX3QgZndfdHlwZTsKIAl1aW50MzJfdCBoZWFkZXJfc2l6ZTsK IAl1aW50MzJfdCBoZWFkZXJfb2Zmc2V0OwogCXVpbnQzMl90IHJzYV9zaXplOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3aWYuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Y19md2lmLmgKaW5kZXggMzI0ZWE5MC4uYzJhN2ZkZCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3aWYuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9ndWNfZndpZi5oCkBAIC0xNTQsNyArMTU0LDcgQEAKICAqIFRoZSBH dUMgZmlybXdhcmUgbGF5b3V0IGxvb2tzIGxpa2UgdGhpczoKICAqCiAgKiAgICAgKy0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0rCi0gKiAgICAgfCAgICAgICAgZ3VjX2Nzc19oZWFkZXIg ICAgICAgICB8CisgKiAgICAgfCAgICAgICAgIHVjX2Nzc19oZWFkZXIgICAgICAgICB8CiAgKiAg ICAgfCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8CiAgKiAgICAgfCBjb250YWlucyBt YWpvci9taW5vciB2ZXJzaW9uICB8CiAgKiAgICAgKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0rCkBAIC0xODEsOSArMTgxLDE2IEBACiAgKiAzLiBMZW5ndGggaW5mbyBvZiBlYWNoIGNv bXBvbmVudCBjYW4gYmUgZm91bmQgaW4gaGVhZGVyLCBpbiBkd29yZHMuCiAgKiA0LiBNb2R1bHVz IGFuZCBleHBvbmVudCBrZXkgYXJlIG5vdCByZXF1aXJlZCBieSBkcml2ZXIuIFRoZXkgbWF5IG5v dCBhcHBlYXIKICAqICAgIGluIGZ3LiBTbyBkcml2ZXIgd2lsbCBsb2FkIGEgdHJ1bmNhdGVkIGZp cm13YXJlIGluIHRoaXMgY2FzZS4KKyAqCisgKiBIdUMgZmlybXdhcmUgbGF5b3V0IGlzIHNhbWUg YXMgR3VDIGZpcm13YXJlLgorICoKKyAqIEh1QyBmaXJtd2FyZSBjc3MgaGVhZGVyIGlzIGRpZmZl cmVudC4gSG93ZXZlciwgdGhlIG9ubHkgZGlmZmVyZW5jZSBpcyB3aGVyZQorICogdGhlIHZlcnNp b24gaW5mb3JtYXRpb24gaXMgc2F2ZWQuIFRoZSB1Y19jc3NfaGVhZGVyIGlzIHVuaWZpZWQgdG8g c3VwcG9ydAorICogYm90aC4gRHJpdmVyIHNob3VsZCBnZXQgSHVDIHZlcnNpb24gZnJvbSB1Y19j c3NfaGVhZGVyLmh1Y19zd192ZXJzaW9uLCB3aGlsZQorICogdWNfY3NzX2hlYWRlci5ndWNfc3df dmVyc2lvbiBmb3IgR3VDLgogICovCiAKLXN0cnVjdCBndWNfY3NzX2hlYWRlciB7CitzdHJ1Y3Qg dWNfY3NzX2hlYWRlciB7CiAJdWludDMyX3QgbW9kdWxlX3R5cGU7CiAJLyogaGVhZGVyX3NpemUg aW5jbHVkZXMgYWxsIG5vbi11Q29kZSBiaXRzLCBpbmNsdWRpbmcgY3NzX2hlYWRlciwgcnNhCiAJ ICoga2V5LCBtb2R1bHVzIGtleSBhbmQgZXhwb25lbnQgZGF0YS4gKi8KQEAgLTIxNCw4ICsyMjEs MTQgQEAgc3RydWN0IGd1Y19jc3NfaGVhZGVyIHsKIAogCWNoYXIgdXNlcm5hbWVbOF07CiAJY2hh ciBidWlsZG51bWJlclsxMl07Ci0JdWludDMyX3QgZGV2aWNlX2lkOwotCXVpbnQzMl90IGd1Y19z d192ZXJzaW9uOworCXVuaW9uIHsKKwkJdWludDMyX3QgZ3VjX2JyYW5jaF9jbGllbnRfdmVyc2lv bjsKKwkJdWludDMyX3QgaHVjX3N3X3ZlcnNpb247CisJfTsKKwl1bmlvbiB7CisJCXVpbnQzMl90 IGd1Y19zd192ZXJzaW9uOworCQl1aW50MzJfdCBodWNfcmVzZXJ2ZWQ7CisJfTsKIAl1aW50MzJf dCBwcm9kX3ByZXByb2RfZnc7CiAJdWludDMyX3QgcmVzZXJ2ZWRbMTJdOwogCXVpbnQzMl90IGhl YWRlcl9pbmZvOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xv YWRlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRlci5jCmluZGV4IGMx YjUzYTYuLjcwYjM3MmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Y19sb2FkZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMK QEAgLTU5Myw3ICs1OTMsNyBAQCB2b2lkIGludGVsX3VjX2Z3X2ZldGNoKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHN0cnVjdCBpbnRlbF91Y19mdyAqdWNfZncpCiAJc3RydWN0IHBjaV9kZXYgKnBk ZXYgPSBkZXYtPnBkZXY7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKIAljb25z dCBzdHJ1Y3QgZmlybXdhcmUgKmZ3OwotCXN0cnVjdCBndWNfY3NzX2hlYWRlciAqY3NzOworCXN0 cnVjdCB1Y19jc3NfaGVhZGVyICpjc3M7CiAJc2l6ZV90IHNpemU7CiAJaW50IGVycjsKIApAQCAt NjEwLDE5ICs2MTAsMTkgQEAgdm9pZCBpbnRlbF91Y19md19mZXRjaChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfdWNfZncgKnVjX2Z3KQogCQl1Y19mdy0+dWNfZndfcGF0aCwg ZncpOwogCiAJLyogQ2hlY2sgdGhlIHNpemUgb2YgdGhlIGJsb2IgYmVmb3JlIGV4YW1pbmluZyBi dWZmZXIgY29udGVudHMgKi8KLQlpZiAoZnctPnNpemUgPCBzaXplb2Yoc3RydWN0IGd1Y19jc3Nf aGVhZGVyKSkgeworCWlmIChmdy0+c2l6ZSA8IHNpemVvZihzdHJ1Y3QgdWNfY3NzX2hlYWRlcikp IHsKIAkJRFJNX05PVEUoIkZpcm13YXJlIGhlYWRlciBpcyBtaXNzaW5nXG4iKTsKIAkJZ290byBm YWlsOwogCX0KIAotCWNzcyA9IChzdHJ1Y3QgZ3VjX2Nzc19oZWFkZXIgKilmdy0+ZGF0YTsKKwlj c3MgPSAoc3RydWN0IHVjX2Nzc19oZWFkZXIgKilmdy0+ZGF0YTsKIAogCS8qIEZpcm13YXJlIGJp dHMgYWx3YXlzIHN0YXJ0IGZyb20gaGVhZGVyICovCiAJdWNfZnctPmhlYWRlcl9vZmZzZXQgPSAw OwogCXVjX2Z3LT5oZWFkZXJfc2l6ZSA9IChjc3MtPmhlYWRlcl9zaXplX2R3IC0gY3NzLT5tb2R1 bHVzX3NpemVfZHcgLQogCQljc3MtPmtleV9zaXplX2R3IC0gY3NzLT5leHBvbmVudF9zaXplX2R3 KSAqIHNpemVvZih1MzIpOwogCi0JaWYgKHVjX2Z3LT5oZWFkZXJfc2l6ZSAhPSBzaXplb2Yoc3Ry dWN0IGd1Y19jc3NfaGVhZGVyKSkgeworCWlmICh1Y19mdy0+aGVhZGVyX3NpemUgIT0gc2l6ZW9m KHN0cnVjdCB1Y19jc3NfaGVhZGVyKSkgewogCQlEUk1fTk9URSgiQ1NTIGhlYWRlciBkZWZpbml0 aW9uIG1pc21hdGNoXG4iKTsKIAkJZ290byBmYWlsOwogCX0KQEAgLTY0NiwyMSArNjQ2LDM2IEBA IHZvaWQgaW50ZWxfdWNfZndfZmV0Y2goc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGlu dGVsX3VjX2Z3ICp1Y19mdykKIAkJZ290byBmYWlsOwogCX0KIAotCS8qIEhlYWRlciBhbmQgdUNv ZGUgd2lsbCBiZSBsb2FkZWQgdG8gV09QQ00uIFNpemUgb2YgdGhlIHR3by4gKi8KLQlzaXplID0g dWNfZnctPmhlYWRlcl9zaXplICsgdWNfZnctPnVjb2RlX3NpemU7Ci0JaWYgKHNpemUgPiBndWNf d29wY21fc2l6ZSh0b19pOTE1KGRldikpKSB7Ci0JCURSTV9OT1RFKCJGaXJtd2FyZSBpcyB0b28g bGFyZ2UgdG8gZml0IGluIFdPUENNXG4iKTsKLQkJZ290byBmYWlsOwotCX0KLQogCS8qCiAJICog VGhlIEd1QyBmaXJtd2FyZSBpbWFnZSBoYXMgdGhlIHZlcnNpb24gbnVtYmVyIGVtYmVkZGVkIGF0 IGEgd2VsbC1rbm93bgogCSAqIG9mZnNldCB3aXRoaW4gdGhlIGZpcm13YXJlIGJsb2I7IG5vdGUg dGhhdCBtYWpvciAvIG1pbm9yIHZlcnNpb24gYXJlCiAJICogVFdPIGJ5dGVzIGVhY2ggKGkuZS4g dTE2KSwgYWx0aG91Z2ggYWxsIHBvaW50ZXJzIGFuZCBvZmZzZXRzIGFyZSBkZWZpbmVkCiAJICog aW4gdGVybXMgb2YgYnl0ZXMgKHU4KS4KIAkgKi8KLQl1Y19mdy0+bWFqb3JfdmVyX2ZvdW5kID0g Y3NzLT5ndWNfc3dfdmVyc2lvbiA+PiAxNjsKLQl1Y19mdy0+bWlub3JfdmVyX2ZvdW5kID0gY3Nz LT5ndWNfc3dfdmVyc2lvbiAmIDB4RkZGRjsKKwlzd2l0Y2ggKHVjX2Z3LT5md190eXBlKSB7CisJ Y2FzZSBVQ19GV19UWVBFX0dVQzoKKwkJLyogSGVhZGVyIGFuZCB1Q29kZSB3aWxsIGJlIGxvYWRl ZCB0byBXT1BDTS4gU2l6ZSBvZiB0aGUgdHdvLiAqLworCQlzaXplID0gdWNfZnctPmhlYWRlcl9z aXplICsgdWNfZnctPnVjb2RlX3NpemU7CisKKwkJLyogVG9wIDMyayBvZiBXT1BDTSBpcyByZXNl cnZlZCAoOEsgc3RhY2sgKyAyNGsgUkM2IGNvbnRleHQpLiAqLworCQlpZiAoc2l6ZSA+IGd1Y193 b3BjbV9zaXplKHRvX2k5MTUoZGV2KSkpIHsKKwkJCURSTV9FUlJPUigiRmlybXdhcmUgaXMgdG9v IGxhcmdlIHRvIGZpdCBpbiBXT1BDTVxuIik7CisJCQlnb3RvIGZhaWw7CisJCX0KKwkJdWNfZnct Pm1ham9yX3Zlcl9mb3VuZCA9IGNzcy0+Z3VjX3N3X3ZlcnNpb24gPj4gMTY7CisJCXVjX2Z3LT5t aW5vcl92ZXJfZm91bmQgPSBjc3MtPmd1Y19zd192ZXJzaW9uICYgMHhGRkZGOworCQlicmVhazsK KworCWNhc2UgVUNfRldfVFlQRV9IVUM6CisJCXVjX2Z3LT5tYWpvcl92ZXJfZm91bmQgPSBjc3Mt Pmh1Y19zd192ZXJzaW9uID4+IDE2OworCQl1Y19mdy0+bWlub3JfdmVyX2ZvdW5kID0gY3NzLT5o dWNfc3dfdmVyc2lvbiAmIDB4RkZGRjsKKwkJYnJlYWs7CisKKwlkZWZhdWx0OgorCQlEUk1fRVJS T1IoIlVua25vd24gZmlybXdhcmUgdHlwZSAlZFxuIiwgdWNfZnctPmZ3X3R5cGUpOworCQllcnIg PSAtRU5PRVhFQzsKKwkJZ290byBmYWlsOworCX0KIAogCWlmICh1Y19mdy0+bWFqb3JfdmVyX2Zv dW5kICE9IHVjX2Z3LT5tYWpvcl92ZXJfd2FudGVkIHx8CiAJICAgIHVjX2Z3LT5taW5vcl92ZXJf Zm91bmQgPCB1Y19mdy0+bWlub3JfdmVyX3dhbnRlZCkgewotLSAKMi43LjQKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=