From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 37/64] drm/i915: Stop passing caller's num_dwords to engine->semaphore.signal() Date: Thu, 7 Jul 2016 09:41:43 +0100 Message-ID: <1467880930-23082-37-git-send-email-chris@chris-wilson.co.uk> References: <1467880930-23082-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: 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 461556E75B for ; Thu, 7 Jul 2016 08:43:10 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id 187so3803608wmz.1 for ; Thu, 07 Jul 2016 01:43:10 -0700 (PDT) In-Reply-To: <1467880930-23082-1-git-send-email-chris@chris-wilson.co.uk> 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 UmF0aGVyIHRoYW4gcGFzcyBpbiB0aGUgbnVtX2R3b3JkcyB0aGF0IHRoZSBjYWxsZXIgd2lzaGVz IHRvIHVzZSBhZnRlcgp0aGUgc2lnbmFsIGNvbW1hbmQgcGFja2V0LCBzcGxpdCB0aGUgYnJlYWRj cnVtYiBlbWlzc2lvbiBpbnRvIHR3byBwaGFzZXMKYW5kIGhhdmUgYm90aCB0aGUgc2lnbmFsIGFu ZCBicmVhZGNydW1iIGluZGl2aWRpdWFsbHkgYWNxdWlyZSBzcGFjZSBvbgp0aGUgcmluZy4gVGhp cyBtYWtlcyB0aGUgaW50ZXJmYWNlIHNpbXBsZXIgZm9yIHRoZSByZWFkZXIsIGFuZCB3aWxsCnNp bXBsaWZ5IGZvciBwYXRjaGVzLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0Bj aHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5jIHwgNTEgKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAgNCArLS0KIDIgZmlsZXMgY2hhbmdlZCwg MjMgaW5zZXJ0aW9ucygrKSwgMzIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5jCmluZGV4IDQ3ZjY3Y2NhYjBhNi4uN2Y1ZTBiMzQyNzNmIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC0xMzEyLDEwICsxMzEyLDggQEAg c3RhdGljIHZvaWQgcmVuZGVyX3JpbmdfY2xlYW51cChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl bmdpbmUpCiAJaW50ZWxfZmluaV9waXBlX2NvbnRyb2woZW5naW5lKTsKIH0KIAotc3RhdGljIGlu dCBnZW44X3Jjc19zaWduYWwoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpzaWduYWxsZXJf cmVxLAotCQkJICAgdW5zaWduZWQgaW50IG51bV9kd29yZHMpCitzdGF0aWMgaW50IGdlbjhfcmNz X3NpZ25hbChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnNpZ25hbGxlcl9yZXEpCiB7Ci0j ZGVmaW5lIE1CT1hfVVBEQVRFX0RXT1JEUyA4CiAJc3RydWN0IGludGVsX3JpbmcgKnNpZ25hbGxl ciA9IHNpZ25hbGxlcl9yZXEtPnJpbmc7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gc2lnbmFsbGVyX3JlcS0+aTkxNTsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICp3YWl0 ZXI7CkBAIC0xMzIzLDEwICsxMzIxLDcgQEAgc3RhdGljIGludCBnZW44X3Jjc19zaWduYWwoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpzaWduYWxsZXJfcmVxLAogCWludCByZXQsIG51bV9y aW5nczsKIAogCW51bV9yaW5ncyA9IGh3ZWlnaHQzMihJTlRFTF9JTkZPKGRldl9wcml2KS0+cmlu Z19tYXNrKTsKLQludW1fZHdvcmRzICs9IChudW1fcmluZ3MtMSkgKiBNQk9YX1VQREFURV9EV09S RFM7Ci0jdW5kZWYgTUJPWF9VUERBVEVfRFdPUkRTCi0KLQlyZXQgPSBpbnRlbF9yaW5nX2JlZ2lu KHNpZ25hbGxlcl9yZXEsIG51bV9kd29yZHMpOworCXJldCA9IGludGVsX3JpbmdfYmVnaW4oc2ln bmFsbGVyX3JlcSwgKG51bV9yaW5ncy0xKSAqIDgpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7 CiAKQEAgLTEzNTAsMTQgKzEzNDUsMTMgQEAgc3RhdGljIGludCBnZW44X3Jjc19zaWduYWwoc3Ry dWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpzaWduYWxsZXJfcmVxLAogCQkJCU1JX1NFTUFQSE9S RV9UQVJHRVQod2FpdGVyLT5od19pZCkpOwogCQlpbnRlbF9yaW5nX2VtaXQoc2lnbmFsbGVyLCAw KTsKIAl9CisJaW50ZWxfcmluZ19hZHZhbmNlKHNpZ25hbGxlcik7CiAKIAlyZXR1cm4gMDsKIH0K IAotc3RhdGljIGludCBnZW44X3hjc19zaWduYWwoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpzaWduYWxsZXJfcmVxLAotCQkJICAgdW5zaWduZWQgaW50IG51bV9kd29yZHMpCitzdGF0aWMg aW50IGdlbjhfeGNzX3NpZ25hbChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnNpZ25hbGxl cl9yZXEpCiB7Ci0jZGVmaW5lIE1CT1hfVVBEQVRFX0RXT1JEUyA2CiAJc3RydWN0IGludGVsX3Jp bmcgKnNpZ25hbGxlciA9IHNpZ25hbGxlcl9yZXEtPnJpbmc7CiAJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gc2lnbmFsbGVyX3JlcS0+aTkxNTsKIAlzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICp3YWl0ZXI7CkBAIC0xMzY1LDEwICsxMzU5LDcgQEAgc3RhdGljIGludCBnZW44X3hj c19zaWduYWwoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpzaWduYWxsZXJfcmVxLAogCWlu dCByZXQsIG51bV9yaW5nczsKIAogCW51bV9yaW5ncyA9IGh3ZWlnaHQzMihJTlRFTF9JTkZPKGRl dl9wcml2KS0+cmluZ19tYXNrKTsKLQludW1fZHdvcmRzICs9IChudW1fcmluZ3MtMSkgKiBNQk9Y X1VQREFURV9EV09SRFM7Ci0jdW5kZWYgTUJPWF9VUERBVEVfRFdPUkRTCi0KLQlyZXQgPSBpbnRl bF9yaW5nX2JlZ2luKHNpZ25hbGxlcl9yZXEsIG51bV9kd29yZHMpOworCXJldCA9IGludGVsX3Jp bmdfYmVnaW4oc2lnbmFsbGVyX3JlcSwgKG51bV9yaW5ncy0xKSAqIDYpOwogCWlmIChyZXQpCiAJ CXJldHVybiByZXQ7CiAKQEAgLTEzOTAsMTIgKzEzODEsMTIgQEAgc3RhdGljIGludCBnZW44X3hj c19zaWduYWwoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpzaWduYWxsZXJfcmVxLAogCQkJ CU1JX1NFTUFQSE9SRV9UQVJHRVQod2FpdGVyLT5od19pZCkpOwogCQlpbnRlbF9yaW5nX2VtaXQo c2lnbmFsbGVyLCAwKTsKIAl9CisJaW50ZWxfcmluZ19hZHZhbmNlKHNpZ25hbGxlcik7CiAKIAly ZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCBnZW42X3NpZ25hbChzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X3JlcXVlc3QgKnNpZ25hbGxlcl9yZXEsCi0JCSAgICAgICB1bnNpZ25lZCBpbnQgbnVtX2R3b3Jk cykKK3N0YXRpYyBpbnQgZ2VuNl9zaWduYWwoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpz aWduYWxsZXJfcmVxKQogewogCXN0cnVjdCBpbnRlbF9yaW5nICpzaWduYWxsZXIgPSBzaWduYWxs ZXJfcmVxLT5yaW5nOwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHNpZ25h bGxlcl9yZXEtPmk5MTU7CkBAIC0xNDAzLDEyICsxMzk0LDggQEAgc3RhdGljIGludCBnZW42X3Np Z25hbChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnNpZ25hbGxlcl9yZXEsCiAJZW51bSBp bnRlbF9lbmdpbmVfaWQgaWQ7CiAJaW50IHJldCwgbnVtX3JpbmdzOwogCi0jZGVmaW5lIE1CT1hf VVBEQVRFX0RXT1JEUyAzCiAJbnVtX3JpbmdzID0gaHdlaWdodDMyKElOVEVMX0lORk8oZGV2X3By aXYpLT5yaW5nX21hc2spOwotCW51bV9kd29yZHMgKz0gcm91bmRfdXAoKG51bV9yaW5ncy0xKSAq IE1CT1hfVVBEQVRFX0RXT1JEUywgMik7Ci0jdW5kZWYgTUJPWF9VUERBVEVfRFdPUkRTCi0KLQly ZXQgPSBpbnRlbF9yaW5nX2JlZ2luKHNpZ25hbGxlcl9yZXEsIG51bV9kd29yZHMpOworCXJldCA9 IGludGVsX3JpbmdfYmVnaW4oc2lnbmFsbGVyX3JlcSwgcm91bmRfdXAoKG51bV9yaW5ncy0xKSAq IDMsIDIpKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC0xNDI2LDYgKzE0MTMsNyBA QCBzdGF0aWMgaW50IGdlbjZfc2lnbmFsKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqc2ln bmFsbGVyX3JlcSwKIAkvKiBJZiBudW1fZHdvcmRzIHdhcyByb3VuZGVkLCBtYWtlIHN1cmUgdGhl IHRhaWwgcG9pbnRlciBpcyBjb3JyZWN0ICovCiAJaWYgKG51bV9yaW5ncyAlIDIgPT0gMCkKIAkJ aW50ZWxfcmluZ19lbWl0KHNpZ25hbGxlciwgTUlfTk9PUCk7CisJaW50ZWxfcmluZ19hZHZhbmNl KHNpZ25hbGxlcik7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTE0NDMsMTEgKzE0MzEsMTMgQEAgc3Rh dGljIGludCBnZW42X2VtaXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJl cSkKIAlzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZyA9IHJlcS0+cmluZzsKIAlpbnQgcmV0OwogCi0J aWYgKHJlcS0+ZW5naW5lLT5zZW1hcGhvcmUuc2lnbmFsKQotCQlyZXQgPSByZXEtPmVuZ2luZS0+ c2VtYXBob3JlLnNpZ25hbChyZXEsIDQpOwotCWVsc2UKLQkJcmV0ID0gaW50ZWxfcmluZ19iZWdp bihyZXEsIDQpOworCWlmIChyZXEtPmVuZ2luZS0+c2VtYXBob3JlLnNpZ25hbCkgeworCQlyZXQg PSByZXEtPmVuZ2luZS0+c2VtYXBob3JlLnNpZ25hbChyZXEpOworCQlpZiAocmV0KQorCQkJcmV0 dXJuIHJldDsKKwl9CiAKKwlyZXQgPSBpbnRlbF9yaW5nX2JlZ2luKHJlcSwgNCk7CiAJaWYgKHJl dCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMTQ2OCwxMCArMTQ1OCwxMyBAQCBzdGF0aWMgaW50IGdl bjhfcmVuZGVyX2VtaXRfcmVxdWVzdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSkK IAlzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZyA9IHJlcS0+cmluZzsKIAlpbnQgcmV0OwogCi0JaWYg KGVuZ2luZS0+c2VtYXBob3JlLnNpZ25hbCkKLQkJcmV0ID0gZW5naW5lLT5zZW1hcGhvcmUuc2ln bmFsKHJlcSwgOCk7Ci0JZWxzZQotCQlyZXQgPSBpbnRlbF9yaW5nX2JlZ2luKHJlcSwgOCk7CisJ aWYgKGVuZ2luZS0+c2VtYXBob3JlLnNpZ25hbCkgeworCQlyZXQgPSBlbmdpbmUtPnNlbWFwaG9y ZS5zaWduYWwocmVxKTsKKwkJaWYgKHJldCkKKwkJCXJldHVybiByZXQ7CisJfQorCisJcmV0ID0g aW50ZWxfcmluZ19iZWdpbihyZXEsIDgpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCBmNmZkZmI4YzE3NzYuLmNl NjIwZDQyNmU4YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAt Mjc3LDkgKzI3Nyw3IEBAIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgewogCQlpbnQJKCpzeW5jX3Rv KShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnRvX3JlcSwKIAkJCQkgICBzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpmcm9tLAogCQkJCSAgIHUzMiBzZXFubyk7Ci0JCWludAkoKnNpZ25hbCko c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpzaWduYWxsZXJfcmVxLAotCQkJCSAgLyogbnVt X2R3b3JkcyBuZWVkZWQgYnkgY2FsbGVyICovCi0JCQkJICB1bnNpZ25lZCBpbnQgbnVtX2R3b3Jk cyk7CisJCWludAkoKnNpZ25hbCkoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpzaWduYWxs ZXJfcmVxKTsKIAl9IHNlbWFwaG9yZTsKIAogCS8qIEV4ZWNsaXN0cyAqLwotLSAKMi44LjEKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=