From mboxrd@z Thu Jan  1 00:00:00 1970
From: yu.dai@intel.com
Subject: [PATCH] drm/i915/guc: Move GuC wq_reserve_space to
	ring_reserve_space
Date: Tue,  8 Dec 2015 17:04:50 -0800
Message-ID: <1449623090-1461-1-git-send-email-yu.dai@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga02.intel.com (mga02.intel.com [134.134.136.20])
 by gabe.freedesktop.org (Postfix) with ESMTP id 0BF6B720D1
 for <intel-gfx@lists.freedesktop.org>; Tue,  8 Dec 2015 17:07:21 -0800 (PST)
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+CgpTcGxpdCBHdUMgd29yayBxdWV1ZSBz
cGFjZSByZXNlcnZlIGFuZCBzdWJtaXNzaW9uIGFuZCBtb3ZlIHRoZSBzcGFjZQpyZXNlcnZlIHRv
IHdoZXJlIHJpbmcgc3BhY2UgaXMgcmVzZXJ2ZWQuIFRoZSByZWFzb24gaXMgdGhhdCBmYWlsdXJl
CmluIGludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlX2FuZF9zdWJtaXQgd29uJ3QgYmUgaGFuZGxl
ZC4gSW4gdGhlCmNhc2UgdGltZW91dCBoYXBwZW5zLCBkcml2ZXIgY2FuIHJldHVybiBlYXJseSBp
biBvcmRlciB0byBoYW5kbGUgdGhlCmVycm9yLgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5
MTVfZ3VjX3N1Ym1pc3Npb24uYyB8IDIxICsrKysrKysrKy0tLS0tLS0tLS0tLQogZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmggICAgICAgICAgIHwgIDEgKwogZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfbHJjLmMgICAgICAgICAgIHwgMTAgKysrKysrKysrLQogMyBmaWxlcyBjaGFu
Z2VkLCAxOSBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggOGE3MTQ1OC4uMjY0ZmRmNyAxMDA2NDQK
LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCisrKyBiL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYwpAQCAtNDcyLDI1ICs0NzIs
MjEgQEAgc3RhdGljIHZvaWQgZ3VjX2ZpbmlfY3R4X2Rlc2Moc3RydWN0IGludGVsX2d1YyAqZ3Vj
LAogCQkJICAgICBzaXplb2YoZGVzYykgKiBjbGllbnQtPmN0eF9pbmRleCk7CiB9CiAKLS8qIEdl
dCB2YWxpZCB3b3JrcXVldWUgaXRlbSBhbmQgcmV0dXJuIGl0IGJhY2sgdG8gb2Zmc2V0ICovCi1z
dGF0aWMgaW50IGd1Y19nZXRfd29ya3F1ZXVlX3NwYWNlKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQg
KmdjLCB1MzIgKm9mZnNldCkKK2ludCBpOTE1X2d1Y193cV9yZXNlcnZlX3NwYWNlKHN0cnVjdCBp
OTE1X2d1Y19jbGllbnQgKmdjKQogewogCXN0cnVjdCBndWNfcHJvY2Vzc19kZXNjICpkZXNjOwog
CXZvaWQgKmJhc2U7CiAJdTMyIHNpemUgPSBzaXplb2Yoc3RydWN0IGd1Y193cV9pdGVtKTsKIAlp
bnQgcmV0ID0gLUVUSU1FRE9VVCwgdGltZW91dF9jb3VudGVyID0gMjAwOwogCisJaWYgKCFnYykK
KwkJcmV0dXJuIDA7CisKIAliYXNlID0ga21hcF9hdG9taWMoaTkxNV9nZW1fb2JqZWN0X2dldF9w
YWdlKGdjLT5jbGllbnRfb2JqLCAwKSk7CiAJZGVzYyA9IGJhc2UgKyBnYy0+cHJvY19kZXNjX29m
ZnNldDsKIAogCXdoaWxlICh0aW1lb3V0X2NvdW50ZXItLSA+IDApIHsKIAkJaWYgKENJUkNfU1BB
Q0UoZ2MtPndxX3RhaWwsIGRlc2MtPmhlYWQsIGdjLT53cV9zaXplKSA+PSBzaXplKSB7Ci0JCQkq
b2Zmc2V0ID0gZ2MtPndxX3RhaWw7Ci0KLQkJCS8qIGFkdmFuY2UgdGhlIHRhaWwgZm9yIG5leHQg
d29ya3F1ZXVlIGl0ZW0gKi8KLQkJCWdjLT53cV90YWlsICs9IHNpemU7Ci0JCQlnYy0+d3FfdGFp
bCAmPSBnYy0+d3Ffc2l6ZSAtIDE7Ci0KIAkJCS8qIHRoaXMgd2lsbCBicmVhayB0aGUgbG9vcCAq
LwogCQkJdGltZW91dF9jb3VudGVyID0gMDsKIAkJCXJldCA9IDA7CkBAIC01MTIsMTEgKzUwOCwx
MiBAQCBzdGF0aWMgaW50IGd1Y19hZGRfd29ya3F1ZXVlX2l0ZW0oc3RydWN0IGk5MTVfZ3VjX2Ns
aWVudCAqZ2MsCiAJc3RydWN0IGd1Y193cV9pdGVtICp3cWk7CiAJdm9pZCAqYmFzZTsKIAl1MzIg
dGFpbCwgd3FfbGVuLCB3cV9vZmYgPSAwOwotCWludCByZXQ7CiAKLQlyZXQgPSBndWNfZ2V0X3dv
cmtxdWV1ZV9zcGFjZShnYywgJndxX29mZik7Ci0JaWYgKHJldCkKLQkJcmV0dXJuIHJldDsKKwl3
cV9vZmYgPSBnYy0+d3FfdGFpbDsKKworCS8qIGFkdmFuY2UgdGhlIHRhaWwgZm9yIG5leHQgd29y
a3F1ZXVlIGl0ZW0gKi8KKwlnYy0+d3FfdGFpbCArPSBzaXplb2Yoc3RydWN0IGd1Y193cV9pdGVt
KTsKKwlnYy0+d3FfdGFpbCAmPSBnYy0+d3Ffc2l6ZSAtIDE7CiAKIAkvKiBGb3Igbm93IHdvcmtx
dWV1ZSBpdGVtIGlzIDQgRFdzOyB3b3JrcXVldWUgYnVmZmVyIGlzIDIgcGFnZXMuIFNvIHdlCiAJ
ICogc2hvdWxkIG5vdCBoYXZlIHRoZSBjYXNlIHdoZXJlIHN0cnVjdHVyZSB3cWkgaXMgYWNyb3Nz
IHBhZ2UsIG5laXRoZXIKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1
Yy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKaW5kZXggMGUwNDhiZi4uNTlj
OGUyMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKKysrIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKQEAgLTEyMyw1ICsxMjMsNiBAQCBpbnQg
aTkxNV9ndWNfc3VibWl0KHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCwKIAkJICAgIHN0
cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEpOwogdm9pZCBpOTE1X2d1Y19zdWJtaXNzaW9u
X2Rpc2FibGUoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIGk5MTVfZ3VjX3N1Ym1pc3Np
b25fZmluaShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKK2ludCBpOTE1X2d1Y193cV9yZXNlcnZl
X3NwYWNlKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmNsaWVudCk7CiAKICNlbmRpZgpkaWZmIC0t
Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9scmMuYwppbmRleCBmOTZmYjUxLi4yNWNiZWFiIDEwMDY0NAotLS0gYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9scmMuYwpAQCAtODQ0LDYgKzg0NCw4IEBAIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYmVn
aW4oc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEsIGludCBudW1fZHdvcmRzKQogCiBp
bnQgaW50ZWxfbG9naWNhbF9yaW5nX3Jlc2VydmVfc3BhY2Uoc3RydWN0IGRybV9pOTE1X2dlbV9y
ZXF1ZXN0ICpyZXF1ZXN0KQogeworCWludCByZXQ7CisKIAkvKgogCSAqIFRoZSBmaXJzdCBjYWxs
IG1lcmVseSBub3RlcyB0aGUgcmVzZXJ2ZSByZXF1ZXN0IGFuZCBpcyBjb21tb24gZm9yCiAJICog
YWxsIGJhY2sgZW5kcy4gVGhlIHN1YnNlcXVlbnQgbG9jYWxpc2VkIF9iZWdpbigpIGNhbGwgYWN0
dWFsbHkKQEAgLTg1NCw3ICs4NTYsMTMgQEAgaW50IGludGVsX2xvZ2ljYWxfcmluZ19yZXNlcnZl
X3NwYWNlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIAkgKi8KIAlpbnRl
bF9yaW5nX3Jlc2VydmVkX3NwYWNlX3Jlc2VydmUocmVxdWVzdC0+cmluZ2J1ZiwgTUlOX1NQQUNF
X0ZPUl9BRERfUkVRVUVTVCk7CiAKLQlyZXR1cm4gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJl
cXVlc3QsIDApOworCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyZXF1ZXN0LCAwKTsK
KwlpZiAocmV0KQorCQlyZXR1cm4gcmV0OworCisJcmV0ID0gaTkxNV9ndWNfd3FfcmVzZXJ2ZV9z
cGFjZShyZXF1ZXN0LT5pOTE1LT5ndWMuZXhlY2J1Zl9jbGllbnQpOworCisJcmV0dXJuIHJldDsK
IH0KIAogLyoqCi0tIAoyLjUuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl
c2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p
bnRlbC1nZngK