From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH v5 2/3] drm/i915/guc: Make wq_lock irq-safe Date: Tue, 28 Feb 2017 11:28:02 +0000 Message-ID: <20170228112803.11646-2-chris@chris-wilson.co.uk> References: <20170228112803.11646-1-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-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 35D7C6E634 for ; Tue, 28 Feb 2017 11:28:09 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id r18so1855940wmd.3 for ; Tue, 28 Feb 2017 03:28:09 -0800 (PST) In-Reply-To: <20170228112803.11646-1-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 Rm9sbG93aW5nIHRoZSB1c2Ugb2YgZG1hX2ZlbmNlX3NpZ25hbCgpIGZyb20gd2l0aGluIG91ciBp bnRlcnJ1cHQKaGFuZGxlciwgd2UgbmVlZCB0byBtYWtlIGd1Yy0+d3FfbG9jayBhbHNvIGlycS1z YWZlLiBUaGlzIHdhcyBkb25lCnByZXZpb3VzbHkgYXMgcGFydCBvZiB0aGUgZ3VjIHNjaGVkdWxl ciBwYXRjaCAod2hpY2ggYWxzbyBzdGFydGVkCm1peGluZyBvdXIgZmVuY2VzIHdpdGggdGhlIGlu dGVycnVwdCBoYW5kbGVyKSwgYnV0IGlzIG5vdyByZXF1aXJlZCB0bwpmaXggdGhlIGN1cnJlbnQg Z3VjIHN1Ym1pc3Npb24gYmFja2VuZC4KCnY0OiBEb2N1bWVudCB0aGF0IF9faTkxNV9ndWNfc3Vi bWl0IGlzIGFsd2F5cyB1bmRlciBhbiBpcnEgZGlzYWJsZWQKc2VjdGlvbgp2NTogTW92ZSB3cV9y c3ZkIGFkanVzdG1lbnQgdG8gaXRzIG93biBmdW5jdGlvbgoKRml4ZXM6IDY3YjgwN2E4OTIzMCAo ImRybS9pOTE1OiBEZWxheSBkaXNhYmxpbmcgdGhlIHVzZXIgaW50ZXJydXB0IGZvciBicmVhZGNy dW1icyIpClNpZ25lZC1vZmYtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNv LnVrPgpDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KQ2M6IE1p a2EgS3VvcHBhbGEgPG1pa2Eua3VvcHBhbGFAbGludXguaW50ZWwuY29tPgpSZXZpZXdlZC1ieTog TWljaGFsIFdhamRlY3prbyA8bWljaGFsLndhamRlY3prb0BpbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jIHwgMjggKysrKysrKysrKysrKysr KysrKystLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIwIGluc2VydGlvbnMoKyksIDggZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlz c2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmluZGV4 IGJlZWM4OGEzMDM0Ny4uZDZhNmNmMjU0MGExIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9ndWNfc3VibWlzc2lvbi5jCkBAIC0zNDgsNyArMzQ4LDcgQEAgaW50IGk5MTVfZ3VjX3dxX3Jl c2VydmUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogCXUzMiBmcmVlc3Bh Y2U7CiAJaW50IHJldDsKIAotCXNwaW5fbG9jaygmY2xpZW50LT53cV9sb2NrKTsKKwlzcGluX2xv Y2tfaXJxKCZjbGllbnQtPndxX2xvY2spOwogCWZyZWVzcGFjZSA9IENJUkNfU1BBQ0UoY2xpZW50 LT53cV90YWlsLCBkZXNjLT5oZWFkLCBjbGllbnQtPndxX3NpemUpOwogCWZyZWVzcGFjZSAtPSBj bGllbnQtPndxX3JzdmQ7CiAJaWYgKGxpa2VseShmcmVlc3BhY2UgPj0gd3FpX3NpemUpKSB7CkBA IC0zNTgsMjEgKzM1OCwyNyBAQCBpbnQgaTkxNV9ndWNfd3FfcmVzZXJ2ZShzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAJCWNsaWVudC0+bm9fd3Ffc3BhY2UrKzsKIAkJcmV0 ID0gLUVBR0FJTjsKIAl9Ci0Jc3Bpbl91bmxvY2soJmNsaWVudC0+d3FfbG9jayk7CisJc3Bpbl91 bmxvY2tfaXJxKCZjbGllbnQtPndxX2xvY2spOwogCiAJcmV0dXJuIHJldDsKIH0KIAorc3RhdGlj IHZvaWQgZ3VjX2NsaWVudF91cGRhdGVfd3FfcnN2ZChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpj bGllbnQsIGludCBzaXplKQoreworCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CisKKwlzcGluX2xvY2tf aXJxc2F2ZSgmY2xpZW50LT53cV9sb2NrLCBmbGFncyk7CisJY2xpZW50LT53cV9yc3ZkICs9IHNp emU7CisJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmY2xpZW50LT53cV9sb2NrLCBmbGFncyk7Cit9 CisKIHZvaWQgaTkxNV9ndWNfd3FfdW5yZXNlcnZlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcmVxdWVzdCkKIHsKLQljb25zdCBzaXplX3Qgd3FpX3NpemUgPSBzaXplb2Yoc3RydWN0IGd1 Y193cV9pdGVtKTsKKwljb25zdCBpbnQgd3FpX3NpemUgPSBzaXplb2Yoc3RydWN0IGd1Y193cV9p dGVtKTsKIAlzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpjbGllbnQgPSByZXF1ZXN0LT5pOTE1LT5n dWMuZXhlY2J1Zl9jbGllbnQ7CiAKIAlHRU1fQlVHX09OKFJFQURfT05DRShjbGllbnQtPndxX3Jz dmQpIDwgd3FpX3NpemUpOwotCi0Jc3Bpbl9sb2NrKCZjbGllbnQtPndxX2xvY2spOwotCWNsaWVu dC0+d3FfcnN2ZCAtPSB3cWlfc2l6ZTsKLQlzcGluX3VubG9jaygmY2xpZW50LT53cV9sb2NrKTsK KwlndWNfY2xpZW50X3VwZGF0ZV93cV9yc3ZkKGNsaWVudCwgLXdxaV9zaXplKTsKIH0KIAogLyog Q29uc3RydWN0IGEgV29yayBJdGVtIGFuZCBhcHBlbmQgaXQgdG8gdGhlIEd1QydzIFdvcmsgUXVl dWUgKi8KQEAgLTUxMSw2ICs1MTcsOSBAQCBzdGF0aWMgdm9pZCBfX2k5MTVfZ3VjX3N1Ym1pdChz dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJxKQogCXN0cnVjdCBpOTE1X2d1Y19jbGllbnQg KmNsaWVudCA9IGd1Yy0+ZXhlY2J1Zl9jbGllbnQ7CiAJaW50IGJfcmV0OwogCisJLyogV2UgYXJl IGFsd2F5cyBjYWxsZWQgd2l0aCBpcnFzIGRpc2FibGVkICovCisJR0VNX0JVR19PTighaXJxc19k aXNhYmxlZCgpKTsKKwogCXNwaW5fbG9jaygmY2xpZW50LT53cV9sb2NrKTsKIAlndWNfd3FfaXRl bV9hcHBlbmQoY2xpZW50LCBycSk7CiAKQEAgLTk0NSwxNiArOTU0LDE5IEBAIGludCBpOTE1X2d1 Y19zdWJtaXNzaW9uX2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAK IAkvKiBUYWtlIG92ZXIgZnJvbSBtYW51YWwgY29udHJvbCBvZiBFTFNQIChleGVjbGlzdHMpICov CiAJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgZGV2X3ByaXYsIGlkKSB7CisJCWNvbnN0IGludCB3 cWlfc2l6ZSA9IHNpemVvZihzdHJ1Y3QgZ3VjX3dxX2l0ZW0pOwogCQlzdHJ1Y3QgZHJtX2k5MTVf Z2VtX3JlcXVlc3QgKnJxOwogCiAJCWVuZ2luZS0+c3VibWl0X3JlcXVlc3QgPSBpOTE1X2d1Y19z dWJtaXQ7CiAJCWVuZ2luZS0+c2NoZWR1bGUgPSBOVUxMOwogCiAJCS8qIFJlcGxheSB0aGUgY3Vy cmVudCBzZXQgb2YgcHJldmlvdXNseSBzdWJtaXR0ZWQgcmVxdWVzdHMgKi8KKwkJc3Bpbl9sb2Nr X2lycSgmZW5naW5lLT50aW1lbGluZS0+bG9jayk7CiAJCWxpc3RfZm9yX2VhY2hfZW50cnkocnEs ICZlbmdpbmUtPnRpbWVsaW5lLT5yZXF1ZXN0cywgbGluaykgewotCQkJY2xpZW50LT53cV9yc3Zk ICs9IHNpemVvZihzdHJ1Y3QgZ3VjX3dxX2l0ZW0pOworCQkJZ3VjX2NsaWVudF91cGRhdGVfd3Ff cnN2ZChjbGllbnQsIHdxaV9zaXplKTsKIAkJCV9faTkxNV9ndWNfc3VibWl0KHJxKTsKIAkJfQor CQlzcGluX3VubG9ja19pcnEoJmVuZ2luZS0+dGltZWxpbmUtPmxvY2spOwogCX0KIAogCXJldHVy biAwOwotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK