From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 38/62] drm/i915: Stop passing caller's
	num_dwords to engine->semaphore.signal()
Date: Fri,  3 Jun 2016 17:37:03 +0100
Message-ID: <1464971847-15809-39-git-send-email-chris@chris-wilson.co.uk>
References: <1464971847-15809-1-git-send-email-chris@chris-wilson.co.uk>
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 mail-wm0-x241.google.com (mail-wm0-x241.google.com
 [IPv6:2a00:1450:400c:c09::241])
 by gabe.freedesktop.org (Postfix) with ESMTPS id E0DAF6E17A
 for <intel-gfx@lists.freedesktop.org>; Fri,  3 Jun 2016 16:38:11 +0000 (UTC)
Received: by mail-wm0-x241.google.com with SMTP id n184so620544wmn.1
 for <intel-gfx@lists.freedesktop.org>; Fri, 03 Jun 2016 09:38:11 -0700 (PDT)
In-Reply-To: <1464971847-15809-1-git-send-email-chris@chris-wilson.co.uk>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://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: <https://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

UmF0aGVyIHRoYW4gcGFzcyBpbiB0aGUgbnVtX2R3b3JkcyB0aGF0IHRoZSBjYWxsZXIgd2lzaGVz
IHRvIHVzZSBhZnRlcgp0aGUgc2lnbmFsIGNvbW1hbmQgcGFja2V0LCBzcGxpdCB0aGUgYnJlYWRj
cnVtYiBlbWlzc2lvbiBpbnRvIHR3byBwaGFzZXMKYW5kIGhhdmUgYm90aCB0aGUgc2lnbmFsIGFu
ZCBicmVhZGNydW1iIGluZGl2aWRpdWFsbHkgYWNxdWlyZSBzcGFjZSBvbgp0aGUgcmluZy4gVGhp
cyBtYWtlcyB0aGUgaW50ZXJmYWNlIHNpbXBsZXIgZm9yIHRoZSByZWFkZXIsIGFuZCB3aWxsCnNp
bXBsaWZ5IGZvciBwYXRjaGVzLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0Bj
aHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1
ZmZlci5jIHwgNTEgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAgNCArLS0KIDIgZmlsZXMgY2hhbmdlZCwg
MjMgaW5zZXJ0aW9ucygrKSwgMzIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfcmluZ2J1ZmZlci5jCmluZGV4IGI3YjVjMmQ5NGRiNS4uYjRlZGJkZWFjMjdlIDEwMDY0NAot
LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC0xMjI2LDEwICsxMjI2LDggQEAg
c3RhdGljIHZvaWQgcmVuZGVyX3JpbmdfY2xlYW51cChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl
bmdpbmUpCiAJaW50ZWxfZmluaV9waXBlX2NvbnRyb2woZW5naW5lKTsKIH0KIAotc3RhdGljIGlu
dCBnZW44X3Jjc19zaWduYWwoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpzaWduYWxsZXJf
cmVxLAotCQkJICAgdW5zaWduZWQgaW50IG51bV9kd29yZHMpCitzdGF0aWMgaW50IGdlbjhfcmNz
X3NpZ25hbChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnNpZ25hbGxlcl9yZXEpCiB7Ci0j
ZGVmaW5lIE1CT1hfVVBEQVRFX0RXT1JEUyA4CiAJc3RydWN0IGludGVsX3JpbmcgKnNpZ25hbGxl
ciA9IHNpZ25hbGxlcl9yZXEtPnJpbmc7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w
cml2ID0gc2lnbmFsbGVyX3JlcS0+aTkxNTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICp3YWl0
ZXI7CkBAIC0xMjM3LDEwICsxMjM1LDcgQEAgc3RhdGljIGludCBnZW44X3Jjc19zaWduYWwoc3Ry
dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpzaWduYWxsZXJfcmVxLAogCWludCByZXQsIG51bV9y
aW5nczsKIAogCW51bV9yaW5ncyA9IGh3ZWlnaHQzMihJTlRFTF9JTkZPKGRldl9wcml2KS0+cmlu
Z19tYXNrKTsKLQludW1fZHdvcmRzICs9IChudW1fcmluZ3MtMSkgKiBNQk9YX1VQREFURV9EV09S
RFM7Ci0jdW5kZWYgTUJPWF9VUERBVEVfRFdPUkRTCi0KLQlyZXQgPSBpbnRlbF9yaW5nX2JlZ2lu
KHNpZ25hbGxlcl9yZXEsIG51bV9kd29yZHMpOworCXJldCA9IGludGVsX3JpbmdfYmVnaW4oc2ln
bmFsbGVyX3JlcSwgKG51bV9yaW5ncy0xKSAqIDgpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7
CiAKQEAgLTEyNjIsMTQgKzEyNTcsMTMgQEAgc3RhdGljIGludCBnZW44X3Jjc19zaWduYWwoc3Ry
dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpzaWduYWxsZXJfcmVxLAogCQkJCQkgICBNSV9TRU1B
UEhPUkVfVEFSR0VUKHdhaXRlci0+aHdfaWQpKTsKIAkJaW50ZWxfcmluZ19lbWl0KHNpZ25hbGxl
ciwgMCk7CiAJfQorCWludGVsX3JpbmdfYWR2YW5jZShzaWduYWxsZXIpOwogCiAJcmV0dXJuIDA7
CiB9CiAKLXN0YXRpYyBpbnQgZ2VuOF94Y3Nfc2lnbmFsKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVx
dWVzdCAqc2lnbmFsbGVyX3JlcSwKLQkJCSAgIHVuc2lnbmVkIGludCBudW1fZHdvcmRzKQorc3Rh
dGljIGludCBnZW44X3hjc19zaWduYWwoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpzaWdu
YWxsZXJfcmVxKQogewotI2RlZmluZSBNQk9YX1VQREFURV9EV09SRFMgNgogCXN0cnVjdCBpbnRl
bF9yaW5nICpzaWduYWxsZXIgPSBzaWduYWxsZXJfcmVxLT5yaW5nOwogCXN0cnVjdCBkcm1faTkx
NV9wcml2YXRlICpkZXZfcHJpdiA9IHNpZ25hbGxlcl9yZXEtPmk5MTU7CiAJc3RydWN0IGludGVs
X2VuZ2luZV9jcyAqd2FpdGVyOwpAQCAtMTI3NywxMCArMTI3MSw3IEBAIHN0YXRpYyBpbnQgZ2Vu
OF94Y3Nfc2lnbmFsKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqc2lnbmFsbGVyX3JlcSwK
IAlpbnQgcmV0LCBudW1fcmluZ3M7CiAKIAludW1fcmluZ3MgPSBod2VpZ2h0MzIoSU5URUxfSU5G
TyhkZXZfcHJpdiktPnJpbmdfbWFzayk7Ci0JbnVtX2R3b3JkcyArPSAobnVtX3JpbmdzLTEpICog
TUJPWF9VUERBVEVfRFdPUkRTOwotI3VuZGVmIE1CT1hfVVBEQVRFX0RXT1JEUwotCi0JcmV0ID0g
aW50ZWxfcmluZ19iZWdpbihzaWduYWxsZXJfcmVxLCBudW1fZHdvcmRzKTsKKwlyZXQgPSBpbnRl
bF9yaW5nX2JlZ2luKHNpZ25hbGxlcl9yZXEsIChudW1fcmluZ3MtMSkgKiA2KTsKIAlpZiAocmV0
KQogCQlyZXR1cm4gcmV0OwogCkBAIC0xMzAwLDEyICsxMjkxLDEyIEBAIHN0YXRpYyBpbnQgZ2Vu
OF94Y3Nfc2lnbmFsKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqc2lnbmFsbGVyX3JlcSwK
IAkJCQkJICAgTUlfU0VNQVBIT1JFX1RBUkdFVCh3YWl0ZXItPmh3X2lkKSk7CiAJCWludGVsX3Jp
bmdfZW1pdChzaWduYWxsZXIsIDApOwogCX0KKwlpbnRlbF9yaW5nX2FkdmFuY2Uoc2lnbmFsbGVy
KTsKIAogCXJldHVybiAwOwogfQogCi1zdGF0aWMgaW50IGdlbjZfc2lnbmFsKHN0cnVjdCBkcm1f
aTkxNV9nZW1fcmVxdWVzdCAqc2lnbmFsbGVyX3JlcSwKLQkJICAgICAgIHVuc2lnbmVkIGludCBu
dW1fZHdvcmRzKQorc3RhdGljIGludCBnZW42X3NpZ25hbChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl
cXVlc3QgKnNpZ25hbGxlcl9yZXEpCiB7CiAJc3RydWN0IGludGVsX3JpbmcgKnNpZ25hbGxlciA9
IHNpZ25hbGxlcl9yZXEtPnJpbmc7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2
ID0gc2lnbmFsbGVyX3JlcS0+aTkxNTsKQEAgLTEzMTMsMTIgKzEzMDQsOCBAQCBzdGF0aWMgaW50
IGdlbjZfc2lnbmFsKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqc2lnbmFsbGVyX3JlcSwK
IAllbnVtIGludGVsX2VuZ2luZV9pZCBpZDsKIAlpbnQgcmV0LCBudW1fcmluZ3M7CiAKLSNkZWZp
bmUgTUJPWF9VUERBVEVfRFdPUkRTIDMKIAludW1fcmluZ3MgPSBod2VpZ2h0MzIoSU5URUxfSU5G
TyhkZXZfcHJpdiktPnJpbmdfbWFzayk7Ci0JbnVtX2R3b3JkcyArPSByb3VuZF91cCgobnVtX3Jp
bmdzLTEpICogTUJPWF9VUERBVEVfRFdPUkRTLCAyKTsKLSN1bmRlZiBNQk9YX1VQREFURV9EV09S
RFMKLQotCXJldCA9IGludGVsX3JpbmdfYmVnaW4oc2lnbmFsbGVyX3JlcSwgbnVtX2R3b3Jkcyk7
CisJcmV0ID0gaW50ZWxfcmluZ19iZWdpbihzaWduYWxsZXJfcmVxLCByb3VuZF91cCgobnVtX3Jp
bmdzLTEpICogMywgMikpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTEzMzYsNiAr
MTMyMyw3IEBAIHN0YXRpYyBpbnQgZ2VuNl9zaWduYWwoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1
ZXN0ICpzaWduYWxsZXJfcmVxLAogCS8qIElmIG51bV9kd29yZHMgd2FzIHJvdW5kZWQsIG1ha2Ug
c3VyZSB0aGUgdGFpbCBwb2ludGVyIGlzIGNvcnJlY3QgKi8KIAlpZiAobnVtX3JpbmdzICUgMiA9
PSAwKQogCQlpbnRlbF9yaW5nX2VtaXQoc2lnbmFsbGVyLCBNSV9OT09QKTsKKwlpbnRlbF9yaW5n
X2FkdmFuY2Uoc2lnbmFsbGVyKTsKIAogCXJldHVybiAwOwogfQpAQCAtMTM1MywxMSArMTM0MSwx
MyBAQCBzdGF0aWMgaW50IGdlbjZfZW1pdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVx
dWVzdCAqcmVxKQogCXN0cnVjdCBpbnRlbF9yaW5nICpyaW5nID0gcmVxLT5yaW5nOwogCWludCBy
ZXQ7CiAKLQlpZiAocmVxLT5lbmdpbmUtPnNlbWFwaG9yZS5zaWduYWwpCi0JCXJldCA9IHJlcS0+
ZW5naW5lLT5zZW1hcGhvcmUuc2lnbmFsKHJlcSwgNCk7Ci0JZWxzZQotCQlyZXQgPSBpbnRlbF9y
aW5nX2JlZ2luKHJlcSwgNCk7CisJaWYgKHJlcS0+ZW5naW5lLT5zZW1hcGhvcmUuc2lnbmFsKSB7
CisJCXJldCA9IHJlcS0+ZW5naW5lLT5zZW1hcGhvcmUuc2lnbmFsKHJlcSk7CisJCWlmIChyZXQp
CisJCQlyZXR1cm4gcmV0OworCX0KIAorCXJldCA9IGludGVsX3JpbmdfYmVnaW4ocmVxLCA0KTsK
IAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC0xMzc4LDEwICsxMzY4LDEzIEBAIHN0YXRp
YyBpbnQgZ2VuOF9yZW5kZXJfZW1pdF9yZXF1ZXN0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz
dCAqcmVxKQogCXN0cnVjdCBpbnRlbF9yaW5nICpyaW5nID0gcmVxLT5yaW5nOwogCWludCByZXQ7
CiAKLQlpZiAoZW5naW5lLT5zZW1hcGhvcmUuc2lnbmFsKQotCQlyZXQgPSBlbmdpbmUtPnNlbWFw
aG9yZS5zaWduYWwocmVxLCA4KTsKLQllbHNlCi0JCXJldCA9IGludGVsX3JpbmdfYmVnaW4ocmVx
LCA4KTsKKwlpZiAoZW5naW5lLT5zZW1hcGhvcmUuc2lnbmFsKSB7CisJCXJldCA9IGVuZ2luZS0+
c2VtYXBob3JlLnNpZ25hbChyZXEpOworCQlpZiAocmV0KQorCQkJcmV0dXJuIHJldDsKKwl9CisK
KwlyZXQgPSBpbnRlbF9yaW5nX2JlZ2luKHJlcSwgOCk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJl
dDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5o
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IDJlYjEyZDky
ZDExMi4uZTlmYjUwOGZhZTg2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl
ci5oCkBAIC0yODYsOSArMjg2LDcgQEAgc3RydWN0IGludGVsX2VuZ2luZV9jcyB7CiAJCWludAko
KnN5bmNfdG8pKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqdG9fcmVxLAogCQkJCSAgIHN0
cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmZyb20sCiAJCQkJICAgdTMyIHNlcW5vKTsKLQkJaW50CSgq
c2lnbmFsKShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnNpZ25hbGxlcl9yZXEsCi0JCQkJ
ICAvKiBudW1fZHdvcmRzIG5lZWRlZCBieSBjYWxsZXIgKi8KLQkJCQkgIHVuc2lnbmVkIGludCBu
dW1fZHdvcmRzKTsKKwkJaW50CSgqc2lnbmFsKShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3Qg
KnNpZ25hbGxlcl9yZXEpOwogCX0gc2VtYXBob3JlOwogCiAJLyogRXhlY2xpc3RzICovCi0tIAoy
LjguMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50
ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz
Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==