From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 1/8] drm/i915: Serialise concurrent calls to i915_gem_set_wedged() Date: Mon, 14 Jan 2019 21:04:01 +0000 Message-ID: <20190114210408.4561-2-chris@chris-wilson.co.uk> References: <20190114210408.4561-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 fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5A0716EB41 for ; Mon, 14 Jan 2019 21:04:31 +0000 (UTC) In-Reply-To: <20190114210408.4561-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 Cc: mika.kuoppala@intel.com List-Id: intel-gfx@lists.freedesktop.org TWFrZSBpOTE1X2dlbV9zZXRfd2VkZ2VkKCkgYW5kIGk5MTVfZ2VtX3Vuc2V0X3dlZGdlZCgpIGJl aGF2aW91ciBtb3JlCmNvbnNpc3RlbnRseSBpZiBjYWxsZWQgY29uY3VycmVudGx5LgoKU2lnbmVk LW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBNaWth IEt1b3BwYWxhIDxtaWthLmt1b3BwYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgICAgICAgfCAzMiArKysrKysrKysrKysrKy0t LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5oICAgICAgICAgfCAgNCAr Ky0KIC4uLi9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZ2VtX2RldmljZS5jICB8ICAxICsK IDMgZmlsZXMgY2hhbmdlZCwgMjggaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYwppbmRleCAwYmZlZDMzMTc4ZTEuLjkxMGM0OWJlZmM1MCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0zMTczLDEwICszMTczLDE1IEBAIHN0YXRpYyB2b2lkIG5v cF9zdWJtaXRfcmVxdWVzdChzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpyZXF1ZXN0KQogCiB2b2lkIGk5 MTVfZ2VtX3NldF93ZWRnZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCiB7CisJc3Ry dWN0IGk5MTVfZ3B1X2Vycm9yICplcnJvciA9ICZpOTE1LT5ncHVfZXJyb3I7CiAJc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lOwogCWVudW0gaW50ZWxfZW5naW5lX2lkIGlkOwogCi0JR0VN X1RSQUNFKCJzdGFydFxuIik7CisJbXV0ZXhfbG9jaygmZXJyb3ItPndlZGdlX211dGV4KTsKKwlp ZiAodGVzdF9iaXQoSTkxNV9XRURHRUQsICZlcnJvci0+ZmxhZ3MpKSB7CisJCW11dGV4X3VubG9j aygmZXJyb3ItPndlZGdlX211dGV4KTsKKwkJcmV0dXJuOworCX0KIAogCWlmIChHRU1fU0hPV19E RUJVRygpKSB7CiAJCXN0cnVjdCBkcm1fcHJpbnRlciBwID0gZHJtX2RlYnVnX3ByaW50ZXIoX19m dW5jX18pOwpAQCAtMzE4NSw4ICszMTkwLDcgQEAgdm9pZCBpOTE1X2dlbV9zZXRfd2VkZ2VkKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogCQkJaW50ZWxfZW5naW5lX2R1bXAoZW5naW5l LCAmcCwgIiVzXG4iLCBlbmdpbmUtPm5hbWUpOwogCX0KIAotCWlmICh0ZXN0X2FuZF9zZXRfYml0 KEk5MTVfV0VER0VELCAmaTkxNS0+Z3B1X2Vycm9yLmZsYWdzKSkKLQkJZ290byBvdXQ7CisJR0VN X1RSQUNFKCJzdGFydFxuIik7CiAKIAkvKgogCSAqIEZpcnN0LCBzdG9wIHN1Ym1pc3Npb24gdG8g aHcsIGJ1dCBkbyBub3QgeWV0IGNvbXBsZXRlIHJlcXVlc3RzIGJ5CkBAIC0zMjIyLDIzICszMjI2 LDMxIEBAIHZvaWQgaTkxNV9nZW1fc2V0X3dlZGdlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq aTkxNSkKIAkJaW50ZWxfZW5naW5lX3dha2V1cChlbmdpbmUpOwogCX0KIAotb3V0OgorCXNtcF9t Yl9fYmVmb3JlX2F0b21pYygpOworCXNldF9iaXQoSTkxNV9XRURHRUQsICZlcnJvci0+ZmxhZ3Mp OworCiAJR0VNX1RSQUNFKCJlbmRcbiIpOworCW11dGV4X3VubG9jaygmZXJyb3ItPndlZGdlX211 dGV4KTsKIAotCXdha2VfdXBfYWxsKCZpOTE1LT5ncHVfZXJyb3IucmVzZXRfcXVldWUpOworCXdh a2VfdXBfYWxsKCZlcnJvci0+cmVzZXRfcXVldWUpOwogfQogCiBib29sIGk5MTVfZ2VtX3Vuc2V0 X3dlZGdlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIHsKKwlzdHJ1Y3QgaTkxNV9n cHVfZXJyb3IgKmVycm9yID0gJmk5MTUtPmdwdV9lcnJvcjsKIAlzdHJ1Y3QgaTkxNV90aW1lbGlu ZSAqdGw7CisJYm9vbCByZXQgPSBmYWxzZTsKIAogCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmk5MTUt PmRybS5zdHJ1Y3RfbXV0ZXgpOwotCWlmICghdGVzdF9iaXQoSTkxNV9XRURHRUQsICZpOTE1LT5n cHVfZXJyb3IuZmxhZ3MpKQorCisJaWYgKCF0ZXN0X2JpdChJOTE1X1dFREdFRCwgJmVycm9yLT5m bGFncykpCiAJCXJldHVybiB0cnVlOwogCiAJaWYgKCFpOTE1LT5ndC5zY3JhdGNoKSAvKiBOZXZl ciBmdWxsIGluaXRpYWxpc2VkLCByZWNvdmVyeSBpbXBvc3NpYmxlICovCiAJCXJldHVybiBmYWxz ZTsKIAorCW11dGV4X2xvY2soJmVycm9yLT53ZWRnZV9tdXRleCk7CisKIAlHRU1fVFJBQ0UoInN0 YXJ0XG4iKTsKIAogCS8qCkBAIC0zMjcyLDcgKzMyODQsNyBAQCBib29sIGk5MTVfZ2VtX3Vuc2V0 X3dlZGdlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIAkJICovCiAJCWlmIChkbWFf ZmVuY2VfZGVmYXVsdF93YWl0KCZycS0+ZmVuY2UsIHRydWUsCiAJCQkJCSAgIE1BWF9TQ0hFRFVM RV9USU1FT1VUKSA8IDApCi0JCQlyZXR1cm4gZmFsc2U7CisJCQlnb3RvIHVubG9jazsKIAl9CiAJ aTkxNV9yZXRpcmVfcmVxdWVzdHMoaTkxNSk7CiAJR0VNX0JVR19PTihpOTE1LT5ndC5hY3RpdmVf cmVxdWVzdHMpOwpAQCAtMzI5NSw4ICszMzA3LDExIEBAIGJvb2wgaTkxNV9nZW1fdW5zZXRfd2Vk Z2VkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogCiAJc21wX21iX19iZWZvcmVfYXRv bWljKCk7IC8qIGNvbXBsZXRlIHRha2VvdmVyIGJlZm9yZSBlbmFibGluZyBleGVjYnVmICovCiAJ Y2xlYXJfYml0KEk5MTVfV0VER0VELCAmaTkxNS0+Z3B1X2Vycm9yLmZsYWdzKTsKKwlyZXQgPSB0 cnVlOwordW5sb2NrOgorCW11dGV4X3VubG9jaygmaTkxNS0+Z3B1X2Vycm9yLndlZGdlX211dGV4 KTsKIAotCXJldHVybiB0cnVlOworCXJldHVybiByZXQ7CiB9CiAKIHN0YXRpYyB2b2lkCkBAIC01 NjkyLDYgKzU3MDcsNyBAQCBpbnQgaTkxNV9nZW1faW5pdF9lYXJseShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCiAJCQkgIGk5MTVfZ2VtX2lkbGVfd29ya19oYW5kbGVyKTsKIAlp bml0X3dhaXRxdWV1ZV9oZWFkKCZkZXZfcHJpdi0+Z3B1X2Vycm9yLndhaXRfcXVldWUpOwogCWlu aXRfd2FpdHF1ZXVlX2hlYWQoJmRldl9wcml2LT5ncHVfZXJyb3IucmVzZXRfcXVldWUpOworCW11 dGV4X2luaXQoJmRldl9wcml2LT5ncHVfZXJyb3Iud2VkZ2VfbXV0ZXgpOwogCiAJYXRvbWljX3Nl dCgmZGV2X3ByaXYtPm1tLmJzZF9lbmdpbmVfZGlzcGF0Y2hfaW5kZXgsIDApOwogCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuaAppbmRleCA2ZDlmNDU0NjhhYzEuLjYwNDI5MWY3NzYy ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5oCkBAIC0yNzEsOCArMjcxLDgg QEAgc3RydWN0IGk5MTVfZ3B1X2Vycm9yIHsKICNkZWZpbmUgSTkxNV9SRVNFVF9CQUNLT0ZGCTAK ICNkZWZpbmUgSTkxNV9SRVNFVF9IQU5ET0ZGCTEKICNkZWZpbmUgSTkxNV9SRVNFVF9NT0RFU0VU CTIKKyNkZWZpbmUgSTkxNV9SRVNFVF9FTkdJTkUJMwogI2RlZmluZSBJOTE1X1dFREdFRAkJKEJJ VFNfUEVSX0xPTkcgLSAxKQotI2RlZmluZSBJOTE1X1JFU0VUX0VOR0lORQkoSTkxNV9XRURHRUQg LSBJOTE1X05VTV9FTkdJTkVTKQogCiAJLyoqIE51bWJlciBvZiB0aW1lcyBhbiBlbmdpbmUgaGFz IGJlZW4gcmVzZXQgKi8KIAl1MzIgcmVzZXRfZW5naW5lX2NvdW50W0k5MTVfTlVNX0VOR0lORVNd OwpAQCAtMjgzLDYgKzI4Myw4IEBAIHN0cnVjdCBpOTE1X2dwdV9lcnJvciB7CiAJLyoqIFJlYXNv biBmb3IgdGhlIGN1cnJlbnQgKmdsb2JhbCogcmVzZXQgKi8KIAljb25zdCBjaGFyICpyZWFzb247 CiAKKwlzdHJ1Y3QgbXV0ZXggd2VkZ2VfbXV0ZXg7IC8qIHNlcmlhbGlzZXMgd2VkZ2luZy91bndl ZGdpbmcgKi8KKwogCS8qKgogCSAqIFdhaXRxdWV1ZSB0byBzaWduYWwgd2hlbiBhIGhhbmcgaXMg ZGV0ZWN0ZWQuIFVzZWQgdG8gZm9yIHdhaXRlcnMKIAkgKiB0byByZWxlYXNlIHRoZSBzdHJ1Y3Rf bXV0ZXggZm9yIHRoZSByZXNldCB0byBwcm9jZWRlLgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZ2VtX2RldmljZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvc2VsZnRlc3RzL21vY2tfZ2VtX2RldmljZS5jCmluZGV4IDA4MjgwOTU2OTY4MS4uM2NkYTY2 MjkyZTc2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvbW9ja19n ZW1fZGV2aWNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL21vY2tfZ2Vt X2RldmljZS5jCkBAIC0xODgsNiArMTg4LDcgQEAgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKm1v Y2tfZ2VtX2RldmljZSh2b2lkKQogCiAJaW5pdF93YWl0cXVldWVfaGVhZCgmaTkxNS0+Z3B1X2Vy cm9yLndhaXRfcXVldWUpOwogCWluaXRfd2FpdHF1ZXVlX2hlYWQoJmk5MTUtPmdwdV9lcnJvci5y ZXNldF9xdWV1ZSk7CisJbXV0ZXhfaW5pdCgmaTkxNS0+Z3B1X2Vycm9yLndlZGdlX211dGV4KTsK IAogCWk5MTUtPndxID0gYWxsb2Nfb3JkZXJlZF93b3JrcXVldWUoIm1vY2siLCAwKTsKIAlpZiAo IWk5MTUtPndxKQotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK