From: John Stultz Subject: [PATCH v2] drm: kirin: Fix dsi probe/attach logic Date: Fri, 20 Sep 2019 04:09:15 +0000 Message-ID: <20190920040915.73599-1-john.stultz@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4D8E56E832 for ; Fri, 20 Sep 2019 04:09:21 +0000 (UTC) Received: by mail-pl1-x644.google.com with SMTP id f19so2586322plr.3 for ; Thu, 19 Sep 2019 21:09:21 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: lkml Cc: Jernej Skrabec , Neil Armstrong , David Airlie , Jonas Karlman , "dri-devel@lists.freedesktop.org" , Xinliang Liu , Thierry Reding , Laurent Pinchart , Rongrong Zou , Sean Paul , Sam Ravnborg , Matt Redfearn List-Id: dri-devel@lists.freedesktop.org U2luY2UgY29tbWl0IDgzZjM1YmMzYTg1MiAoImRybS9icmlkZ2U6IGFkdjc1MTE6IEF0dGFjaCB0 byBEU0kKaG9zdCBhdCBwcm9iZSB0aW1lIikgbGFuZGVkIGluIC1uZXh0IHRoZSBIaUtleSBib2Fy ZCB3b3VsZCBmYWlsCnRvIGJvb3QsIGxvb3Bpbmc6CgogIGFkdjc1MTEgMi0wMDM5OiBmYWlsZWQg dG8gZmluZCBkc2kgaG9zdAoKbWVzc2FnZXMgb3ZlciBhbmQgb3Zlci4gQW5kcnplaiBIYWpkYSBz dWdnZXN0ZWQgdGhpcyBpcyBkdWUgdG8gYQpjaXJjdWxhciBkZXBlbmRlbmN5IGlzc3VlLCBhbmQg dGhhdCB0aGUgYWR2NzUxMSBjaGFuZ2UgaXMKY29ycmVjdGluZyB0aGUgaW1wcm9wZXIgb3JkZXIg dXNlZCBlYXJsaWVyLgoKVW5mb3J0dW5hdGVseSB0aGlzIG1lYW5zIHRoZSBEU0kgZHJpdmVycyB0 aGF0IHVzZSBhZHY3NTExIG5lZWQKdG8gYWxzbyBuZWVkIHRvIGJlIHVwZGF0ZWQgdG8gdXNlIHRo ZSBwcm9wZXIgb3JkZXJpbmcgdG8KY29udGludWUgdG8gd29yay4KClRoaXMgcGF0Y2ggdHJpZXMg dG8gcmVvcmRlciB0aGUgaW5pdGlhbGl6YXRpb24gdG8gcmVnaXN0ZXIgdGhlCmRzaV9ob3N0IGZp cnN0LCBhbmQgdGhlbiBjYWxsIGNvbXBvbmVudF9hZGQgdmlhIGRzaV9ob3N0X2F0dGFjaCwKaW5z dGVhZCBvZiBkb2luZyB0aGF0IGF0IHByb2JlIHRpbWUuCgpUaGlzIHNlZW1zIHRvIHJlc29sdmUg dGhlIGlzc3VlIHdpdGggdGhlIEhpS2V5IGJvYXJkLgoKQ2M6IEFuZHJ6ZWogSGFqZGEgPGEuaGFq ZGFAc2Ftc3VuZy5jb20+CkNjOiBNYXR0IFJlZGZlYXJuIDxtYXR0LnJlZGZlYXJuQHRoaW5jaS5j b20+CkNjOiBYaW5saWFuZyBMaXUgPHoubGl1eGlubGlhbmdAaGlzaWxpY29uLmNvbT4KQ2M6IFJv bmdyb25nIFpvdSA8em91cm9uZ3JvbmdAZ21haWwuY29tPgpDYzogTGF1cmVudCBQaW5jaGFydCA8 TGF1cmVudC5waW5jaGFydEBpZGVhc29uYm9hcmQuY29tPgpDYzogTmVpbCBBcm1zdHJvbmcgPG5h cm1zdHJvbmdAYmF5bGlicmUuY29tPgpDYzogSm9uYXMgS2FybG1hbiA8am9uYXNAa3dpYm9vLnNl PgpDYzogSmVybmVqIFNrcmFiZWMgPGplcm5lai5za3JhYmVjQHNpb2wubmV0PgpDYzogVGhpZXJy eSBSZWRpbmcgPHRoaWVycnkucmVkaW5nQGdtYWlsLmNvbT4KQ2M6IERhdmlkIEFpcmxpZSA8YWly bGllZEBsaW51eC5pZT4sCkNjOiBTZWFuIFBhdWwgPHNlYW5wYXVsQGNocm9taXVtLm9yZz4KQ2M6 IFNhbSBSYXZuYm9yZyA8c2FtQHJhdm5ib3JnLm9yZz4KQ2M6ICJkcmktZGV2ZWxAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnIiA8ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZz4KRml4ZXM6IDgz ZjM1YmMzYTg1MiAoImRybS9icmlkZ2U6IGFkdjc1MTE6IEF0dGFjaCB0byBEU0kgaG9zdCBhdCBw cm9iZSB0aW1lIikKU2lnbmVkLW9mZi1ieTogSm9obiBTdHVsdHogPGpvaG4uc3R1bHR6QGxpbmFy by5vcmc+CkNoYW5nZS1JZDogSWE0MjM0NWY4MWI0OTU1YTczMmQwMjUxZjFkMWRkYjExOGY4ODUy OTkKLS0tCnYyOiBSZW9yZGVyZWQgcGxhdGZvcm1fc2V0X2RydmRhdGEgYW5kIGRzaV9ob3N0X2lu aXQsIHN1Z2dlc3RlZAogICAgYnkgQW5kcnplagoKTm90ZTogSSdtIHJlYWxseSBub3Qgc3VwZXIg ZmFtaWxpYXIgd2l0aCB0aGUgRFNJIGNvZGUgaGVyZSwKYW5kIGFtIG1vc3RseSBqdXN0IHRyeWlu ZyB0byByZWZhY3RvciB0aGUgZXhpc3RpbmcgY29kZSBpbiBhCnNpbWlsYXIgZmFzaGlvbiB0byB0 aGUgc3VnZ2VzdGVkIGR3LW1pcGktZHNpLXJvY2tjaGlwLmMKaW1wbGVtZW50YXRpb24uIENhcmVm dWwgcmV2aWV3IHdvdWxkIGJlIGdyZWF0bHkgYXBwcmVjaWF0ZWQhCi0tLQogZHJpdmVycy9ncHUv ZHJtL2hpc2lsaWNvbi9raXJpbi9kd19kcm1fZHNpLmMgfCAxMDcgKysrKysrKysrLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDUyIGluc2VydGlvbnMoKyksIDU1IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4vZHdfZHJtX2RzaS5jIGIv ZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9kd19kcm1fZHNpLmMKaW5kZXggNWJmODEz ODk0MWRlLi4wZGRmMjJhOGJlMGYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGlj b24va2lyaW4vZHdfZHJtX2RzaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2ly aW4vZHdfZHJtX2RzaS5jCkBAIC03OSw2ICs3OSw3IEBAIHN0cnVjdCBkc2lfaHdfY3R4IHsKIH07 CiAKIHN0cnVjdCBkd19kc2kgeworCXN0cnVjdCBkZXZpY2UgKmRldjsKIAlzdHJ1Y3QgZHJtX2Vu Y29kZXIgZW5jb2RlcjsKIAlzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJpZGdlOwogCXN0cnVjdCBtaXBp X2RzaV9ob3N0IGhvc3Q7CkBAIC03MjQsNTEgKzcyNSw2IEBAIHN0YXRpYyBpbnQgZHdfZHJtX2Vu Y29kZXJfaW5pdChzdHJ1Y3QgZGV2aWNlICpkZXYsCiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBp bnQgZHNpX2hvc3RfYXR0YWNoKHN0cnVjdCBtaXBpX2RzaV9ob3N0ICpob3N0LAotCQkJICAgc3Ry dWN0IG1pcGlfZHNpX2RldmljZSAqbWRzaSkKLXsKLQlzdHJ1Y3QgZHdfZHNpICpkc2kgPSBob3N0 X3RvX2RzaShob3N0KTsKLQotCWlmIChtZHNpLT5sYW5lcyA8IDEgfHwgbWRzaS0+bGFuZXMgPiA0 KSB7Ci0JCURSTV9FUlJPUigiZHNpIGRldmljZSBwYXJhbXMgaW52YWxpZFxuIik7Ci0JCXJldHVy biAtRUlOVkFMOwotCX0KLQotCWRzaS0+bGFuZXMgPSBtZHNpLT5sYW5lczsKLQlkc2ktPmZvcm1h dCA9IG1kc2ktPmZvcm1hdDsKLQlkc2ktPm1vZGVfZmxhZ3MgPSBtZHNpLT5tb2RlX2ZsYWdzOwot Ci0JcmV0dXJuIDA7Ci19Ci0KLXN0YXRpYyBpbnQgZHNpX2hvc3RfZGV0YWNoKHN0cnVjdCBtaXBp X2RzaV9ob3N0ICpob3N0LAotCQkJICAgc3RydWN0IG1pcGlfZHNpX2RldmljZSAqbWRzaSkKLXsK LQkvKiBkbyBub3RoaW5nICovCi0JcmV0dXJuIDA7Ci19Ci0KLXN0YXRpYyBjb25zdCBzdHJ1Y3Qg bWlwaV9kc2lfaG9zdF9vcHMgZHNpX2hvc3Rfb3BzID0gewotCS5hdHRhY2ggPSBkc2lfaG9zdF9h dHRhY2gsCi0JLmRldGFjaCA9IGRzaV9ob3N0X2RldGFjaCwKLX07Ci0KLXN0YXRpYyBpbnQgZHNp X2hvc3RfaW5pdChzdHJ1Y3QgZGV2aWNlICpkZXYsIHN0cnVjdCBkd19kc2kgKmRzaSkKLXsKLQlz dHJ1Y3QgbWlwaV9kc2lfaG9zdCAqaG9zdCA9ICZkc2ktPmhvc3Q7Ci0JaW50IHJldDsKLQotCWhv c3QtPmRldiA9IGRldjsKLQlob3N0LT5vcHMgPSAmZHNpX2hvc3Rfb3BzOwotCXJldCA9IG1pcGlf ZHNpX2hvc3RfcmVnaXN0ZXIoaG9zdCk7Ci0JaWYgKHJldCkgewotCQlEUk1fRVJST1IoImZhaWxl ZCB0byByZWdpc3RlciBkc2kgaG9zdFxuIik7Ci0JCXJldHVybiByZXQ7Ci0JfQotCi0JcmV0dXJu IDA7Ci19Ci0KIHN0YXRpYyBpbnQgZHNpX2JyaWRnZV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsIHN0cnVjdCBkd19kc2kgKmRzaSkKIHsKIAlzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIg PSAmZHNpLT5lbmNvZGVyOwpAQCAtNzk2LDEwICs3NTIsNiBAQCBzdGF0aWMgaW50IGRzaV9iaW5k KHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRldmljZSAqbWFzdGVyLCB2b2lkICpkYXRhKQog CWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLQlyZXQgPSBkc2lfaG9zdF9pbml0KGRldiwgZHNp KTsKLQlpZiAocmV0KQotCQlyZXR1cm4gcmV0OwotCiAJcmV0ID0gZHNpX2JyaWRnZV9pbml0KGRy bV9kZXYsIGRzaSk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKQEAgLTgxNywxMyArNzY5LDIy IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgY29tcG9uZW50X29wcyBkc2lfb3BzID0gewogCS51bmJp bmQJPSBkc2lfdW5iaW5kLAogfTsKIAotc3RhdGljIGludCBkc2lfcGFyc2VfZHQoc3RydWN0IHBs YXRmb3JtX2RldmljZSAqcGRldiwgc3RydWN0IGR3X2RzaSAqZHNpKQorc3RhdGljIGludCBkc2lf aG9zdF9hdHRhY2goc3RydWN0IG1pcGlfZHNpX2hvc3QgKmhvc3QsCisJCQkgICBzdHJ1Y3QgbWlw aV9kc2lfZGV2aWNlICptZHNpKQogewotCXN0cnVjdCBkc2lfaHdfY3R4ICpjdHggPSBkc2ktPmN0 eDsKLQlzdHJ1Y3QgZGV2aWNlX25vZGUgKm5wID0gcGRldi0+ZGV2Lm9mX25vZGU7Ci0Jc3RydWN0 IHJlc291cmNlICpyZXM7CisJc3RydWN0IGR3X2RzaSAqZHNpID0gaG9zdF90b19kc2koaG9zdCk7 CisJc3RydWN0IGRldmljZV9ub2RlICpucCA9IGRzaS0+ZGV2LT5vZl9ub2RlOwogCWludCByZXQ7 CiAKKwlpZiAobWRzaS0+bGFuZXMgPCAxIHx8IG1kc2ktPmxhbmVzID4gNCkgeworCQlEUk1fRVJS T1IoImRzaSBkZXZpY2UgcGFyYW1zIGludmFsaWRcbiIpOworCQlyZXR1cm4gLUVJTlZBTDsKKwl9 CisKKwlkc2ktPmxhbmVzID0gbWRzaS0+bGFuZXM7CisJZHNpLT5mb3JtYXQgPSBtZHNpLT5mb3Jt YXQ7CisJZHNpLT5tb2RlX2ZsYWdzID0gbWRzaS0+bW9kZV9mbGFnczsKKwogCS8qCiAJICogR2V0 IHRoZSBlbmRwb2ludCBub2RlLiBJbiBvdXIgY2FzZSwgZHNpIGhhcyBvbmUgb3V0cHV0IHBvcnQx CiAJICogdG8gd2hpY2ggdGhlIGV4dGVybmFsIEhETUkgYnJpZGdlIGlzIGNvbm5lY3RlZC4KQEAg LTgzMiw2ICs3OTMsNDIgQEAgc3RhdGljIGludCBkc2lfcGFyc2VfZHQoc3RydWN0IHBsYXRmb3Jt X2RldmljZSAqcGRldiwgc3RydWN0IGR3X2RzaSAqZHNpKQogCWlmIChyZXQpCiAJCXJldHVybiBy ZXQ7CiAKKwlyZXR1cm4gY29tcG9uZW50X2FkZChkc2ktPmRldiwgJmRzaV9vcHMpOworfQorCitz dGF0aWMgaW50IGRzaV9ob3N0X2RldGFjaChzdHJ1Y3QgbWlwaV9kc2lfaG9zdCAqaG9zdCwKKwkJ CSAgIHN0cnVjdCBtaXBpX2RzaV9kZXZpY2UgKm1kc2kpCit7CisJLyogZG8gbm90aGluZyAqLwor CXJldHVybiAwOworfQorCitzdGF0aWMgY29uc3Qgc3RydWN0IG1pcGlfZHNpX2hvc3Rfb3BzIGRz aV9ob3N0X29wcyA9IHsKKwkuYXR0YWNoID0gZHNpX2hvc3RfYXR0YWNoLAorCS5kZXRhY2ggPSBk c2lfaG9zdF9kZXRhY2gsCit9OworCitzdGF0aWMgaW50IGRzaV9ob3N0X2luaXQoc3RydWN0IGRl dmljZSAqZGV2LCBzdHJ1Y3QgZHdfZHNpICpkc2kpCit7CisJc3RydWN0IG1pcGlfZHNpX2hvc3Qg Kmhvc3QgPSAmZHNpLT5ob3N0OworCWludCByZXQ7CisKKwlob3N0LT5kZXYgPSBkZXY7CisJaG9z dC0+b3BzID0gJmRzaV9ob3N0X29wczsKKwlyZXQgPSBtaXBpX2RzaV9ob3N0X3JlZ2lzdGVyKGhv c3QpOworCWlmIChyZXQpIHsKKwkJRFJNX0VSUk9SKCJmYWlsZWQgdG8gcmVnaXN0ZXIgZHNpIGhv c3RcbiIpOworCQlyZXR1cm4gcmV0OworCX0KKworCXJldHVybiAwOworfQorCitzdGF0aWMgaW50 IGRzaV9wYXJzZV9kdChzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2LCBzdHJ1Y3QgZHdfZHNp ICpkc2kpCit7CisJc3RydWN0IGRzaV9od19jdHggKmN0eCA9IGRzaS0+Y3R4OworCXN0cnVjdCBy ZXNvdXJjZSAqcmVzOworCiAJY3R4LT5wY2xrID0gZGV2bV9jbGtfZ2V0KCZwZGV2LT5kZXYsICJw Y2xrIik7CiAJaWYgKElTX0VSUihjdHgtPnBjbGspKSB7CiAJCURSTV9FUlJPUigiZmFpbGVkIHRv IGdldCBwY2xrIGNsb2NrXG4iKTsKQEAgLTg2Miw2ICs4NTksNyBAQCBzdGF0aWMgaW50IGRzaV9w cm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogCX0KIAlkc2kgPSAmZGF0YS0+ZHNp OwogCWN0eCA9ICZkYXRhLT5jdHg7CisJZHNpLT5kZXYgPSAmcGRldi0+ZGV2OwogCWRzaS0+Y3R4 ID0gY3R4OwogCiAJcmV0ID0gZHNpX3BhcnNlX2R0KHBkZXYsIGRzaSk7CkBAIC04NjksOCArODY3 LDcgQEAgc3RhdGljIGludCBkc2lfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikK IAkJcmV0dXJuIHJldDsKIAogCXBsYXRmb3JtX3NldF9kcnZkYXRhKHBkZXYsIGRhdGEpOwotCi0J cmV0dXJuIGNvbXBvbmVudF9hZGQoJnBkZXYtPmRldiwgJmRzaV9vcHMpOworCXJldHVybiBkc2lf aG9zdF9pbml0KCZwZGV2LT5kZXYsIGRzaSk7CiB9CiAKIHN0YXRpYyBpbnQgZHNpX3JlbW92ZShz dHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQotLSAKMi4xNy4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=