From: michael.h.nguyen@intel.com Subject: [PATCH v7 5/5] drm/i915: Tidy up execbuffer command parsing code Date: Thu, 11 Dec 2014 12:13:12 -0800 Message-ID: <1418328792-28072-6-git-send-email-michael.h.nguyen@intel.com> References: <1418328792-28072-1-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id A15BF6E505 for ; Thu, 11 Dec 2014 12:15:59 -0800 (PST) In-Reply-To: <1418328792-28072-1-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: intel-gfx@lists.freedesktop.org Cc: Brad Volkin List-Id: intel-gfx@lists.freedesktop.org RnJvbTogQnJhZCBWb2xraW4gPGJyYWRsZXkuZC52b2xraW5AaW50ZWwuY29tPgoKTW92ZSBpdCB0 byBhIHNlcGFyYXRlIGZ1bmN0aW9uIHNpbmNlIHRoZSBtYWluIGRvX2V4ZWNidWZmZXIgZnVuY3Rp b24KYWxyZWFkeSBoYXMgc28gbXVjaCBnb2luZyBvbi4KCnYyOgotIE1vdmUgcGluL3VucGluIGNh bGxzIGluc2lkZSBpOTE1X3BhcnNlX2NtZHMoKSAoQ2hyaXMgVywgdjQgNy83CiAgZmVlZGJhY2sp CgpJc3N1ZTogVklaLTQ3MTkKU2lnbmVkLW9mZi1ieTogQnJhZCBWb2xraW4gPGJyYWRsZXkuZC52 b2xraW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfY21kX3BhcnNl ci5jICAgICB8ICAgOCArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZl ci5jIHwgMTI0ICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQs IDc3IGluc2VydGlvbnMoKyksIDU1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfY21kX3BhcnNlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9jbWRfcGFyc2VyLmMKaW5kZXggYTY5OGI0Ny4uMGQ3NTdjZCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9jbWRfcGFyc2VyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9jbWRfcGFyc2VyLmMKQEAgLTEwNTAsMTAgKzEwNTAsMTcgQEAgaW50IGk5MTVfcGFy c2VfY21kcyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCXN0cnVjdCBkcm1faTkxNV9j bWRfZGVzY3JpcHRvciBkZWZhdWx0X2Rlc2MgPSB7IDAgfTsKIAlib29sIG9hY29udHJvbF9zZXQg PSBmYWxzZTsgLyogT0FDT05UUk9MIHRyYWNraW5nLiBTZWUgY2hlY2tfY21kKCkgKi8KIAorCXJl dCA9IGk5MTVfZ2VtX29ial9nZ3R0X3BpbihzaGFkb3dfYmF0Y2hfb2JqLCA0MDk2LCAwKTsKKwlp ZiAocmV0KSB7CisJCURSTV9ERUJVR19EUklWRVIoIkNNRDogRmFpbGVkIHRvIHBpbiBzaGFkb3cg YmF0Y2hcbiIpOworCQlyZXR1cm4gLTE7CisJfQorCiAJYmF0Y2hfYmFzZSA9IGNvcHlfYmF0Y2go c2hhZG93X2JhdGNoX29iaiwgYmF0Y2hfb2JqLAogCQkJCWJhdGNoX3N0YXJ0X29mZnNldCwgYmF0 Y2hfbGVuKTsKIAlpZiAoSVNfRVJSKGJhdGNoX2Jhc2UpKSB7CiAJCURSTV9ERUJVR19EUklWRVIo IkNNRDogRmFpbGVkIHRvIGNvcHkgYmF0Y2hcbiIpOworCQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91 bnBpbihzaGFkb3dfYmF0Y2hfb2JqKTsKIAkJcmV0dXJuIFBUUl9FUlIoYmF0Y2hfYmFzZSk7CiAJ fQogCkBAIC0xMTI0LDYgKzExMzEsNyBAQCBpbnQgaTkxNV9wYXJzZV9jbWRzKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKnJpbmcsCiAJfQogCiAJdnVubWFwKGJhdGNoX2Jhc2UpOworCWk5MTVfZ2Vt X29iamVjdF9nZ3R0X3VucGluKHNoYWRvd19iYXRjaF9vYmopOwogCiAJcmV0dXJuIHJldDsKIH0K ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwppbmRleCA5YWY0MDUz Li4zZDM2NDY1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9leGVj YnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5j CkBAIC0xMDY5LDYgKzEwNjksNjUgQEAgaTkxNV9lbWl0X2JveChzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpyaW5nLAogCXJldHVybiAwOwogfQogCitzdGF0aWMgc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QqCitpOTE1X2dlbV9leGVjYnVmZmVyX3BhcnNlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcsCisJCQkgIHN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY19vYmplY3QyICpzaGFkb3dfZXhl Y19lbnRyeSwKKwkJCSAgc3RydWN0IGViX3ZtYXMgKmViLAorCQkJICBzdHJ1Y3QgZHJtX2k5MTVf Z2VtX29iamVjdCAqYmF0Y2hfb2JqLAorCQkJICB1MzIgYmF0Y2hfc3RhcnRfb2Zmc2V0LAorCQkJ ICB1MzIgYmF0Y2hfbGVuLAorCQkJICBib29sIGlzX21hc3RlciwKKwkJCSAgdTMyICpmbGFncykK K3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGJhdGNoX29i ai0+YmFzZS5kZXYpOworCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpzaGFkb3dfYmF0Y2hf b2JqOworCWludCByZXQ7CisKKwlzaGFkb3dfYmF0Y2hfb2JqID0gaTkxNV9nZW1fYmF0Y2hfcG9v bF9nZXQoJmRldl9wcml2LT5tbS5iYXRjaF9wb29sLAorCQkJCQkJICAgYmF0Y2hfb2JqLT5iYXNl LnNpemUpOworCWlmIChJU19FUlIoc2hhZG93X2JhdGNoX29iaikpCisJCXJldHVybiBzaGFkb3df YmF0Y2hfb2JqOworCisJcmV0ID0gaTkxNV9wYXJzZV9jbWRzKHJpbmcsCisJCQkgICAgICBiYXRj aF9vYmosCisJCQkgICAgICBzaGFkb3dfYmF0Y2hfb2JqLAorCQkJICAgICAgYmF0Y2hfc3RhcnRf b2Zmc2V0LAorCQkJICAgICAgYmF0Y2hfbGVuLAorCQkJICAgICAgaXNfbWFzdGVyKTsKKwlpZiAo cmV0KSB7CisJCWlmIChyZXQgPT0gLUVBQ0NFUykKKwkJCXJldHVybiBiYXRjaF9vYmo7CisJfSBl bHNlIHsKKwkJc3RydWN0IGk5MTVfdm1hICp2bWE7CisKKwkJbWVtc2V0KHNoYWRvd19leGVjX2Vu dHJ5LCAwLCBzaXplb2YoKnNoYWRvd19leGVjX2VudHJ5KSk7CisKKwkJdm1hID0gaTkxNV9nZW1f b2JqX3RvX2dndHQoc2hhZG93X2JhdGNoX29iaik7CisJCXZtYS0+ZXhlY19lbnRyeSA9IHNoYWRv d19leGVjX2VudHJ5OworCQl2bWEtPmV4ZWNfZW50cnktPmZsYWdzID0gX19FWEVDX09CSkVDVF9Q VVJHRUFCTEU7CisJCWRybV9nZW1fb2JqZWN0X3JlZmVyZW5jZSgmc2hhZG93X2JhdGNoX29iai0+ YmFzZSk7CisJCWxpc3RfYWRkX3RhaWwoJnZtYS0+ZXhlY19saXN0LCAmZWItPnZtYXMpOworCisJ CXNoYWRvd19iYXRjaF9vYmotPmJhc2UucGVuZGluZ19yZWFkX2RvbWFpbnMgPQorCQkJYmF0Y2hf b2JqLT5iYXNlLnBlbmRpbmdfcmVhZF9kb21haW5zOworCisJCS8qCisJCSAqIFNldCB0aGUgRElT UEFUQ0hfU0VDVVJFIGJpdCB0byByZW1vdmUgdGhlIE5PTl9TRUNVUkUKKwkJICogYml0IGZyb20g TUlfQkFUQ0hfQlVGRkVSX1NUQVJUIGNvbW1hbmRzIGlzc3VlZCBpbiB0aGUKKwkJICogZGlzcGF0 Y2hfZXhlY2J1ZmZlciBpbXBsZW1lbnRhdGlvbnMuIFdlIHNwZWNpZmljYWxseQorCQkgKiBkb24n dCB3YW50IHRoYXQgc2V0IHdoZW4gdGhlIGNvbW1hbmQgcGFyc2VyIGlzCisJCSAqIGVuYWJsZWQu CisJCSAqCisJCSAqIEZJWE1FOiB3aXRoIGFsaWFzaW5nIHBwZ3R0LCBidWZmZXJzIHRoYXQgc2hv dWxkIG9ubHkKKwkJICogYmUgaW4gZ2d0dCBzdGlsbCBlbmQgdXAgaW4gdGhlIGFsaWFzaW5nIHBw Z3R0LiByZW1vdmUKKwkJICogdGhpcyBjaGVjayB3aGVuIHRoYXQgaXMgZml4ZWQuCisJCSAqLwor CQlpZiAoVVNFU19GVUxMX1BQR1RUKGRldikpCisJCQkqZmxhZ3MgfD0gSTkxNV9ESVNQQVRDSF9T RUNVUkU7CisJfQorCisJcmV0dXJuIHJldCA/IEVSUl9QVFIocmV0KSA6IHNoYWRvd19iYXRjaF9v Ymo7Cit9CiAKIGludAogaTkxNV9nZW1fcmluZ2J1ZmZlcl9zdWJtaXNzaW9uKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwKQEAgLTEyODYsNyArMTM0NSw2IEBA IGk5MTVfZ2VtX2RvX2V4ZWNidWZmZXIoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0 YSwKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRl OwogCXN0cnVjdCBlYl92bWFzICplYjsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqYmF0 Y2hfb2JqOwotCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpzaGFkb3dfYmF0Y2hfb2JqID0g TlVMTDsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2V4ZWNfb2JqZWN0MiBzaGFkb3dfZXhlY19lbnRy eTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nOwogCXN0cnVjdCBpbnRlbF9jb250ZXh0 ICpjdHg7CkBAIC0xNDA2LDYyICsxNDY0LDE4IEBAIGk5MTVfZ2VtX2RvX2V4ZWNidWZmZXIoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAl9CiAKIAlpZiAoaTkxNV9uZWVkc19j bWRfcGFyc2VyKHJpbmcpKSB7Ci0JCXNoYWRvd19iYXRjaF9vYmogPQotCQkJaTkxNV9nZW1fYmF0 Y2hfcG9vbF9nZXQoJmRldl9wcml2LT5tbS5iYXRjaF9wb29sLAotCQkJCQkJYmF0Y2hfb2JqLT5i YXNlLnNpemUpOwotCQlpZiAoSVNfRVJSKHNoYWRvd19iYXRjaF9vYmopKSB7Ci0JCQlyZXQgPSBQ VFJfRVJSKHNoYWRvd19iYXRjaF9vYmopOwotCQkJLyogRG9uJ3QgdHJ5IHRvIGNsZWFuIHVwIHRo ZSBvYmogaW4gdGhlIGVycm9yIHBhdGggKi8KLQkJCXNoYWRvd19iYXRjaF9vYmogPSBOVUxMOwor CQliYXRjaF9vYmogPSBpOTE1X2dlbV9leGVjYnVmZmVyX3BhcnNlKHJpbmcsCisJCQkJCQkgICAg ICAmc2hhZG93X2V4ZWNfZW50cnksCisJCQkJCQkgICAgICBlYiwKKwkJCQkJCSAgICAgIGJhdGNo X29iaiwKKwkJCQkJCSAgICAgIGFyZ3MtPmJhdGNoX3N0YXJ0X29mZnNldCwKKwkJCQkJCSAgICAg IGFyZ3MtPmJhdGNoX2xlbiwKKwkJCQkJCSAgICAgIGZpbGUtPmlzX21hc3RlciwKKwkJCQkJCSAg ICAgICZmbGFncyk7CisJCWlmIChJU19FUlIoYmF0Y2hfb2JqKSkgeworCQkJcmV0ID0gUFRSX0VS UihiYXRjaF9vYmopOwogCQkJZ290byBlcnI7CiAJCX0KLQotCQlyZXQgPSBpOTE1X2dlbV9vYmpf Z2d0dF9waW4oc2hhZG93X2JhdGNoX29iaiwgNDA5NiwgMCk7Ci0JCWlmIChyZXQpCi0JCQlnb3Rv IGVycjsKLQotCQlyZXQgPSBpOTE1X3BhcnNlX2NtZHMocmluZywKLQkJCQkgICAgICBiYXRjaF9v YmosCi0JCQkJICAgICAgc2hhZG93X2JhdGNoX29iaiwKLQkJCQkgICAgICBhcmdzLT5iYXRjaF9z dGFydF9vZmZzZXQsCi0JCQkJICAgICAgYXJncy0+YmF0Y2hfbGVuLAotCQkJCSAgICAgIGZpbGUt PmlzX21hc3Rlcik7Ci0JCWk5MTVfZ2VtX29iamVjdF9nZ3R0X3VucGluKHNoYWRvd19iYXRjaF9v YmopOwotCi0JCWlmIChyZXQpIHsKLQkJCWlmIChyZXQgIT0gLUVBQ0NFUykKLQkJCQlnb3RvIGVy cjsKLQkJfSBlbHNlIHsKLQkJCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOwotCi0JCQltZW1zZXQoJnNo YWRvd19leGVjX2VudHJ5LCAwLAotCQkJICAgICAgIHNpemVvZihzaGFkb3dfZXhlY19lbnRyeSkp OwotCi0JCQl2bWEgPSBpOTE1X2dlbV9vYmpfdG9fZ2d0dChzaGFkb3dfYmF0Y2hfb2JqKTsKLQkJ CXZtYS0+ZXhlY19lbnRyeSA9ICZzaGFkb3dfZXhlY19lbnRyeTsKLQkJCXZtYS0+ZXhlY19lbnRy eS0+ZmxhZ3MgPSBfX0VYRUNfT0JKRUNUX1BVUkdFQUJMRTsKLQkJCWRybV9nZW1fb2JqZWN0X3Jl ZmVyZW5jZSgmc2hhZG93X2JhdGNoX29iai0+YmFzZSk7Ci0JCQlsaXN0X2FkZF90YWlsKCZ2bWEt PmV4ZWNfbGlzdCwgJmViLT52bWFzKTsKLQotCQkJc2hhZG93X2JhdGNoX29iai0+YmFzZS5wZW5k aW5nX3JlYWRfZG9tYWlucyA9Ci0JCQkJYmF0Y2hfb2JqLT5iYXNlLnBlbmRpbmdfcmVhZF9kb21h aW5zOwotCi0JCQliYXRjaF9vYmogPSBzaGFkb3dfYmF0Y2hfb2JqOwotCi0JCQkvKgotCQkJICog U2V0IHRoZSBESVNQQVRDSF9TRUNVUkUgYml0IHRvIHJlbW92ZSB0aGUgTk9OX1NFQ1VSRQotCQkJ ICogYml0IGZyb20gTUlfQkFUQ0hfQlVGRkVSX1NUQVJUIGNvbW1hbmRzIGlzc3VlZCBpbiB0aGUK LQkJCSAqIGRpc3BhdGNoX2V4ZWNidWZmZXIgaW1wbGVtZW50YXRpb25zLiBXZSBzcGVjaWZpY2Fs bHkKLQkJCSAqIGRvbid0IHdhbnQgdGhhdCBzZXQgd2hlbiB0aGUgY29tbWFuZCBwYXJzZXIgaXMK LQkJCSAqIGVuYWJsZWQuCi0JCQkgKgotCQkJICogRklYTUU6IHdpdGggYWxpYXNpbmcgcHBndHQs IGJ1ZmZlcnMgdGhhdCBzaG91bGQgb25seQotCQkJICogYmUgaW4gZ2d0dCBzdGlsbCBlbmQgdXAg aW4gdGhlIGFsaWFzaW5nIHBwZ3R0LiByZW1vdmUKLQkJCSAqIHRoaXMgY2hlY2sgd2hlbiB0aGF0 IGlzIGZpeGVkLgotCQkJICovCi0JCQlpZiAoVVNFU19GVUxMX1BQR1RUKGRldikpCi0JCQkJZmxh Z3MgfD0gSTkxNV9ESVNQQVRDSF9TRUNVUkU7Ci0JCX0KIAl9CiAKIAliYXRjaF9vYmotPmJhc2Uu cGVuZGluZ19yZWFkX2RvbWFpbnMgfD0gSTkxNV9HRU1fRE9NQUlOX0NPTU1BTkQ7Ci0tIAoxLjku MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK