From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 32/41] drm/i915: Rename ->emit_request to ->emit_breadcrumb Date: Thu, 20 Oct 2016 16:04:14 +0100 Message-ID: <20161020150423.4560-33-chris@chris-wilson.co.uk> References: <20161020150423.4560-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-lf0-x243.google.com (mail-lf0-x243.google.com [IPv6:2a00:1450:4010:c07::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6E68C6EB9D for ; Thu, 20 Oct 2016 15:05:04 +0000 (UTC) Received: by mail-lf0-x243.google.com with SMTP id x79so463187lff.2 for ; Thu, 20 Oct 2016 08:05:04 -0700 (PDT) In-Reply-To: <20161020150423.4560-1-chris@chris-wilson.co.uk> 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 Tm93IHRoYXQgdGhlIGVtaXNzaW9uIG9mIHRoZSByZXF1ZXN0IHRhaWwgYW5kIGl0cyBzdWJtaXNz aW9uIHRvIGhhcmR3YXJlCmFyZSB0d28gc2VwYXJhdGUgc3RlcHMsIGVuZ2luZS0+ZW1pdF9yZXF1 ZXN0KCkgaXMgY29uZnVzaW5nLgplbmdpbmUtPmVtaXRfcmVxdWVzdCgpIGlzIGNhbGxlZCB0byBl bWl0IHRoZSBicmVhZGNydW1iIGNvbW1hbmRzIGZvciB0aGUKcmVxdWVzdCBpbnRvIHRoZSByaW5n LCBuYW1lIGl0IHN1Y2ggKGVuZ2luZS0+ZW1pdF9icmVhZGNydW1iKS4KClNpZ25lZC1vZmYtYnk6 IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpSZXZpZXdlZC1ieTogSm9v bmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYyB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICB8IDEwICsrKysrLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8IDE2ICsrKysrKysrLS0tLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCB8ICAyICstCiA0IGZpbGVzIGNoYW5n ZWQsIDE2IGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX3JlcXVlc3QuYwppbmRleCA1YzAxYjk1NDhlNzIuLjVmNjQzZTA4MmYyZCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVxdWVzdC5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlcXVlc3QuYwpAQCAtNjg1LDggKzY4NSw4IEBA IHZvaWQgX19pOTE1X2FkZF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx dWVzdCwgYm9vbCBmbHVzaF9jYWNoZXMpCiAJcmVxdWVzdC0+cG9zdGZpeCA9IHJpbmctPnRhaWw7 CiAKIAkvKiBOb3QgYWxsb3dlZCB0byBmYWlsISAqLwotCXJldCA9IGVuZ2luZS0+ZW1pdF9yZXF1 ZXN0KHJlcXVlc3QpOwotCVdBUk4ocmV0LCAiKCVzKS0+ZW1pdF9yZXF1ZXN0IGZhaWxlZDogJWQh XG4iLCBlbmdpbmUtPm5hbWUsIHJldCk7CisJcmV0ID0gZW5naW5lLT5lbWl0X2JyZWFkY3J1bWIo cmVxdWVzdCk7CisJV0FSTihyZXQsICIoJXMpLT5lbWl0X2JyZWFkY3J1bWIgZmFpbGVkOiAlZCFc biIsIGVuZ2luZS0+bmFtZSwgcmV0KTsKIAogCS8qIFNhbml0eSBjaGVjayB0aGF0IHRoZSByZXNl cnZlZCBzaXplIHdhcyBsYXJnZSBlbm91Z2guICovCiAJcmV0ID0gcmluZy0+dGFpbCAtIHJlcXVl c3Rfc3RhcnQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IGUwYTliZjgxNzc0Yi4uNTdk YmE0NThmMTg1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtNDQwLDcgKzQ0MCw3IEBA IHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19kZXF1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSkKIAlpZiAobGFzdCkKIAkJLyogV2FJZGxlTGl0ZVJlc3RvcmU6YmR3LHNrbAogCQkgKiBB cHBseSB0aGUgd2EgTk9PUHMgdG8gcHJldmVudCByaW5nOkhFQUQgPT0gcmVxOlRBSUwKLQkJICog YXMgd2UgcmVzdWJtaXQgdGhlIHJlcXVlc3QuIFNlZSBnZW44X2VtaXRfcmVxdWVzdCgpCisJCSAq IGFzIHdlIHJlc3VibWl0IHRoZSByZXF1ZXN0LiBTZWUgZ2VuOF9lbWl0X2JyZWFkY3J1bWIoKQog CQkgKiBmb3Igd2hlcmUgd2UgcHJlcGFyZSB0aGUgcGFkZGluZyBhZnRlciB0aGUgZW5kIG9mIHRo ZQogCQkgKiByZXF1ZXN0LgogCQkgKi8KQEAgLTE1NjcsNyArMTU2Nyw3IEBAIHN0YXRpYyB2b2lk IGJ4dF9hX3NlcW5vX2JhcnJpZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogICog cmVzdG9yZSB3aXRoIEhFQUQ9PVRBSUwgKFdhSWRsZUxpdGVSZXN0b3JlKS4KICAqLwogCi1zdGF0 aWMgaW50IGdlbjhfZW1pdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx dWVzdCkKK3N0YXRpYyBpbnQgZ2VuOF9lbWl0X2JyZWFkY3J1bWIoc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpyZXF1ZXN0KQogewogCXN0cnVjdCBpbnRlbF9yaW5nICpyaW5nID0gcmVxdWVz dC0+cmluZzsKIAlpbnQgcmV0OwpAQCAtMTU5MCw3ICsxNTkwLDcgQEAgc3RhdGljIGludCBnZW44 X2VtaXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAJcmV0 dXJuIGludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlKHJlcXVlc3QpOwogfQogCi1zdGF0aWMgaW50 IGdlbjhfZW1pdF9yZXF1ZXN0X3JlbmRlcihzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJl cXVlc3QpCitzdGF0aWMgaW50IGdlbjhfZW1pdF9icmVhZGNydW1iX3JlbmRlcihzdHJ1Y3QgZHJt X2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiB7CiAJc3RydWN0IGludGVsX3JpbmcgKnJpbmcg PSByZXF1ZXN0LT5yaW5nOwogCWludCByZXQ7CkBAIC0xNjk0LDcgKzE2OTQsNyBAQCBsb2dpY2Fs X3JpbmdfZGVmYXVsdF92ZnVuY3Moc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCWVu Z2luZS0+aW5pdF9odyA9IGdlbjhfaW5pdF9jb21tb25fcmluZzsKIAllbmdpbmUtPnJlc2V0X2h3 ID0gcmVzZXRfY29tbW9uX3Jpbmc7CiAJZW5naW5lLT5lbWl0X2ZsdXNoID0gZ2VuOF9lbWl0X2Zs dXNoOwotCWVuZ2luZS0+ZW1pdF9yZXF1ZXN0ID0gZ2VuOF9lbWl0X3JlcXVlc3Q7CisJZW5naW5l LT5lbWl0X2JyZWFkY3J1bWIgPSBnZW44X2VtaXRfYnJlYWRjcnVtYjsKIAllbmdpbmUtPnN1Ym1p dF9yZXF1ZXN0ID0gZXhlY2xpc3RzX3N1Ym1pdF9yZXF1ZXN0OwogCiAJZW5naW5lLT5pcnFfZW5h YmxlID0gZ2VuOF9sb2dpY2FsX3JpbmdfZW5hYmxlX2lycTsKQEAgLTE4MTYsNyArMTgxNiw3IEBA IGludCBsb2dpY2FsX3JlbmRlcl9yaW5nX2luaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKQogCQllbmdpbmUtPmluaXRfaHcgPSBnZW44X2luaXRfcmVuZGVyX3Jpbmc7CiAJZW5naW5l LT5pbml0X2NvbnRleHQgPSBnZW44X2luaXRfcmNzX2NvbnRleHQ7CiAJZW5naW5lLT5lbWl0X2Zs dXNoID0gZ2VuOF9lbWl0X2ZsdXNoX3JlbmRlcjsKLQllbmdpbmUtPmVtaXRfcmVxdWVzdCA9IGdl bjhfZW1pdF9yZXF1ZXN0X3JlbmRlcjsKKwllbmdpbmUtPmVtaXRfYnJlYWRjcnVtYiA9IGdlbjhf ZW1pdF9icmVhZGNydW1iX3JlbmRlcjsKIAogCXJldCA9IGludGVsX2VuZ2luZV9jcmVhdGVfc2Ny YXRjaChlbmdpbmUsIDQwOTYpOwogCWlmIChyZXQpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmMKaW5kZXggNjVmZmIxY2VhYjNiLi42YTBjNzVjNTgzM2IgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTEzMzAsNyArMTMzMCw3IEBAIHN0YXRp YyB2b2lkIGk5eHhfc3VibWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpy ZXF1ZXN0KQogCQkJaW50ZWxfcmluZ19vZmZzZXQocmVxdWVzdC0+cmluZywgcmVxdWVzdC0+dGFp bCkpOwogfQogCi1zdGF0aWMgaW50IGk5eHhfZW1pdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxKQorc3RhdGljIGludCBpOXh4X2VtaXRfYnJlYWRjcnVtYihzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIHsKIAlzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZyA9 IHJlcS0+cmluZzsKIAlpbnQgcmV0OwpAQCAtMTM1MSwxNCArMTM1MSwxNCBAQCBzdGF0aWMgaW50 IGk5eHhfZW1pdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogfQog CiAvKioKLSAqIGdlbjZfc2VtYV9lbWl0X3JlcXVlc3QgLSBVcGRhdGUgdGhlIHNlbWFwaG9yZSBt YWlsYm94IHJlZ2lzdGVycworICogZ2VuNl9zZW1hX2VtaXRfYnJlYWRjcnVtYiAtIFVwZGF0ZSB0 aGUgc2VtYXBob3JlIG1haWxib3ggcmVnaXN0ZXJzCiAgKgogICogQHJlcXVlc3QgLSByZXF1ZXN0 IHRvIHdyaXRlIHRvIHRoZSByaW5nCiAgKgogICogVXBkYXRlIHRoZSBtYWlsYm94IHJlZ2lzdGVy cyBpbiB0aGUgKm90aGVyKiByaW5ncyB3aXRoIHRoZSBjdXJyZW50IHNlcW5vLgogICogVGhpcyBh Y3RzIGxpa2UgYSBzaWduYWwgaW4gdGhlIGNhbm9uaWNhbCBzZW1hcGhvcmUuCiAgKi8KLXN0YXRp YyBpbnQgZ2VuNl9zZW1hX2VtaXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcSkKK3N0YXRpYyBpbnQgZ2VuNl9zZW1hX2VtaXRfYnJlYWRjcnVtYihzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIHsKIAlpbnQgcmV0OwogCkBAIC0xMzY2LDEwICsxMzY2LDEw IEBAIHN0YXRpYyBpbnQgZ2VuNl9zZW1hX2VtaXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X3JlcXVlc3QgKnJlcSkKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JcmV0dXJuIGk5eHhf ZW1pdF9yZXF1ZXN0KHJlcSk7CisJcmV0dXJuIGk5eHhfZW1pdF9icmVhZGNydW1iKHJlcSk7CiB9 CiAKLXN0YXRpYyBpbnQgZ2VuOF9yZW5kZXJfZW1pdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9n ZW1fcmVxdWVzdCAqcmVxKQorc3RhdGljIGludCBnZW44X3JlbmRlcl9lbWl0X2JyZWFkY3J1bWIo c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiB7CiAJc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lID0gcmVxLT5lbmdpbmU7CiAJc3RydWN0IGludGVsX3JpbmcgKnJpbmcgPSBy ZXEtPnJpbmc7CkBAIC0yNjM5LDkgKzI2MzksOSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9yaW5nX2Rl ZmF1bHRfdmZ1bmNzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAllbmdpbmUt PmluaXRfaHcgPSBpbml0X3JpbmdfY29tbW9uOwogCWVuZ2luZS0+cmVzZXRfaHcgPSByZXNldF9y aW5nX2NvbW1vbjsKIAotCWVuZ2luZS0+ZW1pdF9yZXF1ZXN0ID0gaTl4eF9lbWl0X3JlcXVlc3Q7 CisJZW5naW5lLT5lbWl0X2JyZWFkY3J1bWIgPSBpOXh4X2VtaXRfYnJlYWRjcnVtYjsKIAlpZiAo aTkxNS5zZW1hcGhvcmVzKQotCQllbmdpbmUtPmVtaXRfcmVxdWVzdCA9IGdlbjZfc2VtYV9lbWl0 X3JlcXVlc3Q7CisJCWVuZ2luZS0+ZW1pdF9icmVhZGNydW1iID0gZ2VuNl9zZW1hX2VtaXRfYnJl YWRjcnVtYjsKIAllbmdpbmUtPnN1Ym1pdF9yZXF1ZXN0ID0gaTl4eF9zdWJtaXRfcmVxdWVzdDsK IAogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDgpCkBAIC0yNjY4LDcgKzI2NjgsNyBAQCBp bnQgaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lKQogCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCkgewogCQllbmdpbmUtPmlu aXRfY29udGV4dCA9IGludGVsX3Jjc19jdHhfaW5pdDsKLQkJZW5naW5lLT5lbWl0X3JlcXVlc3Qg PSBnZW44X3JlbmRlcl9lbWl0X3JlcXVlc3Q7CisJCWVuZ2luZS0+ZW1pdF9icmVhZGNydW1iID0g Z2VuOF9yZW5kZXJfZW1pdF9icmVhZGNydW1iOwogCQllbmdpbmUtPmVtaXRfZmx1c2ggPSBnZW44 X3JlbmRlcl9yaW5nX2ZsdXNoOwogCQlpZiAoaTkxNS5zZW1hcGhvcmVzKQogCQkJZW5naW5lLT5z ZW1hcGhvcmUuc2lnbmFsID0gZ2VuOF9yY3Nfc2lnbmFsOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5oCmluZGV4IGE2MmUzOTZjODg2My4uYTVjZWQxNjQ5ZWNkIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBAIC0yNTUsNyArMjU1LDcgQEAgc3Ry dWN0IGludGVsX2VuZ2luZV9jcyB7CiAjZGVmaW5lIEk5MTVfRElTUEFUQ0hfU0VDVVJFIEJJVCgw KQogI2RlZmluZSBJOTE1X0RJU1BBVENIX1BJTk5FRCBCSVQoMSkKICNkZWZpbmUgSTkxNV9ESVNQ QVRDSF9SUyAgICAgQklUKDIpCi0JaW50CQkoKmVtaXRfcmVxdWVzdCkoc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXEpOworCWludAkJKCplbWl0X2JyZWFkY3J1bWIpKHN0cnVjdCBkcm1f aTkxNV9nZW1fcmVxdWVzdCAqcmVxKTsKIAogCS8qIFBhc3MgdGhlIHJlcXVlc3QgdG8gdGhlIGhh cmR3YXJlIHF1ZXVlIChlLmcuIGRpcmVjdGx5IGludG8KIAkgKiB0aGUgbGVnYWN5IHJpbmdidWZm ZXIgb3IgdG8gdGhlIGVuZCBvZiBhbiBleGVjbGlzdCkuCi0tIAoyLjkuMwoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==