From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ander Conselvan de Oliveira Subject: [PATCH 1/2] drm/i915: Make __wait_seqno non-static and rename to __i915_wait_seqno Date: Thu, 6 Nov 2014 09:26:38 +0200 Message-ID: <1415258799-5530-1-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <20141105122949.GX13658@nuc-i3427.alporthouse.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 940826EE83 for ; Wed, 5 Nov 2014 23:27:16 -0800 (PST) In-Reply-To: <20141105122949.GX13658@nuc-i3427.alporthouse.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, chris@chris-wilson.co.uk Cc: Ander Conselvan de Oliveira , shuang.he@linux.intel.com List-Id: intel-gfx@lists.freedesktop.org U28gdGhhdCBpdCBjYW4gYmUgdXNlZCBieSB0aGUgZmxpcCBjb2RlIHRvIHdhaXQgZm9yIHJlbmRl cmluZyB3aXRob3V0CmhvbGRpbmcgYW55IGxvY2tzLgoKU2lnbmVkLW9mZi1ieTogQW5kZXIgQ29u c2VsdmFuIGRlIE9saXZlaXJhIDxhbmRlci5jb25zZWx2YW4uZGUub2xpdmVpcmFAaW50ZWwuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggfCAgNSArKysrKwogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyB8IDIwICsrKysrKysrKysrLS0tLS0tLS0tCiAyIGZp bGVzIGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKaW5kZXggNTQ2OTFiYy4uZDZhMDEwMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCkBAIC0yNTM1LDYgKzI1MzUsMTEgQEAgaW50IF9faTkxNV9hZGRfcmVxdWVzdChzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkgICAgICAgdTMyICpzZXFubyk7CiAjZGVmaW5lIGk5 MTVfYWRkX3JlcXVlc3QocmluZywgc2Vxbm8pIFwKIAlfX2k5MTVfYWRkX3JlcXVlc3QocmluZywg TlVMTCwgTlVMTCwgc2Vxbm8pCitpbnQgX19pOTE1X3dhaXRfc2Vxbm8oc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqcmluZywgdTMyIHNlcW5vLAorCQkJdW5zaWduZWQgcmVzZXRfY291bnRlciwKKwkJ CWJvb2wgaW50ZXJydXB0aWJsZSwKKwkJCXM2NCAqdGltZW91dCwKKwkJCXN0cnVjdCBkcm1faTkx NV9maWxlX3ByaXZhdGUgKmZpbGVfcHJpdik7CiBpbnQgX19tdXN0X2NoZWNrIGk5MTVfd2FpdF9z ZXFubyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJCSB1aW50MzJfdCBzZXFubyk7 CiBpbnQgaTkxNV9nZW1fZmF1bHQoc3RydWN0IHZtX2FyZWFfc3RydWN0ICp2bWEsIHN0cnVjdCB2 bV9mYXVsdCAqdm1mKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDFkZTk0Y2MuLjNlMGNh YmUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMTEzNCw3ICsxMTM0LDcgQEAgc3RhdGlj IGJvb2wgY2FuX3dhaXRfYm9vc3Qoc3RydWN0IGRybV9pOTE1X2ZpbGVfcHJpdmF0ZSAqZmlsZV9w cml2KQogfQogCiAvKioKLSAqIF9fd2FpdF9zZXFubyAtIHdhaXQgdW50aWwgZXhlY3V0aW9uIG9m IHNlcW5vIGhhcyBmaW5pc2hlZAorICogX19pOTE1X3dhaXRfc2Vxbm8gLSB3YWl0IHVudGlsIGV4 ZWN1dGlvbiBvZiBzZXFubyBoYXMgZmluaXNoZWQKICAqIEByaW5nOiB0aGUgcmluZyBleHBlY3Rl ZCB0byByZXBvcnQgc2Vxbm8KICAqIEBzZXFubzogZHVoIQogICogQHJlc2V0X2NvdW50ZXI6IHJl c2V0IHNlcXVlbmNlIGFzc29jaWF0ZWQgd2l0aCB0aGUgZ2l2ZW4gc2Vxbm8KQEAgLTExNTEsNyAr MTE1MSw3IEBAIHN0YXRpYyBib29sIGNhbl93YWl0X2Jvb3N0KHN0cnVjdCBkcm1faTkxNV9maWxl X3ByaXZhdGUgKmZpbGVfcHJpdikKICAqIFJldHVybnMgMCBpZiB0aGUgc2Vxbm8gd2FzIGZvdW5k IHdpdGhpbiB0aGUgYWxsb3RlZCB0aW1lLiBFbHNlIHJldHVybnMgdGhlCiAgKiBlcnJubyB3aXRo IHJlbWFpbmluZyB0aW1lIGZpbGxlZCBpbiB0aW1lb3V0IGFyZ3VtZW50LgogICovCi1zdGF0aWMg aW50IF9fd2FpdF9zZXFubyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLCB1MzIgc2Vxbm8s CitpbnQgX19pOTE1X3dhaXRfc2Vxbm8oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgdTMy IHNlcW5vLAogCQkJdW5zaWduZWQgcmVzZXRfY291bnRlciwKIAkJCWJvb2wgaW50ZXJydXB0aWJs ZSwKIAkJCXM2NCAqdGltZW91dCwKQEAgLTEyNjIsNiArMTI2Miw3IEBAIGk5MTVfd2FpdF9zZXFu byhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLCB1aW50MzJfdCBzZXFubykKIAlzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2ID0gcmluZy0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJYm9vbCBpbnRlcnJ1cHRpYmxlID0gZGV2X3By aXYtPm1tLmludGVycnVwdGlibGU7CisJdW5zaWduZWQgcmVzZXRfY291bnRlcjsKIAlpbnQgcmV0 OwogCiAJQlVHX09OKCFtdXRleF9pc19sb2NrZWQoJmRldi0+c3RydWN0X211dGV4KSk7CkBAIC0x Mjc1LDkgKzEyNzYsOSBAQCBpOTE1X3dhaXRfc2Vxbm8oc3RydWN0IGludGVsX2VuZ2luZV9jcyAq cmluZywgdWludDMyX3Qgc2Vxbm8pCiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAotCXJldHVy biBfX3dhaXRfc2Vxbm8ocmluZywgc2Vxbm8sCi0JCQkgICAgYXRvbWljX3JlYWQoJmRldl9wcml2 LT5ncHVfZXJyb3IucmVzZXRfY291bnRlciksCi0JCQkgICAgaW50ZXJydXB0aWJsZSwgTlVMTCwg TlVMTCk7CisJcmVzZXRfY291bnRlciA9IGF0b21pY19yZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9y LnJlc2V0X2NvdW50ZXIpOworCXJldHVybiBfX2k5MTVfd2FpdF9zZXFubyhyaW5nLCBzZXFubywg cmVzZXRfY291bnRlciwgaW50ZXJydXB0aWJsZSwKKwkJCQkgTlVMTCwgTlVMTCk7CiB9CiAKIHN0 YXRpYyBpbnQKQEAgLTEzNTMsNyArMTM1NCw4IEBAIGk5MTVfZ2VtX29iamVjdF93YWl0X3JlbmRl cmluZ19fbm9uYmxvY2tpbmcoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAogCXJl c2V0X2NvdW50ZXIgPSBhdG9taWNfcmVhZCgmZGV2X3ByaXYtPmdwdV9lcnJvci5yZXNldF9jb3Vu dGVyKTsKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQlyZXQgPSBfX3dhaXRf c2Vxbm8ocmluZywgc2Vxbm8sIHJlc2V0X2NvdW50ZXIsIHRydWUsIE5VTEwsIGZpbGVfcHJpdik7 CisJcmV0ID0gX19pOTE1X3dhaXRfc2Vxbm8ocmluZywgc2Vxbm8sIHJlc2V0X2NvdW50ZXIsIHRy dWUsIE5VTEwsCisJCQkJZmlsZV9wcml2KTsKIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRl eCk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKQEAgLTI4NDcsOCArMjg0OSw4IEBAIGk5MTVf Z2VtX3dhaXRfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwgc3RydWN0 IGRybV9maWxlICpmaWxlKQogCXJlc2V0X2NvdW50ZXIgPSBhdG9taWNfcmVhZCgmZGV2X3ByaXYt PmdwdV9lcnJvci5yZXNldF9jb3VudGVyKTsKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211 dGV4KTsKIAotCXJldHVybiBfX3dhaXRfc2Vxbm8ocmluZywgc2Vxbm8sIHJlc2V0X2NvdW50ZXIs IHRydWUsICZhcmdzLT50aW1lb3V0X25zLAotCQkJICAgIGZpbGUtPmRyaXZlcl9wcml2KTsKKwly ZXR1cm4gX19pOTE1X3dhaXRfc2Vxbm8ocmluZywgc2Vxbm8sIHJlc2V0X2NvdW50ZXIsIHRydWUs CisJCQkJICZhcmdzLT50aW1lb3V0X25zLCBmaWxlLT5kcml2ZXJfcHJpdik7CiAKIG91dDoKIAlk cm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZSgmb2JqLT5iYXNlKTsKQEAgLTQwMTMsNyArNDAxNSw3 IEBAIGk5MTVfZ2VtX3JpbmdfdGhyb3R0bGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0 IGRybV9maWxlICpmaWxlKQogCWlmIChzZXFubyA9PSAwKQogCQlyZXR1cm4gMDsKIAotCXJldCA9 IF9fd2FpdF9zZXFubyhyaW5nLCBzZXFubywgcmVzZXRfY291bnRlciwgdHJ1ZSwgTlVMTCwgTlVM TCk7CisJcmV0ID0gX19pOTE1X3dhaXRfc2Vxbm8ocmluZywgc2Vxbm8sIHJlc2V0X2NvdW50ZXIs IHRydWUsIE5VTEwsIE5VTEwpOwogCWlmIChyZXQgPT0gMCkKIAkJcXVldWVfZGVsYXllZF93b3Jr KGRldl9wcml2LT53cSwgJmRldl9wcml2LT5tbS5yZXRpcmVfd29yaywgMCk7CiAKLS0gCjEuOC4z LjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==