From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 36/59] drm/i915: Update workarounds_emit() to take request structures Date: Thu, 19 Mar 2015 12:30:41 +0000 Message-ID: <1426768264-16996-37-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 69DD06EA34 for ; Thu, 19 Mar 2015 05:31:48 -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 dGhlICpfcmluZ193b3JrYXJvdW5kc19lbWl0KCkgZnVuY3Rpb25zIHRvIHRha2UgcmVxdWVzdHMg aW5zdGVhZCBvZgpyaW5nL2NvbnRleHQgcGFpcnMuCgpGb3I6IFZJWi01MTE1ClNpZ25lZC1vZmYt Ynk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+ClJldmlld2VkLWJ5 OiBUb21hcyBFbGYgPHRvbWFzLmVsZkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMgICAgICAgIHwgICAxNCArKysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgICAgNiArKystLS0KIDIgZmlsZXMgY2hhbmdl ZCwgMTAgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuYwppbmRleCA5MTdhNzZjLi5iMmYwM2I5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpA QCAtMTA1NiwxMSArMTA1NiwxMSBAQCB2b2lkIGludGVsX2xyX2NvbnRleHRfdW5waW4oc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAl9CiB9CiAKLXN0YXRpYyBpbnQgaW50ZWxfbG9naWNh bF9yaW5nX3dvcmthcm91bmRzX2VtaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKLQkJ CQkJICAgICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgpCitzdGF0aWMgaW50IGludGVsX2xv Z2ljYWxfcmluZ193b3JrYXJvdW5kc19lbWl0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxKQogewogCWludCByZXQsIGk7Ci0Jc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYg PSBjdHgtPmVuZ2luZVtyaW5nLT5pZF0ucmluZ2J1ZjsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nID0gcmVxLT5yaW5nOworCXN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmID0g cmVxLT5yaW5nYnVmOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByaW5nLT5kZXY7CiAJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1 Y3QgaTkxNV93b3JrYXJvdW5kcyAqdyA9ICZkZXZfcHJpdi0+d29ya2Fyb3VuZHM7CkBAIC0xMDY5 LDExICsxMDY5LDExIEBAIHN0YXRpYyBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX3dvcmthcm91bmRz X2VtaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJcmV0dXJuIDA7CiAKIAlyaW5n LT5ncHVfY2FjaGVzX2RpcnR5ID0gdHJ1ZTsKLQlyZXQgPSBsb2dpY2FsX3JpbmdfZmx1c2hfYWxs X2NhY2hlcyhyaW5nYnVmLCBjdHgpOworCXJldCA9IGxvZ2ljYWxfcmluZ19mbHVzaF9hbGxfY2Fj aGVzKHJpbmdidWYsIHJlcS0+Y3R4KTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JcmV0 ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJpbmdidWYsIGN0eCwgdy0+Y291bnQgKiAyICsg Mik7CisJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJpbmdidWYsIHJlcS0+Y3R4LCB3 LT5jb3VudCAqIDIgKyAyKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC0xMDg3LDcg KzEwODcsNyBAQCBzdGF0aWMgaW50IGludGVsX2xvZ2ljYWxfcmluZ193b3JrYXJvdW5kc19lbWl0 KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJaW50ZWxfbG9naWNhbF9yaW5nX2FkdmFu Y2UocmluZ2J1Zik7CiAKIAlyaW5nLT5ncHVfY2FjaGVzX2RpcnR5ID0gdHJ1ZTsKLQlyZXQgPSBs b2dpY2FsX3JpbmdfZmx1c2hfYWxsX2NhY2hlcyhyaW5nYnVmLCBjdHgpOworCXJldCA9IGxvZ2lj YWxfcmluZ19mbHVzaF9hbGxfY2FjaGVzKHJpbmdidWYsIHJlcS0+Y3R4KTsKIAlpZiAocmV0KQog CQlyZXR1cm4gcmV0OwogCkBAIC0xMzU0LDcgKzEzNTQsNyBAQCBzdGF0aWMgaW50IGdlbjhfaW5p dF9yY3NfY29udGV4dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIHsKIAlpbnQg cmV0OwogCi0JcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX3dvcmthcm91bmRzX2VtaXQocmVxLT5y aW5nLCByZXEtPmN0eCk7CisJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX3dvcmthcm91bmRzX2Vt aXQocmVxKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggODQ4ODVmMi4uMmM0ZjQ1YyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtNzAzLDEwICs3MDMsMTAgQEAgZXJyOgogCXJl dHVybiByZXQ7CiB9CiAKLXN0YXRpYyBpbnQgaW50ZWxfcmluZ193b3JrYXJvdW5kc19lbWl0KHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCi0JCQkJICAgICAgIHN0cnVjdCBpbnRlbF9jb250 ZXh0ICpjdHgpCitzdGF0aWMgaW50IGludGVsX3Jpbmdfd29ya2Fyb3VuZHNfZW1pdChzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIHsKIAlpbnQgcmV0LCBpOworCXN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKnJpbmcgPSByZXEtPnJpbmc7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9 IHJpbmctPmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRl dl9wcml2YXRlOwogCXN0cnVjdCBpOTE1X3dvcmthcm91bmRzICp3ID0gJmRldl9wcml2LT53b3Jr YXJvdW5kczsKQEAgLTc0Niw3ICs3NDYsNyBAQCBzdGF0aWMgaW50IGludGVsX3Jjc19jdHhfaW5p dChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIHsKIAlpbnQgcmV0OwogCi0JcmV0 ID0gaW50ZWxfcmluZ193b3JrYXJvdW5kc19lbWl0KHJlcS0+cmluZywgcmVxLT5jdHgpOworCXJl dCA9IGludGVsX3Jpbmdfd29ya2Fyb3VuZHNfZW1pdChyZXEpOwogCWlmIChyZXQgIT0gMCkKIAkJ cmV0dXJuIHJldDsKIAotLSAKMS43LjkuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK