From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tursulin@ursulin.net>
Subject: [PATCH 03/10] drm/i915: Tidy execbuf_submit
Date: Tue, 31 Jan 2017 13:15:39 +0000
Message-ID: <1485868546-4927-4-git-send-email-tvrtko.ursulin@linux.intel.com>
References: <1485868546-4927-1-git-send-email-tvrtko.ursulin@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mail-wj0-x244.google.com (mail-wj0-x244.google.com
 [IPv6:2a00:1450:400c:c01::244])
 by gabe.freedesktop.org (Postfix) with ESMTPS id F3F236E65D
 for <Intel-gfx@lists.freedesktop.org>; Tue, 31 Jan 2017 13:15:58 +0000 (UTC)
Received: by mail-wj0-x244.google.com with SMTP id i7so10678131wjf.2
 for <Intel-gfx@lists.freedesktop.org>; Tue, 31 Jan 2017 05:15:58 -0800 (PST)
In-Reply-To: <1485868546-4927-1-git-send-email-tvrtko.ursulin@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClVzZSBhIGxv
Y2FsIHZhcmlhYmxlIGZvciBzdG9yaW5nIHRoZSByZXF1ZXN0IGFuZCBlbmdpbmUKYW5kIGF0IHRo
ZSBzYW1lIHRpbWUgZHJvcCB0aGUgZW5naW5lIGZpZWxkIGZyb20KaTkxNV9leGVjYnVmZmVyX3Bh
cmFtcyBzaW5jZSBpdCBpcyBhdmFpbGFibGUgZnJvbSB0aGUKcmVxdWVzdC4KCiAgICAgdGV4dCAg
ICBkYXRhICAgICBic3MgICAgIGRlYyAgICAgaGV4IGZpbGVuYW1lCiAgMTA4NTQwMiAgIDI2Mzk4
ICAgIDI2MjggMTExNDQyOCAgMTEwMTNjIGk5MTUua28uMAogIDEwODUzNTQgICAyNjM5OCAgICAy
NjI4IDExMTQzODAgIDExMDEwYyBpOTE1LmtvLjEKClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1
bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV9nZW1fZXhlY2J1ZmZlci5jIHwgMzUgKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0t
CiAxIGZpbGUgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgMTggZGVsZXRpb25zKC0pCgpkaWZm
IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIGIvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jCmluZGV4IDI5OTE3NTE1MTZm
OC4uMTE5MzIyZWI5ODk3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl
bV9leGVjYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1
ZmZlci5jCkBAIC01Myw3ICs1Myw2IEBAIHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zIHsK
IAlzdHJ1Y3QgaTkxNV92bWEJCSAgICAqYmF0Y2g7CiAJdTMyCQkJICAgIGRpc3BhdGNoX2ZsYWdz
OwogCXUzMgkJICAgIAkgICAgYmF0Y2hfc3RhcnQ7Ci0Jc3RydWN0IGludGVsX2VuZ2luZV9jcwkg
ICAgKmVuZ2luZTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3Q7CiB9Owog
CkBAIC0xNDEwLDE3ICsxNDA5LDE5IEBAIGV4ZWNidWZfc3VibWl0KHN0cnVjdCBpOTE1X2V4ZWNi
dWZmZXJfcGFyYW1zICpwYXJhbXMsCiAJICAgICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY2J1
ZmZlcjIgKmFyZ3MsCiAJICAgICAgIHN0cnVjdCBsaXN0X2hlYWQgKnZtYXMpCiB7Ci0Jc3RydWN0
IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gcGFyYW1zLT5yZXF1ZXN0LT5pOTE1OworCXN0
cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxID0gcGFyYW1zLT5yZXF1ZXN0OworCXN0cnVj
dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHJlcS0+aTkxNTsKKwlzdHJ1Y3QgaW50ZWxf
ZW5naW5lX2NzICplbmdpbmUgPSByZXEtPmVuZ2luZTsKIAl1NjQgZXhlY19zdGFydCwgZXhlY19s
ZW47CiAJaW50IGluc3RwX21vZGU7CiAJdTMyIGluc3RwX21hc2s7CiAJaW50IHJldDsKIAotCXJl
dCA9IGk5MTVfZ2VtX2V4ZWNidWZmZXJfbW92ZV90b19ncHUocGFyYW1zLT5yZXF1ZXN0LCB2bWFz
KTsKKwlyZXQgPSBpOTE1X2dlbV9leGVjYnVmZmVyX21vdmVfdG9fZ3B1KHJlcSwgdm1hcyk7CiAJ
aWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAotCXJldCA9IGk5MTVfc3dpdGNoX2NvbnRleHQocGFy
YW1zLT5yZXF1ZXN0KTsKKwlyZXQgPSBpOTE1X3N3aXRjaF9jb250ZXh0KHJlcSk7CiAJaWYgKHJl
dCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMTQzMCwyNSArMTQzMSwyNSBAQCBleGVjYnVmX3N1Ym1p
dChzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAogCWNhc2UgSTkxNV9FWEVD
X0NPTlNUQU5UU19SRUxfR0VORVJBTDoKIAljYXNlIEk5MTVfRVhFQ19DT05TVEFOVFNfQUJTT0xV
VEU6CiAJY2FzZSBJOTE1X0VYRUNfQ09OU1RBTlRTX1JFTF9TVVJGQUNFOgotCQlpZiAoaW5zdHBf
bW9kZSAhPSAwICYmIHBhcmFtcy0+ZW5naW5lLT5pZCAhPSBSQ1MpIHsKKwkJaWYgKGluc3RwX21v
ZGUgIT0gMCAmJiBlbmdpbmUtPmlkICE9IFJDUykgewogCQkJRFJNX0RFQlVHKCJub24tMCByZWwg
Y29uc3RhbnRzIG1vZGUgb24gbm9uLVJDU1xuIik7CiAJCQlyZXR1cm4gLUVJTlZBTDsKIAkJfQog
CiAJCWlmIChpbnN0cF9tb2RlICE9IGRldl9wcml2LT5yZWxhdGl2ZV9jb25zdGFudHNfbW9kZSkg
ewotCQkJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPCA0KSB7CisJCQlpZiAoSU5URUxf
R0VOKGRldl9wcml2KSA8IDQpIHsKIAkJCQlEUk1fREVCVUcoIm5vIHJlbCBjb25zdGFudHMgb24g
cHJlLWdlbjRcbiIpOwogCQkJCXJldHVybiAtRUlOVkFMOwogCQkJfQogCi0JCQlpZiAoSU5URUxf
SU5GTyhkZXZfcHJpdiktPmdlbiA+IDUgJiYKKwkJCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID4g
NSAmJgogCQkJICAgIGluc3RwX21vZGUgPT0gSTkxNV9FWEVDX0NPTlNUQU5UU19SRUxfU1VSRkFD
RSkgewogCQkJCURSTV9ERUJVRygicmVsIHN1cmZhY2UgY29uc3RhbnRzIG1vZGUgaW52YWxpZCBv
biBnZW41K1xuIik7CiAJCQkJcmV0dXJuIC1FSU5WQUw7CiAJCQl9CiAKIAkJCS8qIFRoZSBIVyBj
aGFuZ2VkIHRoZSBtZWFuaW5nIG9uIHRoaXMgYml0IG9uIGdlbjYgKi8KLQkJCWlmIChJTlRFTF9J
TkZPKGRldl9wcml2KS0+Z2VuID49IDYpCisJCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA2
KQogCQkJCWluc3RwX21hc2sgJj0gfkk5MTVfRVhFQ19DT05TVEFOVFNfUkVMX1NVUkZBQ0U7CiAJ
CX0KIAkJYnJlYWs7CkBAIC0xNDU3LDExICsxNDU4LDExIEBAIGV4ZWNidWZfc3VibWl0KHN0cnVj
dCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJhbXMsCiAJCXJldHVybiAtRUlOVkFMOwogCX0K
IAotCWlmIChwYXJhbXMtPmVuZ2luZS0+aWQgPT0gUkNTICYmCisJaWYgKGVuZ2luZS0+aWQgPT0g
UkNTICYmCiAJICAgIGluc3RwX21vZGUgIT0gZGV2X3ByaXYtPnJlbGF0aXZlX2NvbnN0YW50c19t
b2RlKSB7Ci0JCXN0cnVjdCBpbnRlbF9yaW5nICpyaW5nID0gcGFyYW1zLT5yZXF1ZXN0LT5yaW5n
OworCQlzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZyA9IHJlcS0+cmluZzsKIAotCQlyZXQgPSBpbnRl
bF9yaW5nX2JlZ2luKHBhcmFtcy0+cmVxdWVzdCwgNCk7CisJCXJldCA9IGludGVsX3JpbmdfYmVn
aW4ocmVxLCA0KTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CiAKQEAgLTE0NzUsNyArMTQ3
Niw3IEBAIGV4ZWNidWZfc3VibWl0KHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJfcGFyYW1zICpwYXJh
bXMsCiAJfQogCiAJaWYgKGFyZ3MtPmZsYWdzICYgSTkxNV9FWEVDX0dFTjdfU09MX1JFU0VUKSB7
Ci0JCXJldCA9IGk5MTVfcmVzZXRfZ2VuN19zb2xfb2Zmc2V0cyhwYXJhbXMtPnJlcXVlc3QpOwor
CQlyZXQgPSBpOTE1X3Jlc2V0X2dlbjdfc29sX29mZnNldHMocmVxKTsKIAkJaWYgKHJldCkKIAkJ
CXJldHVybiByZXQ7CiAJfQpAQCAtMTQ4NiwxNSArMTQ4NywxNCBAQCBleGVjYnVmX3N1Ym1pdChz
dHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAogCWlmIChleGVjX2xlbiA9PSAw
KQogCQlleGVjX2xlbiA9IHBhcmFtcy0+YmF0Y2gtPnNpemUgLSBwYXJhbXMtPmJhdGNoX3N0YXJ0
OwogCi0JcmV0ID0gcGFyYW1zLT5lbmdpbmUtPmVtaXRfYmJfc3RhcnQocGFyYW1zLT5yZXF1ZXN0
LAotCQkJCQkgICAgZXhlY19zdGFydCwgZXhlY19sZW4sCi0JCQkJCSAgICBwYXJhbXMtPmRpc3Bh
dGNoX2ZsYWdzKTsKKwlyZXQgPSBlbmdpbmUtPmVtaXRfYmJfc3RhcnQocmVxLCBleGVjX3N0YXJ0
LCBleGVjX2xlbiwKKwkJCQkgICAgcGFyYW1zLT5kaXNwYXRjaF9mbGFncyk7CiAJaWYgKHJldCkK
IAkJcmV0dXJuIHJldDsKIAotCXRyYWNlX2k5MTVfZ2VtX3JpbmdfZGlzcGF0Y2gocGFyYW1zLT5y
ZXF1ZXN0LCBwYXJhbXMtPmRpc3BhdGNoX2ZsYWdzKTsKKwl0cmFjZV9pOTE1X2dlbV9yaW5nX2Rp
c3BhdGNoKHJlcSwgcGFyYW1zLT5kaXNwYXRjaF9mbGFncyk7CiAKLQlpOTE1X2dlbV9leGVjYnVm
ZmVyX21vdmVfdG9fYWN0aXZlKHZtYXMsIHBhcmFtcy0+cmVxdWVzdCk7CisJaTkxNV9nZW1fZXhl
Y2J1ZmZlcl9tb3ZlX3RvX2FjdGl2ZSh2bWFzLCByZXEpOwogCiAJcmV0dXJuIDA7CiB9CkBAIC0x
ODMxLDcgKzE4MzEsNiBAQCBpOTE1X2dlbV9kb19leGVjYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNl
ICpkZXYsIHZvaWQgKmRhdGEsCiAJICoga2VwdCBhcm91bmQgYmV5b25kIHRoZSBkdXJhdGlvbiBv
ZiB0aGUgSU9DVEwgb25jZSB0aGUgR1BVCiAJICogc2NoZWR1bGVyIGFycml2ZXMuCiAJICovCi0J
cGFyYW1zLmVuZ2luZQkgICAgICA9IGVuZ2luZTsKIAlwYXJhbXMuZGlzcGF0Y2hfZmxhZ3MgPSBk
aXNwYXRjaF9mbGFnczsKIAlwYXJhbXMuYmF0Y2gJICAgICAgPSBiYXRjaDsKIAlwYXJhbXMuYmF0
Y2hfc3RhcnQgICAgPSBiYXRjaF9zdGFydF9vZmZzZXQ7Ci0tIAoyLjcuNAoKX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz
dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0
b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==