From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 2/4] drm/i915: Removed now redudant parameter to i915_gem_request_completed() Date: Fri, 26 Jun 2015 13:58:10 +0100 Message-ID: <1435323492-28630-3-git-send-email-John.C.Harrison@Intel.com> References: <1435323492-28630-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 4FC3E6ECC9 for ; Fri, 26 Jun 2015 05:58:17 -0700 (PDT) In-Reply-To: <1435323492-28630-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 RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClRoZSBjaGFu Z2UgdG8gdGhlIGltcGxlbWVudGF0aW9uIG9mIGk5MTVfZ2VtX3JlcXVlc3RfY29tcGxldGVkKCkg bWVhbnMgdGhhdCB0aGUKbGF6eSBjb2hlcmVuY3kgZmxhZyBpcyBubyBsb25nZXIgdXNlZC4gVGhp cyBjYW4gbm93IGJlIHJlbW92ZWQgdG8gc2ltcGxpZnkgdGhlCmludGVyZmFjZS4KCkZvcjogVkla LTUxOTAKU2lnbmVkLW9mZi1ieTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVs LmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyAgfCAgMiArLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgIHwgIDMgKy0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgfCAxOCArKysrKysrKystLS0tLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cG0uYyAgICAgIHwgIDQgKystLQogNiBmaWxlcyBjaGFuZ2VkLCAxNSBpbnNlcnRpb25zKCspLCAx NiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rl YnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCmluZGV4IDExNGFh MTMuLjNlMTlkMDQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdm cy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCkBAIC01ODgsNyAr NTg4LDcgQEAgc3RhdGljIGludCBpOTE1X2dlbV9wYWdlZmxpcF9pbmZvKHN0cnVjdCBzZXFfZmls ZSAqbSwgdm9pZCAqZGF0YSkKIAkJCQkJICAgaTkxNV9nZW1fcmVxdWVzdF9nZXRfc2Vxbm8od29y ay0+ZmxpcF9xdWV1ZWRfcmVxKSwKIAkJCQkJICAgZGV2X3ByaXYtPm5leHRfc2Vxbm8sCiAJCQkJ CSAgIHJpbmctPmdldF9zZXFubyhyaW5nLCB0cnVlKSwKLQkJCQkJICAgaTkxNV9nZW1fcmVxdWVz dF9jb21wbGV0ZWQod29yay0+ZmxpcF9xdWV1ZWRfcmVxLCB0cnVlKSk7CisJCQkJCSAgIGk5MTVf Z2VtX3JlcXVlc3RfY29tcGxldGVkKHdvcmstPmZsaXBfcXVldWVkX3JlcSkpOwogCQkJfSBlbHNl CiAJCQkJc2VxX3ByaW50ZihtLCAiRmxpcCBub3QgYXNzb2NpYXRlZCB3aXRoIGFueSByaW5nXG4i KTsKIAkJCXNlcV9wcmludGYobSwgIkZsaXAgcXVldWVkIG9uIGZyYW1lICVkLCAod2FzIHJlYWR5 IG9uIGZyYW1lICVkKSwgbm93ICVkXG4iLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggZmUy YzFhZi4uMmU2YzE1MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yMjIzLDggKzIyMjMs NyBAQCBpbnQgaTkxNV9nZW1fcmVxdWVzdF9hbGxvYyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nLAogCQkJICAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICoqcmVxX291dCk7CiB2b2lk IGk5MTVfZ2VtX3JlcXVlc3RfY2FuY2VsKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx KTsKIAotc3RhdGljIGlubGluZSBib29sIGk5MTVfZ2VtX3JlcXVlc3RfY29tcGxldGVkKHN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLAotCQkJCQkgICAgICBib29sIGxhenlfY29oZXJl bmN5KQorc3RhdGljIGlubGluZSBib29sIGk5MTVfZ2VtX3JlcXVlc3RfY29tcGxldGVkKHN0cnVj dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxKQogewogCXJldHVybiBmZW5jZV9pc19zaWduYWxl ZCgmcmVxLT5mZW5jZSk7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCA1ZmM0NGJmLi4w YWU3NmI0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTExNzksNyArMTE3OSw3IEBAIHN0 YXRpYyBpbnQgX19pOTE1X3NwaW5fcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg KnJlcSkKIAogCXRpbWVvdXQgPSBqaWZmaWVzICsgMTsKIAl3aGlsZSAoIW5lZWRfcmVzY2hlZCgp KSB7Ci0JCWlmIChpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChyZXEsIHRydWUpKQorCQlpZiAo aTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0ZWQocmVxKSkKIAkJCXJldHVybiAwOwogCiAJCWlmICh0 aW1lX2FmdGVyX2VxKGppZmZpZXMsIHRpbWVvdXQpKQpAQCAtMTE4Nyw3ICsxMTg3LDcgQEAgc3Rh dGljIGludCBfX2k5MTVfc3Bpbl9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxKQogCiAJCWNwdV9yZWxheF9sb3dsYXRlbmN5KCk7CiAJfQotCWlmIChpOTE1X2dlbV9yZXF1 ZXN0X2NvbXBsZXRlZChyZXEsIGZhbHNlKSkKKwlpZiAoaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0 ZWQocmVxKSkKIAkJcmV0dXJuIDA7CiAKIAlyZXR1cm4gLUVBR0FJTjsKQEAgLTEyMzEsNyArMTIz MSw3IEBAIGludCBfX2k5MTVfd2FpdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcmVxLAogCWlmIChsaXN0X2VtcHR5KCZyZXEtPmxpc3QpKQogCQlyZXR1cm4gMDsKIAotCWlm IChpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChyZXEsIHRydWUpKQorCWlmIChpOTE1X2dlbV9y ZXF1ZXN0X2NvbXBsZXRlZChyZXEpKQogCQlyZXR1cm4gMDsKIAogCXRpbWVvdXRfZXhwaXJlID0g dGltZW91dCA/CkBAIC0xMjcxLDcgKzEyNzEsNyBAQCBpbnQgX19pOTE1X3dhaXRfcmVxdWVzdChz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkJCWJyZWFrOwogCQl9CiAKLQkJaWYg KGk5MTVfZ2VtX3JlcXVlc3RfY29tcGxldGVkKHJlcSwgZmFsc2UpKSB7CisJCWlmIChpOTE1X2dl bV9yZXF1ZXN0X2NvbXBsZXRlZChyZXEpKSB7CiAJCQlyZXQgPSAwOwogCQkJYnJlYWs7CiAJCX0K QEAgLTI3NTMsNyArMjc1Myw3IEBAIGk5MTVfZ2VtX2ZpbmRfYWN0aXZlX3JlcXVlc3Qoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJl cXVlc3Q7CiAKIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KHJlcXVlc3QsICZyaW5nLT5yZXF1ZXN0X2xp c3QsIGxpc3QpIHsKLQkJaWYgKGk5MTVfZ2VtX3JlcXVlc3RfY29tcGxldGVkKHJlcXVlc3QsIGZh bHNlKSkKKwkJaWYgKGk5MTVfZ2VtX3JlcXVlc3RfY29tcGxldGVkKHJlcXVlc3QpKQogCQkJY29u dGludWU7CiAKIAkJcmV0dXJuIHJlcXVlc3Q7CkBAIC0yODk2LDcgKzI4OTYsNyBAQCBpOTE1X2dl bV9yZXRpcmVfcmVxdWVzdHNfcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCQkJ CQkgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QsCiAJCQkJCSAgIGxpc3QpOwogCi0JCWlm ICghaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0ZWQocmVxdWVzdCwgdHJ1ZSkpCisJCWlmICghaTkx NV9nZW1fcmVxdWVzdF9jb21wbGV0ZWQocmVxdWVzdCkpCiAJCQlicmVhazsKIAogCQlpOTE1X2dl bV9yZXF1ZXN0X3JldGlyZShyZXF1ZXN0KTsKQEAgLTI5MjAsNyArMjkyMCw3IEBAIGk5MTVfZ2Vt X3JldGlyZV9yZXF1ZXN0c19yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJfQog CiAJaWYgKHVubGlrZWx5KHJpbmctPnRyYWNlX2lycV9yZXEgJiYKLQkJICAgICBpOTE1X2dlbV9y ZXF1ZXN0X2NvbXBsZXRlZChyaW5nLT50cmFjZV9pcnFfcmVxLCB0cnVlKSkpIHsKKwkJICAgICBp OTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChyaW5nLT50cmFjZV9pcnFfcmVxKSkpIHsKIAkJcmlu Zy0+aXJxX3B1dChyaW5nKTsKIAkJaTkxNV9nZW1fcmVxdWVzdF9hc3NpZ24oJnJpbmctPnRyYWNl X2lycV9yZXEsIE5VTEwpOwogCX0KQEAgLTMwMjYsNyArMzAyNiw3IEBAIGk5MTVfZ2VtX29iamVj dF9mbHVzaF9hY3RpdmUoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIAkJaWYgKGxp c3RfZW1wdHkoJnJlcS0+bGlzdCkpCiAJCQlnb3RvIHJldGlyZTsKIAotCQlpZiAoaTkxNV9nZW1f cmVxdWVzdF9jb21wbGV0ZWQocmVxLCB0cnVlKSkgeworCQlpZiAoaTkxNV9nZW1fcmVxdWVzdF9j b21wbGV0ZWQocmVxKSkgewogCQkJX19pOTE1X2dlbV9yZXF1ZXN0X3JldGlyZV9fdXB0byhyZXEp OwogcmV0aXJlOgogCQkJaTkxNV9nZW1fb2JqZWN0X3JldGlyZV9fcmVhZChvYmosIGkpOwpAQCAt MzEzOCw3ICszMTM4LDcgQEAgX19pOTE1X2dlbV9vYmplY3Rfc3luYyhzdHJ1Y3QgZHJtX2k5MTVf Z2VtX29iamVjdCAqb2JqLAogCWlmICh0byA9PSBmcm9tKQogCQlyZXR1cm4gMDsKIAotCWlmIChp OTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChmcm9tX3JlcSwgdHJ1ZSkpCisJaWYgKGk5MTVfZ2Vt X3JlcXVlc3RfY29tcGxldGVkKGZyb21fcmVxKSkKIAkJcmV0dXJuIDA7CiAKIAlpZiAoIWk5MTVf c2VtYXBob3JlX2lzX2VuYWJsZWQob2JqLT5iYXNlLmRldikpIHsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2ly cS5jCmluZGV4IDllNWFlYTYuLmJhYjJjYTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwpAQCAt MjQ5OSw3ICsyNDk5LDcgQEAgc3RhdGljIGJvb2wKIHJpbmdfaWRsZShzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICpyaW5nKQogewogCXJldHVybiAobGlzdF9lbXB0eSgmcmluZy0+cmVxdWVzdF9saXN0 KSB8fAotCQlpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChyaW5nX2xhc3RfcmVxdWVzdChyaW5n KSwgZmFsc2UpKTsKKwkJaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0ZWQocmluZ19sYXN0X3JlcXVl c3QocmluZykpKTsKIH0KIAogc3RhdGljIGJvb2wKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYwppbmRleCBiZjYzMGEyLi4yMGU2Njc1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCkBAIC0xMTI5Miw3ICsxMTI5Miw3IEBAIHN0YXRpYyBib29sIF9faW50ZWxfcGFnZWZs aXBfc3RhbGxfY2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogCWlmICh3b3JrLT5mbGlw X3JlYWR5X3ZibGFuayA9PSAwKSB7CiAJCWlmICh3b3JrLT5mbGlwX3F1ZXVlZF9yZXEgJiYKLQkJ ICAgICFpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZCh3b3JrLT5mbGlwX3F1ZXVlZF9yZXEsIHRy dWUpKQorCQkgICAgIWk5MTVfZ2VtX3JlcXVlc3RfY29tcGxldGVkKHdvcmstPmZsaXBfcXVldWVk X3JlcSkpCiAJCQlyZXR1cm4gZmFsc2U7CiAKIAkJd29yay0+ZmxpcF9yZWFkeV92YmxhbmsgPSBk cm1fY3J0Y192YmxhbmtfY291bnQoY3J0Yyk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCAz MmZmMDM0Li4xYzhlMmIyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTY4NzcsNyArNjg3 Nyw3IEBAIHN0YXRpYyB2b2lkIF9faW50ZWxfcnBzX2Jvb3N0X3dvcmsoc3RydWN0IHdvcmtfc3Ry dWN0ICp3b3JrKQogCXN0cnVjdCByZXF1ZXN0X2Jvb3N0ICpib29zdCA9IGNvbnRhaW5lcl9vZih3 b3JrLCBzdHJ1Y3QgcmVxdWVzdF9ib29zdCwgd29yayk7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9y ZXF1ZXN0ICpyZXEgPSBib29zdC0+cmVxOwogCi0JaWYgKCFpOTE1X2dlbV9yZXF1ZXN0X2NvbXBs ZXRlZChyZXEsIHRydWUpKQorCWlmICghaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0ZWQocmVxKSkK IAkJZ2VuNl9ycHNfYm9vc3QodG9faTkxNShyZXEtPnJpbmctPmRldiksIE5VTEwsCiAJCQkgICAg ICAgcmVxLT5lbWl0dGVkX2ppZmZpZXMpOwogCkBAIC02ODkzLDcgKzY4OTMsNyBAQCB2b2lkIGlu dGVsX3F1ZXVlX3Jwc19ib29zdF9mb3JfcmVxdWVzdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAog CWlmIChyZXEgPT0gTlVMTCB8fCBJTlRFTF9JTkZPKGRldiktPmdlbiA8IDYpCiAJCXJldHVybjsK IAotCWlmIChpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChyZXEsIHRydWUpKQorCWlmIChpOTE1 X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChyZXEpKQogCQlyZXR1cm47CiAKIAlib29zdCA9IGttYWxs b2Moc2l6ZW9mKCpib29zdCksIEdGUF9BVE9NSUMpOwotLSAKMS45LjEKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==