From: John.C.Harrison@Intel.com Subject: [PATCH 08/10] drm/i915: Prelude to splitting i915_gem_do_execbuffer in two Date: Tue, 9 Dec 2014 12:59:11 +0000 Message-ID: <1418129953-1505-9-git-send-email-John.C.Harrison@Intel.com> References: <1418129953-1505-1-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 1674172752 for ; Tue, 9 Dec 2014 04:59:23 -0800 (PST) In-Reply-To: <1418129953-1505-1-git-send-email-John.C.Harrison@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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBzY2hl ZHVsZXIgZGVjb3VwbGVzIHRoZSBzdWJtaXNzaW9uIG9mIGJhdGNoIGJ1ZmZlcnMgdG8gdGhlIGRy aXZlciB3aXRoIHRoZWlyCnN1Ym1pc3Npb24gdG8gdGhlIGhhcmR3YXJlLiBUaGlzIGJhc2ljYWxs eSBtZWFucyBzcGxpdHRpbmcgdGhlIGV4ZWNidWZmZXIoKQpmdW5jdGlvbiBpbiBoYWxmLiBUaGlz IGNoYW5nZSByZWFycmFuZ2VzIHNvbWUgY29kZSByZWFkeSBmb3IgdGhlIHNwbGl0IHRvIG9jY3Vy LgoKQ2hhbmdlLUlkOiBJY2M5YzhhZmFhYzE4ODIxZjNlYjhhMTUxYTQ5ZjkxOGY5MGMwNjhhMwpG b3I6IFZJWi0xNTg3ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNv bkBJbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZl ci5jIHwgICA0NyArKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgfCAgIDE3ICsrKysrKystLS0KIDIgZmlsZXMgY2hh bmdlZCwgNDAgaW5zZXJ0aW9ucygrKSwgMjQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCmluZGV4IGYwOTUwMWMuLmEzMzk1NTYgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKQEAgLTg0OCwxMCArODQ4 LDcgQEAgaTkxNV9nZW1fZXhlY2J1ZmZlcl9tb3ZlX3RvX2dwdShzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpyaW5nLAogCWlmIChmbHVzaF9kb21haW5zICYgSTkxNV9HRU1fRE9NQUlOX0dUVCkKIAkJ d21iKCk7CiAKLQkvKiBVbmNvbmRpdGlvbmFsbHkgaW52YWxpZGF0ZSBncHUgY2FjaGVzIGFuZCBl bnN1cmUgdGhhdCB3ZSBkbyBmbHVzaAotCSAqIGFueSByZXNpZHVhbCB3cml0ZXMgZnJvbSB0aGUg cHJldmlvdXMgYmF0Y2guCi0JICovCi0JcmV0dXJuIGludGVsX3JpbmdfaW52YWxpZGF0ZV9hbGxf Y2FjaGVzKHJpbmcpOworCXJldHVybiAwOwogfQogCiBzdGF0aWMgYm9vbApAQCAtMTEyMywxNCAr MTEyMCw2IEBAIGk5MTVfZ2VtX3JpbmdidWZmZXJfc3VibWlzc2lvbihzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCiAJCX0KIAl9CiAKLQlyZXQgPSBpOTE1X2dl bV9leGVjYnVmZmVyX21vdmVfdG9fZ3B1KHJpbmcsIHZtYXMpOwotCWlmIChyZXQpCi0JCWdvdG8g ZXJyb3I7Ci0KLQlyZXQgPSBpOTE1X3N3aXRjaF9jb250ZXh0KHJpbmcsIGN0eCk7Ci0JaWYgKHJl dCkKLQkJZ290byBlcnJvcjsKLQogCWluc3RwX21vZGUgPSBhcmdzLT5mbGFncyAmIEk5MTVfRVhF Q19DT05TVEFOVFNfTUFTSzsKIAlpbnN0cF9tYXNrID0gSTkxNV9FWEVDX0NPTlNUQU5UU19NQVNL OwogCXN3aXRjaCAoaW5zdHBfbW9kZSkgewpAQCAtMTE2OCw2ICsxMTU3LDI4IEBAIGk5MTVfZ2Vt X3JpbmdidWZmZXJfc3VibWlzc2lvbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJt X2ZpbGUgKmZpbGUsCiAJCWdvdG8gZXJyb3I7CiAJfQogCisJcmV0ID0gaTkxNV9nZW1fZXhlY2J1 ZmZlcl9tb3ZlX3RvX2dwdShyaW5nLCB2bWFzKTsKKwlpZiAocmV0KQorCQlnb3RvIGVycm9yOwor CisJaTkxNV9nZW1fZXhlY2J1ZmZlcl9tb3ZlX3RvX2FjdGl2ZSh2bWFzLCByaW5nKTsKKworCS8q IFRvIGJlIHNwbGl0IGludG8gdHdvIGZ1bmN0aW9ucyBoZXJlLi4uICovCisKKwlpbnRlbF9ydW50 aW1lX3BtX2dldChkZXZfcHJpdik7CisKKwkvKiBVbmNvbmRpdGlvbmFsbHkgaW52YWxpZGF0ZSBn cHUgY2FjaGVzIGFuZCBlbnN1cmUgdGhhdCB3ZSBkbyBmbHVzaAorCSAqIGFueSByZXNpZHVhbCB3 cml0ZXMgZnJvbSB0aGUgcHJldmlvdXMgYmF0Y2guCisJICovCisJcmV0ID0gaW50ZWxfcmluZ19p bnZhbGlkYXRlX2FsbF9jYWNoZXMocmluZyk7CisJaWYgKHJldCkKKwkJZ290byBlcnJvcjsKKwor CS8qIFN3aXRjaCB0byB0aGUgY29ycmVjdCBjb250ZXh0IGZvciB0aGUgYmF0Y2ggKi8KKwlyZXQg PSBpOTE1X3N3aXRjaF9jb250ZXh0KHJpbmcsIGN0eCk7CisJaWYgKHJldCkKKwkJZ290byBlcnJv cjsKKwogCWlmIChyaW5nID09ICZkZXZfcHJpdi0+cmluZ1tSQ1NdICYmCiAJCQlpbnN0cF9tb2Rl ICE9IGRldl9wcml2LT5yZWxhdGl2ZV9jb25zdGFudHNfbW9kZSkgewogCQlyZXQgPSBpbnRlbF9y aW5nX2JlZ2luKHJpbmcsIDQpOwpAQCAtMTIwOCwxNSArMTIxOSwxOCBAQCBpOTE1X2dlbV9yaW5n YnVmZmVyX3N1Ym1pc3Npb24oc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxl ICpmaWxlLAogCQkJCQkJZXhlY19zdGFydCwgZXhlY19sZW4sCiAJCQkJCQlkaXNwYXRjaF9mbGFn cyk7CiAJCWlmIChyZXQpCi0JCQlyZXR1cm4gcmV0OworCQkJZ290byBlcnJvcjsKIAl9CiAKIAl0 cmFjZV9pOTE1X2dlbV9yaW5nX2Rpc3BhdGNoKGludGVsX3JpbmdfZ2V0X3JlcXVlc3QocmluZyks IGRpc3BhdGNoX2ZsYWdzKTsKIAotCWk5MTVfZ2VtX2V4ZWNidWZmZXJfbW92ZV90b19hY3RpdmUo dm1hcywgcmluZyk7CiAJaTkxNV9nZW1fZXhlY2J1ZmZlcl9yZXRpcmVfY29tbWFuZHMoZGV2LCBm aWxlLCByaW5nLCBiYXRjaF9vYmopOwogCiBlcnJvcjoKKwkvKiBpbnRlbF9ncHVfYnVzeSBzaG91 bGQgYWxzbyBnZXQgYSByZWYsIHNvIGl0IHdpbGwgZnJlZSB3aGVuIHRoZSBkZXZpY2UKKwkgKiBp cyByZWFsbHkgaWRsZS4gKi8KKwlpbnRlbF9ydW50aW1lX3BtX3B1dChkZXZfcHJpdik7CisKIAlr ZnJlZShjbGlwcmVjdHMpOwogCXJldHVybiByZXQ7CiB9CkBAIC0xMzM1LDggKzEzNDksNiBAQCBp OTE1X2dlbV9kb19leGVjYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEs CiAJCXJldHVybiAtRUlOVkFMOwogCX0KIAotCWludGVsX3J1bnRpbWVfcG1fZ2V0KGRldl9wcml2 KTsKLQogCXJldCA9IGk5MTVfbXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKGRldik7CiAJaWYgKHJl dCkKIAkJZ290byBwcmVfbXV0ZXhfZXJyOwpAQCAtMTQ2Nyw5ICsxNDc5LDYgQEAgZXJyOgogCW11 dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCiBwcmVfbXV0ZXhfZXJyOgotCS8qIGlu dGVsX2dwdV9idXN5IHNob3VsZCBhbHNvIGdldCBhIHJlZiwgc28gaXQgd2lsbCBmcmVlIHdoZW4g dGhlIGRldmljZQotCSAqIGlzIHJlYWxseSBpZGxlLiAqLwotCWludGVsX3J1bnRpbWVfcG1fcHV0 KGRldl9wcml2KTsKIAlyZXR1cm4gcmV0OwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmlu ZGV4IDAzN2NiZDUuLmYxNmIxNWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC02MzAs MTAgKzYzMCw3IEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX21vdmVfdG9fZ3B1KHN0cnVjdCBpbnRl bF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCWlmIChmbHVzaF9kb21haW5zICYgSTkxNV9HRU1fRE9N QUlOX0dUVCkKIAkJd21iKCk7CiAKLQkvKiBVbmNvbmRpdGlvbmFsbHkgaW52YWxpZGF0ZSBncHUg Y2FjaGVzIGFuZCBlbnN1cmUgdGhhdCB3ZSBkbyBmbHVzaAotCSAqIGFueSByZXNpZHVhbCB3cml0 ZXMgZnJvbSB0aGUgcHJldmlvdXMgYmF0Y2guCi0JICovCi0JcmV0dXJuIGxvZ2ljYWxfcmluZ19p bnZhbGlkYXRlX2FsbF9jYWNoZXMocmluZ2J1Zik7CisJcmV0dXJuIDA7CiB9CiAKIC8qKgpAQCAt NzE3LDYgKzcxNCwxNyBAQCBpbnQgaW50ZWxfZXhlY2xpc3RzX3N1Ym1pc3Npb24oc3RydWN0IGRy bV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlLAogCWlmIChyZXQpCiAJCXJldHVy biByZXQ7CiAKKwlpOTE1X2dlbV9leGVjYnVmZmVyX21vdmVfdG9fYWN0aXZlKHZtYXMsIHJpbmcp OworCisJLyogVG8gYmUgc3BsaXQgaW50byB0d28gZnVuY3Rpb25zIGhlcmUuLi4gKi8KKworCS8q IFVuY29uZGl0aW9uYWxseSBpbnZhbGlkYXRlIGdwdSBjYWNoZXMgYW5kIGVuc3VyZSB0aGF0IHdl IGRvIGZsdXNoCisJICogYW55IHJlc2lkdWFsIHdyaXRlcyBmcm9tIHRoZSBwcmV2aW91cyBiYXRj aC4KKwkgKi8KKwlyZXQgPSBsb2dpY2FsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVzKHJpbmdi dWYpOworCWlmIChyZXQpCisJCXJldHVybiByZXQ7CisKIAlpZiAocmluZyA9PSAmZGV2X3ByaXYt PnJpbmdbUkNTXSAmJgogCSAgICBpbnN0cF9tb2RlICE9IGRldl9wcml2LT5yZWxhdGl2ZV9jb25z dGFudHNfbW9kZSkgewogCQlyZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4ocmluZ2J1Ziwg NCk7CkBAIC03MzgsNyArNzQ2LDYgQEAgaW50IGludGVsX2V4ZWNsaXN0c19zdWJtaXNzaW9uKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwKIAogCXRyYWNlX2k5 MTVfZ2VtX3JpbmdfZGlzcGF0Y2goaW50ZWxfcmluZ19nZXRfcmVxdWVzdChyaW5nKSwgZGlzcGF0 Y2hfZmxhZ3MpOwogCi0JaTkxNV9nZW1fZXhlY2J1ZmZlcl9tb3ZlX3RvX2FjdGl2ZSh2bWFzLCBy aW5nKTsKIAlpOTE1X2dlbV9leGVjYnVmZmVyX3JldGlyZV9jb21tYW5kcyhkZXYsIGZpbGUsIHJp bmcsIGJhdGNoX29iaik7CiAKIAlyZXR1cm4gMDsKLS0gCjEuNy45LjUKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==