From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH 2/2] drm/i915: refactor eb_get_batch() Date: Thu, 30 Jun 2016 16:12:49 +0100 Message-ID: <1467299569-10920-2-git-send-email-david.s.gordon@intel.com> References: <1467299569-10920-1-git-send-email-david.s.gordon@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 F29AE6E8EE for ; Thu, 30 Jun 2016 15:13:21 +0000 (UTC) In-Reply-To: <1467299569-10920-1-git-send-email-david.s.gordon@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 UHJlY3Vyc29yIGZvciBmaXggdG8gc2VjdXJlIGJhdGNoIGV4ZWN1dGlvbi4gV2Ugd2lsbCBuZWVk IHRvIGJlIGFibGUgdG8KcmV0cmlldmUgdGhlIGJhdGNoIFZNQSAoYXMgd2VsbCBhcyB0aGUgYmF0 Y2ggaXRzZWxmKSBmcm9tIHRoZSBlYiBsaXN0LApzbyB0aGlzIHBhdGNoIGV4dHJhY3RzIHRoYXQg cGFydCBvZiBlYl9nZXRfYmF0Y2goKSBpbnRvIGEgc2VwYXJhdGUKZnVuY3Rpb24sIGFuZCBtb3Zl cyBib3RoIHBhcnRzIHRvIGEgbW9yZSBsb2dpY2FsIHBsYWNlIGluIHRoZSBmaWxlLCBuZWFyCndo ZXJlIHRoZSBlYiBsaXN0IGlzIGNyZWF0ZWQuCgpBbHNvLCBpdCBtYXkgbm90IGJlIG9idmlvdXMs IGJ1dCB0aGUgY3VycmVudCBleGVjYnVmZmVyMiBpb2N0bCBpbnRlcmZhY2UKcmVxdWlyZXMgdGhh dCB0aGUgYnVmZmVyIG9iamVjdCBjb250YWluaW5nIHRoZSBiYXRjaC10by1iZS1leGVjdXRlZCBi ZQp0aGUgTEFTVCBlbnRyeSBpbiB0aGUgZXhlYzJfbGlzdFtdIGFycmF5IChJIGV4cGVjdGVkIGl0 IHRvIGJlIHRoZSBmaXJzdCEpLgoKVG8gY2xhcmlmeSB0aGlzLCB3ZSBjYW4gcmVwbGFjZSB0aGUg cmF0aGVyIG9ic2N1cmUgY29uc3RydWN0CgkibGlzdF9lbnRyeShlYi0+dm1hcy5wcmV2LCAuLi4p IgppbiB0aGUgb2xkIHZlcnNpb24gb2YgZWJfZ2V0X2JhdGNoKCkgd2l0aCB0aGUgZXF1aXZhbGVu dCBidXQgbW9yZSBleHBsaWNpdAoJImxpc3RfbGFzdF9lbnRyeSgmZWItPnZtYXMsLi4uKSIKaW4g dGhlIG5ldyBlYl9nZXRfYmF0Y2hfdm1hKCkgYW5kIG9mIGNvdXJzZSBhZGQgYW4gZXhwbGFuYXRv cnkgY29tbWVudC4KClNpZ25lZC1vZmYtYnk6IERhdmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBp bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5j IHwgNDkgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjkg aW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fZXhlY2J1ZmZlci5jCmluZGV4IDYwOGZkYzQuLmVlYThiMWYgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9leGVjYnVmZmVyLmMKQEAgLTE4Niw2ICsxODYsMzUgQEAgc3Ry dWN0IGViX3ZtYXMgewogCXJldHVybiByZXQ7CiB9CiAKK3N0YXRpYyBpbmxpbmUgc3RydWN0IGk5 MTVfdm1hICoKK2ViX2dldF9iYXRjaF92bWEoc3RydWN0IGViX3ZtYXMgKmViKQoreworCS8qIFRo ZSBiYXRjaCBpcyBhbHdheXMgdGhlIExBU1QgaXRlbSBpbiB0aGUgVk1BIGxpc3QgKi8KKwlzdHJ1 Y3QgaTkxNV92bWEgKnZtYSA9IGxpc3RfbGFzdF9lbnRyeSgmZWItPnZtYXMsIHR5cGVvZigqdm1h KSwgZXhlY19saXN0KTsKKworCXJldHVybiB2bWE7Cit9CisKK3N0YXRpYyBzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqCitlYl9nZXRfYmF0Y2goc3RydWN0IGViX3ZtYXMgKmViKQoreworCXN0 cnVjdCBpOTE1X3ZtYSAqdm1hID0gZWJfZ2V0X2JhdGNoX3ZtYShlYik7CisKKwkvKgorCSAqIFNO QSBpcyBkb2luZyBmYW5jeSB0cmlja3Mgd2l0aCBjb21wcmVzc2luZyBiYXRjaCBidWZmZXJzLCB3 aGljaCBsZWFkcworCSAqIHRvIG5lZ2F0aXZlIHJlbG9jYXRpb24gZGVsdGFzLiBVc3VhbGx5IHRo YXQgd29ya3Mgb3V0IG9rIHNpbmNlIHRoZQorCSAqIHJlbG9jYXRlIGFkZHJlc3MgaXMgc3RpbGwg cG9zaXRpdmUsIGV4Y2VwdCB3aGVuIHRoZSBiYXRjaCBpcyBwbGFjZWQKKwkgKiB2ZXJ5IGxvdyBp biB0aGUgR1RULiBFbnN1cmUgdGhpcyBkb2Vzbid0IGhhcHBlbi4KKwkgKgorCSAqIE5vdGUgdGhh dCBhY3R1YWwgaGFuZ3MgaGF2ZSBvbmx5IGJlZW4gb2JzZXJ2ZWQgb24gZ2VuNywgYnV0IGZvcgor CSAqIHBhcmFub2lhIGRvIGl0IGV2ZXJ5d2hlcmUuCisJICovCisJaWYgKCh2bWEtPmV4ZWNfZW50 cnktPmZsYWdzICYgRVhFQ19PQkpFQ1RfUElOTkVEKSA9PSAwKQorCQl2bWEtPmV4ZWNfZW50cnkt PmZsYWdzIHw9IF9fRVhFQ19PQkpFQ1RfTkVFRFNfQklBUzsKKworCXJldHVybiB2bWEtPm9iajsK K30KKwogc3RhdGljIHN0cnVjdCBpOTE1X3ZtYSAqZWJfZ2V0X3ZtYShzdHJ1Y3QgZWJfdm1hcyAq ZWIsIHVuc2lnbmVkIGxvbmcgaGFuZGxlKQogewogCWlmIChlYi0+YW5kIDwgMCkgewpAQCAtMTM0 MSwyNiArMTM3MCw2IEBAIHN0YXRpYyBib29sIG9ubHlfbWFwcGFibGVfZm9yX3JlbG9jKHVuc2ln bmVkIGludCBmbGFncykKIAlyZXR1cm4gZmlsZV9wcml2LT5ic2RfcmluZzsKIH0KIAotc3RhdGlj IHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICoKLWViX2dldF9iYXRjaChzdHJ1Y3QgZWJfdm1h cyAqZWIpCi17Ci0Jc3RydWN0IGk5MTVfdm1hICp2bWEgPSBsaXN0X2VudHJ5KGViLT52bWFzLnBy ZXYsIHR5cGVvZigqdm1hKSwgZXhlY19saXN0KTsKLQotCS8qCi0JICogU05BIGlzIGRvaW5nIGZh bmN5IHRyaWNrcyB3aXRoIGNvbXByZXNzaW5nIGJhdGNoIGJ1ZmZlcnMsIHdoaWNoIGxlYWRzCi0J ICogdG8gbmVnYXRpdmUgcmVsb2NhdGlvbiBkZWx0YXMuIFVzdWFsbHkgdGhhdCB3b3JrcyBvdXQg b2sgc2luY2UgdGhlCi0JICogcmVsb2NhdGUgYWRkcmVzcyBpcyBzdGlsbCBwb3NpdGl2ZSwgZXhj ZXB0IHdoZW4gdGhlIGJhdGNoIGlzIHBsYWNlZAotCSAqIHZlcnkgbG93IGluIHRoZSBHVFQuIEVu c3VyZSB0aGlzIGRvZXNuJ3QgaGFwcGVuLgotCSAqCi0JICogTm90ZSB0aGF0IGFjdHVhbCBoYW5n cyBoYXZlIG9ubHkgYmVlbiBvYnNlcnZlZCBvbiBnZW43LCBidXQgZm9yCi0JICogcGFyYW5vaWEg ZG8gaXQgZXZlcnl3aGVyZS4KLQkgKi8KLQlpZiAoKHZtYS0+ZXhlY19lbnRyeS0+ZmxhZ3MgJiBF WEVDX09CSkVDVF9QSU5ORUQpID09IDApCi0JCXZtYS0+ZXhlY19lbnRyeS0+ZmxhZ3MgfD0gX19F WEVDX09CSkVDVF9ORUVEU19CSUFTOwotCi0JcmV0dXJuIHZtYS0+b2JqOwotfQotCiAjZGVmaW5l IEk5MTVfVVNFUl9SSU5HUyAoNCkKIAogc3RhdGljIGNvbnN0IGVudW0gaW50ZWxfZW5naW5lX2lk IHVzZXJfcmluZ19tYXBbSTkxNV9VU0VSX1JJTkdTICsgMV0gPSB7Ci0tIAoxLjkuMQoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxp bmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==