From mboxrd@z Thu Jan 1 00:00:00 1970 From: John.C.Harrison@Intel.com Subject: [PATCH 26/53] drm/i915: Update render_state_init() to take a request structure Date: Thu, 19 Feb 2015 17:17:38 +0000 Message-ID: <1424366285-29232-27-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 C944072097 for ; Thu, 19 Feb 2015 09:18:33 -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 dGhlIHR3byByZW5kZXJfc3RhdGVfaW5pdCgpIGZ1bmN0aW9ucyB0byB0YWtlIGEgcmVxdWVzdCBw b2ludGVyIGluc3RlYWQKb2YgYSByaW5nLiBUaGlzIHJlbW92ZXMgdGhlaXIgcmVsaWFuY2Ugb24g dGhlIE9MUi4KCnYyOiBSZWJhc2VkIHRvIG5ld2VyIHRyZWUuCgpGb3I6IFZJWi01MTE1ClNpZ25l ZC1vZmYtYnk6IEpvaG4gSGFycmlzb24gPEpvaG4uQy5IYXJyaXNvbkBJbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMgfCAgIDE4ICsrKysr KysrKy0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRl LmggfCAgICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAg ICB8ICAgMjIgKysrKysrKysrKy0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5jICAgICAgfCAgICAyICstCiA0IGZpbGVzIGNoYW5nZWQsIDIxIGluc2Vy dGlvbnMoKyksIDIzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fcmVuZGVyX3N0YXRlLmMKaW5kZXggOTg5NDc2ZS4uODVjYzc0NiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fcmVuZGVyX3N0YXRlLmMKQEAgLTE1MiwyOSArMTUyLDI5IEBA IGludCBpOTE1X2dlbV9yZW5kZXJfc3RhdGVfcHJlcGFyZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nLAogCXJldHVybiAwOwogfQogCi1pbnQgaTkxNV9nZW1fcmVuZGVyX3N0YXRlX2luaXQo c3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKK2ludCBpOTE1X2dlbV9yZW5kZXJfc3RhdGVf aW5pdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIHsKIAlzdHJ1Y3QgcmVuZGVy X3N0YXRlIHNvOwogCWludCByZXQ7CiAKLQlyZXQgPSBpOTE1X2dlbV9yZW5kZXJfc3RhdGVfcHJl cGFyZShyaW5nLCAmc28pOworCXJldCA9IGk5MTVfZ2VtX3JlbmRlcl9zdGF0ZV9wcmVwYXJlKHJl cS0+cmluZywgJnNvKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCiAJaWYgKHNvLnJvZGF0 YSA9PSBOVUxMKQogCQlyZXR1cm4gMDsKIAotCXJldCA9IHJpbmctPmRpc3BhdGNoX2V4ZWNidWZm ZXIocmluZywKLQkJCQkJc28uZ2d0dF9vZmZzZXQsCi0JCQkJCXNvLnJvZGF0YS0+YmF0Y2hfaXRl bXMgKiA0LAotCQkJCQlJOTE1X0RJU1BBVENIX1NFQ1VSRSk7CisJcmV0ID0gcmVxLT5yaW5nLT5k aXNwYXRjaF9leGVjYnVmZmVyKHJlcS0+cmluZywKKwkJCQkJICAgICBzby5nZ3R0X29mZnNldCwK KwkJCQkJICAgICBzby5yb2RhdGEtPmJhdGNoX2l0ZW1zICogNCwKKwkJCQkJICAgICBJOTE1X0RJ U1BBVENIX1NFQ1VSRSk7CiAJaWYgKHJldCkKIAkJZ290byBvdXQ7CiAKLQlpOTE1X3ZtYV9tb3Zl X3RvX2FjdGl2ZShpOTE1X2dlbV9vYmpfdG9fZ2d0dChzby5vYmopLCByaW5nKTsKKwlpOTE1X3Zt YV9tb3ZlX3RvX2FjdGl2ZShpOTE1X2dlbV9vYmpfdG9fZ2d0dChzby5vYmopLCByZXEtPnJpbmcp OwogCi0JV0FSTl9PTihyaW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVlc3QtPmJhdGNoX29iaik7 Ci0JcmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0LT5iYXRjaF9vYmogPSBzby5vYmo7CisJ V0FSTl9PTihyZXEtPmJhdGNoX29iaik7CisJcmVxLT5iYXRjaF9vYmogPSBzby5vYmo7CiAJLyog X19pOTE1X2FkZF9yZXF1ZXN0IG1vdmVzIG9iamVjdCB0byBpbmFjdGl2ZSBpZiBpdCBmYWlscyAq Lwogb3V0OgogCWk5MTVfZ2VtX3JlbmRlcl9zdGF0ZV9maW5pKCZzbyk7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9yZW5kZXJfc3RhdGUuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5oCmluZGV4IGM0NDk2MWUuLjdhYTczNzIg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3JlbmRlcl9zdGF0ZS5oCkBAIC0z OSw3ICszOSw3IEBAIHN0cnVjdCByZW5kZXJfc3RhdGUgewogCWludCBnZW47CiB9OwogCi1pbnQg aTkxNV9nZW1fcmVuZGVyX3N0YXRlX2luaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7 CitpbnQgaTkxNV9nZW1fcmVuZGVyX3N0YXRlX2luaXQoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1 ZXN0ICpyZXEpOwogdm9pZCBpOTE1X2dlbV9yZW5kZXJfc3RhdGVfZmluaShzdHJ1Y3QgcmVuZGVy X3N0YXRlICpzbyk7CiBpbnQgaTkxNV9nZW1fcmVuZGVyX3N0YXRlX3ByZXBhcmUoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqcmluZywKIAkJCQkgIHN0cnVjdCByZW5kZXJfc3RhdGUgKnNvKTsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggY2JlYzA1Ni4uZjBiYjk4YSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMKQEAgLTEzNDUsMzEgKzEzNDUsMjkgQEAgc3RhdGljIGludCBnZW44X2Vt aXRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKIAlyZXR1cm4gMDsK IH0KIAotc3RhdGljIGludCBpbnRlbF9scl9jb250ZXh0X3JlbmRlcl9zdGF0ZV9pbml0KHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCi0JCQkJCSAgICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0 ICpjdHgpCitzdGF0aWMgaW50IGludGVsX2xyX2NvbnRleHRfcmVuZGVyX3N0YXRlX2luaXQoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiB7Ci0Jc3RydWN0IGludGVsX3JpbmdidWZm ZXIgKnJpbmdidWYgPSBjdHgtPmVuZ2luZVtyaW5nLT5pZF0ucmluZ2J1ZjsKIAlzdHJ1Y3QgcmVu ZGVyX3N0YXRlIHNvOwogCWludCByZXQ7CiAKLQlyZXQgPSBpOTE1X2dlbV9yZW5kZXJfc3RhdGVf cHJlcGFyZShyaW5nLCAmc28pOworCXJldCA9IGk5MTVfZ2VtX3JlbmRlcl9zdGF0ZV9wcmVwYXJl KHJlcS0+cmluZywgJnNvKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCiAJaWYgKHNvLnJv ZGF0YSA9PSBOVUxMKQogCQlyZXR1cm4gMDsKIAotCXJldCA9IHJpbmctPmVtaXRfYmJfc3RhcnQo cmluZ2J1ZiwKLQkJCWN0eCwKLQkJCXNvLmdndHRfb2Zmc2V0LAotCQkJSTkxNV9ESVNQQVRDSF9T RUNVUkUpOworCXJldCA9IHJlcS0+cmluZy0+ZW1pdF9iYl9zdGFydChyZXEtPnJpbmdidWYsCisJ CQkJICAgICAgIHJlcS0+Y3R4LAorCQkJCSAgICAgICBzby5nZ3R0X29mZnNldCwKKwkJCQkgICAg ICAgSTkxNV9ESVNQQVRDSF9TRUNVUkUpOwogCWlmIChyZXQpCiAJCWdvdG8gb3V0OwogCi0JaTkx NV92bWFfbW92ZV90b19hY3RpdmUoaTkxNV9nZW1fb2JqX3RvX2dndHQoc28ub2JqKSwgcmluZyk7 CisJaTkxNV92bWFfbW92ZV90b19hY3RpdmUoaTkxNV9nZW1fb2JqX3RvX2dndHQoc28ub2JqKSwg cmVxLT5yaW5nKTsKIAotCVdBUk5fT04ocmluZy0+b3V0c3RhbmRpbmdfbGF6eV9yZXF1ZXN0LT5i YXRjaF9vYmopOwotCXJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdC0+YmF0Y2hfb2JqID0g c28ub2JqOworCVdBUk5fT04ocmVxLT5iYXRjaF9vYmopOworCXJlcS0+YmF0Y2hfb2JqID0gc28u b2JqOwogCS8qIF9faTkxNV9hZGRfcmVxdWVzdCBtb3ZlcyBvYmplY3QgdG8gaW5hY3RpdmUgaWYg aXQgZmFpbHMgKi8KIG91dDoKIAlpOTE1X2dlbV9yZW5kZXJfc3RhdGVfZmluaSgmc28pOwpAQCAt MTM4NCw3ICsxMzgyLDcgQEAgc3RhdGljIGludCBnZW44X2luaXRfcmNzX2NvbnRleHQoc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAot CXJldHVybiBpbnRlbF9scl9jb250ZXh0X3JlbmRlcl9zdGF0ZV9pbml0KHJlcS0+cmluZywgcmVx LT5jdHgpOworCXJldHVybiBpbnRlbF9scl9jb250ZXh0X3JlbmRlcl9zdGF0ZV9pbml0KHJlcSk7 CiB9CiAKIC8qKgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IDI2 OTY0YTIuLmVmYjE3MjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMK QEAgLTc4Myw3ICs3ODMsNyBAQCBzdGF0aWMgaW50IGludGVsX3Jjc19jdHhfaW5pdChzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkKIAlpZiAocmV0ICE9IDApCiAJCXJldHVybiByZXQ7 CiAKLQlyZXQgPSBpOTE1X2dlbV9yZW5kZXJfc3RhdGVfaW5pdChyZXEtPnJpbmcpOworCXJldCA9 IGk5MTVfZ2VtX3JlbmRlcl9zdGF0ZV9pbml0KHJlcSk7CiAJaWYgKHJldCkKIAkJRFJNX0VSUk9S KCJpbml0IHJlbmRlciBzdGF0ZTogJWRcbiIsIHJldCk7CiAKLS0gCjEuNy45LjUKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==