From: John.C.Harrison@Intel.com Subject: [PATCH 34/53] drm/i915: Update workarounds_emit() to take request structures Date: Thu, 19 Feb 2015 17:17:46 +0000 Message-ID: <1424366285-29232-35-git-send-email-John.C.Harrison@Intel.com> References: <1423828140-10653-1-git-send-email-John.C.Harrison@Intel.com> <1424366285-29232-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 4E34E72094 for ; Thu, 19 Feb 2015 09:18:42 -0800 (PST) In-Reply-To: <1424366285-29232-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+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgIHwgICAxNCArKysrKysrLS0tLS0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgICAgNiArKystLS0KIDIg ZmlsZXMgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuYwppbmRleCBmYWI5MjY5Li4wOGVkODAwIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuYwpAQCAtMTA3NiwxMSArMTA3NiwxMSBAQCBpbnQgaW50ZWxfbG9naWNhbF9yaW5n X2JlZ2luKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCXJldHVybiAwOwogfQog Ci1zdGF0aWMgaW50IGludGVsX2xvZ2ljYWxfcmluZ193b3JrYXJvdW5kc19lbWl0KHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKnJpbmcsCi0JCQkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAq Y3R4KQorc3RhdGljIGludCBpbnRlbF9sb2dpY2FsX3Jpbmdfd29ya2Fyb3VuZHNfZW1pdChzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIHsKIAlpbnQgcmV0LCBpOwotCXN0cnVjdCBp bnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmID0gY3R4LT5lbmdpbmVbcmluZy0+aWRdLnJpbmdidWY7 CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJlcS0+cmluZzsKKwlzdHJ1Y3QgaW50 ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiA9IHJlcS0+cmluZ2J1ZjsKIAlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2ID0gcmluZy0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGk5MTVfd29ya2Fyb3VuZHMgKncgPSAmZGV2X3By aXYtPndvcmthcm91bmRzOwpAQCAtMTA4OSwxMSArMTA4OSwxMSBAQCBzdGF0aWMgaW50IGludGVs X2xvZ2ljYWxfcmluZ193b3JrYXJvdW5kc19lbWl0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp bmcsCiAJCXJldHVybiAwOwogCiAJcmluZy0+Z3B1X2NhY2hlc19kaXJ0eSA9IHRydWU7Ci0JcmV0 ID0gbG9naWNhbF9yaW5nX2ZsdXNoX2FsbF9jYWNoZXMocmluZ2J1ZiwgY3R4KTsKKwlyZXQgPSBs b2dpY2FsX3JpbmdfZmx1c2hfYWxsX2NhY2hlcyhyaW5nYnVmLCByZXEtPmN0eCk7CiAJaWYgKHJl dCkKIAkJcmV0dXJuIHJldDsKIAotCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5n YnVmLCBjdHgsIHctPmNvdW50ICogMiArIDIpOworCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19i ZWdpbihyaW5nYnVmLCByZXEtPmN0eCwgdy0+Y291bnQgKiAyICsgMik7CiAJaWYgKHJldCkKIAkJ cmV0dXJuIHJldDsKIApAQCAtMTEwNyw3ICsxMTA3LDcgQEAgc3RhdGljIGludCBpbnRlbF9sb2dp Y2FsX3Jpbmdfd29ya2Fyb3VuZHNfZW1pdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAog CWludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlKHJpbmdidWYpOwogCiAJcmluZy0+Z3B1X2NhY2hl c19kaXJ0eSA9IHRydWU7Ci0JcmV0ID0gbG9naWNhbF9yaW5nX2ZsdXNoX2FsbF9jYWNoZXMocmlu Z2J1ZiwgY3R4KTsKKwlyZXQgPSBsb2dpY2FsX3JpbmdfZmx1c2hfYWxsX2NhY2hlcyhyaW5nYnVm LCByZXEtPmN0eCk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMTM3Nyw3ICsxMzc3 LDcgQEAgc3RhdGljIGludCBnZW44X2luaXRfcmNzX2NvbnRleHQoc3RydWN0IGRybV9pOTE1X2dl bV9yZXF1ZXN0ICpyZXEpCiB7CiAJaW50IHJldDsKIAotCXJldCA9IGludGVsX2xvZ2ljYWxfcmlu Z193b3JrYXJvdW5kc19lbWl0KHJlcS0+cmluZywgcmVxLT5jdHgpOworCXJldCA9IGludGVsX2xv Z2ljYWxfcmluZ193b3JrYXJvdW5kc19lbWl0KHJlcSk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJl dDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IGVmYTQ0ZGIu LmQxNDdmZmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZm ZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTcz NiwxMCArNzM2LDEwIEBAIGVycjoKIAlyZXR1cm4gcmV0OwogfQogCi1zdGF0aWMgaW50IGludGVs X3Jpbmdfd29ya2Fyb3VuZHNfZW1pdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAotCQkJ CSAgICAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KQorc3RhdGljIGludCBpbnRlbF9yaW5n X3dvcmthcm91bmRzX2VtaXQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiB7CiAJ aW50IHJldCwgaTsKKwlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmVxLT5yaW5nOwog CXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByaW5nLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaTkxNV93b3JrYXJv dW5kcyAqdyA9ICZkZXZfcHJpdi0+d29ya2Fyb3VuZHM7CkBAIC03NzksNyArNzc5LDcgQEAgc3Rh dGljIGludCBpbnRlbF9yY3NfY3R4X2luaXQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpy ZXEpCiB7CiAJaW50IHJldDsKIAotCXJldCA9IGludGVsX3Jpbmdfd29ya2Fyb3VuZHNfZW1pdChy ZXEtPnJpbmcsIHJlcS0+Y3R4KTsKKwlyZXQgPSBpbnRlbF9yaW5nX3dvcmthcm91bmRzX2VtaXQo cmVxKTsKIAlpZiAocmV0ICE9IDApCiAJCXJldHVybiByZXQ7CiAKLS0gCjEuNy45LjUKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==