From: Dave Gordon Subject: [PATCH 3/4] drm/i915: refactor eb_get_batch() Date: Fri, 15 Apr 2016 12:32:56 +0100 Message-ID: <1460719977-12435-3-git-send-email-david.s.gordon@intel.com> References: <1460719977-12435-1-git-send-email-david.s.gordon@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id BF7F76E127 for ; Fri, 15 Apr 2016 11:33:03 +0000 (UTC) In-Reply-To: <1460719977-12435-1-git-send-email-david.s.gordon@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 UHJlY3Vyc29yIGZvciBmaXggdG8gc2VjdXJlIGJhdGNoIGV4ZWN1dGlvbi4gV2Ugd2lsbCBuZWVk IHRvIGJlIGFibGUgdG8KcmV0cmlldmUgdGhlIGJhdGNoIFZNQSAoYXMgd2VsbCBhcyB0aGUgYmF0 Y2ggaXRzZWxmKSBmcm9tIHRoZSBlYiBsaXN0LApzbyB0aGlzIHBhdGNoIGV4dHJhY3RzIHRoYXQg cGFydCBvZiBlYl9nZXRfYmF0Y2goKSBpbnRvIGEgc2VwYXJhdGUKZnVuY3Rpb24sIGFuZCBtb3Zl cyBib3RoIHBhcnRzIHRvIGEgbW9yZSBsb2dpY2FsIHBsYWNlIGluIHRoZSBmaWxlLCBuZWFyCndo ZXJlIHRoZSBlYiBsaXN0IGlzIGNyZWF0ZWQuCgpTaWduZWQtb2ZmLWJ5OiBEYXZlIEdvcmRvbiA8 ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2V4ZWNidWZmZXIuYyB8IDUwICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQogMSBm aWxlIGNoYW5nZWQsIDI5IGluc2VydGlvbnMoKyksIDIxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwppbmRleCBiYzk3NjcwLi4zYTYwMTQ2 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCkBAIC0xODYs NiArMTg2LDM1IEBAIHN0cnVjdCBlYl92bWFzIHsKIAlyZXR1cm4gcmV0OwogfQogCitzdGF0aWMg aW5saW5lIHN0cnVjdCBpOTE1X3ZtYSAqCitlYl9nZXRfYmF0Y2hfdm1hKHN0cnVjdCBlYl92bWFz ICplYikKK3sKKwkvKiBUaGUgYmF0Y2ggaXMgYWx3YXlzIHRoZSBMQVNUIGl0ZW0gaW4gdGhlIFZN QSBsaXN0ICovCisJc3RydWN0IGk5MTVfdm1hICp2bWEgPSBsaXN0X2xhc3RfZW50cnkoJmViLT52 bWFzLCB0eXBlb2YoKnZtYSksIGV4ZWNfbGlzdCk7CisKKwlyZXR1cm4gdm1hOworfQorCitzdGF0 aWMgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKgorZWJfZ2V0X2JhdGNoKHN0cnVjdCBlYl92 bWFzICplYikKK3sKKwlzdHJ1Y3QgaTkxNV92bWEgKnZtYSA9IGViX2dldF9iYXRjaF92bWEoZWIp OworCisJLyoKKwkgKiBTTkEgaXMgZG9pbmcgZmFuY3kgdHJpY2tzIHdpdGggY29tcHJlc3Npbmcg YmF0Y2ggYnVmZmVycywgd2hpY2ggbGVhZHMKKwkgKiB0byBuZWdhdGl2ZSByZWxvY2F0aW9uIGRl bHRhcy4gVXN1YWxseSB0aGF0IHdvcmtzIG91dCBvayBzaW5jZSB0aGUKKwkgKiByZWxvY2F0ZSBh ZGRyZXNzIGlzIHN0aWxsIHBvc2l0aXZlLCBleGNlcHQgd2hlbiB0aGUgYmF0Y2ggaXMgcGxhY2Vk CisJICogdmVyeSBsb3cgaW4gdGhlIEdUVC4gRW5zdXJlIHRoaXMgZG9lc24ndCBoYXBwZW4uCisJ ICoKKwkgKiBOb3RlIHRoYXQgYWN0dWFsIGhhbmdzIGhhdmUgb25seSBiZWVuIG9ic2VydmVkIG9u IGdlbjcsIGJ1dCBmb3IKKwkgKiBwYXJhbm9pYSBkbyBpdCBldmVyeXdoZXJlLgorCSAqLworCWlm ICgodm1hLT5leGVjX2VudHJ5LT5mbGFncyAmIEVYRUNfT0JKRUNUX1BJTk5FRCkgPT0gMCkKKwkJ dm1hLT5leGVjX2VudHJ5LT5mbGFncyB8PSBfX0VYRUNfT0JKRUNUX05FRURTX0JJQVM7CisKKwly ZXR1cm4gdm1hLT5vYmo7Cit9CisKIHN0YXRpYyBzdHJ1Y3QgaTkxNV92bWEgKmViX2dldF92bWEo c3RydWN0IGViX3ZtYXMgKmViLCB1bnNpZ25lZCBsb25nIGhhbmRsZSkKIHsKIAlpZiAoZWItPmFu ZCA8IDApIHsKQEAgLTEzNTEsMjcgKzEzODAsNiBAQCBzdGF0aWMgYm9vbCBvbmx5X21hcHBhYmxl X2Zvcl9yZWxvYyh1bnNpZ25lZCBpbnQgZmxhZ3MpCiAJcmV0dXJuIGZpbGVfcHJpdi0+YnNkX3Jp bmc7CiB9CiAKLXN0YXRpYyBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqCi1lYl9nZXRfYmF0 Y2goc3RydWN0IGViX3ZtYXMgKmViKQotewotCS8qIFRoZSBiYXRjaCBpcyBhbHdheXMgdGhlIExB U1QgaXRlbSBpbiB0aGUgVk1BIGxpc3QgKi8KLQlzdHJ1Y3QgaTkxNV92bWEgKnZtYSA9IGxpc3Rf bGFzdF9lbnRyeSgmZWItPnZtYXMsIHR5cGVvZigqdm1hKSwgZXhlY19saXN0KTsKLQotCS8qCi0J ICogU05BIGlzIGRvaW5nIGZhbmN5IHRyaWNrcyB3aXRoIGNvbXByZXNzaW5nIGJhdGNoIGJ1ZmZl cnMsIHdoaWNoIGxlYWRzCi0JICogdG8gbmVnYXRpdmUgcmVsb2NhdGlvbiBkZWx0YXMuIFVzdWFs bHkgdGhhdCB3b3JrcyBvdXQgb2sgc2luY2UgdGhlCi0JICogcmVsb2NhdGUgYWRkcmVzcyBpcyBz dGlsbCBwb3NpdGl2ZSwgZXhjZXB0IHdoZW4gdGhlIGJhdGNoIGlzIHBsYWNlZAotCSAqIHZlcnkg bG93IGluIHRoZSBHVFQuIEVuc3VyZSB0aGlzIGRvZXNuJ3QgaGFwcGVuLgotCSAqCi0JICogTm90 ZSB0aGF0IGFjdHVhbCBoYW5ncyBoYXZlIG9ubHkgYmVlbiBvYnNlcnZlZCBvbiBnZW43LCBidXQg Zm9yCi0JICogcGFyYW5vaWEgZG8gaXQgZXZlcnl3aGVyZS4KLQkgKi8KLQlpZiAoKHZtYS0+ZXhl Y19lbnRyeS0+ZmxhZ3MgJiBFWEVDX09CSkVDVF9QSU5ORUQpID09IDApCi0JCXZtYS0+ZXhlY19l bnRyeS0+ZmxhZ3MgfD0gX19FWEVDX09CSkVDVF9ORUVEU19CSUFTOwotCi0JcmV0dXJuIHZtYS0+ b2JqOwotfQotCiAjZGVmaW5lIEk5MTVfVVNFUl9SSU5HUyAoNCkKIAogc3RhdGljIGNvbnN0IGVu dW0gaW50ZWxfZW5naW5lX2lkIHVzZXJfcmluZ19tYXBbSTkxNV9VU0VSX1JJTkdTICsgMV0gPSB7 Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 Cg==