From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 4/6] drm/i915: Use to_i915() instead of guc_to_i915() Date: Fri, 15 Apr 2016 18:46:03 +0100 Message-ID: <1460742365-3646-5-git-send-email-chris@chris-wilson.co.uk> References: <1460742365-3646-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 46FA06E23C for ; Fri, 15 Apr 2016 17:46:17 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id y144so7984681wmd.0 for ; Fri, 15 Apr 2016 10:46:17 -0700 (PDT) In-Reply-To: <1460742365-3646-1-git-send-email-chris@chris-wilson.co.uk> 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 VGhlIGNvbnZlbmllbmNlIG9mIHNhdmluZyBhIGZldyBjaGFyYWN0ZXJzIGJ5IHVzaW5nIGEgY29u c2lzdGVudAppbnRlcmZhY2UgdG8gb2J0YWluIG91ciBkcm1faTkxNV9wcml2YXRlIHN0cnVjdCBm cm9tIGludGVsX2d1Yy4KClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMt d2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggICAgICAg ICAgICB8ICA1ICsrKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9u LmMgfCAxNyArKysrKysrLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxMSBpbnNlcnRpb25z KCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAyODJkODlk MDk3YWUuLjc2ZWViNDdjOWMxNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yMDE0LDcg KzIwMTQsOCBAQCBzdGF0aWMgaW5saW5lIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfdG9f aTkxNShjb25zdCBzdHJ1Y3QgZGV2aWNlICpkZXYpCiAJcmV0dXJuIF9fdG9faTkxNShkZXZfZ2V0 X2RydmRhdGEoZGV2KSk7CiB9CiAKLXN0YXRpYyBpbmxpbmUgc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmd1Y190b19pOTE1KHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKK3N0YXRpYyBpbmxpbmUgc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKgorX19ndWNfdG9faTkxNShjb25zdCBzdHJ1Y3QgaW50ZWxf Z3VjICpndWMpCiB7CiAJcmV0dXJuIGNvbnRhaW5lcl9vZihndWMsIHN0cnVjdCBkcm1faTkxNV9w cml2YXRlLCBndWMpOwogfQpAQCAtMjUwNiw2ICsyNTA3LDggQEAgc3RydWN0IGRybV9pOTE1X2Nt ZF90YWJsZSB7CiAJCV9fcCA9IF9fdG9faTkxNSgoc3RydWN0IGRybV9kZXZpY2UgKilwKTsgXAog CWVsc2UgaWYgKF9fYnVpbHRpbl90eXBlc19jb21wYXRpYmxlX3AodHlwZW9mKCpwKSwgc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QpKSBcCiAJCV9fcCA9IF9fb2JqX3RvX2k5MTUoKHN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICopcCk7IFwKKwllbHNlIGlmIChfX2J1aWx0aW5fdHlwZXNfY29t cGF0aWJsZV9wKHR5cGVvZigqcCksIHN0cnVjdCBpbnRlbF9ndWMpKSBcCisJCV9fcCA9IF9fZ3Vj X3RvX2k5MTUoKHN0cnVjdCBpbnRlbF9ndWMgKilwKTsgXAogCWVsc2UgXAogCQlCVUlMRF9CVUco KTsgXAogCV9fcDsgXApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNf c3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5j CmluZGV4IGRhODZiZGJiYTI3NS4uYzEwY2IxM2QwZmM5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCkBAIC03Nyw3ICs3Nyw3IEBAIHN0YXRpYyBpbmxpbmUg Ym9vbCBob3N0Mmd1Y19hY3Rpb25fcmVzcG9uc2Uoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LAogCiBzdGF0aWMgaW50IGhvc3QyZ3VjX2FjdGlvbihzdHJ1Y3QgaW50ZWxfZ3VjICpn dWMsIHUzMiAqZGF0YSwgdTMyIGxlbikKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSBndWNfdG9faTkxNShndWMpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoZ3VjKTsKIAl1MzIgc3RhdHVzOwogCWludCBpOwogCWludCByZXQ7CkBA IC0xNTIsNyArMTUyLDcgQEAgc3RhdGljIGludCBob3N0Mmd1Y19yZWxlYXNlX2Rvb3JiZWxsKHN0 cnVjdCBpbnRlbF9ndWMgKmd1YywKIHN0YXRpYyBpbnQgaG9zdDJndWNfc2FtcGxlX2ZvcmNld2Fr ZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAJCQkJICAgICBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50 ICpjbGllbnQpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3Rv X2k5MTUoZ3VjKTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1 KGd1Yyk7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGRldl9wcml2LT5kZXY7CiAJdTMyIGRh dGFbMl07CiAKQEAgLTI1NCw3ICsyNTQsNyBAQCBzdGF0aWMgaW50IGd1Y19yaW5nX2Rvb3JiZWxs KHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjKQogc3RhdGljIHZvaWQgZ3VjX2Rpc2FibGVfZG9v cmJlbGwoc3RydWN0IGludGVsX2d1YyAqZ3VjLAogCQkJCSBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50 ICpjbGllbnQpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3Rv X2k5MTUoZ3VjKTsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1 KGd1Yyk7CiAJc3RydWN0IGd1Y19kb29yYmVsbF9pbmZvICpkb29yYmVsbDsKIAl2b2lkICpiYXNl OwogCWk5MTVfcmVnX3QgZHJicmVnID0gR0VOOF9EUkJSRUdMKGNsaWVudC0+ZG9vcmJlbGxfaWQp OwpAQCAtMzc2LDcgKzM3Niw2IEBAIHN0YXRpYyB2b2lkIGd1Y19pbml0X3Byb2NfZGVzYyhzdHJ1 Y3QgaW50ZWxfZ3VjICpndWMsCiBzdGF0aWMgdm9pZCBndWNfaW5pdF9jdHhfZGVzYyhzdHJ1Y3Qg aW50ZWxfZ3VjICpndWMsCiAJCQkgICAgICBzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQp CiB7Ci0Jc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2k5MTUoZ3Vj KTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CiAJc3RydWN0IGludGVsX2NvbnRl eHQgKmN0eCA9IGNsaWVudC0+b3duZXI7CiAJc3RydWN0IGd1Y19jb250ZXh0X2Rlc2MgZGVzYzsK QEAgLTM5MCw3ICszODksNyBAQCBzdGF0aWMgdm9pZCBndWNfaW5pdF9jdHhfZGVzYyhzdHJ1Y3Qg aW50ZWxfZ3VjICpndWMsCiAJZGVzYy5wcmlvcml0eSA9IGNsaWVudC0+cHJpb3JpdHk7CiAJZGVz Yy5kYl9pZCA9IGNsaWVudC0+ZG9vcmJlbGxfaWQ7CiAKLQlmb3JfZWFjaF9lbmdpbmVfaWQoZW5n aW5lLCBkZXZfcHJpdiwgaWQpIHsKKwlmb3JfZWFjaF9lbmdpbmVfaWQoZW5naW5lLCBndWMsIGlk KSB7CiAJCXN0cnVjdCBndWNfZXhlY2xpc3RfY29udGV4dCAqbHJjID0gJmRlc2MubHJjW2VuZ2lu ZS0+Z3VjX2lkXTsKIAkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsKIAkJdWludDY0 X3QgY3R4X2Rlc2M7CkBAIC03NzIsNyArNzcxLDYgQEAgZXJyOgogCiBzdGF0aWMgdm9pZCBndWNf Y3JlYXRlX2xvZyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiB7Ci0Jc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2k5MTUoZ3VjKTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X29iamVjdCAqb2JqOwogCXVuc2lnbmVkIGxvbmcgb2Zmc2V0OwogCXVpbnQzMl90IHNpemUsIGZs YWdzOwpAQCAtNzkxLDcgKzc4OSw3IEBAIHN0YXRpYyB2b2lkIGd1Y19jcmVhdGVfbG9nKHN0cnVj dCBpbnRlbF9ndWMgKmd1YykKIAogCW9iaiA9IGd1Yy0+bG9nX29iajsKIAlpZiAoIW9iaikgewot CQlvYmogPSBnZW1fYWxsb2NhdGVfZ3VjX29iaihkZXZfcHJpdi0+ZGV2LCBzaXplKTsKKwkJb2Jq ID0gZ2VtX2FsbG9jYXRlX2d1Y19vYmoodG9faTkxNShndWMpLT5kZXYsIHNpemUpOwogCQlpZiAo IW9iaikgewogCQkJLyogbG9nZ2luZyB3aWxsIGJlIG9mZiAqLwogCQkJaTkxNS5ndWNfbG9nX2xl dmVsID0gLTE7CkBAIC04MzUsNyArODMzLDcgQEAgc3RhdGljIHZvaWQgaW5pdF9ndWNfcG9saWNp ZXMoc3RydWN0IGd1Y19wb2xpY2llcyAqcG9saWNpZXMpCiAKIHN0YXRpYyB2b2lkIGd1Y19jcmVh dGVfYWRzKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYgPSBndWNfdG9faTkxNShndWMpOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiA9IHRvX2k5MTUoZ3VjKTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq b2JqOwogCXN0cnVjdCBndWNfYWRzICphZHM7CiAJc3RydWN0IGd1Y19wb2xpY2llcyAqcG9saWNp ZXM7CkBAIC04NjgsOCArODY2LDcgQEAgc3RhdGljIHZvaWQgZ3VjX2NyZWF0ZV9hZHMoc3RydWN0 IGludGVsX2d1YyAqZ3VjKQogCSAqIHNvIGl0cyBhZGRyZXNzIHdvbid0IGNoYW5nZSBhZnRlciB3 ZSd2ZSB0b2xkIHRoZSBHdUMgd2hlcmUKIAkgKiB0byBmaW5kIGl0LgogCSAqLwotCWVuZ2luZSA9 ICZkZXZfcHJpdi0+ZW5naW5lW1JDU107Ci0JYWRzLT5nb2xkZW5fY29udGV4dF9scmNhID0gZW5n aW5lLT5zdGF0dXNfcGFnZS5nZnhfYWRkcjsKKwlhZHMtPmdvbGRlbl9jb250ZXh0X2xyY2EgPSBk ZXZfcHJpdi0+ZW5naW5lW1JDU10uc3RhdHVzX3BhZ2UuZ2Z4X2FkZHI7CiAKIAlmb3JfZWFjaF9l bmdpbmUoZW5naW5lLCBkZXZfcHJpdikKIAkJYWRzLT5lbmdfc3RhdGVfc2l6ZVtlbmdpbmUtPmd1 Y19pZF0gPSBpbnRlbF9scl9jb250ZXh0X3NpemUoZW5naW5lKTsKLS0gCjIuOC4wLnJjMwoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==