From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sam Ravnborg Subject: [PATCH v3 2/4] drm/via: copy DRM_WAIT_ON as VIA_WAIT_ON and use it Date: Mon, 22 Jul 2019 22:35:43 +0200 Message-ID: <20190722203545.8612-3-sam@ravnborg.org> References: <20190722203545.8612-1-sam@ravnborg.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190722203545.8612-1-sam@ravnborg.org> 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, openchrome-devel@lists.freedesktop.org Cc: Thomas Hellstrom , Sam Ravnborg , "Gustavo A. R. Silva" , David Airlie , Daniel Vetter , =?UTF-8?q?Michel=20D=C3=A4nzer?= , Kevin Brace , Mike Marshall , Ira Weiny , Emil Velikov List-Id: dri-devel@lists.freedesktop.org VklBX1dBSVRfT04oKSBpcyBhIGRpcmVjdCBjb3B5IG9mIERSTV9XQUlUX09OKCkgZnJvbQpkcm1f b3NfbGludXguaC4KVGhlIGNvcHkgaXMgbWFkZSBzbyB3ZSBjYW4gYXZvaWQgdGhlIGRlcGVuZGVu Y3kgb24gdGhlIGxlZ2FjeSBoZWFkZXIuCkEgbW9yZSBpbnZvbHZlZCBhcHByb2FjaCBoYWQgYmVl biB0byBpbnRyb2R1Y2Ugd2FpdF9ldmVudF8qIGJ1dCBmb3IgdGhpcwpsZWdhY3kgZHJpdmVyIHRo ZSBzaW1wbGVyIGFuZCBtb3JlIHNhZmUgYXBwcm9hY2ggd2l0aCBhIGNvcHkgb2YgdGhlCm1hY3Jv IHdhcyBzZWxlY3RlZC4KQWRkZWQgdGhlIHJlbGV2YW50IGhlYWRlciBmaWxlcyBmb3IgdGhlIGZ1 bmN0aW9ucyB1c2VkIGluIFZJQV9XQUlUX09OLgoKdjM6Ci0gVXBkYXRlZCB1c2VycyBvZiBEUk1f V0FJVF9PTiA9PiBWSUFfV0FJVF9PTiAoRW1pbCkKLSBVcGRhdGVkICRzdWJqZWN0IChFbWlsKQoK U2lnbmVkLW9mZi1ieTogU2FtIFJhdm5ib3JnIDxzYW1AcmF2bmJvcmcub3JnPgpDYzogS2V2aW4g QnJhY2UgPGtldmluYnJhY2VAZ214LmNvbT4KQ2M6IFRob21hcyBIZWxsc3Ryb20gPHRoZWxsc3Ry b21Adm13YXJlLmNvbT4KQ2M6ICJHdXN0YXZvIEEuIFIuIFNpbHZhIiA8Z3VzdGF2b0BlbWJlZGRl ZG9yLmNvbT4KQ2M6IE1pa2UgTWFyc2hhbGwgPGh1YmNhcEBvbW5pYm9uZC5jb20+CkNjOiBJcmEg V2VpbnkgPGlyYS53ZWlueUBpbnRlbC5jb20+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0 dGVyQGZmd2xsLmNoPgpDYzogRW1pbCBWZWxpa292IDxlbWlsLnZlbGlrb3ZAY29sbGFib3JhLmNv bT4KQ2M6IE1pY2hlbCBEw6RuemVyIDxtaWNoZWxAZGFlbnplci5uZXQ+Ci0tLQogZHJpdmVycy9n cHUvZHJtL3ZpYS92aWFfZG1hYmxpdC5jIHwgIDQgKy0tCiBkcml2ZXJzL2dwdS9kcm0vdmlhL3Zp YV9kcnYuaCAgICAgfCA0MiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKystCiBkcml2ZXJz L2dwdS9kcm0vdmlhL3ZpYV9pcnEuYyAgICAgfCAgNCArLS0KIGRyaXZlcnMvZ3B1L2RybS92aWEv dmlhX3ZpZGVvLmMgICB8ICAyICstCiA0IGZpbGVzIGNoYW5nZWQsIDQ2IGluc2VydGlvbnMoKyks IDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3ZpYS92aWFfZG1h YmxpdC5jIGIvZHJpdmVycy9ncHUvZHJtL3ZpYS92aWFfZG1hYmxpdC5jCmluZGV4IGUxNTU3ZGQ2 NzA4My4uMmVjOTNkOTc2YTQzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmlhL3ZpYV9k bWFibGl0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3ZpYS92aWFfZG1hYmxpdC5jCkBAIC00MzYs NyArNDM2LDcgQEAgdmlhX2RtYWJsaXRfc3luYyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1aW50 MzJfdCBoYW5kbGUsIGludCBlbmdpbmUpCiAJaW50IHJldCA9IDA7CiAKIAlpZiAodmlhX2RtYWJs aXRfYWN0aXZlKGJsaXRxLCBlbmdpbmUsIGhhbmRsZSwgJnF1ZXVlKSkgewotCQlEUk1fV0FJVF9P TihyZXQsICpxdWV1ZSwgMyAqIEhaLAorCQlWSUFfV0FJVF9PTihyZXQsICpxdWV1ZSwgMyAqIEha LAogCQkJICAgICF2aWFfZG1hYmxpdF9hY3RpdmUoYmxpdHEsIGVuZ2luZSwgaGFuZGxlLCBOVUxM KSk7CiAJfQogCURSTV9ERUJVRygiRE1BIGJsaXQgc3luYyBoYW5kbGUgMHgleCBlbmdpbmUgJWQg cmV0dXJuZWQgJWRcbiIsCkBAIC02ODcsNyArNjg3LDcgQEAgdmlhX2RtYWJsaXRfZ3JhYl9zbG90 KGRybV92aWFfYmxpdHFfdCAqYmxpdHEsIGludCBlbmdpbmUpCiAJd2hpbGUgKGJsaXRxLT5udW1f ZnJlZSA9PSAwKSB7CiAJCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmJsaXRxLT5ibGl0X2xvY2ss IGlycXNhdmUpOwogCi0JCURSTV9XQUlUX09OKHJldCwgYmxpdHEtPmJ1c3lfcXVldWUsIEhaLCBi bGl0cS0+bnVtX2ZyZWUgPiAwKTsKKwkJVklBX1dBSVRfT04ocmV0LCBibGl0cS0+YnVzeV9xdWV1 ZSwgSFosIGJsaXRxLT5udW1fZnJlZSA+IDApOwogCQlpZiAocmV0KQogCQkJcmV0dXJuICgtRUlO VFIgPT0gcmV0KSA/IC1FQUdBSU4gOiByZXQ7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS92aWEvdmlhX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL3ZpYS92aWFfZHJ2LmgKaW5kZXggOGMx NmMyMDhhZTgzLi4zZWI5MmU4MTY1NWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92aWEv dmlhX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS92aWEvdmlhX2Rydi5oCkBAIC0yNCw4ICsy NCwxMyBAQAogI2lmbmRlZiBfVklBX0RSVl9IXwogI2RlZmluZSBfVklBX0RSVl9IXwogCi0jaW5j bHVkZSA8ZHJtL2RybV9tbS5oPgorI2luY2x1ZGUgPGxpbnV4L2ppZmZpZXMuaD4KKyNpbmNsdWRl IDxsaW51eC9zY2hlZC5oPgorI2luY2x1ZGUgPGxpbnV4L3NjaGVkL3NpZ25hbC5oPgorI2luY2x1 ZGUgPGxpbnV4L3dhaXQuaD4KKwogI2luY2x1ZGUgPGRybS9kcm1fbGVnYWN5Lmg+CisjaW5jbHVk ZSA8ZHJtL2RybV9tbS5oPgogCiAjZGVmaW5lIERSSVZFUl9BVVRIT1IJIlZhcmlvdXMiCiAKQEAg LTE0OCw2ICsxNTMsNDEgQEAgc3RhdGljIGlubGluZSB2b2lkIHZpYV93cml0ZThfbWFza19hbmQo c3RydWN0IGRybV92aWFfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJd3JpdGViKHZhbCAmIG1hc2ssICh2 b2lkIF9faW9tZW0gKikoZGV2X3ByaXYtPm1taW8tPmhhbmRsZSArIHJlZykpOwogfQogCisvKgor ICogUG9sbCBpbiBhIGxvb3Agd2FpdGluZyBmb3IgJ2NvbnRpZGl0aW9uJyB0byBiZSB0cnVlLgor ICogTm90ZTogQSBkaXJlY3QgcmVwbGFjZW1lbnQgd2l0aCB3YWl0X2V2ZW50X2ludGVycnVwdGli bGVfdGltZW91dCgpCisgKiAgICAgICB3aWxsIG5vdCB3b3JrIHVubGVzcyBkcml2ZXIgaXMgdXBk YXRlZCB0byBlbWl0IHdha2VfdXAoKQorICogICAgICAgaW4gcmVsZXZhbnQgcGxhY2VzIHRoYXQg Y2FuIGltcGFjdCB0aGUgJ2NvbmRpdGlvbicKKyAqCisgKiBSZXR1cm5zOgorICogICByZXQga2Vl cHMgY3VycmVudCB2YWx1ZSBpZiAnY29uZGl0aW9uJyBiZWNvbWVzIHRydWUKKyAqICAgcmV0ID0g LUJVU1kgaWYgdGltZW91dCBoYXBwZW5zCisgKiAgIHJldCA9IC1FSU5UUiBpZiBhIHNpZ25hbCBp bnRlcnJ1cHRlZCB0aGUgd2FpdGluZyBwZXJpb2QKKyAqLworI2RlZmluZSBWSUFfV0FJVF9PTigg cmV0LCBxdWV1ZSwgdGltZW91dCwgY29uZGl0aW9uICkJCVwKK2RvIHsJCQkJCQkJCVwKKwlERUNM QVJFX1dBSVRRVUVVRShlbnRyeSwgY3VycmVudCk7CQkJXAorCXVuc2lnbmVkIGxvbmcgZW5kID0g amlmZmllcyArICh0aW1lb3V0KTsJCVwKKwlhZGRfd2FpdF9xdWV1ZSgmKHF1ZXVlKSwgJmVudHJ5 KTsJCQlcCisJCQkJCQkJCVwKKwlmb3IgKDs7KSB7CQkJCQkJXAorCQlfX3NldF9jdXJyZW50X3N0 YXRlKFRBU0tfSU5URVJSVVBUSUJMRSk7CVwKKwkJaWYgKGNvbmRpdGlvbikJCQkJCVwKKwkJCWJy ZWFrOwkJCQkJXAorCQlpZiAodGltZV9hZnRlcl9lcShqaWZmaWVzLCBlbmQpKSB7CQlcCisJCQly ZXQgPSAtRUJVU1k7CQkJCVwKKwkJCWJyZWFrOwkJCQkJXAorCQl9CQkJCQkJXAorCQlzY2hlZHVs ZV90aW1lb3V0KChIWi8xMDAgPiAxKSA/IEhaLzEwMCA6IDEpOwlcCisJCWlmIChzaWduYWxfcGVu ZGluZyhjdXJyZW50KSkgewkJCVwKKwkJCXJldCA9IC1FSU5UUjsJCQkJXAorCQkJYnJlYWs7CQkJ CQlcCisJCX0JCQkJCQlcCisJfQkJCQkJCQlcCisJX19zZXRfY3VycmVudF9zdGF0ZShUQVNLX1JV Tk5JTkcpOwkJCVwKKwlyZW1vdmVfd2FpdF9xdWV1ZSgmKHF1ZXVlKSwgJmVudHJ5KTsJCQlcCit9 IHdoaWxlICgwKQorCiBleHRlcm4gY29uc3Qgc3RydWN0IGRybV9pb2N0bF9kZXNjIHZpYV9pb2N0 bHNbXTsKIGV4dGVybiBpbnQgdmlhX21heF9pb2N0bDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL3ZpYS92aWFfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vdmlhL3ZpYV9pcnEuYwppbmRl eCAwZWUwYjc2N2MzZDcuLjVhYzI2ZDIwM2Y0NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L3ZpYS92aWFfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3ZpYS92aWFfaXJxLmMKQEAgLTIz MywxMiArMjMzLDEyIEBAIHZpYV9kcml2ZXJfaXJxX3dhaXQoc3RydWN0IGRybV9kZXZpY2UgKmRl diwgdW5zaWduZWQgaW50IGlycSwgaW50IGZvcmNlX3NlcXVlbmNlCiAJY3VyX2lycSA9IGRldl9w cml2LT52aWFfaXJxcyArIHJlYWxfaXJxOwogCiAJaWYgKG1hc2tzW3JlYWxfaXJxXVsyXSAmJiAh Zm9yY2Vfc2VxdWVuY2UpIHsKLQkJRFJNX1dBSVRfT04ocmV0LCBjdXJfaXJxLT5pcnFfcXVldWUs IDMgKiBIWiwKKwkJVklBX1dBSVRfT04ocmV0LCBjdXJfaXJxLT5pcnFfcXVldWUsIDMgKiBIWiwK IAkJCSAgICAoKHZpYV9yZWFkKGRldl9wcml2LCBtYXNrc1tpcnFdWzJdKSAmIG1hc2tzW2lycV1b M10pID09CiAJCQkgICAgIG1hc2tzW2lycV1bNF0pKTsKIAkJY3VyX2lycV9zZXF1ZW5jZSA9IGF0 b21pY19yZWFkKCZjdXJfaXJxLT5pcnFfcmVjZWl2ZWQpOwogCX0gZWxzZSB7Ci0JCURSTV9XQUlU X09OKHJldCwgY3VyX2lycS0+aXJxX3F1ZXVlLCAzICogSFosCisJCVZJQV9XQUlUX09OKHJldCwg Y3VyX2lycS0+aXJxX3F1ZXVlLCAzICogSFosCiAJCQkgICAgKCgoY3VyX2lycV9zZXF1ZW5jZSA9 CiAJCQkgICAgICAgYXRvbWljX3JlYWQoJmN1cl9pcnEtPmlycV9yZWNlaXZlZCkpIC0KIAkJCSAg ICAgICpzZXF1ZW5jZSkgPD0gKDEgPDwgMjMpKSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vdmlhL3ZpYV92aWRlby5jIGIvZHJpdmVycy9ncHUvZHJtL3ZpYS92aWFfdmlkZW8uYwppbmRl eCBhOWZmYmFkMWNmZGQuLmNmNTM2MTJjOTQ1ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L3ZpYS92aWFfdmlkZW8uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdmlhL3ZpYV92aWRlby5jCkBA IC04Miw3ICs4Miw3IEBAIGludCB2aWFfZGVjb2Rlcl9mdXRleChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfCiAKIAlzd2l0Y2ggKGZ4LT5m dW5jKSB7CiAJY2FzZSBWSUFfRlVURVhfV0FJVDoKLQkJRFJNX1dBSVRfT04ocmV0LCBkZXZfcHJp di0+ZGVjb2Rlcl9xdWV1ZVtmeC0+bG9ja10sCisJCVZJQV9XQUlUX09OKHJldCwgZGV2X3ByaXYt PmRlY29kZXJfcXVldWVbZngtPmxvY2tdLAogCQkJICAgIChmeC0+bXMgLyAxMCkgKiAoSFogLyAx MDApLCAqbG9jayAhPSBmeC0+dmFsKTsKIAkJcmV0dXJuIHJldDsKIAljYXNlIFZJQV9GVVRFWF9X QUtFOgotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmkt ZGV2ZWw=