From: Daniel Vetter Subject: [PATCH 2/2] drm/i915: sync dp link status checks against atomic commmits Date: Fri, 10 Nov 2017 11:53:13 +0100 Message-ID: <20171110105313.16718-2-daniel.vetter@ffwll.ch> References: <20171110105313.16718-1-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171110105313.16718-1-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: DRI Development Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org VHdvIGJpdHM6Ci0gY2hlY2sgYWN0dWFsIGF0b21pYyBzdGF0ZSwgdGhlIGxlZ2FjeSBzdHVmZiBj YW4gb25seSBiZSBsb29rZWQgYXQKICBmcm9tIHdpdGhpbiB0aGUgYXRvbWljX2NvbW1pdF90YWls IGZ1bmN0aW9uLCBzaW5jZSBpdCdzIG9ubHkKICBwcm90ZWN0ZWQgYnkgb3JkZXJpbmcgYW5kIG5v dCBieSBhbnkgbG9ja3MuCgotIE1ha2Ugc3VyZSB3ZSBkb24ndCB3cmVhayB0aGUgd29yayBhbiBv bmdvaW5nIG5vbmJsb2NraW5nIGNvbW1pdCBpcwogIGRvaW5nLgoKdjI6IFdlIG5lZWQgdGhlIGNy dGMgbG9jayB0b28sIGJlY2F1c2UgYSBwbGFuZSB1cGRhdGUgbWlnaHQgY2hhbmdlIGl0CndpdGhv dXQgaGF2aW5nIHRvIGFjcXVpcmUgdGhlIGNvbm5lY3Rpb25fbXV0ZXggKE1hYXJ0ZW4pLiBVc2UK TWFhcnRlbidzIGNoYW5nZXMgZm9yIHRoaXMgbG9ja2luZywgd2hpbGUga2VlcGluZyB0aGUgbG9n aWMgdGhhdCB1c2VzCnRoZSBjb25uZWN0aW9uLT5jb21taXQtPmh3X2RvbmUgc2lnbmFsIGZvciBz eW5jaW5nIHdpdGggbm9uYmxvY2tpbmcKY29tbWl0cy4KCnYzOiBUaGUgaW5pdGlhbCBzdGF0ZSBv YmplY3RzIGZyb20gdGhlIGh3IHN0YXRlIHJlYWRvdXQgZG8gbm90IGhhdmUgYQpjb21taXQgb2Jq ZWN0LiBDaGVjayBmb3IgdGhhdCAoc3BvdHRlZCBieSBDSSkuCgpDYzogTWFuYXNpIE5hdmFyZSA8 bWFuYXNpLmQubmF2YXJlQGludGVsLmNvbT4KQ2M6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVu Lmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+CkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5 cmphbGFAbGludXguaW50ZWwuY29tPgpSZWZlcmVuY2VzOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0 b3Aub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDMzMzYKQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVl ZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTk5MjcyClNpZ25lZC1vZmYtYnk6IERhbmllbCBW ZXR0ZXIgPGRhbmllbC52ZXR0ZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RwLmMgfCA1NyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0t LQogMSBmaWxlIGNoYW5nZWQsIDUxIGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2RwLmMKaW5kZXggY2RkZDk2YjI0ODc4Li41OTE4OWNkZWUzZGIgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAtNDMxOSw2ICs0MzE5LDggQEAgc3RhdGljIHZvaWQKIGlu dGVsX2RwX2NoZWNrX2xpbmtfc3RhdHVzKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiB7CiAJ c3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIgPSAmZHBfdG9fZGlnX3BvcnQoaW50 ZWxfZHApLT5iYXNlOworCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlID0K KwkJaW50ZWxfZHAtPmF0dGFjaGVkX2Nvbm5lY3Rvci0+YmFzZS5zdGF0ZTsKIAlzdHJ1Y3QgZHJt X2RldmljZSAqZGV2ID0gaW50ZWxfZHBfdG9fZGV2KGludGVsX2RwKTsKIAl1OCBsaW5rX3N0YXR1 c1tEUF9MSU5LX1NUQVRVU19TSVpFXTsKIApAQCAtNDMyOSwxMCArNDMzMSwxNiBAQCBpbnRlbF9k cF9jaGVja19saW5rX3N0YXR1cyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCQlyZXR1cm47 CiAJfQogCi0JaWYgKCFpbnRlbF9lbmNvZGVyLT5iYXNlLmNydGMpCisJaWYgKCFjb25uX3N0YXRl LT5jcnRjKQogCQlyZXR1cm47CiAKLQlpZiAoIXRvX2ludGVsX2NydGMoaW50ZWxfZW5jb2Rlci0+ YmFzZS5jcnRjKS0+YWN0aXZlKQorCVdBUk5fT04oIWRybV9tb2Rlc2V0X2lzX2xvY2tlZCgmY29u bl9zdGF0ZS0+Y3J0Yy0+bXV0ZXgpKTsKKworCWlmICghY29ubl9zdGF0ZS0+Y3J0Yy0+c3RhdGUt PmFjdGl2ZSkKKwkJcmV0dXJuOworCisJaWYgKGNvbm5fc3RhdGUtPmNvbW1pdCAmJgorCSAgICAh dHJ5X3dhaXRfZm9yX2NvbXBsZXRpb24oJmNvbm5fc3RhdGUtPmNvbW1pdC0+aHdfZG9uZSkpCiAJ CXJldHVybjsKIAogCS8qCkBAIC00MzY4LDcgKzQzNzYsNiBAQCBpbnRlbF9kcF9jaGVja19saW5r X3N0YXR1cyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogc3RhdGljIGJvb2wKIGludGVsX2Rw X3Nob3J0X3B1bHNlKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiB7Ci0Jc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9IGludGVsX2RwX3RvX2RldihpbnRlbF9kcCk7CiAJc3RydWN0IGludGVsX2Vu Y29kZXIgKmludGVsX2VuY29kZXIgPSAmZHBfdG9fZGlnX3BvcnQoaW50ZWxfZHApLT5iYXNlOwog CXU4IHNpbmtfaXJxX3ZlY3RvciA9IDA7CiAJdTggb2xkX3NpbmtfY291bnQgPSBpbnRlbF9kcC0+ c2lua19jb3VudDsKQEAgLTQ0MDgsOSArNDQxNSw4IEBAIGludGVsX2RwX3Nob3J0X3B1bHNlKHN0 cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJCQlEUk1fREVCVUdfRFJJVkVSKCJDUCBvciBzaW5r IHNwZWNpZmljIGlycSB1bmhhbmRsZWRcbiIpOwogCX0KIAotCWRybV9tb2Rlc2V0X2xvY2soJmRl di0+bW9kZV9jb25maWcuY29ubmVjdGlvbl9tdXRleCwgTlVMTCk7CiAJaW50ZWxfZHBfY2hlY2tf bGlua19zdGF0dXMoaW50ZWxfZHApOwotCWRybV9tb2Rlc2V0X3VubG9jaygmZGV2LT5tb2RlX2Nv bmZpZy5jb25uZWN0aW9uX211dGV4KTsKKwogCWlmIChpbnRlbF9kcC0+Y29tcGxpYW5jZS50ZXN0 X3R5cGUgPT0gRFBfVEVTVF9MSU5LX1RSQUlOSU5HKSB7CiAJCURSTV9ERUJVR19LTVMoIkxpbmsg VHJhaW5pbmcgQ29tcGxpYW5jZSBUZXN0IHJlcXVlc3RlZFxuIik7CiAJCS8qIFNlbmQgYSBIb3Rw bHVnIFVldmVudCB0byB1c2Vyc3BhY2UgdG8gc3RhcnQgbW9kZXNldCAqLwpAQCAtNDg2MCw4ICs0 ODY2LDE5IEBAIGludGVsX2RwX2RldGVjdChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9y LAogCQkgICAgICBjb25uZWN0b3ItPmJhc2UuaWQsIGNvbm5lY3Rvci0+bmFtZSk7CiAKIAkvKiBJ ZiBmdWxsIGRldGVjdCBpcyBub3QgcGVyZm9ybWVkIHlldCwgZG8gYSBmdWxsIGRldGVjdCAqLwot CWlmICghaW50ZWxfZHAtPmRldGVjdF9kb25lKQorCWlmICghaW50ZWxfZHAtPmRldGVjdF9kb25l KSB7CisJCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKKwkJaW50IHJldDsKKworCQljcnRjID0gY29u bmVjdG9yLT5zdGF0ZS0+Y3J0YzsKKwkJaWYgKGNydGMpIHsKKwkJCXJldCA9IGRybV9tb2Rlc2V0 X2xvY2soJmNydGMtPm11dGV4LCBjdHgpOworCQkJaWYgKHJldCkKKwkJCQlyZXR1cm4gcmV0Owor CQl9CisKIAkJc3RhdHVzID0gaW50ZWxfZHBfbG9uZ19wdWxzZShpbnRlbF9kcC0+YXR0YWNoZWRf Y29ubmVjdG9yKTsKKwl9CiAKIAlpbnRlbF9kcC0+ZGV0ZWN0X2RvbmUgPSBmYWxzZTsKIApAQCAt NTE0NiwxMCArNTE2MywzOCBAQCBpbnRlbF9kcF9ocGRfcHVsc2Uoc3RydWN0IGludGVsX2RpZ2l0 YWxfcG9ydCAqaW50ZWxfZGlnX3BvcnQsIGJvb2wgbG9uZ19ocGQpCiAJfQogCiAJaWYgKCFpbnRl bF9kcC0+aXNfbXN0KSB7CisJCXN0cnVjdCBkcm1fbW9kZXNldF9hY3F1aXJlX2N0eCBjdHg7CisJ CXN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IgPSAmaW50ZWxfZHAtPmF0dGFjaGVkX2Nv bm5lY3Rvci0+YmFzZTsKKwkJc3RydWN0IGRybV9jcnRjICpjcnRjOworCQlpbnQgaXJldDsKKwor CQlkcm1fbW9kZXNldF9hY3F1aXJlX2luaXQoJmN0eCwgMCk7CityZXRyeToKKwkJaXJldCA9IGRy bV9tb2Rlc2V0X2xvY2soJmRldi0+bW9kZV9jb25maWcuY29ubmVjdGlvbl9tdXRleCwgJmN0eCk7 CisJCWlmIChpcmV0KQorCQkJZ290byBlcnI7CisKKwkJY3J0YyA9IGNvbm5lY3Rvci0+c3RhdGUt PmNydGM7CisJCWlmIChjcnRjKSB7CisJCQlpcmV0ID0gZHJtX21vZGVzZXRfbG9jaygmY3J0Yy0+ bXV0ZXgsICZjdHgpOworCQkJaWYgKGlyZXQpCisJCQkJZ290byBlcnI7CisJCX0KKwogCQlpZiAo IWludGVsX2RwX3Nob3J0X3B1bHNlKGludGVsX2RwKSkgewogCQkJaW50ZWxfZHAtPmRldGVjdF9k b25lID0gZmFsc2U7CiAJCQlnb3RvIHB1dF9wb3dlcjsKIAkJfQorCitlcnI6CisJCWlmIChpcmV0 ID09IC1FREVBRExLKSB7CisJCQlkcm1fbW9kZXNldF9iYWNrb2ZmKCZjdHgpOworCQkJZ290byBy ZXRyeTsKKwkJfQorCisJCWRybV9tb2Rlc2V0X2Ryb3BfbG9ja3MoJmN0eCk7CisJCWRybV9tb2Rl c2V0X2FjcXVpcmVfZmluaSgmY3R4KTsKKwkJV0FSTihpcmV0LCAiQWNxdWlyaW5nIG1vZGVzZXQg bG9ja3MgZmFpbGVkIHdpdGggJWlcbiIsIGlyZXQpOwogCX0KIAogCXJldCA9IElSUV9IQU5ETEVE OwotLSAKMi4xNS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK