From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Subject: [PATCH 07/13] drm/i915: Consolidate dispatch_execbuffer
	vfunc
Date: Mon, 27 Jun 2016 15:04:14 +0100
Message-ID: <1467036260-9252-8-git-send-email-tvrtko.ursulin@linux.intel.com>
References: <1467036260-9252-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 mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id A0F596E2D3
 for <Intel-gfx@lists.freedesktop.org>; Mon, 27 Jun 2016 14:04:58 +0000 (UTC)
In-Reply-To: <1467036260-9252-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

RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNpZ25lZC1v
ZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgMjUgKysrKysrLS0tLS0tLS0t
LS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgMTkgZGVsZXRpb25z
KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5j
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IDQwYTk3OWYx
ZjU1Ni4uNTQ1MzZmNTVlOTBkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl
ci5jCkBAIC0yODgxLDExICsyODgxLDE1IEBAIHN0YXRpYyB2b2lkIGludGVsX3JpbmdfZGVmYXVs
dF92ZnVuY3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCWVuZ2luZS0+Z2V0
X3NlcW5vID0gcmluZ19nZXRfc2Vxbm87CiAJZW5naW5lLT5zZXRfc2Vxbm8gPSByaW5nX3NldF9z
ZXFubzsKIAotCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDYpIHsKKwlpZiAoSU5URUxfR0VO
KGRldl9wcml2KSA+PSA4KSB7CisJCWVuZ2luZS0+ZGlzcGF0Y2hfZXhlY2J1ZmZlciA9IGdlbjhf
cmluZ19kaXNwYXRjaF9leGVjYnVmZmVyOworCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2
KSA+PSA2KSB7CiAJCWVuZ2luZS0+YWRkX3JlcXVlc3QgPSBnZW42X2FkZF9yZXF1ZXN0OwogCQll
bmdpbmUtPmlycV9zZXFub19iYXJyaWVyID0gZ2VuNl9zZXFub19iYXJyaWVyOworCQllbmdpbmUt
PmRpc3BhdGNoX2V4ZWNidWZmZXIgPSBnZW42X3JpbmdfZGlzcGF0Y2hfZXhlY2J1ZmZlcjsKIAl9
IGVsc2UgewogCQllbmdpbmUtPmFkZF9yZXF1ZXN0ID0gaTl4eF9hZGRfcmVxdWVzdDsKKwkJZW5n
aW5lLT5kaXNwYXRjaF9leGVjYnVmZmVyID0gaTk2NV9kaXNwYXRjaF9leGVjYnVmZmVyOwogCX0K
IAogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDgpIHsKQEAgLTI5OTMsMTUgKzI5OTcsOSBA
QCBpbnQgaW50ZWxfaW5pdF9yZW5kZXJfcmluZ19idWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRl
dikKIAogCWlmIChJU19IQVNXRUxMKGRldl9wcml2KSkKIAkJZW5naW5lLT5kaXNwYXRjaF9leGVj
YnVmZmVyID0gaHN3X3JpbmdfZGlzcGF0Y2hfZXhlY2J1ZmZlcjsKLQllbHNlIGlmIChJU19HRU44
KGRldl9wcml2KSkKLQkJZW5naW5lLT5kaXNwYXRjaF9leGVjYnVmZmVyID0gZ2VuOF9yaW5nX2Rp
c3BhdGNoX2V4ZWNidWZmZXI7Ci0JZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA2KQot
CQllbmdpbmUtPmRpc3BhdGNoX2V4ZWNidWZmZXIgPSBnZW42X3JpbmdfZGlzcGF0Y2hfZXhlY2J1
ZmZlcjsKLQllbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDQpCi0JCWVuZ2luZS0+ZGlz
cGF0Y2hfZXhlY2J1ZmZlciA9IGk5NjVfZGlzcGF0Y2hfZXhlY2J1ZmZlcjsKIAllbHNlIGlmIChJ
U19JODMwKGRldl9wcml2KSB8fCBJU184NDVHKGRldl9wcml2KSkKIAkJZW5naW5lLT5kaXNwYXRj
aF9leGVjYnVmZmVyID0gaTgzMF9kaXNwYXRjaF9leGVjYnVmZmVyOwotCWVsc2UKKwllbHNlIGlm
IChJTlRFTF9HRU4oZGV2X3ByaXYpIDw9IDMpCiAJCWVuZ2luZS0+ZGlzcGF0Y2hfZXhlY2J1ZmZl
ciA9IGk5MTVfZGlzcGF0Y2hfZXhlY2J1ZmZlcjsKIAllbmdpbmUtPmluaXRfaHcgPSBpbml0X3Jl
bmRlcl9yaW5nOwogCWVuZ2luZS0+Y2xlYW51cCA9IHJlbmRlcl9yaW5nX2NsZWFudXA7CkBAIC0z
MDU5LDggKzMwNTcsNiBAQCBpbnQgaW50ZWxfaW5pdF9ic2RfcmluZ19idWZmZXIoc3RydWN0IGRy
bV9kZXZpY2UgKmRldikKIAkJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCkgewogCQkJZW5n
aW5lLT5pcnFfZW5hYmxlX21hc2sgPQogCQkJCUdUX1JFTkRFUl9VU0VSX0lOVEVSUlVQVCA8PCBH
RU44X1ZDUzFfSVJRX1NISUZUOwotCQkJZW5naW5lLT5kaXNwYXRjaF9leGVjYnVmZmVyID0KLQkJ
CQlnZW44X3JpbmdfZGlzcGF0Y2hfZXhlY2J1ZmZlcjsKIAkJCWlmIChpOTE1X3NlbWFwaG9yZV9p
c19lbmFibGVkKGRldl9wcml2KSkgewogCQkJCWVuZ2luZS0+c2VtYXBob3JlLnN5bmNfdG8gPSBn
ZW44X3Jpbmdfc3luYzsKIAkJCQllbmdpbmUtPnNlbWFwaG9yZS5zaWduYWwgPSBnZW44X3hjc19z
aWduYWw7CkBAIC0zMDY4LDggKzMwNjQsNiBAQCBpbnQgaW50ZWxfaW5pdF9ic2RfcmluZ19idWZm
ZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCX0KIAkJfSBlbHNlIHsKIAkJCWVuZ2luZS0+
aXJxX2VuYWJsZV9tYXNrID0gR1RfQlNEX1VTRVJfSU5URVJSVVBUOwotCQkJZW5naW5lLT5kaXNw
YXRjaF9leGVjYnVmZmVyID0KLQkJCQlnZW42X3JpbmdfZGlzcGF0Y2hfZXhlY2J1ZmZlcjsKIAkJ
CWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRldl9wcml2KSkgewogCQkJCWVuZ2luZS0+
c2VtYXBob3JlLnN5bmNfdG8gPSBnZW42X3Jpbmdfc3luYzsKIAkJCQllbmdpbmUtPnNlbWFwaG9y
ZS5zaWduYWwgPSBnZW42X3NpZ25hbDsKQEAgLTMwOTMsNyArMzA4Nyw2IEBAIGludCBpbnRlbF9p
bml0X2JzZF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQl9IGVsc2Ugewog
CQkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPSBJOTE1X0JTRF9VU0VSX0lOVEVSUlVQVDsKIAkJ
fQotCQllbmdpbmUtPmRpc3BhdGNoX2V4ZWNidWZmZXIgPSBpOTY1X2Rpc3BhdGNoX2V4ZWNidWZm
ZXI7CiAJfQogCiAJcmV0dXJuIGludGVsX2luaXRfcmluZ19idWZmZXIoZGV2LCBlbmdpbmUpOwpA
QCAtMzExOCw4ICszMTExLDYgQEAgaW50IGludGVsX2luaXRfYnNkMl9yaW5nX2J1ZmZlcihzdHJ1
Y3QgZHJtX2RldmljZSAqZGV2KQogCWVuZ2luZS0+Zmx1c2ggPSBnZW42X2JzZF9yaW5nX2ZsdXNo
OwogCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0KIAkJCUdUX1JFTkRFUl9VU0VSX0lOVEVSUlVQ
VCA8PCBHRU44X1ZDUzJfSVJRX1NISUZUOwotCWVuZ2luZS0+ZGlzcGF0Y2hfZXhlY2J1ZmZlciA9
Ci0JCQlnZW44X3JpbmdfZGlzcGF0Y2hfZXhlY2J1ZmZlcjsKIAlpZiAoaTkxNV9zZW1hcGhvcmVf
aXNfZW5hYmxlZChkZXZfcHJpdikpIHsKIAkJZW5naW5lLT5zZW1hcGhvcmUuc3luY190byA9IGdl
bjhfcmluZ19zeW5jOwogCQllbmdpbmUtPnNlbWFwaG9yZS5zaWduYWwgPSBnZW44X3hjc19zaWdu
YWw7CkBAIC0zMTQ2LDcgKzMxMzcsNiBAQCBpbnQgaW50ZWxfaW5pdF9ibHRfcmluZ19idWZmZXIo
c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4KSB7
CiAJCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0KIAkJCUdUX1JFTkRFUl9VU0VSX0lOVEVSUlVQ
VCA8PCBHRU44X0JDU19JUlFfU0hJRlQ7Ci0JCWVuZ2luZS0+ZGlzcGF0Y2hfZXhlY2J1ZmZlciA9
IGdlbjhfcmluZ19kaXNwYXRjaF9leGVjYnVmZmVyOwogCQlpZiAoaTkxNV9zZW1hcGhvcmVfaXNf
ZW5hYmxlZChkZXZfcHJpdikpIHsKIAkJCWVuZ2luZS0+c2VtYXBob3JlLnN5bmNfdG8gPSBnZW44
X3Jpbmdfc3luYzsKIAkJCWVuZ2luZS0+c2VtYXBob3JlLnNpZ25hbCA9IGdlbjhfeGNzX3NpZ25h
bDsKQEAgLTMxNTQsNyArMzE0NCw2IEBAIGludCBpbnRlbF9pbml0X2JsdF9yaW5nX2J1ZmZlcihz
dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQl9CiAJfSBlbHNlIHsKIAkJZW5naW5lLT5pcnFfZW5h
YmxlX21hc2sgPSBHVF9CTFRfVVNFUl9JTlRFUlJVUFQ7Ci0JCWVuZ2luZS0+ZGlzcGF0Y2hfZXhl
Y2J1ZmZlciA9IGdlbjZfcmluZ19kaXNwYXRjaF9leGVjYnVmZmVyOwogCQlpZiAoaTkxNV9zZW1h
cGhvcmVfaXNfZW5hYmxlZChkZXZfcHJpdikpIHsKIAkJCWVuZ2luZS0+c2VtYXBob3JlLnNpZ25h
bCA9IGdlbjZfc2lnbmFsOwogCQkJZW5naW5lLT5zZW1hcGhvcmUuc3luY190byA9IGdlbjZfcmlu
Z19zeW5jOwpAQCAtMzE5OSw3ICszMTg4LDYgQEAgaW50IGludGVsX2luaXRfdmVib3hfcmluZ19i
dWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+
PSA4KSB7CiAJCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0KIAkJCUdUX1JFTkRFUl9VU0VSX0lO
VEVSUlVQVCA8PCBHRU44X1ZFQ1NfSVJRX1NISUZUOwotCQllbmdpbmUtPmRpc3BhdGNoX2V4ZWNi
dWZmZXIgPSBnZW44X3JpbmdfZGlzcGF0Y2hfZXhlY2J1ZmZlcjsKIAkJaWYgKGk5MTVfc2VtYXBo
b3JlX2lzX2VuYWJsZWQoZGV2X3ByaXYpKSB7CiAJCQllbmdpbmUtPnNlbWFwaG9yZS5zeW5jX3Rv
ID0gZ2VuOF9yaW5nX3N5bmM7CiAJCQllbmdpbmUtPnNlbWFwaG9yZS5zaWduYWwgPSBnZW44X3hj
c19zaWduYWw7CkBAIC0zMjA5LDcgKzMxOTcsNiBAQCBpbnQgaW50ZWxfaW5pdF92ZWJveF9yaW5n
X2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQllbmdpbmUtPmlycV9lbmFibGVfbWFz
ayA9IFBNX1ZFQk9YX1VTRVJfSU5URVJSVVBUOwogCQllbmdpbmUtPmlycV9nZXQgPSBoc3dfdmVi
b3hfZ2V0X2lycTsKIAkJZW5naW5lLT5pcnFfcHV0ID0gaHN3X3ZlYm94X3B1dF9pcnE7Ci0JCWVu
Z2luZS0+ZGlzcGF0Y2hfZXhlY2J1ZmZlciA9IGdlbjZfcmluZ19kaXNwYXRjaF9leGVjYnVmZmVy
OwogCQlpZiAoaTkxNV9zZW1hcGhvcmVfaXNfZW5hYmxlZChkZXZfcHJpdikpIHsKIAkJCWVuZ2lu
ZS0+c2VtYXBob3JlLnN5bmNfdG8gPSBnZW42X3Jpbmdfc3luYzsKIAkJCWVuZ2luZS0+c2VtYXBo
b3JlLnNpZ25hbCA9IGdlbjZfc2lnbmFsOwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt
Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t
YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=