From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [PATCH] drm: Fix GETCONNECTOR regression
Date: Tue, 20 Jun 2017 22:28:37 +0200
Message-ID: <20170620202837.1701-1-daniel.vetter@ffwll.ch>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: DRI Development <dri-devel@lists.freedesktop.org>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: "H.J. Lu" <hjl.tools@gmail.com>, David Airlie <airlied@linux.ie>, Daniel Vetter <daniel.vetter@ffwll.ch>, "# v4 . 11+" <stable@vger.kernel.org>, Daniel Vetter <daniel.vetter@intel.com>, "Pandiyan,
 Dhinakaran" <dhinakaran.pandiyan@intel.com>
List-Id: dri-devel@lists.freedesktop.org

SW4KCmNvbW1pdCA5MWVlZmMwNWYwYWM3MTkwMjkwNmIyMDU4MzYwZTYxYmQyNTEzN2ZlCkF1dGhv
cjogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KRGF0ZTogICBXZWQgRGVj
IDE0IDAwOjA4OjEwIDIwMTYgKzAxMDAKCiAgICBkcm06IFRpZ2h0ZW4gbG9ja2luZyBpbiBkcm1f
bW9kZV9nZXRjb25uZWN0b3IKCkkgcmVvcmRlcmVkIHRoZSBsb2dpYyBhIGJpdCBpbiB0aGF0IElP
Q1RMLCBidXQgdGhhdCBicm9rZSB1c2Vyc3BhY2UKc2luY2UgaXQnbGwgZ2V0IHRoZSBuZXcgbW9k
ZSBsaXN0LCBidXQgbm90IHRoZSBuZXcgcHJvcGVydHkgdmFsdWVzLgpGaXggdGhhdCBhZ2Fpbi4K
CnYyOiBGaXggdXAgdGhlIGVycm9yIHBhdGggaGFuZGxpbmcgd2hlbiBjb3B5X3RvX3VzZXIgZm9y
IHRoZSBtb2RlcwpmYWlsZXMgKERoaW5ha2FyYW4pLgoKRml4ZXM6IDkxZWVmYzA1ZjBhYyAoImRy
bTogVGlnaHRlbiBsb2NraW5nIGluIGRybV9tb2RlX2dldGNvbm5lY3RvciIpCkNjOiBTZWFuIFBh
dWwgPHNlYW5wYXVsQGNocm9taXVtLm9yZz4KQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0
ZXJAaW50ZWwuY29tPgpDYzogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGxpbnV4LmludGVsLmNv
bT4KQ2M6IERhdmlkIEFpcmxpZSA8YWlybGllZEBsaW51eC5pZT4KQ2M6IGRyaS1kZXZlbEBsaXN0
cy5mcmVlZGVza3RvcC5vcmcKUmVwb3J0ZWQtYnk6ICJILkouIEx1IiA8aGpsLnRvb2xzQGdtYWls
LmNvbT4KVGVzdGVkLWJ5OiAiSC5KLiBMdSIgPGhqbC50b29sc0BnbWFpbC5jb20+CkNjOiA8c3Rh
YmxlQHZnZXIua2VybmVsLm9yZz4gIyB2NC4xMSsKQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVl
ZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDU3NgpDYzogIkguSi4gTHUiIDxoamwudG9v
bHNAZ21haWwuY29tPgpDYzogIlBhbmRpeWFuLCBEaGluYWthcmFuIiA8ZGhpbmFrYXJhbi5wYW5k
aXlhbkBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0
ZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fY29ubmVjdG9yLmMgfCAzOCAr
KysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIw
IGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1
L2RybS9kcm1fY29ubmVjdG9yLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2Nvbm5lY3Rvci5jCmlu
ZGV4IDVjZDYxYWZmNzg1Ny4uODA3MmU2ZTRjNjJjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k
cm0vZHJtX2Nvbm5lY3Rvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fY29ubmVjdG9yLmMK
QEAgLTEyOTMsMjEgKzEyOTMsNiBAQCBpbnQgZHJtX21vZGVfZ2V0Y29ubmVjdG9yKHN0cnVjdCBk
cm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJaWYgKCFjb25uZWN0b3IpCiAJCXJldHVybiAt
RU5PRU5UOwogCi0JZHJtX21vZGVzZXRfbG9jaygmZGV2LT5tb2RlX2NvbmZpZy5jb25uZWN0aW9u
X211dGV4LCBOVUxMKTsKLQllbmNvZGVyID0gZHJtX2Nvbm5lY3Rvcl9nZXRfZW5jb2Rlcihjb25u
ZWN0b3IpOwotCWlmIChlbmNvZGVyKQotCQlvdXRfcmVzcC0+ZW5jb2Rlcl9pZCA9IGVuY29kZXIt
PmJhc2UuaWQ7Ci0JZWxzZQotCQlvdXRfcmVzcC0+ZW5jb2Rlcl9pZCA9IDA7Ci0KLQlyZXQgPSBk
cm1fbW9kZV9vYmplY3RfZ2V0X3Byb3BlcnRpZXMoJmNvbm5lY3Rvci0+YmFzZSwgZmlsZV9wcml2
LT5hdG9taWMsCi0JCQkodWludDMyX3QgX191c2VyICopKHVuc2lnbmVkIGxvbmcpKG91dF9yZXNw
LT5wcm9wc19wdHIpLAotCQkJKHVpbnQ2NF90IF9fdXNlciAqKSh1bnNpZ25lZCBsb25nKShvdXRf
cmVzcC0+cHJvcF92YWx1ZXNfcHRyKSwKLQkJCSZvdXRfcmVzcC0+Y291bnRfcHJvcHMpOwotCWRy
bV9tb2Rlc2V0X3VubG9jaygmZGV2LT5tb2RlX2NvbmZpZy5jb25uZWN0aW9uX211dGV4KTsKLQlp
ZiAocmV0KQotCQlnb3RvIG91dF91bnJlZjsKLQogCWZvciAoaSA9IDA7IGkgPCBEUk1fQ09OTkVD
VE9SX01BWF9FTkNPREVSOyBpKyspCiAJCWlmIChjb25uZWN0b3ItPmVuY29kZXJfaWRzW2ldICE9
IDApCiAJCQllbmNvZGVyc19jb3VudCsrOwpAQCAtMTMyMCw3ICsxMzA1LDcgQEAgaW50IGRybV9t
b2RlX2dldGNvbm5lY3RvcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQkJ
CWlmIChwdXRfdXNlcihjb25uZWN0b3ItPmVuY29kZXJfaWRzW2ldLAogCQkJCQkgICAgIGVuY29k
ZXJfcHRyICsgY29waWVkKSkgewogCQkJCQlyZXQgPSAtRUZBVUxUOwotCQkJCQlnb3RvIG91dF91
bnJlZjsKKwkJCQkJZ290byBvdXQ7CiAJCQkJfQogCQkJCWNvcGllZCsrOwogCQkJfQpAQCAtMTM2
NCwxNSArMTM0OSwzMiBAQCBpbnQgZHJtX21vZGVfZ2V0Y29ubmVjdG9yKHN0cnVjdCBkcm1fZGV2
aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJCQlpZiAoY29weV90b191c2VyKG1vZGVfcHRyICsgY29w
aWVkLAogCQkJCQkgJnVfbW9kZSwgc2l6ZW9mKHVfbW9kZSkpKSB7CiAJCQkJcmV0ID0gLUVGQVVM
VDsKKwkJCQltdXRleF91bmxvY2soJmRldi0+bW9kZV9jb25maWcubXV0ZXgpOworCiAJCQkJZ290
byBvdXQ7CiAJCQl9CiAJCQljb3BpZWQrKzsKIAkJfQogCX0KIAlvdXRfcmVzcC0+Y291bnRfbW9k
ZXMgPSBtb2RlX2NvdW50Owotb3V0OgogCW11dGV4X3VubG9jaygmZGV2LT5tb2RlX2NvbmZpZy5t
dXRleCk7Ci1vdXRfdW5yZWY6CisKKwlkcm1fbW9kZXNldF9sb2NrKCZkZXYtPm1vZGVfY29uZmln
LmNvbm5lY3Rpb25fbXV0ZXgsIE5VTEwpOworCWVuY29kZXIgPSBkcm1fY29ubmVjdG9yX2dldF9l
bmNvZGVyKGNvbm5lY3Rvcik7CisJaWYgKGVuY29kZXIpCisJCW91dF9yZXNwLT5lbmNvZGVyX2lk
ID0gZW5jb2Rlci0+YmFzZS5pZDsKKwllbHNlCisJCW91dF9yZXNwLT5lbmNvZGVyX2lkID0gMDsK
KworCS8qIE9ubHkgZ3JhYiBwcm9wZXJ0aWVzIGFmdGVyIHByb2JpbmcsIHRvIG1ha2Ugc3VyZSBF
RElEIGFuZCBvdGhlcgorCSAqIHByb3BlcnRpZXMgcmVmbGVjdCB0aGUgbGF0ZXN0IHN0YXR1cy4g
Ki8KKwlyZXQgPSBkcm1fbW9kZV9vYmplY3RfZ2V0X3Byb3BlcnRpZXMoJmNvbm5lY3Rvci0+YmFz
ZSwgZmlsZV9wcml2LT5hdG9taWMsCisJCQkodWludDMyX3QgX191c2VyICopKHVuc2lnbmVkIGxv
bmcpKG91dF9yZXNwLT5wcm9wc19wdHIpLAorCQkJKHVpbnQ2NF90IF9fdXNlciAqKSh1bnNpZ25l
ZCBsb25nKShvdXRfcmVzcC0+cHJvcF92YWx1ZXNfcHRyKSwKKwkJCSZvdXRfcmVzcC0+Y291bnRf
cHJvcHMpOworCWRybV9tb2Rlc2V0X3VubG9jaygmZGV2LT5tb2RlX2NvbmZpZy5jb25uZWN0aW9u
X211dGV4KTsKKworb3V0OgogCWRybV9jb25uZWN0b3JfcHV0KGNvbm5lY3Rvcik7CiAKIAlyZXR1
cm4gcmV0OwotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz
a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p
bnRlbC1nZngK