From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 5/5] drm/i915: Simplify intel_init_ring_buffer prototype Date: Fri, 1 Jul 2016 17:47:15 +0100 Message-ID: <1467391635-9902-5-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1467391635-9902-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id EC9726E1D2 for ; Fri, 1 Jul 2016 16:47:22 +0000 (UTC) In-Reply-To: <1467391635-9902-1-git-send-email-tvrtko.ursulin@linux.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkVuZ2luZSBj b250YWlucyBkZXZfcHJpdiBzbyBuZWVkIHRvIHBhc3MgaXQgaW4uCgpTaWduZWQtb2ZmLWJ5OiBU dnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyB8IDE4ICsrKysrKysrLS0tLS0tLS0tLQogMSBm aWxlIGNoYW5nZWQsIDggaW5zZXJ0aW9ucygrKSwgMTAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IDk2NDc3NmJiMTgxYy4uNzYwYzZiNTNm MDYzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC0yMzc2LDIx ICsyMzc2LDE5IEBAIHN0YXRpYyB2b2lkIGludGVsX3JpbmdfY29udGV4dF91bnBpbihzdHJ1Y3Qg aTkxNV9nZW1fY29udGV4dCAqY3R4LAogCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2UoY3R4 KTsKIH0KIAotc3RhdGljIGludCBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsCi0JCQkJICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCitzdGF0aWMg aW50IGludGVsX2luaXRfcmluZ19idWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsK KwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmk5MTU7CiAJc3Ry dWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWY7CiAJaW50IHJldDsKIAogCVdBUk5fT04oZW5n aW5lLT5idWZmZXIpOwogCi0JZW5naW5lLT5pOTE1ID0gZGV2X3ByaXY7CiAJSU5JVF9MSVNUX0hF QUQoJmVuZ2luZS0+YWN0aXZlX2xpc3QpOwogCUlOSVRfTElTVF9IRUFEKCZlbmdpbmUtPnJlcXVl c3RfbGlzdCk7CiAJSU5JVF9MSVNUX0hFQUQoJmVuZ2luZS0+ZXhlY2xpc3RfcXVldWUpOwogCUlO SVRfTElTVF9IRUFEKCZlbmdpbmUtPmJ1ZmZlcnMpOwotCWk5MTVfZ2VtX2JhdGNoX3Bvb2xfaW5p dChkZXYsICZlbmdpbmUtPmJhdGNoX3Bvb2wpOworCWk5MTVfZ2VtX2JhdGNoX3Bvb2xfaW5pdChk ZXZfcHJpdi0+ZGV2LCAmZW5naW5lLT5iYXRjaF9wb29sKTsKIAltZW1zZXQoZW5naW5lLT5zZW1h cGhvcmUuc3luY19zZXFubywgMCwKIAkgICAgICAgc2l6ZW9mKGVuZ2luZS0+c2VtYXBob3JlLnN5 bmNfc2Vxbm8pKTsKIApAQCAtMzA5Nyw3ICszMDk1LDcgQEAgaW50IGludGVsX2luaXRfcmVuZGVy X3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkJZW5naW5lLT5z Y3JhdGNoLmd0dF9vZmZzZXQgPSBpOTE1X2dlbV9vYmpfZ2d0dF9vZmZzZXQob2JqKTsKIAl9CiAK LQlyZXQgPSBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKGRldl9wcml2LT5kZXYsIGVuZ2luZSk7CisJ cmV0ID0gaW50ZWxfaW5pdF9yaW5nX2J1ZmZlcihlbmdpbmUpOwogCWlmIChyZXQpCiAJCXJldHVy biByZXQ7CiAKQEAgLTMxMzMsNyArMzEzMSw3IEBAIGludCBpbnRlbF9pbml0X2JzZF9yaW5nX2J1 ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJCQllbmdpbmUtPmlycV9lbmFi bGVfbWFzayA9IEk5MTVfQlNEX1VTRVJfSU5URVJSVVBUOwogCX0KIAotCXJldHVybiBpbnRlbF9p bml0X3JpbmdfYnVmZmVyKGRldl9wcml2LT5kZXYsIGVuZ2luZSk7CisJcmV0dXJuIGludGVsX2lu aXRfcmluZ19idWZmZXIoZW5naW5lKTsKIH0KIAogLyoqCkBAIC0zMTQ4LDcgKzMxNDYsNyBAQCBp bnQgaW50ZWxfaW5pdF9ic2QyX3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSkKIAogCWVuZ2luZS0+Zmx1c2ggPSBnZW42X2JzZF9yaW5nX2ZsdXNoOwogCi0JcmV0dXJu IGludGVsX2luaXRfcmluZ19idWZmZXIoZGV2X3ByaXYtPmRldiwgZW5naW5lKTsKKwlyZXR1cm4g aW50ZWxfaW5pdF9yaW5nX2J1ZmZlcihlbmdpbmUpOwogfQogCiBpbnQgaW50ZWxfaW5pdF9ibHRf cmluZ19idWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQpAQCAtMzE2Miw3ICsz MTYwLDcgQEAgaW50IGludGVsX2luaXRfYmx0X3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSkKIAlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDgpCiAJCWVuZ2luZS0+ aXJxX2VuYWJsZV9tYXNrID0gR1RfQkxUX1VTRVJfSU5URVJSVVBUOwogCi0JcmV0dXJuIGludGVs X2luaXRfcmluZ19idWZmZXIoZGV2X3ByaXYtPmRldiwgZW5naW5lKTsKKwlyZXR1cm4gaW50ZWxf aW5pdF9yaW5nX2J1ZmZlcihlbmdpbmUpOwogfQogCiBpbnQgaW50ZWxfaW5pdF92ZWJveF9yaW5n X2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCkBAIC0zMTgwLDcgKzMxNzgs NyBAQCBpbnQgaW50ZWxfaW5pdF92ZWJveF9yaW5nX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUpCiAJCWVuZ2luZS0+aXJxX3B1dCA9IGhzd192ZWJveF9wdXRfaXJxOwogCX0K IAotCXJldHVybiBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKGRldl9wcml2LT5kZXYsIGVuZ2luZSk7 CisJcmV0dXJuIGludGVsX2luaXRfcmluZ19idWZmZXIoZW5naW5lKTsKIH0KIAogaW50Ci0tIAox LjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==