From: Tvrtko Ursulin Subject: [PATCH v3] drm/i915: Consolidate dispatch_execbuffer vfunc Date: Wed, 29 Jun 2016 17:40:26 +0100 Message-ID: <1467218426-15018-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1467212972-861-7-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 45F3B6E211 for ; Wed, 29 Jun 2016 16:40:45 +0000 (UTC) In-Reply-To: <1467212972-861-7-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 ZGlzcGF0Y2hfZXhlY2J1ZmZlciBiZWZvcmUgYWRkX3JlcXVlc3QuIChDaHJpcyBXaWxzb24pCnYz OiBGaXggYWRkX3JlcXVlc3QgYW5kIGlycV9zZXFub19iYXJyaWVyIGZvciBnZW44Ky4KClNpZ25l ZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgMjcgKysrKysrKystLS0t LS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCAxOSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggZGNh Y2YxN2M1MjVmLi4xNWY4ZGVkNjMyNWQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n YnVmZmVyLmMKQEAgLTI4ODEsMTAgKzI4ODEsMTYgQEAgc3RhdGljIHZvaWQgaW50ZWxfcmluZ19k ZWZhdWx0X3ZmdW5jcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJZW5naW5l LT5nZXRfc2Vxbm8gPSByaW5nX2dldF9zZXFubzsKIAllbmdpbmUtPnNldF9zZXFubyA9IHJpbmdf c2V0X3NlcW5vOwogCi0JaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNikgeworCWlmIChJTlRF TF9HRU4oZGV2X3ByaXYpID49IDgpIHsKKwkJZW5naW5lLT5kaXNwYXRjaF9leGVjYnVmZmVyID0g Z2VuOF9yaW5nX2Rpc3BhdGNoX2V4ZWNidWZmZXI7CisJCWVuZ2luZS0+YWRkX3JlcXVlc3QgPSBn ZW42X2FkZF9yZXF1ZXN0OworCQllbmdpbmUtPmlycV9zZXFub19iYXJyaWVyID0gZ2VuNl9zZXFu b19iYXJyaWVyOworCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA2KSB7CisJCWVu Z2luZS0+ZGlzcGF0Y2hfZXhlY2J1ZmZlciA9IGdlbjZfcmluZ19kaXNwYXRjaF9leGVjYnVmZmVy OwogCQllbmdpbmUtPmFkZF9yZXF1ZXN0ID0gZ2VuNl9hZGRfcmVxdWVzdDsKIAkJZW5naW5lLT5p cnFfc2Vxbm9fYmFycmllciA9IGdlbjZfc2Vxbm9fYmFycmllcjsKIAl9IGVsc2UgeworCQllbmdp bmUtPmRpc3BhdGNoX2V4ZWNidWZmZXIgPSBpOTY1X2Rpc3BhdGNoX2V4ZWNidWZmZXI7CiAJCWVu Z2luZS0+YWRkX3JlcXVlc3QgPSBpOXh4X2FkZF9yZXF1ZXN0OwogCX0KIApAQCAtMjk5MywxNSAr Mjk5OSw5IEBAIGludCBpbnRlbF9pbml0X3JlbmRlcl9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogCiAJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpKQogCQllbmdpbmUtPmRpc3Bh dGNoX2V4ZWNidWZmZXIgPSBoc3dfcmluZ19kaXNwYXRjaF9leGVjYnVmZmVyOwotCWVsc2UgaWYg KElTX0dFTjgoZGV2X3ByaXYpKQotCQllbmdpbmUtPmRpc3BhdGNoX2V4ZWNidWZmZXIgPSBnZW44 X3JpbmdfZGlzcGF0Y2hfZXhlY2J1ZmZlcjsKLQllbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYp ID49IDYpCi0JCWVuZ2luZS0+ZGlzcGF0Y2hfZXhlY2J1ZmZlciA9IGdlbjZfcmluZ19kaXNwYXRj aF9leGVjYnVmZmVyOwotCWVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNCkKLQkJZW5n aW5lLT5kaXNwYXRjaF9leGVjYnVmZmVyID0gaTk2NV9kaXNwYXRjaF9leGVjYnVmZmVyOwogCWVs c2UgaWYgKElTX0k4MzAoZGV2X3ByaXYpIHx8IElTXzg0NUcoZGV2X3ByaXYpKQogCQllbmdpbmUt PmRpc3BhdGNoX2V4ZWNidWZmZXIgPSBpODMwX2Rpc3BhdGNoX2V4ZWNidWZmZXI7Ci0JZWxzZQor CWVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPD0gMykKIAkJZW5naW5lLT5kaXNwYXRjaF9l eGVjYnVmZmVyID0gaTkxNV9kaXNwYXRjaF9leGVjYnVmZmVyOwogCWVuZ2luZS0+aW5pdF9odyA9 IGluaXRfcmVuZGVyX3Jpbmc7CiAJZW5naW5lLT5jbGVhbnVwID0gcmVuZGVyX3JpbmdfY2xlYW51 cDsKQEAgLTMwNTksOCArMzA1OSw2IEBAIGludCBpbnRlbF9pbml0X2JzZF9yaW5nX2J1ZmZlcihz dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4KSB7 CiAJCQllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9CiAJCQkJR1RfUkVOREVSX1VTRVJfSU5URVJS VVBUIDw8IEdFTjhfVkNTMV9JUlFfU0hJRlQ7Ci0JCQllbmdpbmUtPmRpc3BhdGNoX2V4ZWNidWZm ZXIgPQotCQkJCWdlbjhfcmluZ19kaXNwYXRjaF9leGVjYnVmZmVyOwogCQkJaWYgKGk5MTVfc2Vt YXBob3JlX2lzX2VuYWJsZWQoZGV2X3ByaXYpKSB7CiAJCQkJZW5naW5lLT5zZW1hcGhvcmUuc3lu Y190byA9IGdlbjhfcmluZ19zeW5jOwogCQkJCWVuZ2luZS0+c2VtYXBob3JlLnNpZ25hbCA9IGdl bjhfeGNzX3NpZ25hbDsKQEAgLTMwNjgsOCArMzA2Niw2IEBAIGludCBpbnRlbF9pbml0X2JzZF9y aW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJfQogCQl9IGVsc2UgewogCQkJ ZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPSBHVF9CU0RfVVNFUl9JTlRFUlJVUFQ7Ci0JCQllbmdp bmUtPmRpc3BhdGNoX2V4ZWNidWZmZXIgPQotCQkJCWdlbjZfcmluZ19kaXNwYXRjaF9leGVjYnVm ZmVyOwogCQkJaWYgKGk5MTVfc2VtYXBob3JlX2lzX2VuYWJsZWQoZGV2X3ByaXYpKSB7CiAJCQkJ ZW5naW5lLT5zZW1hcGhvcmUuc3luY190byA9IGdlbjZfcmluZ19zeW5jOwogCQkJCWVuZ2luZS0+ c2VtYXBob3JlLnNpZ25hbCA9IGdlbjZfc2lnbmFsOwpAQCAtMzA5Myw3ICszMDg5LDYgQEAgaW50 IGludGVsX2luaXRfYnNkX3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCX0g ZWxzZSB7CiAJCQllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9IEk5MTVfQlNEX1VTRVJfSU5URVJS VVBUOwogCQl9Ci0JCWVuZ2luZS0+ZGlzcGF0Y2hfZXhlY2J1ZmZlciA9IGk5NjVfZGlzcGF0Y2hf ZXhlY2J1ZmZlcjsKIAl9CiAKIAlyZXR1cm4gaW50ZWxfaW5pdF9yaW5nX2J1ZmZlcihkZXYsIGVu Z2luZSk7CkBAIC0zMTE4LDggKzMxMTMsNiBAQCBpbnQgaW50ZWxfaW5pdF9ic2QyX3JpbmdfYnVm ZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJZW5naW5lLT5mbHVzaCA9IGdlbjZfYnNkX3Jp bmdfZmx1c2g7CiAJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPQogCQkJR1RfUkVOREVSX1VTRVJf SU5URVJSVVBUIDw8IEdFTjhfVkNTMl9JUlFfU0hJRlQ7Ci0JZW5naW5lLT5kaXNwYXRjaF9leGVj YnVmZmVyID0KLQkJCWdlbjhfcmluZ19kaXNwYXRjaF9leGVjYnVmZmVyOwogCWlmIChpOTE1X3Nl bWFwaG9yZV9pc19lbmFibGVkKGRldl9wcml2KSkgewogCQllbmdpbmUtPnNlbWFwaG9yZS5zeW5j X3RvID0gZ2VuOF9yaW5nX3N5bmM7CiAJCWVuZ2luZS0+c2VtYXBob3JlLnNpZ25hbCA9IGdlbjhf eGNzX3NpZ25hbDsKQEAgLTMxNDYsNyArMzEzOSw2IEBAIGludCBpbnRlbF9pbml0X2JsdF9yaW5n X2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYp ID49IDgpIHsKIAkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPQogCQkJR1RfUkVOREVSX1VTRVJf SU5URVJSVVBUIDw8IEdFTjhfQkNTX0lSUV9TSElGVDsKLQkJZW5naW5lLT5kaXNwYXRjaF9leGVj YnVmZmVyID0gZ2VuOF9yaW5nX2Rpc3BhdGNoX2V4ZWNidWZmZXI7CiAJCWlmIChpOTE1X3NlbWFw aG9yZV9pc19lbmFibGVkKGRldl9wcml2KSkgewogCQkJZW5naW5lLT5zZW1hcGhvcmUuc3luY190 byA9IGdlbjhfcmluZ19zeW5jOwogCQkJZW5naW5lLT5zZW1hcGhvcmUuc2lnbmFsID0gZ2VuOF94 Y3Nfc2lnbmFsOwpAQCAtMzE1NCw3ICszMTQ2LDYgQEAgaW50IGludGVsX2luaXRfYmx0X3Jpbmdf YnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCX0KIAl9IGVsc2UgewogCQllbmdpbmUt PmlycV9lbmFibGVfbWFzayA9IEdUX0JMVF9VU0VSX0lOVEVSUlVQVDsKLQkJZW5naW5lLT5kaXNw YXRjaF9leGVjYnVmZmVyID0gZ2VuNl9yaW5nX2Rpc3BhdGNoX2V4ZWNidWZmZXI7CiAJCWlmIChp OTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRldl9wcml2KSkgewogCQkJZW5naW5lLT5zZW1hcGhv cmUuc2lnbmFsID0gZ2VuNl9zaWduYWw7CiAJCQllbmdpbmUtPnNlbWFwaG9yZS5zeW5jX3RvID0g Z2VuNl9yaW5nX3N5bmM7CkBAIC0zMTk5LDcgKzMxOTAsNiBAQCBpbnQgaW50ZWxfaW5pdF92ZWJv eF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlmIChJTlRFTF9HRU4oZGV2 X3ByaXYpID49IDgpIHsKIAkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPQogCQkJR1RfUkVOREVS X1VTRVJfSU5URVJSVVBUIDw8IEdFTjhfVkVDU19JUlFfU0hJRlQ7Ci0JCWVuZ2luZS0+ZGlzcGF0 Y2hfZXhlY2J1ZmZlciA9IGdlbjhfcmluZ19kaXNwYXRjaF9leGVjYnVmZmVyOwogCQlpZiAoaTkx NV9zZW1hcGhvcmVfaXNfZW5hYmxlZChkZXZfcHJpdikpIHsKIAkJCWVuZ2luZS0+c2VtYXBob3Jl LnN5bmNfdG8gPSBnZW44X3Jpbmdfc3luYzsKIAkJCWVuZ2luZS0+c2VtYXBob3JlLnNpZ25hbCA9 IGdlbjhfeGNzX3NpZ25hbDsKQEAgLTMyMDksNyArMzE5OSw2IEBAIGludCBpbnRlbF9pbml0X3Zl Ym94X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWVuZ2luZS0+aXJxX2Vu YWJsZV9tYXNrID0gUE1fVkVCT1hfVVNFUl9JTlRFUlJVUFQ7CiAJCWVuZ2luZS0+aXJxX2dldCA9 IGhzd192ZWJveF9nZXRfaXJxOwogCQllbmdpbmUtPmlycV9wdXQgPSBoc3dfdmVib3hfcHV0X2ly cTsKLQkJZW5naW5lLT5kaXNwYXRjaF9leGVjYnVmZmVyID0gZ2VuNl9yaW5nX2Rpc3BhdGNoX2V4 ZWNidWZmZXI7CiAJCWlmIChpOTE1X3NlbWFwaG9yZV9pc19lbmFibGVkKGRldl9wcml2KSkgewog CQkJZW5naW5lLT5zZW1hcGhvcmUuc3luY190byA9IGdlbjZfcmluZ19zeW5jOwogCQkJZW5naW5l LT5zZW1hcGhvcmUuc2lnbmFsID0gZ2VuNl9zaWduYWw7Ci0tIAoxLjkuMQoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==