From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 07/13] drm/i915: Consolidate dispatch_execbuffer vfunc Date: Wed, 29 Jun 2016 16:09:26 +0100 Message-ID: <1467212972-861-7-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1467212972-861-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: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 1425F6E720 for ; Wed, 29 Jun 2016 15:09:44 +0000 (UTC) In-Reply-To: <1467212972-861-1-git-send-email-tvrtko.ursulin@linux.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCnYyOiBQdXQg ZGlzcGF0Y2hfZXhlY2J1ZmZlciBiZWZvcmUgYWRkX3JlcXVlc3QuIChDaHJpcyBXaWxzb24pCgpT aWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpS ZXZpZXdlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgMjUgKysrKysrLS0tLS0t LS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgMTkgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IGRjYWNm MTdjNTI1Zi4uYTk2MWIwOTU2ODBiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5jCkBAIC0yODgxLDEwICsyODgxLDE0IEBAIHN0YXRpYyB2b2lkIGludGVsX3JpbmdfZGVm YXVsdF92ZnVuY3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCWVuZ2luZS0+ Z2V0X3NlcW5vID0gcmluZ19nZXRfc2Vxbm87CiAJZW5naW5lLT5zZXRfc2Vxbm8gPSByaW5nX3Nl dF9zZXFubzsKIAotCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDYpIHsKKwlpZiAoSU5URUxf R0VOKGRldl9wcml2KSA+PSA4KSB7CisJCWVuZ2luZS0+ZGlzcGF0Y2hfZXhlY2J1ZmZlciA9IGdl bjhfcmluZ19kaXNwYXRjaF9leGVjYnVmZmVyOworCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9w cml2KSA+PSA2KSB7CisJCWVuZ2luZS0+ZGlzcGF0Y2hfZXhlY2J1ZmZlciA9IGdlbjZfcmluZ19k aXNwYXRjaF9leGVjYnVmZmVyOwogCQllbmdpbmUtPmFkZF9yZXF1ZXN0ID0gZ2VuNl9hZGRfcmVx dWVzdDsKIAkJZW5naW5lLT5pcnFfc2Vxbm9fYmFycmllciA9IGdlbjZfc2Vxbm9fYmFycmllcjsK IAl9IGVsc2UgeworCQllbmdpbmUtPmRpc3BhdGNoX2V4ZWNidWZmZXIgPSBpOTY1X2Rpc3BhdGNo X2V4ZWNidWZmZXI7CiAJCWVuZ2luZS0+YWRkX3JlcXVlc3QgPSBpOXh4X2FkZF9yZXF1ZXN0Owog CX0KIApAQCAtMjk5MywxNSArMjk5Nyw5IEBAIGludCBpbnRlbF9pbml0X3JlbmRlcl9yaW5nX2J1 ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYp KQogCQllbmdpbmUtPmRpc3BhdGNoX2V4ZWNidWZmZXIgPSBoc3dfcmluZ19kaXNwYXRjaF9leGVj YnVmZmVyOwotCWVsc2UgaWYgKElTX0dFTjgoZGV2X3ByaXYpKQotCQllbmdpbmUtPmRpc3BhdGNo X2V4ZWNidWZmZXIgPSBnZW44X3JpbmdfZGlzcGF0Y2hfZXhlY2J1ZmZlcjsKLQllbHNlIGlmIChJ TlRFTF9HRU4oZGV2X3ByaXYpID49IDYpCi0JCWVuZ2luZS0+ZGlzcGF0Y2hfZXhlY2J1ZmZlciA9 IGdlbjZfcmluZ19kaXNwYXRjaF9leGVjYnVmZmVyOwotCWVsc2UgaWYgKElOVEVMX0dFTihkZXZf cHJpdikgPj0gNCkKLQkJZW5naW5lLT5kaXNwYXRjaF9leGVjYnVmZmVyID0gaTk2NV9kaXNwYXRj aF9leGVjYnVmZmVyOwogCWVsc2UgaWYgKElTX0k4MzAoZGV2X3ByaXYpIHx8IElTXzg0NUcoZGV2 X3ByaXYpKQogCQllbmdpbmUtPmRpc3BhdGNoX2V4ZWNidWZmZXIgPSBpODMwX2Rpc3BhdGNoX2V4 ZWNidWZmZXI7Ci0JZWxzZQorCWVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPD0gMykKIAkJ ZW5naW5lLT5kaXNwYXRjaF9leGVjYnVmZmVyID0gaTkxNV9kaXNwYXRjaF9leGVjYnVmZmVyOwog CWVuZ2luZS0+aW5pdF9odyA9IGluaXRfcmVuZGVyX3Jpbmc7CiAJZW5naW5lLT5jbGVhbnVwID0g cmVuZGVyX3JpbmdfY2xlYW51cDsKQEAgLTMwNTksOCArMzA1Nyw2IEBAIGludCBpbnRlbF9pbml0 X2JzZF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlpZiAoSU5URUxfR0VO KGRldl9wcml2KSA+PSA4KSB7CiAJCQllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9CiAJCQkJR1Rf UkVOREVSX1VTRVJfSU5URVJSVVBUIDw8IEdFTjhfVkNTMV9JUlFfU0hJRlQ7Ci0JCQllbmdpbmUt PmRpc3BhdGNoX2V4ZWNidWZmZXIgPQotCQkJCWdlbjhfcmluZ19kaXNwYXRjaF9leGVjYnVmZmVy OwogCQkJaWYgKGk5MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQoZGV2X3ByaXYpKSB7CiAJCQkJZW5n aW5lLT5zZW1hcGhvcmUuc3luY190byA9IGdlbjhfcmluZ19zeW5jOwogCQkJCWVuZ2luZS0+c2Vt YXBob3JlLnNpZ25hbCA9IGdlbjhfeGNzX3NpZ25hbDsKQEAgLTMwNjgsOCArMzA2NCw2IEBAIGlu dCBpbnRlbF9pbml0X2JzZF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJ fQogCQl9IGVsc2UgewogCQkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPSBHVF9CU0RfVVNFUl9J TlRFUlJVUFQ7Ci0JCQllbmdpbmUtPmRpc3BhdGNoX2V4ZWNidWZmZXIgPQotCQkJCWdlbjZfcmlu Z19kaXNwYXRjaF9leGVjYnVmZmVyOwogCQkJaWYgKGk5MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQo ZGV2X3ByaXYpKSB7CiAJCQkJZW5naW5lLT5zZW1hcGhvcmUuc3luY190byA9IGdlbjZfcmluZ19z eW5jOwogCQkJCWVuZ2luZS0+c2VtYXBob3JlLnNpZ25hbCA9IGdlbjZfc2lnbmFsOwpAQCAtMzA5 Myw3ICszMDg3LDYgQEAgaW50IGludGVsX2luaXRfYnNkX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJCX0gZWxzZSB7CiAJCQllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9IEk5 MTVfQlNEX1VTRVJfSU5URVJSVVBUOwogCQl9Ci0JCWVuZ2luZS0+ZGlzcGF0Y2hfZXhlY2J1ZmZl ciA9IGk5NjVfZGlzcGF0Y2hfZXhlY2J1ZmZlcjsKIAl9CiAKIAlyZXR1cm4gaW50ZWxfaW5pdF9y aW5nX2J1ZmZlcihkZXYsIGVuZ2luZSk7CkBAIC0zMTE4LDggKzMxMTEsNiBAQCBpbnQgaW50ZWxf aW5pdF9ic2QyX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJZW5naW5lLT5m bHVzaCA9IGdlbjZfYnNkX3JpbmdfZmx1c2g7CiAJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPQog CQkJR1RfUkVOREVSX1VTRVJfSU5URVJSVVBUIDw8IEdFTjhfVkNTMl9JUlFfU0hJRlQ7Ci0JZW5n aW5lLT5kaXNwYXRjaF9leGVjYnVmZmVyID0KLQkJCWdlbjhfcmluZ19kaXNwYXRjaF9leGVjYnVm ZmVyOwogCWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRldl9wcml2KSkgewogCQllbmdp bmUtPnNlbWFwaG9yZS5zeW5jX3RvID0gZ2VuOF9yaW5nX3N5bmM7CiAJCWVuZ2luZS0+c2VtYXBo b3JlLnNpZ25hbCA9IGdlbjhfeGNzX3NpZ25hbDsKQEAgLTMxNDYsNyArMzEzNyw2IEBAIGludCBp bnRlbF9pbml0X2JsdF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChJ TlRFTF9HRU4oZGV2X3ByaXYpID49IDgpIHsKIAkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPQog CQkJR1RfUkVOREVSX1VTRVJfSU5URVJSVVBUIDw8IEdFTjhfQkNTX0lSUV9TSElGVDsKLQkJZW5n aW5lLT5kaXNwYXRjaF9leGVjYnVmZmVyID0gZ2VuOF9yaW5nX2Rpc3BhdGNoX2V4ZWNidWZmZXI7 CiAJCWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRldl9wcml2KSkgewogCQkJZW5naW5l LT5zZW1hcGhvcmUuc3luY190byA9IGdlbjhfcmluZ19zeW5jOwogCQkJZW5naW5lLT5zZW1hcGhv cmUuc2lnbmFsID0gZ2VuOF94Y3Nfc2lnbmFsOwpAQCAtMzE1NCw3ICszMTQ0LDYgQEAgaW50IGlu dGVsX2luaXRfYmx0X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCX0KIAl9 IGVsc2UgewogCQllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9IEdUX0JMVF9VU0VSX0lOVEVSUlVQ VDsKLQkJZW5naW5lLT5kaXNwYXRjaF9leGVjYnVmZmVyID0gZ2VuNl9yaW5nX2Rpc3BhdGNoX2V4 ZWNidWZmZXI7CiAJCWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRldl9wcml2KSkgewog CQkJZW5naW5lLT5zZW1hcGhvcmUuc2lnbmFsID0gZ2VuNl9zaWduYWw7CiAJCQllbmdpbmUtPnNl bWFwaG9yZS5zeW5jX3RvID0gZ2VuNl9yaW5nX3N5bmM7CkBAIC0zMTk5LDcgKzMxODgsNiBAQCBp bnQgaW50ZWxfaW5pdF92ZWJveF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDgpIHsKIAkJZW5naW5lLT5pcnFfZW5hYmxlX21h c2sgPQogCQkJR1RfUkVOREVSX1VTRVJfSU5URVJSVVBUIDw8IEdFTjhfVkVDU19JUlFfU0hJRlQ7 Ci0JCWVuZ2luZS0+ZGlzcGF0Y2hfZXhlY2J1ZmZlciA9IGdlbjhfcmluZ19kaXNwYXRjaF9leGVj YnVmZmVyOwogCQlpZiAoaTkxNV9zZW1hcGhvcmVfaXNfZW5hYmxlZChkZXZfcHJpdikpIHsKIAkJ CWVuZ2luZS0+c2VtYXBob3JlLnN5bmNfdG8gPSBnZW44X3Jpbmdfc3luYzsKIAkJCWVuZ2luZS0+ c2VtYXBob3JlLnNpZ25hbCA9IGdlbjhfeGNzX3NpZ25hbDsKQEAgLTMyMDksNyArMzE5Nyw2IEBA IGludCBpbnRlbF9pbml0X3ZlYm94X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAJCWVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrID0gUE1fVkVCT1hfVVNFUl9JTlRFUlJVUFQ7CiAJ CWVuZ2luZS0+aXJxX2dldCA9IGhzd192ZWJveF9nZXRfaXJxOwogCQllbmdpbmUtPmlycV9wdXQg PSBoc3dfdmVib3hfcHV0X2lycTsKLQkJZW5naW5lLT5kaXNwYXRjaF9leGVjYnVmZmVyID0gZ2Vu Nl9yaW5nX2Rpc3BhdGNoX2V4ZWNidWZmZXI7CiAJCWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFi bGVkKGRldl9wcml2KSkgewogCQkJZW5naW5lLT5zZW1hcGhvcmUuc3luY190byA9IGdlbjZfcmlu Z19zeW5jOwogCQkJZW5naW5lLT5zZW1hcGhvcmUuc2lnbmFsID0gZ2VuNl9zaWduYWw7Ci0tIAox LjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==