From: Daniel Vetter Subject: Re: [PATCH v6 5/5] drm/i915: Tidy up execbuffer command parsing code Date: Tue, 9 Dec 2014 14:22:58 +0100 Message-ID: <20141209132258.GX27182@phenom.ffwll.local> References: <1418078030-17690-1-git-send-email-michael.h.nguyen@intel.com> <1418078030-17690-6-git-send-email-michael.h.nguyen@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id 308976F252 for ; Tue, 9 Dec 2014 05:22:26 -0800 (PST) Received: by mail-wi0-f171.google.com with SMTP id bs8so7843958wib.4 for ; Tue, 09 Dec 2014 05:22:25 -0800 (PST) Content-Disposition: inline In-Reply-To: <1418078030-17690-6-git-send-email-michael.h.nguyen@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: michael.h.nguyen@intel.com Cc: Brad Volkin , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org T24gTW9uLCBEZWMgMDgsIDIwMTQgYXQgMDI6MzM6NTBQTSAtMDgwMCwgbWljaGFlbC5oLm5ndXll bkBpbnRlbC5jb20gd3JvdGU6Cj4gRnJvbTogQnJhZCBWb2xraW4gPGJyYWRsZXkuZC52b2xraW5A aW50ZWwuY29tPgo+IAo+IE1vdmUgaXQgdG8gYSBzZXBhcmF0ZSBmdW5jdGlvbiBzaW5jZSB0aGUg bWFpbiBkb19leGVjYnVmZmVyIGZ1bmN0aW9uCj4gYWxyZWFkeSBoYXMgc28gbXVjaCBnb2luZyBv bi4KPiAKPiB2MjoKPiAtIE1vdmUgcGluL3VucGluIGNhbGxzIGluc2lkZSBpOTE1X3BhcnNlX2Nt ZHMoKSAoQ2hyaXMgVywgdjQgNy83Cj4gICBmZWVkYmFjaykKPiAKPiBJc3N1ZTogVklaLTQ3MTkK PiBTaWduZWQtb2ZmLWJ5OiBCcmFkIFZvbGtpbiA8YnJhZGxleS5kLnZvbGtpbkBpbnRlbC5jb20+ Cj4gCj4gQ29uZmxpY3RzOgo+IAlkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVm ZmVyLmMKClBsZWFzZSByZW1vdmUgdGhvc2Ugd2hlbiByZWJhc2luZy4gV2hlbiBhY3R1YWxseSBz b21ldGhpbmcgY2hhbmdlZCBwbGVhc2UKbWVudGlvbiB0aGF0IGluIHRoZSBwYXRjaCByZXZsb2cs IGUuZy4KCnYzOiBSZWJhc2UgKGNvbmZsaWN0cyB3aXRoIHBhdGNoICJmb28iIGluIGV4ZWNidWYg Y29kZSkuCgpCdXQgaWYgaXQncyBhIGJvcmluZyByZWJhc2Ugd2l0aG91dCBhbnkgZnVuY3Rpb25h bCBjb25mbGljdHMgSSB3b3VsZG4ndApib3RoZXIgd2l0aCBhIGNoYW5nZWxvZyBlbnRyeS4KLURh bmllbAoKPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9jbWRfcGFyc2VyLmMgICAg IHwgICA4ICsrCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyB8 IDEyNiArKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQo+ICAyIGZpbGVzIGNoYW5nZWQsIDc3 IGluc2VydGlvbnMoKyksIDU3IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2NtZF9wYXJzZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfY21kX3BhcnNlci5jCj4gaW5kZXggMTE4MDc5ZC4uODBiMWIyOCAxMDA2NDQKPiAtLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2NtZF9wYXJzZXIuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfY21kX3BhcnNlci5jCj4gQEAgLTEwNDIsMTAgKzEwNDIsMTcgQEAgaW50 IGk5MTVfcGFyc2VfY21kcyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAo+ICAJc3RydWN0 IGRybV9pOTE1X2NtZF9kZXNjcmlwdG9yIGRlZmF1bHRfZGVzYyA9IHsgMCB9Owo+ICAJYm9vbCBv YWNvbnRyb2xfc2V0ID0gZmFsc2U7IC8qIE9BQ09OVFJPTCB0cmFja2luZy4gU2VlIGNoZWNrX2Nt ZCgpICovCj4gIAo+ICsJcmV0ID0gaTkxNV9nZW1fb2JqX2dndHRfcGluKHNoYWRvd19iYXRjaF9v YmosIDQwOTYsIDApOwo+ICsJaWYgKHJldCkgewo+ICsJCURSTV9ERUJVR19EUklWRVIoIkNNRDog RmFpbGVkIHRvIHBpbiBzaGFkb3cgYmF0Y2hcbiIpOwo+ICsJCXJldHVybiAtMTsKPiArCX0KPiAr Cj4gIAliYXRjaF9iYXNlID0gY29weV9iYXRjaChzaGFkb3dfYmF0Y2hfb2JqLCBiYXRjaF9vYmos Cj4gIAkJCQliYXRjaF9zdGFydF9vZmZzZXQsIGJhdGNoX2xlbik7Cj4gIAlpZiAoSVNfRVJSKGJh dGNoX2Jhc2UpKSB7Cj4gIAkJRFJNX0RFQlVHX0RSSVZFUigiQ01EOiBGYWlsZWQgdG8gY29weSBi YXRjaFxuIik7Cj4gKwkJaTkxNV9nZW1fb2JqZWN0X2dndHRfdW5waW4oc2hhZG93X2JhdGNoX29i aik7Cj4gIAkJcmV0dXJuIFBUUl9FUlIoYmF0Y2hfYmFzZSk7Cj4gIAl9Cj4gIAo+IEBAIC0xMTE2 LDYgKzExMjMsNyBAQCBpbnQgaTkxNV9wYXJzZV9jbWRzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcsCj4gIAl9Cj4gIAo+ICAJdnVubWFwKGJhdGNoX2Jhc2UpOwo+ICsJaTkxNV9nZW1fb2Jq ZWN0X2dndHRfdW5waW4oc2hhZG93X2JhdGNoX29iaik7Cj4gIAo+ICAJcmV0dXJuIHJldDsKPiAg fQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVy LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKPiBpbmRleCAy MDcxOTM4Li4zZDM2NDY1IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2V4ZWNidWZmZXIuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4 ZWNidWZmZXIuYwo+IEBAIC0xMDY5LDYgKzEwNjksNjUgQEAgaTkxNV9lbWl0X2JveChzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpyaW5nLAo+ICAJcmV0dXJuIDA7Cj4gIH0KPiAgCj4gK3N0YXRpYyBz dHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCoKPiAraTkxNV9nZW1fZXhlY2J1ZmZlcl9wYXJzZShz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAo+ICsJCQkgIHN0cnVjdCBkcm1faTkxNV9nZW1f ZXhlY19vYmplY3QyICpzaGFkb3dfZXhlY19lbnRyeSwKPiArCQkJICBzdHJ1Y3QgZWJfdm1hcyAq ZWIsCj4gKwkJCSAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKmJhdGNoX29iaiwKPiArCQkJ ICB1MzIgYmF0Y2hfc3RhcnRfb2Zmc2V0LAo+ICsJCQkgIHUzMiBiYXRjaF9sZW4sCj4gKwkJCSAg Ym9vbCBpc19tYXN0ZXIsCj4gKwkJCSAgdTMyICpmbGFncykKPiArewo+ICsJc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShiYXRjaF9vYmotPmJhc2UuZGV2KTsKPiAr CXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpzaGFkb3dfYmF0Y2hfb2JqOwo+ICsJaW50IHJl dDsKPiArCj4gKwlzaGFkb3dfYmF0Y2hfb2JqID0gaTkxNV9nZW1fYmF0Y2hfcG9vbF9nZXQoJmRl dl9wcml2LT5tbS5iYXRjaF9wb29sLAo+ICsJCQkJCQkgICBiYXRjaF9vYmotPmJhc2Uuc2l6ZSk7 Cj4gKwlpZiAoSVNfRVJSKHNoYWRvd19iYXRjaF9vYmopKQo+ICsJCXJldHVybiBzaGFkb3dfYmF0 Y2hfb2JqOwo+ICsKPiArCXJldCA9IGk5MTVfcGFyc2VfY21kcyhyaW5nLAo+ICsJCQkgICAgICBi YXRjaF9vYmosCj4gKwkJCSAgICAgIHNoYWRvd19iYXRjaF9vYmosCj4gKwkJCSAgICAgIGJhdGNo X3N0YXJ0X29mZnNldCwKPiArCQkJICAgICAgYmF0Y2hfbGVuLAo+ICsJCQkgICAgICBpc19tYXN0 ZXIpOwo+ICsJaWYgKHJldCkgewo+ICsJCWlmIChyZXQgPT0gLUVBQ0NFUykKPiArCQkJcmV0dXJu IGJhdGNoX29iajsKPiArCX0gZWxzZSB7Cj4gKwkJc3RydWN0IGk5MTVfdm1hICp2bWE7Cj4gKwo+ ICsJCW1lbXNldChzaGFkb3dfZXhlY19lbnRyeSwgMCwgc2l6ZW9mKCpzaGFkb3dfZXhlY19lbnRy eSkpOwo+ICsKPiArCQl2bWEgPSBpOTE1X2dlbV9vYmpfdG9fZ2d0dChzaGFkb3dfYmF0Y2hfb2Jq KTsKPiArCQl2bWEtPmV4ZWNfZW50cnkgPSBzaGFkb3dfZXhlY19lbnRyeTsKPiArCQl2bWEtPmV4 ZWNfZW50cnktPmZsYWdzID0gX19FWEVDX09CSkVDVF9QVVJHRUFCTEU7Cj4gKwkJZHJtX2dlbV9v YmplY3RfcmVmZXJlbmNlKCZzaGFkb3dfYmF0Y2hfb2JqLT5iYXNlKTsKPiArCQlsaXN0X2FkZF90 YWlsKCZ2bWEtPmV4ZWNfbGlzdCwgJmViLT52bWFzKTsKPiArCj4gKwkJc2hhZG93X2JhdGNoX29i ai0+YmFzZS5wZW5kaW5nX3JlYWRfZG9tYWlucyA9Cj4gKwkJCWJhdGNoX29iai0+YmFzZS5wZW5k aW5nX3JlYWRfZG9tYWluczsKPiArCj4gKwkJLyoKPiArCQkgKiBTZXQgdGhlIERJU1BBVENIX1NF Q1VSRSBiaXQgdG8gcmVtb3ZlIHRoZSBOT05fU0VDVVJFCj4gKwkJICogYml0IGZyb20gTUlfQkFU Q0hfQlVGRkVSX1NUQVJUIGNvbW1hbmRzIGlzc3VlZCBpbiB0aGUKPiArCQkgKiBkaXNwYXRjaF9l eGVjYnVmZmVyIGltcGxlbWVudGF0aW9ucy4gV2Ugc3BlY2lmaWNhbGx5Cj4gKwkJICogZG9uJ3Qg d2FudCB0aGF0IHNldCB3aGVuIHRoZSBjb21tYW5kIHBhcnNlciBpcwo+ICsJCSAqIGVuYWJsZWQu Cj4gKwkJICoKPiArCQkgKiBGSVhNRTogd2l0aCBhbGlhc2luZyBwcGd0dCwgYnVmZmVycyB0aGF0 IHNob3VsZCBvbmx5Cj4gKwkJICogYmUgaW4gZ2d0dCBzdGlsbCBlbmQgdXAgaW4gdGhlIGFsaWFz aW5nIHBwZ3R0LiByZW1vdmUKPiArCQkgKiB0aGlzIGNoZWNrIHdoZW4gdGhhdCBpcyBmaXhlZC4K PiArCQkgKi8KPiArCQlpZiAoVVNFU19GVUxMX1BQR1RUKGRldikpCj4gKwkJCSpmbGFncyB8PSBJ OTE1X0RJU1BBVENIX1NFQ1VSRTsKPiArCX0KPiArCj4gKwlyZXR1cm4gcmV0ID8gRVJSX1BUUihy ZXQpIDogc2hhZG93X2JhdGNoX29iajsKPiArfQo+ICAKPiAgaW50Cj4gIGk5MTVfZ2VtX3Jpbmdi dWZmZXJfc3VibWlzc2lvbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUg KmZpbGUsCj4gQEAgLTEyODYsNyArMTM0NSw2IEBAIGk5MTVfZ2VtX2RvX2V4ZWNidWZmZXIoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKPiAgCXN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7Cj4gIAlzdHJ1Y3QgZWJfdm1hcyAqZWI7 Cj4gIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqYmF0Y2hfb2JqOwo+IC0Jc3RydWN0IGRy bV9pOTE1X2dlbV9vYmplY3QgKnNoYWRvd19iYXRjaF9vYmogPSBOVUxMOwo+ICAJc3RydWN0IGRy bV9pOTE1X2dlbV9leGVjX29iamVjdDIgc2hhZG93X2V4ZWNfZW50cnk7Cj4gIAlzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nOwo+ICAJc3RydWN0IGludGVsX2NvbnRleHQgKmN0eDsKPiBAQCAt MTQwNiw2MyArMTQ2NCwxNyBAQCBpOTE1X2dlbV9kb19leGVjYnVmZmVyKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHZvaWQgKmRhdGEsCj4gIAl9Cj4gIAo+ICAJaWYgKGk5MTVfbmVlZHNfY21kX3Bh cnNlcihyaW5nKSkgewo+IC0JCXNoYWRvd19iYXRjaF9vYmogPQo+IC0JCQlpOTE1X2dlbV9iYXRj aF9wb29sX2dldCgmZGV2X3ByaXYtPm1tLmJhdGNoX3Bvb2wsCj4gLQkJCQkJCWJhdGNoX29iai0+ YmFzZS5zaXplKTsKPiAtCQlpZiAoSVNfRVJSKHNoYWRvd19iYXRjaF9vYmopKSB7Cj4gLQkJCXJl dCA9IFBUUl9FUlIoc2hhZG93X2JhdGNoX29iaik7Cj4gLQkJCS8qIERvbid0IHRyeSB0byBjbGVh biB1cCB0aGUgb2JqIGluIHRoZSBlcnJvciBwYXRoICovCj4gLQkJCXNoYWRvd19iYXRjaF9vYmog PSBOVUxMOwo+IC0JCQlnb3RvIGVycjsKPiAtCQl9Cj4gLQo+IC0JCXNoYWRvd19iYXRjaF9vYmot Pm1hZHYgPSBJOTE1X01BRFZfV0lMTE5FRUQ7Cj4gLQo+IC0JCXJldCA9IGk5MTVfZ2VtX29ial9n Z3R0X3BpbihzaGFkb3dfYmF0Y2hfb2JqLCA0MDk2LCAwKTsKPiAtCQlpZiAocmV0KQo+ICsJCWJh dGNoX29iaiA9IGk5MTVfZ2VtX2V4ZWNidWZmZXJfcGFyc2UocmluZywKPiArCQkJCQkJICAgICAg JnNoYWRvd19leGVjX2VudHJ5LAo+ICsJCQkJCQkgICAgICBlYiwKPiArCQkJCQkJICAgICAgYmF0 Y2hfb2JqLAo+ICsJCQkJCQkgICAgICBhcmdzLT5iYXRjaF9zdGFydF9vZmZzZXQsCj4gKwkJCQkJ CSAgICAgIGFyZ3MtPmJhdGNoX2xlbiwKPiArCQkJCQkJICAgICAgZmlsZS0+aXNfbWFzdGVyLAo+ ICsJCQkJCQkgICAgICAmZmxhZ3MpOwo+ICsJCWlmIChJU19FUlIoYmF0Y2hfb2JqKSkgewo+ICsJ CQlyZXQgPSBQVFJfRVJSKGJhdGNoX29iaik7Cj4gIAkJCWdvdG8gZXJyOwo+IC0KPiAtCQlyZXQg PSBpOTE1X3BhcnNlX2NtZHMocmluZywKPiAtCQkJCSAgICAgIGJhdGNoX29iaiwKPiAtCQkJCSAg ICAgIHNoYWRvd19iYXRjaF9vYmosCj4gLQkJCQkgICAgICBhcmdzLT5iYXRjaF9zdGFydF9vZmZz ZXQsCj4gLQkJCQkgICAgICBhcmdzLT5iYXRjaF9sZW4sCj4gLQkJCQkgICAgICBmaWxlLT5pc19t YXN0ZXIpOwo+IC0JCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKHNoYWRvd19iYXRjaF9vYmop Owo+IC0KPiAtCQlpZiAocmV0KSB7Cj4gLQkJCWlmIChyZXQgIT0gLUVBQ0NFUykKPiAtCQkJCWdv dG8gZXJyOwo+IC0JCX0gZWxzZSB7Cj4gLQkJCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwo+IC0KPiAt CQkJbWVtc2V0KCZzaGFkb3dfZXhlY19lbnRyeSwgMCwKPiAtCQkJICAgICAgIHNpemVvZihzaGFk b3dfZXhlY19lbnRyeSkpOwo+IC0KPiAtCQkJdm1hID0gaTkxNV9nZW1fb2JqX3RvX2dndHQoc2hh ZG93X2JhdGNoX29iaik7Cj4gLQkJCXZtYS0+ZXhlY19lbnRyeSA9ICZzaGFkb3dfZXhlY19lbnRy eTsKPiAtCQkJdm1hLT5leGVjX2VudHJ5LT5mbGFncyA9IF9fRVhFQ19PQkpFQ1RfUFVSR0VBQkxF Owo+IC0JCQlkcm1fZ2VtX29iamVjdF9yZWZlcmVuY2UoJnNoYWRvd19iYXRjaF9vYmotPmJhc2Up Owo+IC0JCQlsaXN0X2FkZF90YWlsKCZ2bWEtPmV4ZWNfbGlzdCwgJmViLT52bWFzKTsKPiAtCj4g LQkJCXNoYWRvd19iYXRjaF9vYmotPmJhc2UucGVuZGluZ19yZWFkX2RvbWFpbnMgPQo+IC0JCQkJ YmF0Y2hfb2JqLT5iYXNlLnBlbmRpbmdfcmVhZF9kb21haW5zOwo+IC0KPiAtCQkJYmF0Y2hfb2Jq ID0gc2hhZG93X2JhdGNoX29iajsKPiAtCj4gLQkJCS8qCj4gLQkJCSAqIFNldCB0aGUgRElTUEFU Q0hfU0VDVVJFIGJpdCB0byByZW1vdmUgdGhlIE5PTl9TRUNVUkUKPiAtCQkJICogYml0IGZyb20g TUlfQkFUQ0hfQlVGRkVSX1NUQVJUIGNvbW1hbmRzIGlzc3VlZCBpbiB0aGUKPiAtCQkJICogZGlz cGF0Y2hfZXhlY2J1ZmZlciBpbXBsZW1lbnRhdGlvbnMuIFdlIHNwZWNpZmljYWxseQo+IC0JCQkg KiBkb24ndCB3YW50IHRoYXQgc2V0IHdoZW4gdGhlIGNvbW1hbmQgcGFyc2VyIGlzCj4gLQkJCSAq IGVuYWJsZWQuCj4gLQkJCSAqCj4gLQkJCSAqIEZJWE1FOiB3aXRoIGFsaWFzaW5nIHBwZ3R0LCBi dWZmZXJzIHRoYXQgc2hvdWxkIG9ubHkKPiAtCQkJICogYmUgaW4gZ2d0dCBzdGlsbCBlbmQgdXAg aW4gdGhlIGFsaWFzaW5nIHBwZ3R0LiByZW1vdmUKPiAtCQkJICogdGhpcyBjaGVjayB3aGVuIHRo YXQgaXMgZml4ZWQuCj4gLQkJCSAqLwo+IC0JCQlpZiAoVVNFU19GVUxMX1BQR1RUKGRldikpCj4g LQkJCQlmbGFncyB8PSBJOTE1X0RJU1BBVENIX1NFQ1VSRTsKPiAgCQl9Cj4gIAl9Cj4gIAo+IC0t IAo+IDEuOS4xCj4gCj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KPiBJbnRlbC1nZnggbWFpbGluZyBsaXN0Cj4gSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwo+IGh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngKCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBDb3Jw b3JhdGlvbgorNDEgKDApIDc5IDM2NSA1NyA0OCAtIGh0dHA6Ly9ibG9nLmZmd2xsLmNoCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==