From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 46/59] drm/i915: Update ring->sync_to() to take a request structure Date: Thu, 19 Mar 2015 12:30:51 +0000 Message-ID: <1426768264-16996-47-git-send-email-John.C.Harrison@Intel.com> References: <1426768264-16996-1-git-send-email-John.C.Harrison@Intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 94A496EA30 for ; Thu, 19 Mar 2015 05:32:02 -0700 (PDT) In-Reply-To: <1426768264-16996-1-git-send-email-John.C.Harrison@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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClVwZGF0ZWQg dGhlIHJpbmctPnN5bmNfdG8oKSBpbXBsZW1lbnRhdGlvbnMgdG8gdGFrZSBhIHJlcXVlc3QgaW5z dGVhZCBvZiBhIHJpbmcuCkFsc28gdXBkYXRlZCB0aGUgdHJhY2VyIHRvIGluY2x1ZGUgdGhlIHJl cXVlc3QgaWQuCgpGb3I6IFZJWi01MTE1ClNpZ25lZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpv aG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYyAgICAgICAgIHwgICAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3RyYWNl LmggICAgICAgfCAgIDE0ICsrKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmMgfCAgICA2ICsrKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5oIHwgICAgNCArKy0tCiA0IGZpbGVzIGNoYW5nZWQsIDE2IGluc2VydGlvbnMo KyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDg4MWM2ZWEu LjczMDQyOTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMzAwMyw4ICszMDAzLDggQEAg aTkxNV9nZW1fb2JqZWN0X3N5bmMoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAlp ZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JdHJhY2VfaTkxNV9nZW1fcmluZ19zeW5jX3RvKGZy b20sIHRvLCBvYmotPmxhc3RfcmVhZF9yZXEpOwotCXJldCA9IHRvLT5zZW1hcGhvcmUuc3luY190 byh0bywgZnJvbSwgc2Vxbm8pOworCXRyYWNlX2k5MTVfZ2VtX3Jpbmdfc3luY190bygqdG9fcmVx LCBmcm9tLCBvYmotPmxhc3RfcmVhZF9yZXEpOworCXJldCA9IHRvLT5zZW1hcGhvcmUuc3luY190 bygqdG9fcmVxLCBmcm9tLCBzZXFubyk7CiAJaWYgKCFyZXQpCiAJCS8qIFdlIHVzZSBsYXN0X3Jl YWRfcmVxIGJlY2F1c2Ugc3luY190bygpCiAJCSAqIG1pZ2h0IGhhdmUganVzdCBjYXVzZWQgc2Vx bm8gd3JhcCB1bmRlcgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV90cmFj ZS5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV90cmFjZS5oCmluZGV4IGYwNDRlMjkuLjhj YTUzNmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfdHJhY2UuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3RyYWNlLmgKQEAgLTMyNiwyOSArMzI2LDMxIEBA IFRSQUNFX0VWRU5UKGk5MTVfZ2VtX2V2aWN0X3ZtLAogKTsKIAogVFJBQ0VfRVZFTlQoaTkxNV9n ZW1fcmluZ19zeW5jX3RvLAotCSAgICBUUF9QUk9UTyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpm cm9tLAotCQkgICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnRvLAorCSAgICBUUF9QUk9UTyhz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnRvX3JlcSwKKwkJICAgICBzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICpmcm9tLAogCQkgICAgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx KSwKLQkgICAgVFBfQVJHUyhmcm9tLCB0bywgcmVxKSwKKwkgICAgVFBfQVJHUyh0b19yZXEsIGZy b20sIHJlcSksCiAKIAkgICAgVFBfU1RSVUNUX19lbnRyeSgKIAkJCSAgICAgX19maWVsZCh1MzIs IGRldikKIAkJCSAgICAgX19maWVsZCh1MzIsIHN5bmNfZnJvbSkKIAkJCSAgICAgX19maWVsZCh1 MzIsIHN5bmNfdG8pCisJCQkgICAgIF9fZmllbGQodTMyLCB1bmlxX3RvKQogCQkJICAgICBfX2Zp ZWxkKHUzMiwgc2Vxbm8pCiAJCQkgICAgICksCiAKIAkgICAgVFBfZmFzdF9hc3NpZ24oCiAJCQkg ICBfX2VudHJ5LT5kZXYgPSBmcm9tLT5kZXYtPnByaW1hcnktPmluZGV4OwogCQkJICAgX19lbnRy eS0+c3luY19mcm9tID0gZnJvbS0+aWQ7Ci0JCQkgICBfX2VudHJ5LT5zeW5jX3RvID0gdG8tPmlk OworCQkJICAgX19lbnRyeS0+c3luY190byA9IHRvX3JlcS0+cmluZy0+aWQ7CisJCQkgICBfX2Vu dHJ5LT51bmlxX3RvID0gdG9fcmVxLT51bmlxOwogCQkJICAgX19lbnRyeS0+c2Vxbm8gPSBpOTE1 X2dlbV9yZXF1ZXN0X2dldF9zZXFubyhyZXEpOwogCQkJICAgKSwKIAotCSAgICBUUF9wcmludGso ImRldj0ldSwgc3luYy1mcm9tPSV1LCBzeW5jLXRvPSV1LCBzZXFubz0ldSIsCisJICAgIFRQX3By aW50aygiZGV2PSV1LCBzeW5jLWZyb209JXUsIHN5bmMtdG89JXUsIHNlcW5vPSV1LCB0b191bmlx PSV1IiwKIAkJICAgICAgX19lbnRyeS0+ZGV2LAogCQkgICAgICBfX2VudHJ5LT5zeW5jX2Zyb20s IF9fZW50cnktPnN5bmNfdG8sCi0JCSAgICAgIF9fZW50cnktPnNlcW5vKQorCQkgICAgICBfX2Vu dHJ5LT5zZXFubywgX19lbnRyeS0+dW5pcV90bykKICk7CiAKIFRSQUNFX0VWRU5UKGk5MTVfZ2Vt X3JpbmdfZGlzcGF0Y2gsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5k ZXggNzdkMzU3Zi4uMmRlNDNjOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZm ZXIuYwpAQCAtMTI4NCwxMCArMTI4NCwxMSBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaTkxNV9nZW1f aGFzX3NlcW5vX3dyYXBwZWQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKICAqLwogCiBzdGF0aWMg aW50Ci1nZW44X3Jpbmdfc3luYyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICp3YWl0ZXIsCitnZW44 X3Jpbmdfc3luYyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKndhaXRlcl9yZXEsCiAJICAg ICAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnNpZ25hbGxlciwKIAkgICAgICAgdTMyIHNlcW5v KQogeworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKndhaXRlciA9IHdhaXRlcl9yZXEtPnJpbmc7 CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gd2FpdGVyLT5kZXYtPmRldl9w cml2YXRlOwogCWludCByZXQ7CiAKQEAgLTEzMDksMTAgKzEzMTAsMTEgQEAgZ2VuOF9yaW5nX3N5 bmMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqd2FpdGVyLAogfQogCiBzdGF0aWMgaW50Ci1nZW42 X3Jpbmdfc3luYyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICp3YWl0ZXIsCitnZW42X3Jpbmdfc3lu YyhzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKndhaXRlcl9yZXEsCiAJICAgICAgIHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKnNpZ25hbGxlciwKIAkgICAgICAgdTMyIHNlcW5vKQogeworCXN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKndhaXRlciA9IHdhaXRlcl9yZXEtPnJpbmc7CiAJdTMyIGR3 MSA9IE1JX1NFTUFQSE9SRV9NQk9YIHwKIAkJICBNSV9TRU1BUEhPUkVfQ09NUEFSRSB8CiAJCSAg TUlfU0VNQVBIT1JFX1JFR0lTVEVSOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5oCmluZGV4IDJkMWQ4YTYuLjExMDdmODIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmgKQEAgLTIyMiw4ICsyMjIsOCBAQCBzdHJ1Y3QgIGludGVsX2VuZ2luZV9jcyB7 CiAJCX07CiAKIAkJLyogQUtBIHdhaXQoKSAqLwotCQlpbnQJKCpzeW5jX3RvKShzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nLAotCQkJCSAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnRvLAor CQlpbnQJKCpzeW5jX3RvKShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnRvX3JlcSwKKwkJ CQkgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpmcm9tLAogCQkJCSAgIHUzMiBzZXFubyk7CiAJ CWludAkoKnNpZ25hbCkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqc2lnbmFsbGVyLAogCQkJCSAg LyogbnVtX2R3b3JkcyBuZWVkZWQgYnkgY2FsbGVyICovCi0tIAoxLjcuOS41CgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=