From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH] drm/i915/guc: Use formalized struct definition for ads object Date: Wed, 15 Mar 2017 11:49:56 +0000 Message-ID: <20170315114956.10417-1-chris@chris-wilson.co.uk> References: <20170315114411.GB155100@mwajdecz-MOBL1.ger.corp.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 120E46E894 for ; Wed, 15 Mar 2017 11:50:00 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id n11so4283401wma.0 for ; Wed, 15 Mar 2017 04:49:59 -0700 (PDT) In-Reply-To: <20170315114411.GB155100@mwajdecz-MOBL1.ger.corp.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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogTWljaGFsIFdhamRlY3prbyA8bWljaGFsLndhamRlY3prb0BpbnRlbC5jb20+CgpNYW51 YWwgcG9pbnRlciBtYW5pcHVsYXRpb24gaXMgZXJyb3IgcHJvbmUuIExldCBjb21waWxlciBjYWxj dWxhdGUKcmlnaHQgb2Zmc2V0cyBmb3IgdXMgaW4gY2FzZSB3ZSBuZWVkIHRvIGNoYW5nZSBhZHMg bGF5b3V0LgoKdjI6IGRvbid0IGNhbGwgaXQgb2JqZWN0IChDaHJpcykKdjM6IHJlc3R5bGUgb2Zm c2V0IGFzc2lnbm1lbnRzIChDaHJpcykKdjQ6IHN0eWxpc3RpYyByZWR1Y3Rpb25zCgpTaWduZWQt b2ZmLWJ5OiBNaWNoYWwgV2FqZGVjemtvIDxtaWNoYWwud2FqZGVjemtvQGludGVsLmNvbT4KQ2M6 IE9zY2FyIE1hdGVvIDxvc2Nhci5tYXRlb0BpbnRlbC5jb20+CkNjOiBKb29uYXMgTGFodGluZW4g PGpvb25hcy5sYWh0aW5lbkBsaW51eC5pbnRlbC5jb20+CkNjOiBEYW5pZWxlIENlcmFvbG8gU3B1 cmlvIDxkYW5pZWxlLmNlcmFvbG9zcHVyaW9AaW50ZWwuY29tPgpDYzogQ2hyaXMgV2lsc29uIDxj aHJpc0BjaHJpcy13aWxzb24uY28udWs+ClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlz QGNocmlzLXdpbHNvbi5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19z dWJtaXNzaW9uLmMgfCA2OSArKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfdXRpbHMuaCAgICAgICAgICB8ICAyICsKIDIgZmlsZXMgY2hhbmdl ZCwgMzMgaW5zZXJ0aW9ucygrKSwgMzggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmluZGV4IGI0ZDI0Y2Q3NjM5YS4uNWVjMmNiZGEyYmE5 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCkBAIC04MTAs MjIgKzgxMCwyMSBAQCBzdGF0aWMgdm9pZCBndWNfYWRkb25fY3JlYXRlKHN0cnVjdCBpbnRlbF9n dWMgKmd1YykKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBndWNfdG9f aTkxNShndWMpOwogCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwotCXN0cnVjdCBndWNfYWRzICphZHM7 Ci0Jc3RydWN0IGd1Y19wb2xpY2llcyAqcG9saWNpZXM7Ci0Jc3RydWN0IGd1Y19tbWlvX3JlZ19z dGF0ZSAqcmVnX3N0YXRlOwotCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKLQllbnVt IGludGVsX2VuZ2luZV9pZCBpZDsKIAlzdHJ1Y3QgcGFnZSAqcGFnZTsKLQl1MzIgc2l6ZTsKLQog CS8qIFRoZSBhZHMgb2JqIGluY2x1ZGVzIHRoZSBzdHJ1Y3QgaXRzZWxmIGFuZCBidWZmZXJzIHBh c3NlZCB0byBHdUMgKi8KLQlzaXplID0gc2l6ZW9mKHN0cnVjdCBndWNfYWRzKSArIHNpemVvZihz dHJ1Y3QgZ3VjX3BvbGljaWVzKSArCi0JCQlzaXplb2Yoc3RydWN0IGd1Y19tbWlvX3JlZ19zdGF0 ZSkgKwotCQkJR1VDX1MzX1NBVkVfU1BBQ0VfUEFHRVMgKiBQQUdFX1NJWkU7CisJc3RydWN0IHsK KwkJc3RydWN0IGd1Y19hZHMgYWRzOworCQlzdHJ1Y3QgZ3VjX3BvbGljaWVzIHBvbGljaWVzOwor CQlzdHJ1Y3QgZ3VjX21taW9fcmVnX3N0YXRlIHJlZ19zdGF0ZTsKKwkJdTggcmVnX3N0YXRlX2J1 ZmZlcltHVUNfUzNfU0FWRV9TUEFDRV9QQUdFUyAqIFBBR0VfU0laRV07CisJfSBfX3BhY2tlZCAq YmxvYjsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CisJZW51bSBpbnRlbF9lbmdp bmVfaWQgaWQ7CisJdTMyIGJhc2U7CiAKIAl2bWEgPSBndWMtPmFkc192bWE7CiAJaWYgKCF2bWEp IHsKLQkJdm1hID0gaW50ZWxfZ3VjX2FsbG9jYXRlX3ZtYShndWMsIFBBR0VfQUxJR04oc2l6ZSkp OworCQl2bWEgPSBpbnRlbF9ndWNfYWxsb2NhdGVfdm1hKGd1YywgUEFHRV9BTElHTihzaXplb2Yo KmJsb2IpKSk7CiAJCWlmIChJU19FUlIodm1hKSkKIAkJCXJldHVybjsKIApAQCAtODMzLDQ0ICs4 MzIsMzggQEAgc3RhdGljIHZvaWQgZ3VjX2FkZG9uX2NyZWF0ZShzdHJ1Y3QgaW50ZWxfZ3VjICpn dWMpCiAJfQogCiAJcGFnZSA9IGk5MTVfdm1hX2ZpcnN0X3BhZ2Uodm1hKTsKLQlhZHMgPSBrbWFw KHBhZ2UpOwotCi0JLyoKLQkgKiBUaGUgR3VDIHJlcXVpcmVzIGEgIkdvbGRlbiBDb250ZXh0IiB3 aGVuIGl0IHJlaW5pdGlhbGlzZXMKLQkgKiBlbmdpbmVzIGFmdGVyIGEgcmVzZXQuIEhlcmUgd2Ug dXNlIHRoZSBSZW5kZXIgcmluZyBkZWZhdWx0Ci0JICogY29udGV4dCwgd2hpY2ggbXVzdCBhbHJl YWR5IGV4aXN0IGFuZCBiZSBwaW5uZWQgaW4gdGhlIEdHVFQsCi0JICogc28gaXRzIGFkZHJlc3Mg d29uJ3QgY2hhbmdlIGFmdGVyIHdlJ3ZlIHRvbGQgdGhlIEd1QyB3aGVyZQotCSAqIHRvIGZpbmQg aXQuCi0JICovCi0JZW5naW5lID0gZGV2X3ByaXYtPmVuZ2luZVtSQ1NdOwotCWFkcy0+Z29sZGVu X2NvbnRleHRfbHJjYSA9IGVuZ2luZS0+c3RhdHVzX3BhZ2UuZ2d0dF9vZmZzZXQ7Ci0KLQlmb3Jf ZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwgaWQpCi0JCWFkcy0+ZW5nX3N0YXRlX3NpemVb ZW5naW5lLT5ndWNfaWRdID0gaW50ZWxfbHJfY29udGV4dF9zaXplKGVuZ2luZSk7CisJYmxvYiA9 IGttYXAocGFnZSk7CiAKIAkvKiBHdUMgc2NoZWR1bGluZyBwb2xpY2llcyAqLwotCXBvbGljaWVz ID0gKHZvaWQgKilhZHMgKyBzaXplb2Yoc3RydWN0IGd1Y19hZHMpOwotCWd1Y19wb2xpY2llc19p bml0KHBvbGljaWVzKTsKLQotCWFkcy0+c2NoZWR1bGVyX3BvbGljaWVzID0KLQkJZ3VjX2dndHRf b2Zmc2V0KHZtYSkgKyBzaXplb2Yoc3RydWN0IGd1Y19hZHMpOworCWd1Y19wb2xpY2llc19pbml0 KCZibG9iLT5wb2xpY2llcyk7CiAKIAkvKiBNTUlPIHJlZyBzdGF0ZSAqLwotCXJlZ19zdGF0ZSA9 ICh2b2lkICopcG9saWNpZXMgKyBzaXplb2Yoc3RydWN0IGd1Y19wb2xpY2llcyk7Ci0KIAlmb3Jf ZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwgaWQpIHsKLQkJcmVnX3N0YXRlLT5tbWlvX3do aXRlX2xpc3RbZW5naW5lLT5ndWNfaWRdLm1taW9fc3RhcnQgPQorCQlibG9iLT5yZWdfc3RhdGUu bW1pb193aGl0ZV9saXN0W2VuZ2luZS0+Z3VjX2lkXS5tbWlvX3N0YXJ0ID0KIAkJCWVuZ2luZS0+ bW1pb19iYXNlICsgR1VDX01NSU9fV0hJVEVfTElTVF9TVEFSVDsKIAogCQkvKiBOb3RoaW5nIHRv IGJlIHNhdmVkIG9yIHJlc3RvcmVkIGZvciBub3cuICovCi0JCXJlZ19zdGF0ZS0+bW1pb193aGl0 ZV9saXN0W2VuZ2luZS0+Z3VjX2lkXS5jb3VudCA9IDA7CisJCWJsb2ItPnJlZ19zdGF0ZS5tbWlv X3doaXRlX2xpc3RbZW5naW5lLT5ndWNfaWRdLmNvdW50ID0gMDsKIAl9CiAKLQlhZHMtPnJlZ19z dGF0ZV9hZGRyID0gYWRzLT5zY2hlZHVsZXJfcG9saWNpZXMgKwotCQkJc2l6ZW9mKHN0cnVjdCBn dWNfcG9saWNpZXMpOworCS8qCisJICogVGhlIEd1QyByZXF1aXJlcyBhICJHb2xkZW4gQ29udGV4 dCIgd2hlbiBpdCByZWluaXRpYWxpc2VzCisJICogZW5naW5lcyBhZnRlciBhIHJlc2V0LiBIZXJl IHdlIHVzZSB0aGUgUmVuZGVyIHJpbmcgZGVmYXVsdAorCSAqIGNvbnRleHQsIHdoaWNoIG11c3Qg YWxyZWFkeSBleGlzdCBhbmQgYmUgcGlubmVkIGluIHRoZSBHR1RULAorCSAqIHNvIGl0cyBhZGRy ZXNzIHdvbid0IGNoYW5nZSBhZnRlciB3ZSd2ZSB0b2xkIHRoZSBHdUMgd2hlcmUKKwkgKiB0byBm aW5kIGl0LgorCSAqLworCWJsb2ItPmFkcy5nb2xkZW5fY29udGV4dF9scmNhID0KKwkJZGV2X3By aXYtPmVuZ2luZVtSQ1NdLT5zdGF0dXNfcGFnZS5nZ3R0X29mZnNldDsKKworCWZvcl9lYWNoX2Vu Z2luZShlbmdpbmUsIGRldl9wcml2LCBpZCkKKwkJYmxvYi0+YWRzLmVuZ19zdGF0ZV9zaXplW2Vu Z2luZS0+Z3VjX2lkXSA9CisJCQlpbnRlbF9scl9jb250ZXh0X3NpemUoZW5naW5lKTsKIAotCWFk cy0+cmVnX3N0YXRlX2J1ZmZlciA9IGFkcy0+cmVnX3N0YXRlX2FkZHIgKwotCQkJc2l6ZW9mKHN0 cnVjdCBndWNfbW1pb19yZWdfc3RhdGUpOworCWJhc2UgPSBndWNfZ2d0dF9vZmZzZXQodm1hKTsK KwlibG9iLT5hZHMuc2NoZWR1bGVyX3BvbGljaWVzID0gYmFzZSArIHB0cl9vZmZzZXQoYmxvYiwg cG9saWNpZXMpOworCWJsb2ItPmFkcy5yZWdfc3RhdGVfYnVmZmVyID0gYmFzZSArIHB0cl9vZmZz ZXQoYmxvYiwgcmVnX3N0YXRlX2J1ZmZlcik7CisJYmxvYi0+YWRzLnJlZ19zdGF0ZV9hZGRyID0g YmFzZSArIHB0cl9vZmZzZXQoYmxvYiwgcmVnX3N0YXRlKTsKIAogCWt1bm1hcChwYWdlKTsKIH0K ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdXRpbHMuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfdXRpbHMuaAppbmRleCBiOGJhMGYyZjkyYWYuLjk0YTNhMzI5OTkx MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV91dGlscy5oCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdXRpbHMuaApAQCAtNjYsNiArNjYsOCBAQAogI2RlZmlu ZSBwdHJfcGFja19iaXRzKHB0ciwgYml0cykJCQkJCVwKIAkoKHR5cGVvZihwdHIpKSgodW5zaWdu ZWQgbG9uZykocHRyKSB8IChiaXRzKSkpCiAKKyNkZWZpbmUgcHRyX29mZnNldChwdHIsIG1lbWJl cikgb2Zmc2V0b2YodHlwZW9mKCoocHRyKSksIG1lbWJlcikKKwogI2RlZmluZSBmZXRjaF9hbmRf emVybyhwdHIpICh7CQkJCQkJXAogCXR5cGVvZigqcHRyKSBfX1QgPSAqKHB0cik7CQkJCQlcCiAJ KihwdHIpID0gKHR5cGVvZigqcHRyKSkwOwkJCQkJXAotLSAKMi4xMS4wCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK