From: Greg Kroah-Hartman Subject: [PATCH 4.11 52/58] drm: Fix GETCONNECTOR regression Date: Tue, 27 Jun 2017 16:12:55 +0200 Message-ID: <20170627141115.584711114@linuxfoundation.org> References: <20170627141113.402913097@linuxfoundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 517FB6E3B8 for ; Tue, 27 Jun 2017 14:16:18 +0000 (UTC) In-Reply-To: <20170627141113.402913097@linuxfoundation.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org Cc: "H.J. Lu" , Greg Kroah-Hartman , dri-devel@lists.freedesktop.org, stable@vger.kernel.org, Daniel Vetter , "Pandiyan, Dhinakaran" List-Id: dri-devel@lists.freedesktop.org NC4xMS1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBEYW5pZWwgVmV0 dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgoKY29tbWl0IGU5NGFjMzUxMGI2YTBmNjk2ZjJj NDQyYzRmYzQwNTFjODEwMWVmMTIgdXBzdHJlYW0uCgpJbgoKY29tbWl0IDkxZWVmYzA1ZjBhYzcx OTAyOTA2YjIwNTgzNjBlNjFiZDI1MTM3ZmUKQXV0aG9yOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwu dmV0dGVyQGZmd2xsLmNoPgpEYXRlOiAgIFdlZCBEZWMgMTQgMDA6MDg6MTAgMjAxNiArMDEwMAoK ICAgIGRybTogVGlnaHRlbiBsb2NraW5nIGluIGRybV9tb2RlX2dldGNvbm5lY3RvcgoKSSByZW9y ZGVyZWQgdGhlIGxvZ2ljIGEgYml0IGluIHRoYXQgSU9DVEwsIGJ1dCB0aGF0IGJyb2tlIHVzZXJz cGFjZQpzaW5jZSBpdCdsbCBnZXQgdGhlIG5ldyBtb2RlIGxpc3QsIGJ1dCBub3QgdGhlIG5ldyBw cm9wZXJ0eSB2YWx1ZXMuCkZpeCB0aGF0IGFnYWluLgoKdjI6IEZpeCB1cCB0aGUgZXJyb3IgcGF0 aCBoYW5kbGluZyB3aGVuIGNvcHlfdG9fdXNlciBmb3IgdGhlIG1vZGVzCmZhaWxlcyAoRGhpbmFr YXJhbikuCgpGaXhlczogOTFlZWZjMDVmMGFjICgiZHJtOiBUaWdodGVuIGxvY2tpbmcgaW4gZHJt X21vZGVfZ2V0Y29ubmVjdG9yIikKQ2M6IFNlYW4gUGF1bCA8c2VhbnBhdWxAY2hyb21pdW0ub3Jn PgpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+CkNjOiBKYW5pIE5p a3VsYSA8amFuaS5uaWt1bGFAbGludXguaW50ZWwuY29tPgpDYzogRGF2aWQgQWlybGllIDxhaXJs aWVkQGxpbnV4LmllPgpDYzogZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpSZXBvcnRl ZC1ieTogIkguSi4gTHUiIDxoamwudG9vbHNAZ21haWwuY29tPgpUZXN0ZWQtYnk6ICJILkouIEx1 IiA8aGpsLnRvb2xzQGdtYWlsLmNvbT4KQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3Rv cC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDU3NgpDYzogIkguSi4gTHUiIDxoamwudG9vbHNAZ21h aWwuY29tPgpDYzogIlBhbmRpeWFuLCBEaGluYWthcmFuIiA8ZGhpbmFrYXJhbi5wYW5kaXlhbkBp bnRlbC5jb20+ClJldmlld2VkLWJ5OiBTZWFuIFBhdWwgPHNlYW5wYXVsQGNocm9taXVtLm9yZz4K UmV2aWV3ZWQtYnk6IERoaW5ha2FyYW4gUGFuZGl5YW4gPGRoaW5ha2FyYW4ucGFuZGl5YW5AaW50 ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGludGVs LmNvbT4KTGluazogaHR0cDovL3BhdGNod29yay5mcmVlZGVza3RvcC5vcmcvcGF0Y2gvbXNnaWQv MjAxNzA2MjAyMDI4MzcuMTcwMS0xLWRhbmllbC52ZXR0ZXJAZmZ3bGwuY2gKU2lnbmVkLW9mZi1i eTogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4KCi0tLQog ZHJpdmVycy9ncHUvZHJtL2RybV9jb25uZWN0b3IuYyB8ICAgMzggKysrKysrKysrKysrKysrKysr KystLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCAx OCBkZWxldGlvbnMoLSkKCi0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fY29ubmVjdG9yLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2RybV9jb25uZWN0b3IuYwpAQCAtMTE2OSwyMSArMTE2OSw2IEBA IGludCBkcm1fbW9kZV9nZXRjb25uZWN0b3Ioc3RydWN0IGRybV9kZXYKIAlpZiAoIWNvbm5lY3Rv cikKIAkJcmV0dXJuIC1FTk9FTlQ7CiAKLQlkcm1fbW9kZXNldF9sb2NrKCZkZXYtPm1vZGVfY29u ZmlnLmNvbm5lY3Rpb25fbXV0ZXgsIE5VTEwpOwotCWVuY29kZXIgPSBkcm1fY29ubmVjdG9yX2dl dF9lbmNvZGVyKGNvbm5lY3Rvcik7Ci0JaWYgKGVuY29kZXIpCi0JCW91dF9yZXNwLT5lbmNvZGVy X2lkID0gZW5jb2Rlci0+YmFzZS5pZDsKLQllbHNlCi0JCW91dF9yZXNwLT5lbmNvZGVyX2lkID0g MDsKLQotCXJldCA9IGRybV9tb2RlX29iamVjdF9nZXRfcHJvcGVydGllcygmY29ubmVjdG9yLT5i YXNlLCBmaWxlX3ByaXYtPmF0b21pYywKLQkJCSh1aW50MzJfdCBfX3VzZXIgKikodW5zaWduZWQg bG9uZykob3V0X3Jlc3AtPnByb3BzX3B0ciksCi0JCQkodWludDY0X3QgX191c2VyICopKHVuc2ln bmVkIGxvbmcpKG91dF9yZXNwLT5wcm9wX3ZhbHVlc19wdHIpLAotCQkJJm91dF9yZXNwLT5jb3Vu dF9wcm9wcyk7Ci0JZHJtX21vZGVzZXRfdW5sb2NrKCZkZXYtPm1vZGVfY29uZmlnLmNvbm5lY3Rp b25fbXV0ZXgpOwotCWlmIChyZXQpCi0JCWdvdG8gb3V0X3VucmVmOwotCiAJZm9yIChpID0gMDsg aSA8IERSTV9DT05ORUNUT1JfTUFYX0VOQ09ERVI7IGkrKykKIAkJaWYgKGNvbm5lY3Rvci0+ZW5j b2Rlcl9pZHNbaV0gIT0gMCkKIAkJCWVuY29kZXJzX2NvdW50Kys7CkBAIC0xMTk2LDcgKzExODEs NyBAQCBpbnQgZHJtX21vZGVfZ2V0Y29ubmVjdG9yKHN0cnVjdCBkcm1fZGV2CiAJCQkJaWYgKHB1 dF91c2VyKGNvbm5lY3Rvci0+ZW5jb2Rlcl9pZHNbaV0sCiAJCQkJCSAgICAgZW5jb2Rlcl9wdHIg KyBjb3BpZWQpKSB7CiAJCQkJCXJldCA9IC1FRkFVTFQ7Ci0JCQkJCWdvdG8gb3V0X3VucmVmOwor CQkJCQlnb3RvIG91dDsKIAkJCQl9CiAJCQkJY29waWVkKys7CiAJCQl9CkBAIC0xMjQwLDE1ICsx MjI1LDMyIEBAIGludCBkcm1fbW9kZV9nZXRjb25uZWN0b3Ioc3RydWN0IGRybV9kZXYKIAkJCWlm IChjb3B5X3RvX3VzZXIobW9kZV9wdHIgKyBjb3BpZWQsCiAJCQkJCSAmdV9tb2RlLCBzaXplb2Yo dV9tb2RlKSkpIHsKIAkJCQlyZXQgPSAtRUZBVUxUOworCQkJCW11dGV4X3VubG9jaygmZGV2LT5t b2RlX2NvbmZpZy5tdXRleCk7CisKIAkJCQlnb3RvIG91dDsKIAkJCX0KIAkJCWNvcGllZCsrOwog CQl9CiAJfQogCW91dF9yZXNwLT5jb3VudF9tb2RlcyA9IG1vZGVfY291bnQ7Ci1vdXQ6CiAJbXV0 ZXhfdW5sb2NrKCZkZXYtPm1vZGVfY29uZmlnLm11dGV4KTsKLW91dF91bnJlZjoKKworCWRybV9t b2Rlc2V0X2xvY2soJmRldi0+bW9kZV9jb25maWcuY29ubmVjdGlvbl9tdXRleCwgTlVMTCk7CisJ ZW5jb2RlciA9IGRybV9jb25uZWN0b3JfZ2V0X2VuY29kZXIoY29ubmVjdG9yKTsKKwlpZiAoZW5j b2RlcikKKwkJb3V0X3Jlc3AtPmVuY29kZXJfaWQgPSBlbmNvZGVyLT5iYXNlLmlkOworCWVsc2UK KwkJb3V0X3Jlc3AtPmVuY29kZXJfaWQgPSAwOworCisJLyogT25seSBncmFiIHByb3BlcnRpZXMg YWZ0ZXIgcHJvYmluZywgdG8gbWFrZSBzdXJlIEVESUQgYW5kIG90aGVyCisJICogcHJvcGVydGll cyByZWZsZWN0IHRoZSBsYXRlc3Qgc3RhdHVzLiAqLworCXJldCA9IGRybV9tb2RlX29iamVjdF9n ZXRfcHJvcGVydGllcygmY29ubmVjdG9yLT5iYXNlLCBmaWxlX3ByaXYtPmF0b21pYywKKwkJCSh1 aW50MzJfdCBfX3VzZXIgKikodW5zaWduZWQgbG9uZykob3V0X3Jlc3AtPnByb3BzX3B0ciksCisJ CQkodWludDY0X3QgX191c2VyICopKHVuc2lnbmVkIGxvbmcpKG91dF9yZXNwLT5wcm9wX3ZhbHVl c19wdHIpLAorCQkJJm91dF9yZXNwLT5jb3VudF9wcm9wcyk7CisJZHJtX21vZGVzZXRfdW5sb2Nr KCZkZXYtPm1vZGVfY29uZmlnLmNvbm5lY3Rpb25fbXV0ZXgpOworCitvdXQ6CiAJZHJtX2Nvbm5l Y3Rvcl91bnJlZmVyZW5jZShjb25uZWN0b3IpOwogCiAJcmV0dXJuIHJldDsKCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBs aXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK