From: Rob Clark Subject: [PATCH] drm/msm: fix locking inconsistency for gpu->hw_init() Date: Tue, 13 Jun 2017 09:23:45 -0400 Message-ID: <20170613132345.6046-1-robdclark@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: freedreno@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org TW9zdCwgYnV0IG5vdCBhbGwsIHBhdGhzIHdoZXJlIGNhbGxpbmcgdGhlIHdpdGggc3RydWN0X211 dGV4IGhlbGQuICBUaGUKZmFzdC1wYXRoIGluIG1zbV9nZW1fZ2V0X2lvdmEoKSAocGx1cyBzb21l IHN1Yi1jb2RlLXBhdGhzIHRoYXQgb25seSBydW4KdGhlIGZpcnN0IHRpbWUpIHdhcyBtYXNraW5n IHRoaXMgaXNzdWUuCgpTbyBsZXRzIGp1c3QgYWx3YXlzIGhvbGQgc3RydWN0X211dGV4IGZvciBo d19pbml0KCkuICBBbmQgc3ByaW5rbGUgc29tZQpXQVJOX09OKCkncyBhbmQgbWlnaHRfbG9jaygp IHRvIGF2b2lkIHRoaXMgc29ydCBvZiBwcm9ibGVtIGluIHRoZQpmdXR1cmUuCgpTaWduZWQtb2Zm LWJ5OiBSb2IgQ2xhcmsgPHJvYmRjbGFya0BnbWFpbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L21zbS9hZHJlbm8vYTV4eF9ncHUuYyAgICAgIHwgMTMgKysrKystLS0tLS0tLQogZHJpdmVycy9n cHUvZHJtL21zbS9hZHJlbm8vYTV4eF9wb3dlci5jICAgIHwgMTEgKysrKy0tLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9tc20vYWRyZW5vL2FkcmVub19kZXZpY2UuYyB8ICAyICsrCiBkcml2ZXJzL2dw dS9kcm0vbXNtL2FkcmVuby9hZHJlbm9fZ3B1LmMgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJt L21zbS9tc21fZ2VtLmMgICAgICAgICAgICAgIHwgIDMgKysrCiBkcml2ZXJzL2dwdS9kcm0vbXNt L21zbV9ncHUuYyAgICAgICAgICAgICAgfCAgMiArKwogNiBmaWxlcyBjaGFuZ2VkLCAxNyBpbnNl cnRpb25zKCspLCAxNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v bXNtL2FkcmVuby9hNXh4X2dwdS5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9hZHJlbm8vYTV4eF9n cHUuYwppbmRleCBmYzlhODFhLi5kNWQ2MTk4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v bXNtL2FkcmVuby9hNXh4X2dwdS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vYWRyZW5vL2E1 eHhfZ3B1LmMKQEAgLTM4NiwzMSArMzg2LDI4IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX2dlbV9vYmpl Y3QgKmE1eHhfdWNvZGVfbG9hZF9ibyhzdHJ1Y3QgbXNtX2dwdSAqZ3B1LAogCXN0cnVjdCBkcm1f Z2VtX29iamVjdCAqYm87CiAJdm9pZCAqcHRyOwogCi0JbXV0ZXhfbG9jaygmZHJtLT5zdHJ1Y3Rf bXV0ZXgpOwogCWJvID0gbXNtX2dlbV9uZXcoZHJtLCBmdy0+c2l6ZSAtIDQsIE1TTV9CT19VTkNB Q0hFRCk7Ci0JbXV0ZXhfdW5sb2NrKCZkcm0tPnN0cnVjdF9tdXRleCk7Ci0KIAlpZiAoSVNfRVJS KGJvKSkKIAkJcmV0dXJuIGJvOwogCi0JcHRyID0gbXNtX2dlbV9nZXRfdmFkZHIoYm8pOworCXB0 ciA9IG1zbV9nZW1fZ2V0X3ZhZGRyX2xvY2tlZChibyk7CiAJaWYgKCFwdHIpIHsKLQkJZHJtX2dl bV9vYmplY3RfdW5yZWZlcmVuY2VfdW5sb2NrZWQoYm8pOworCQlkcm1fZ2VtX29iamVjdF91bnJl ZmVyZW5jZShibyk7CiAJCXJldHVybiBFUlJfUFRSKC1FTk9NRU0pOwogCX0KIAogCWlmIChpb3Zh KSB7Ci0JCWludCByZXQgPSBtc21fZ2VtX2dldF9pb3ZhKGJvLCBncHUtPmlkLCBpb3ZhKTsKKwkJ aW50IHJldCA9IG1zbV9nZW1fZ2V0X2lvdmFfbG9ja2VkKGJvLCBncHUtPmlkLCBpb3ZhKTsKIAog CQlpZiAocmV0KSB7Ci0JCQlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZV91bmxvY2tlZChibyk7 CisJCQlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZShibyk7CiAJCQlyZXR1cm4gRVJSX1BUUihy ZXQpOwogCQl9CiAJfQogCiAJbWVtY3B5KHB0ciwgJmZ3LT5kYXRhWzRdLCBmdy0+c2l6ZSAtIDQp OwogCi0JbXNtX2dlbV9wdXRfdmFkZHIoYm8pOworCW1zbV9nZW1fcHV0X3ZhZGRyX2xvY2tlZChi byk7CiAJcmV0dXJuIGJvOwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2Fk cmVuby9hNXh4X3Bvd2VyLmMgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL2FkcmVuby9hNXh4X3Bvd2Vy LmMKaW5kZXggNzJkNTJjNy4uNzgzOGY1ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21z bS9hZHJlbm8vYTV4eF9wb3dlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vYWRyZW5vL2E1 eHhfcG93ZXIuYwpAQCAtMjk0LDE3ICsyOTQsMTQgQEAgdm9pZCBhNXh4X2dwbXVfdWNvZGVfaW5p dChzdHJ1Y3QgbXNtX2dwdSAqZ3B1KQogCSAqLwogCWJvc2l6ZSA9IChjbWRzX3NpemUgKyAoY21k c19zaXplIC8gVFlQRTRfTUFYX1BBWUxPQUQpICsgMSkgPDwgMjsKIAotCW11dGV4X2xvY2soJmRy bS0+c3RydWN0X211dGV4KTsKIAlhNXh4X2dwdS0+Z3BtdV9ibyA9IG1zbV9nZW1fbmV3KGRybSwg Ym9zaXplLCBNU01fQk9fVU5DQUNIRUQpOwotCW11dGV4X3VubG9jaygmZHJtLT5zdHJ1Y3RfbXV0 ZXgpOwotCiAJaWYgKElTX0VSUihhNXh4X2dwdS0+Z3BtdV9ibykpCiAJCWdvdG8gZXJyOwogCi0J aWYgKG1zbV9nZW1fZ2V0X2lvdmEoYTV4eF9ncHUtPmdwbXVfYm8sIGdwdS0+aWQsICZhNXh4X2dw dS0+Z3BtdV9pb3ZhKSkKKwlpZiAobXNtX2dlbV9nZXRfaW92YV9sb2NrZWQoYTV4eF9ncHUtPmdw bXVfYm8sIGdwdS0+aWQsICZhNXh4X2dwdS0+Z3BtdV9pb3ZhKSkKIAkJZ290byBlcnI7CiAKLQlw dHIgPSBtc21fZ2VtX2dldF92YWRkcihhNXh4X2dwdS0+Z3BtdV9ibyk7CisJcHRyID0gbXNtX2dl bV9nZXRfdmFkZHJfbG9ja2VkKGE1eHhfZ3B1LT5ncG11X2JvKTsKIAlpZiAoIXB0cikKIAkJZ290 byBlcnI7CiAKQEAgLTMyMyw3ICszMjAsNyBAQCB2b2lkIGE1eHhfZ3BtdV91Y29kZV9pbml0KHN0 cnVjdCBtc21fZ3B1ICpncHUpCiAJCWNtZHNfc2l6ZSAtPSBfc2l6ZTsKIAl9CiAKLQltc21fZ2Vt X3B1dF92YWRkcihhNXh4X2dwdS0+Z3BtdV9ibyk7CisJbXNtX2dlbV9wdXRfdmFkZHJfbG9ja2Vk KGE1eHhfZ3B1LT5ncG11X2JvKTsKIAlhNXh4X2dwdS0+Z3BtdV9kd29yZHMgPSBkd29yZHM7CiAK IAlnb3RvIG91dDsKQEAgLTMzMiw3ICszMjksNyBAQCB2b2lkIGE1eHhfZ3BtdV91Y29kZV9pbml0 KHN0cnVjdCBtc21fZ3B1ICpncHUpCiAJaWYgKGE1eHhfZ3B1LT5ncG11X2lvdmEpCiAJCW1zbV9n ZW1fcHV0X2lvdmEoYTV4eF9ncHUtPmdwbXVfYm8sIGdwdS0+aWQpOwogCWlmIChhNXh4X2dwdS0+ Z3BtdV9ibykKLQkJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2VfdW5sb2NrZWQoYTV4eF9ncHUt PmdwbXVfYm8pOworCQlkcm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZShhNXh4X2dwdS0+Z3BtdV9i byk7CiAKIAlhNXh4X2dwdS0+Z3BtdV9ibyA9IE5VTEw7CiAJYTV4eF9ncHUtPmdwbXVfaW92YSA9 IDA7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2FkcmVuby9hZHJlbm9fZGV2aWNl LmMgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL2FkcmVuby9hZHJlbm9fZGV2aWNlLmMKaW5kZXggNzM0 NWEwMS4uNTZmYjU5ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21zbS9hZHJlbm8vYWRy ZW5vX2RldmljZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vYWRyZW5vL2FkcmVub19kZXZp Y2UuYwpAQCAtMTU4LDcgKzE1OCw5IEBAIHN0cnVjdCBtc21fZ3B1ICphZHJlbm9fbG9hZF9ncHUo c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJaW50IHJldDsKIAogCQlwbV9ydW50aW1lX2dldF9z eW5jKCZwZGV2LT5kZXYpOworCQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJCXJl dCA9IG1zbV9ncHVfaHdfaW5pdChncHUpOworCQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211 dGV4KTsKIAkJcG1fcnVudGltZV9wdXRfc3luYygmcGRldi0+ZGV2KTsKIAkJaWYgKHJldCkgewog CQkJZGV2X2VycihkZXYtPmRldiwgImdwdSBodyBpbml0IGZhaWxlZDogJWRcbiIsIHJldCk7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2FkcmVuby9hZHJlbm9fZ3B1LmMgYi9kcml2 ZXJzL2dwdS9kcm0vbXNtL2FkcmVuby9hZHJlbm9fZ3B1LmMKaW5kZXggNWI2M2ZjNi4uOWUwOGIz ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21zbS9hZHJlbm8vYWRyZW5vX2dwdS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vYWRyZW5vL2FkcmVub19ncHUuYwpAQCAtNjQsNyArNjQs NyBAQCBpbnQgYWRyZW5vX2h3X2luaXQoc3RydWN0IG1zbV9ncHUgKmdwdSkKIAogCURCRygiJXMi LCBncHUtPm5hbWUpOwogCi0JcmV0ID0gbXNtX2dlbV9nZXRfaW92YShncHUtPnJiLT5ibywgZ3B1 LT5pZCwgJmdwdS0+cmJfaW92YSk7CisJcmV0ID0gbXNtX2dlbV9nZXRfaW92YV9sb2NrZWQoZ3B1 LT5yYi0+Ym8sIGdwdS0+aWQsICZncHUtPnJiX2lvdmEpOwogCWlmIChyZXQpIHsKIAkJZ3B1LT5y Yl9pb3ZhID0gMDsKIAkJZGV2X2VycihncHUtPmRldi0+ZGV2LCAiY291bGQgbm90IG1hcCByaW5n YnVmZmVyOiAlZFxuIiwgcmV0KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNt X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZ2VtLmMKaW5kZXggNjhlNTA5Yi4uMTM5 YmU1NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZ2VtLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL21zbS9tc21fZ2VtLmMKQEAgLTMxNCw2ICszMTQsOCBAQCBpbnQgbXNtX2dl bV9nZXRfaW92YV9sb2NrZWQoc3RydWN0IGRybV9nZW1fb2JqZWN0ICpvYmosIGludCBpZCwKIAlz dHJ1Y3QgbXNtX2dlbV9vYmplY3QgKm1zbV9vYmogPSB0b19tc21fYm8ob2JqKTsKIAlpbnQgcmV0 ID0gMDsKIAorCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmb2JqLT5kZXYtPnN0cnVjdF9tdXRl eCkpOworCiAJaWYgKCFtc21fb2JqLT5kb21haW5baWRdLmlvdmEpIHsKIAkJc3RydWN0IG1zbV9k cm1fcHJpdmF0ZSAqcHJpdiA9IG9iai0+ZGV2LT5kZXZfcHJpdmF0ZTsKIAkJc3RydWN0IHBhZ2Ug KipwYWdlcyA9IGdldF9wYWdlcyhvYmopOwpAQCAtMzQ1LDYgKzM0Nyw3IEBAIGludCBtc21fZ2Vt X2dldF9pb3ZhKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqLCBpbnQgaWQsIHVpbnQ2NF90ICpp b3ZhKQogCSAqIGJvIGlzIGRlbGV0ZWQ6CiAJICovCiAJaWYgKG1zbV9vYmotPmRvbWFpbltpZF0u aW92YSkgeworCQltaWdodF9sb2NrKCZvYmotPmRldi0+c3RydWN0X211dGV4KTsKIAkJKmlvdmEg PSBtc21fb2JqLT5kb21haW5baWRdLmlvdmE7CiAJCXJldHVybiAwOwogCX0KZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2dwdS5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9tc21f Z3B1LmMKaW5kZXggOTdiOWMzOC4uOWZjZWRhOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L21zbS9tc21fZ3B1LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZ3B1LmMKQEAgLTIw Myw2ICsyMDMsOCBAQCBpbnQgbXNtX2dwdV9od19pbml0KHN0cnVjdCBtc21fZ3B1ICpncHUpCiB7 CiAJaW50IHJldDsKIAorCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmZ3B1LT5kZXYtPnN0cnVj dF9tdXRleCkpOworCiAJaWYgKCFncHUtPm5lZWRzX2h3X2luaXQpCiAJCXJldHVybiAwOwogCi0t IAoyLjkuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K ZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==