From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 5/5] drm/i915/execlists: Drop promotion on unsubmit Date: Wed, 15 May 2019 14:00:52 +0100 Message-ID: <20190515130052.4475-5-chris@chris-wilson.co.uk> References: <20190515130052.4475-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 fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id B25F589289 for ; Wed, 15 May 2019 13:02:33 +0000 (UTC) In-Reply-To: <20190515130052.4475-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 V2l0aCB0aGUgZGlzYXBwZWFyYW5jZSBvZiBORVdDTElFTlQsIHdlIG5vIGxvbmdlciBuZWVkIHRv IHByb3ZpZGUgdGhlCnByaW9yaXR5IGJvb3N0IG9uIHByZWVtcHRpb24gaW4gb3JkZXIgdG8gcHJl dmVudCByZXBlYXRlZCBnYXp1bXBpbmcsCmFuZCB3ZSBjYW4gcmVtb3ZlIHRoZSBkZWFkIGNvZGUu CgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4K Q2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfbHJjLmMgfCA1OSArKysrKy0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKyksIDQ5IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX2xyYy5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxfbHJjLmMKaW5kZXggYjVlODIxNzFkZjhmLi5mMjYz YTgzNzQyNzMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX2xyYy5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX2xyYy5jCkBAIC0xNjQsOCArMTY0 LDYgQEAKICNkZWZpbmUgV0FfVEFJTF9EV09SRFMgMgogI2RlZmluZSBXQV9UQUlMX0JZVEVTIChz aXplb2YodTMyKSAqIFdBX1RBSUxfRFdPUkRTKQogCi0jZGVmaW5lIEFDVElWRV9QUklPUklUWSAo STkxNV9QUklPUklUWV9OT1NFTUFQSE9SRSkKLQogc3RhdGljIGludCBleGVjbGlzdHNfY29udGV4 dF9kZWZlcnJlZF9hbGxvYyhzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY2UsCiAJCQkJCSAgICBzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpOwogc3RhdGljIHZvaWQgZXhlY2xpc3RzX2luaXRf cmVnX3N0YXRlKHUzMiAqcmVnX3N0YXRlLApAQCAtMTg5LDIzICsxODcsMTIgQEAgc3RhdGljIGlu dCBlZmZlY3RpdmVfcHJpbyhjb25zdCBzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpycSkKIAogCS8qCiAJ ICogT24gdW53aW5kaW5nIHRoZSBhY3RpdmUgcmVxdWVzdCwgd2UgZ2l2ZSBpdCBhIHByaW9yaXR5 IGJ1bXAKLQkgKiBlcXVpdmFsZW50IHRvIGEgZnJlc2hseSBzdWJtaXR0ZWQgcmVxdWVzdC4gVGhp cyBwcm90ZWN0cyBpdCBmcm9tCi0JICogYmVpbmcgZ2F6dW1wZWQgYWdhaW4sIGJ1dCBpdCB3b3Vs ZCBiZSBwcmVmZXJhYmxlIGlmIHdlIGRpZG4ndAotCSAqIGxldCBpdCBiZSBnYXp1bXBlZCBpbiB0 aGUgZmlyc3QgcGxhY2UhCi0JICoKLQkgKiBTZWUgX191bndpbmRfaW5jb21wbGV0ZV9yZXF1ZXN0 cygpCisJICogaWYgaXQgaGFzIGNvbXBsZXRlZCB3YWl0aW5nIG9uIGFueSBzZW1hcGhvcmUuIElm IHdlIGtub3cgdGhhdAorCSAqIHRoZSByZXF1ZXN0IGhhcyBhbHJlYWR5IHN0YXJ0ZWQsIHdlIGNh biBwcmV2ZW50IGFuIHVud2FudGVkCisJICogcHJlZW1wdC10by1pZGxlIGN5Y2xlIGJ5IHRha2lu ZyB0aGF0IGludG8gYWNjb3VudCBub3cuCiAJICovCi0JaWYgKH5wcmlvICYgQUNUSVZFX1BSSU9S SVRZICYmIF9faTkxNV9yZXF1ZXN0X2hhc19zdGFydGVkKHJxKSkgewotCQkvKgotCQkgKiBBZnRl ciBwcmVlbXB0aW9uLCB3ZSBpbnNlcnQgdGhlIGFjdGl2ZSByZXF1ZXN0IGF0IHRoZQotCQkgKiBl bmQgb2YgdGhlIG5ldyBwcmlvcml0eSBsZXZlbC4gVGhpcyBtZWFucyB0aGF0IHdlIHdpbGwgYmUK LQkJICogX2xvd2VyXyBwcmlvcml0eSB0aGFuIHRoZSBwcmVlbXB0ZWUgYWxsIHRoaW5ncyBlcXVh bCAoYW5kCi0JCSAqIHNvIHRoZSBwcmVlbXB0aW9uIGlzIHZhbGlkKSwgc28gYWRqdXN0IG91ciBj b21wYXJpc29uCi0JCSAqIGFjY29yZGluZ2x5LgotCQkgKi8KLQkJcHJpbyB8PSBBQ1RJVkVfUFJJ T1JJVFk7Ci0JCXByaW8tLTsKLQl9CisJaWYgKF9faTkxNV9yZXF1ZXN0X2hhc19zdGFydGVkKHJx KSkKKwkJcHJpbyB8PSBJOTE1X1BSSU9SSVRZX05PU0VNQVBIT1JFOwogCiAJLyogUmVzdHJpY3Qg bWVyZSBXQUlUIGJvb3N0cyBmcm9tIHRyaWdnZXJpbmcgcHJlZW1wdGlvbiAqLwogCXJldHVybiBw cmlvIHwgX19OT19QUkVFTVBUSU9OOwpAQCAtMzcxLDExICszNTgsMTEgQEAgc3RhdGljIHZvaWQg dW53aW5kX3dhX3RhaWwoc3RydWN0IGk5MTVfcmVxdWVzdCAqcnEpCiB9CiAKIHN0YXRpYyBzdHJ1 Y3QgaTkxNV9yZXF1ZXN0ICoKLV9fdW53aW5kX2luY29tcGxldGVfcmVxdWVzdHMoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lLCBpbnQgYm9vc3QpCitfX3Vud2luZF9pbmNvbXBsZXRlX3Jl cXVlc3RzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAlzdHJ1Y3QgaTkxNV9y ZXF1ZXN0ICpycSwgKnJuLCAqYWN0aXZlID0gTlVMTDsKIAlzdHJ1Y3QgbGlzdF9oZWFkICp1bmlu aXRpYWxpemVkX3ZhcihwbCk7Ci0JaW50IHByaW8gPSBJOTE1X1BSSU9SSVRZX0lOVkFMSUQgfCBi b29zdDsKKwlpbnQgcHJpbyA9IEk5MTVfUFJJT1JJVFlfSU5WQUxJRDsKIAogCWxvY2tkZXBfYXNz ZXJ0X2hlbGQoJmVuZ2luZS0+dGltZWxpbmUubG9jayk7CiAKQEAgLTQwMiwzMSArMzg5LDYgQEAg X191bndpbmRfaW5jb21wbGV0ZV9yZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUsIGludCBib29zdCkKIAkJYWN0aXZlID0gcnE7CiAJfQogCi0JLyoKLQkgKiBUaGUgYWN0aXZl IHJlcXVlc3QgaXMgbm93IGVmZmVjdGl2ZWx5IHRoZSBzdGFydCBvZiBhIG5ldyBjbGllbnQKLQkg KiBzdHJlYW0sIHNvIGdpdmUgaXQgdGhlIGVxdWl2YWxlbnQgc21hbGwgcHJpb3JpdHkgYnVtcCB0 byBwcmV2ZW50Ci0JICogaXQgYmVpbmcgZ2F6dW1wZWQgYSBzZWNvbmQgdGltZSBieSBhbm90aGVy IHBlZXIuCi0JICoKLQkgKiBOb3RlIHdlIGhhdmUgdG8gYmUgY2FyZWZ1bCBub3QgdG8gYXBwbHkg YSBwcmlvcml0eSBib29zdCB0byBhIHJlcXVlc3QKLQkgKiBzdGlsbCBzcGlubmluZyBvbiBpdHMg c2VtYXBob3Jlcy4gSWYgdGhlIHJlcXVlc3QgaGFzbid0IHN0YXJ0ZWQsIHRoYXQKLQkgKiBtZWFu cyBpdCBpcyBzdGlsbCB3YWl0aW5nIGZvciBpdHMgZGVwZW5kZW5jaWVzIHRvIGJlIHNpZ25hbGVk LCBhbmQKLQkgKiBpZiB3ZSBhcHBseSBhIHByaW9yaXR5IGJvb3N0IHRvIHRoaXMgcmVxdWVzdCwg d2Ugd2lsbCBib29zdCBpdCBwYXN0Ci0JICogaXRzIHNpZ25hbGVycyBhbmQgc28gYnJlYWsgUEku Ci0JICoKLQkgKiBPbmUgY29uc2VxdWVuY2Ugb2YgdGhpcyBwcmVlbXB0aW9uIGJvb3N0IGlzIHRo YXQgd2UgbWF5IGp1bXAKLQkgKiBvdmVyIGxlc3NlciBwcmlvcml0aWVzIChzdWNoIGFzIEk5MTVf UFJJT1JJVFlfV0FJVCksIGVmZmVjdGl2ZWx5Ci0JICogbWFraW5nIHRob3NlIHByaW9yaXRpZXMg bm9uLXByZWVtcHRpYmxlLiBUaGV5IHdpbGwgYmUgbW92ZWQgZm9yd2FyZAotCSAqIGluIHRoZSBw cmlvcml0eSBxdWV1ZSwgYnV0IHRoZXkgd2lsbCBub3QgZ2FpbiBpbW1lZGlhdGUgYWNjZXNzIHRv Ci0JICogdGhlIEdQVS4KLQkgKi8KLQlpZiAofnByaW8gJiBib29zdCAmJiBfX2k5MTVfcmVxdWVz dF9oYXNfc3RhcnRlZChhY3RpdmUpKSB7Ci0JCXByaW8gfD0gYm9vc3Q7Ci0JCUdFTV9CVUdfT04o YWN0aXZlLT5zY2hlZC5hdHRyLnByaW9yaXR5ID49IHByaW8pOwotCQlhY3RpdmUtPnNjaGVkLmF0 dHIucHJpb3JpdHkgPSBwcmlvOwotCQlsaXN0X21vdmVfdGFpbCgmYWN0aXZlLT5zY2hlZC5saW5r LAotCQkJICAgICAgIGk5MTVfc2NoZWRfbG9va3VwX3ByaW9saXN0KGVuZ2luZSwgcHJpbykpOwot CX0KLQogCXJldHVybiBhY3RpdmU7CiB9CiAKQEAgLTQzNiw3ICszOTgsNyBAQCBleGVjbGlzdHNf dW53aW5kX2luY29tcGxldGVfcmVxdWVzdHMoc3RydWN0IGludGVsX2VuZ2luZV9leGVjbGlzdHMg KmV4ZWNsaXN0cykKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUgPQogCQljb250YWlu ZXJfb2YoZXhlY2xpc3RzLCB0eXBlb2YoKmVuZ2luZSksIGV4ZWNsaXN0cyk7CiAKLQlyZXR1cm4g X191bndpbmRfaW5jb21wbGV0ZV9yZXF1ZXN0cyhlbmdpbmUsIDApOworCXJldHVybiBfX3Vud2lu ZF9pbmNvbXBsZXRlX3JlcXVlc3RzKGVuZ2luZSk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgdm9pZApA QCAtNjU3LDggKzYxOSw3IEBAIHN0YXRpYyB2b2lkIGNvbXBsZXRlX3ByZWVtcHRfY29udGV4dChz dHJ1Y3QgaW50ZWxfZW5naW5lX2V4ZWNsaXN0cyAqZXhlY2xpc3RzKQogCWV4ZWNsaXN0c19jYW5j ZWxfcG9ydF9yZXF1ZXN0cyhleGVjbGlzdHMpOwogCV9fdW53aW5kX2luY29tcGxldGVfcmVxdWVz dHMoY29udGFpbmVyX29mKGV4ZWNsaXN0cywKIAkJCQkJCSAgc3RydWN0IGludGVsX2VuZ2luZV9j cywKLQkJCQkJCSAgZXhlY2xpc3RzKSwKLQkJCQkgICAgIEFDVElWRV9QUklPUklUWSk7CisJCQkJ CQkgIGV4ZWNsaXN0cykpOwogfQogCiBzdGF0aWMgdm9pZCBleGVjbGlzdHNfZGVxdWV1ZShzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCkBAIC0xOTExLDcgKzE4NzIsNyBAQCBzdGF0aWMg dm9pZCBfX2V4ZWNsaXN0c19yZXNldChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsIGJv b2wgc3RhbGxlZCkKIAlleGVjbGlzdHNfY2FuY2VsX3BvcnRfcmVxdWVzdHMoZXhlY2xpc3RzKTsK IAogCS8qIFB1c2ggYmFjayBhbnkgaW5jb21wbGV0ZSByZXF1ZXN0cyBmb3IgcmVwbGF5IGFmdGVy IHRoZSByZXNldC4gKi8KLQlycSA9IF9fdW53aW5kX2luY29tcGxldGVfcmVxdWVzdHMoZW5naW5l LCAwKTsKKwlycSA9IF9fdW53aW5kX2luY29tcGxldGVfcmVxdWVzdHMoZW5naW5lKTsKIAlpZiAo IXJxKQogCQlnb3RvIG91dF9yZXBsYXk7CiAKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4