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: Wed, 6 Jul 2016 11:52:11 +0100 Message-ID: <1467802331-5402-5-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1467802331-5402-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 711366E633 for ; Wed, 6 Jul 2016 10:52:28 +0000 (UTC) In-Reply-To: <1467802331-5402-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 ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IDZiMjRjMTY0MmQ4NC4uMjZmZTMxMjAw NWQxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC0yMTY3LDIx ICsyMTY3LDE5IEBAIHN0YXRpYyB2b2lkIGludGVsX3JpbmdfY29udGV4dF91bnBpbihzdHJ1Y3Qg aTkxNV9nZW1fY29udGV4dCAqY3R4LAogCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2UoY3R4 KTsKIH0KIAotc3RhdGljIGludCBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsCi0JCQkJICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCitzdGF0aWMg aW50IGludGVsX2luaXRfcmluZ19idWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KQogewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZGV2KTsK KwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBlbmdpbmUtPmk5MTU7CiAJc3Ry dWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWY7CiAJaW50IHJldDsKIAogCVdBUk5fT04oZW5n aW5lLT5idWZmZXIpOwogCi0JZW5naW5lLT5pOTE1ID0gZGV2X3ByaXY7CiAJSU5JVF9MSVNUX0hF QUQoJmVuZ2luZS0+YWN0aXZlX2xpc3QpOwogCUlOSVRfTElTVF9IRUFEKCZlbmdpbmUtPnJlcXVl c3RfbGlzdCk7CiAJSU5JVF9MSVNUX0hFQUQoJmVuZ2luZS0+ZXhlY2xpc3RfcXVldWUpOwogCUlO SVRfTElTVF9IRUFEKCZlbmdpbmUtPmJ1ZmZlcnMpOwotCWk5MTVfZ2VtX2JhdGNoX3Bvb2xfaW5p dChkZXYsICZlbmdpbmUtPmJhdGNoX3Bvb2wpOworCWk5MTVfZ2VtX2JhdGNoX3Bvb2xfaW5pdCgm ZGV2X3ByaXYtPmRybSwgJmVuZ2luZS0+YmF0Y2hfcG9vbCk7CiAJbWVtc2V0KGVuZ2luZS0+c2Vt YXBob3JlLnN5bmNfc2Vxbm8sIDAsCiAJICAgICAgIHNpemVvZihlbmdpbmUtPnNlbWFwaG9yZS5z eW5jX3NlcW5vKSk7CiAKQEAgLTI4NzQsNyArMjg3Miw3IEBAIGludCBpbnRlbF9pbml0X3JlbmRl cl9yaW5nX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJZW5naW5lLT5p bml0X2h3ID0gaW5pdF9yZW5kZXJfcmluZzsKIAllbmdpbmUtPmNsZWFudXAgPSByZW5kZXJfcmlu Z19jbGVhbnVwOwogCi0JcmV0ID0gaW50ZWxfaW5pdF9yaW5nX2J1ZmZlcigmZGV2X3ByaXYtPmRy bSwgZW5naW5lKTsKKwlyZXQgPSBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKGVuZ2luZSk7CiAJaWYg KHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMjkxMyw3ICsyOTExLDcgQEAgaW50IGludGVsX2lu aXRfYnNkX3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkJCWVu Z2luZS0+aXJxX2VuYWJsZV9tYXNrID0gSTkxNV9CU0RfVVNFUl9JTlRFUlJVUFQ7CiAJfQogCi0J cmV0dXJuIGludGVsX2luaXRfcmluZ19idWZmZXIoJmRldl9wcml2LT5kcm0sIGVuZ2luZSk7CisJ cmV0dXJuIGludGVsX2luaXRfcmluZ19idWZmZXIoZW5naW5lKTsKIH0KIAogLyoqCkBAIC0yOTI3 LDcgKzI5MjUsNyBAQCBpbnQgaW50ZWxfaW5pdF9ic2QyX3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSkKIAogCWVuZ2luZS0+Zmx1c2ggPSBnZW42X2JzZF9yaW5nX2Zs dXNoOwogCi0JcmV0dXJuIGludGVsX2luaXRfcmluZ19idWZmZXIoJmRldl9wcml2LT5kcm0sIGVu Z2luZSk7CisJcmV0dXJuIGludGVsX2luaXRfcmluZ19idWZmZXIoZW5naW5lKTsKIH0KIAogaW50 IGludGVsX2luaXRfYmx0X3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZSkKQEAgLTI5NDAsNyArMjkzOCw3IEBAIGludCBpbnRlbF9pbml0X2JsdF9yaW5nX2J1ZmZlcihz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikg PCA4KQogCQllbmdpbmUtPmlycV9lbmFibGVfbWFzayA9IEdUX0JMVF9VU0VSX0lOVEVSUlVQVDsK IAotCXJldHVybiBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKCZkZXZfcHJpdi0+ZHJtLCBlbmdpbmUp OworCXJldHVybiBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKGVuZ2luZSk7CiB9CiAKIGludCBpbnRl bF9pbml0X3ZlYm94X3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkK QEAgLTI5NTcsNyArMjk1NSw3IEBAIGludCBpbnRlbF9pbml0X3ZlYm94X3JpbmdfYnVmZmVyKHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAkJZW5naW5lLT5pcnFfZGlzYWJsZSA9IGhz d192ZWJveF9pcnFfZGlzYWJsZTsKIAl9CiAKLQlyZXR1cm4gaW50ZWxfaW5pdF9yaW5nX2J1ZmZl cigmZGV2X3ByaXYtPmRybSwgZW5naW5lKTsKKwlyZXR1cm4gaW50ZWxfaW5pdF9yaW5nX2J1ZmZl cihlbmdpbmUpOwogfQogCiBpbnQKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK