From: Tvrtko Ursulin Subject: [PATCH 5/7] drm/i915: Simplify intel_init_ring_buffer prototype Date: Wed, 13 Jul 2016 16:03:39 +0100 Message-ID: <1468422221-12132-5-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1468422221-12132-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 14F456E772 for ; Wed, 13 Jul 2016 15:08:19 +0000 (UTC) In-Reply-To: <1468422221-12132-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 dnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogRGFu aWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgfCAxOCArKysrKysrKy0tLS0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCA2MmY4Yzc3N2NlZjEuLjNhOGRmNzUyY2VhZSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMjE2OCwyMSArMjE2 OCwxOSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9yaW5nX2NvbnRleHRfdW5waW4oc3RydWN0IGk5MTVf Z2VtX2NvbnRleHQgKmN0eCwKIAlpOTE1X2dlbV9jb250ZXh0X3VucmVmZXJlbmNlKGN0eCk7CiB9 CiAKLXN0YXRpYyBpbnQgaW50ZWxfaW5pdF9yaW5nX2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAotCQkJCSAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQorc3RhdGljIGludCBp bnRlbF9pbml0X3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsK LQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CisJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZW5naW5lLT5pOTE1OwogCXN0cnVjdCBp bnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmOwogCWludCByZXQ7CiAKIAlXQVJOX09OKGVuZ2luZS0+ YnVmZmVyKTsKIAotCWVuZ2luZS0+aTkxNSA9IGRldl9wcml2OwogCUlOSVRfTElTVF9IRUFEKCZl bmdpbmUtPmFjdGl2ZV9saXN0KTsKIAlJTklUX0xJU1RfSEVBRCgmZW5naW5lLT5yZXF1ZXN0X2xp c3QpOwogCUlOSVRfTElTVF9IRUFEKCZlbmdpbmUtPmV4ZWNsaXN0X3F1ZXVlKTsKIAlJTklUX0xJ U1RfSEVBRCgmZW5naW5lLT5idWZmZXJzKTsKLQlpOTE1X2dlbV9iYXRjaF9wb29sX2luaXQoZGV2 LCAmZW5naW5lLT5iYXRjaF9wb29sKTsKKwlpOTE1X2dlbV9iYXRjaF9wb29sX2luaXQoJmRldl9w cml2LT5kcm0sICZlbmdpbmUtPmJhdGNoX3Bvb2wpOwogCW1lbXNldChlbmdpbmUtPnNlbWFwaG9y ZS5zeW5jX3NlcW5vLCAwLAogCSAgICAgICBzaXplb2YoZW5naW5lLT5zZW1hcGhvcmUuc3luY19z ZXFubykpOwogCkBAIC0yODc1LDcgKzI4NzMsNyBAQCBpbnQgaW50ZWxfaW5pdF9yZW5kZXJfcmlu Z19idWZmZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCWVuZ2luZS0+aW5pdF9o dyA9IGluaXRfcmVuZGVyX3Jpbmc7CiAJZW5naW5lLT5jbGVhbnVwID0gcmVuZGVyX3JpbmdfY2xl YW51cDsKIAotCXJldCA9IGludGVsX2luaXRfcmluZ19idWZmZXIoJmRldl9wcml2LT5kcm0sIGVu Z2luZSk7CisJcmV0ID0gaW50ZWxfaW5pdF9yaW5nX2J1ZmZlcihlbmdpbmUpOwogCWlmIChyZXQp CiAJCXJldHVybiByZXQ7CiAKQEAgLTI5MTQsNyArMjkxMiw3IEBAIGludCBpbnRlbF9pbml0X2Jz ZF9yaW5nX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJCQllbmdpbmUt PmlycV9lbmFibGVfbWFzayA9IEk5MTVfQlNEX1VTRVJfSU5URVJSVVBUOwogCX0KIAotCXJldHVy biBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKCZkZXZfcHJpdi0+ZHJtLCBlbmdpbmUpOworCXJldHVy biBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKGVuZ2luZSk7CiB9CiAKIC8qKgpAQCAtMjkyOCw3ICsy OTI2LDcgQEAgaW50IGludGVsX2luaXRfYnNkMl9yaW5nX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICplbmdpbmUpCiAKIAllbmdpbmUtPmZsdXNoID0gZ2VuNl9ic2RfcmluZ19mbHVzaDsK IAotCXJldHVybiBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKCZkZXZfcHJpdi0+ZHJtLCBlbmdpbmUp OworCXJldHVybiBpbnRlbF9pbml0X3JpbmdfYnVmZmVyKGVuZ2luZSk7CiB9CiAKIGludCBpbnRl bF9pbml0X2JsdF9yaW5nX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCkBA IC0yOTQxLDcgKzI5MzksNyBAQCBpbnQgaW50ZWxfaW5pdF9ibHRfcmluZ19idWZmZXIoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDwgOCkK IAkJZW5naW5lLT5pcnFfZW5hYmxlX21hc2sgPSBHVF9CTFRfVVNFUl9JTlRFUlJVUFQ7CiAKLQly ZXR1cm4gaW50ZWxfaW5pdF9yaW5nX2J1ZmZlcigmZGV2X3ByaXYtPmRybSwgZW5naW5lKTsKKwly ZXR1cm4gaW50ZWxfaW5pdF9yaW5nX2J1ZmZlcihlbmdpbmUpOwogfQogCiBpbnQgaW50ZWxfaW5p dF92ZWJveF9yaW5nX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCkBAIC0y OTU4LDcgKzI5NTYsNyBAQCBpbnQgaW50ZWxfaW5pdF92ZWJveF9yaW5nX2J1ZmZlcihzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJCWVuZ2luZS0+aXJxX2Rpc2FibGUgPSBoc3dfdmVi b3hfaXJxX2Rpc2FibGU7CiAJfQogCi0JcmV0dXJuIGludGVsX2luaXRfcmluZ19idWZmZXIoJmRl dl9wcml2LT5kcm0sIGVuZ2luZSk7CisJcmV0dXJuIGludGVsX2luaXRfcmluZ19idWZmZXIoZW5n aW5lKTsKIH0KIAogaW50Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==