From mboxrd@z Thu Jan  1 00:00:00 1970
From: "H.J. Lu" <hjl.tools@gmail.com>
Subject: [PATCH] drm: Restore GNOME monitors.xml support
Date: Sun, 4 Jun 2017 08:34:45 -0700
Message-ID: <20170604153445.GA8094@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mail-yw0-x241.google.com (mail-yw0-x241.google.com
 [IPv6:2607:f8b0:4002:c05::241])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 3B39089FDD
 for <intel-gfx@lists.freedesktop.org>; Sun,  4 Jun 2017 15:34:48 +0000 (UTC)
Received: by mail-yw0-x241.google.com with SMTP id p144so6930983ywp.2
 for <intel-gfx@lists.freedesktop.org>; Sun, 04 Jun 2017 08:34:48 -0700 (PDT)
Received: from gnu-tools-1.localdomain
 (76-220-59-38.lightspeed.sntcca.sbcglobal.net. [76.220.59.38])
 by smtp.gmail.com with ESMTPSA id i188sm328656ywc.64.2017.06.04.08.34.46
 for <intel-gfx@lists.freedesktop.org>
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Sun, 04 Jun 2017 08:34:46 -0700 (PDT)
Content-Disposition: inline
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: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

UGxlYXNlIENDIG1lIHNpbmNlIEkgYW0gbm90IG9uIHRoaXMgbWFpbGluZyBsaXN0LgoKSC5KLgot
LS0KTXkgfi8uY29uZmlnL21vbml0b3JzLnhtbCBzd2FwcyBwcmltYXJ5L3NlY29uZGFyeSBkaXNw
bGF5cyBhcyB3ZWxsIGFzCnRoZWlyIGhvcml6b250YWwgcG9zaXRpb25zLiAgSXQgd29ya3MgZmlu
ZSB1bnRpbDoKCmNvbW1pdCA5MWVlZmMwNWYwYWM3MTkwMjkwNmIyMDU4MzYwZTYxYmQyNTEzN2Zl
CkF1dGhvcjogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KRGF0ZTogICBX
ZWQgRGVjIDE0IDAwOjA4OjEwIDIwMTYgKzAxMDAKCiAgICBkcm06IFRpZ2h0ZW4gbG9ja2luZyBp
biBkcm1fbW9kZV9nZXRjb25uZWN0b3IKCndoaWNoIG1ha2VzIH4vLmNvbmZpZy9tb25pdG9ycy54
bWwgbm90IGVmZmVjdGl2ZS4gIFRoaXMgcGF0Y2ggcmVvcmRlcnMKZHJtX21vZGVfZ2V0Y29ubmVj
dG9yIGFuZCByZXN0b3JlcyBtb25pdG9ycy54bWwgc3VwcG9ydC4KClRoaXMgbWF5IGFsc28gZml4
OgoKaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNTc2CgpT
aWduZWQtb2ZmLWJ5OiBILkouIEx1IDxoamwudG9vbHNAZ21haWwuY29tPgotLS0KIGRyaXZlcnMv
Z3B1L2RybS9kcm1fY29ubmVjdG9yLmMgfCA3NCArKysrKysrKysrKysrKysrKysrKy0tLS0tLS0t
LS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM3IGluc2VydGlvbnMoKyksIDM3IGRlbGV0
aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fY29ubmVjdG9yLmMgYi9k
cml2ZXJzL2dwdS9kcm0vZHJtX2Nvbm5lY3Rvci5jCmluZGV4IDQ1NDY0YzguLjRmZThmZjMgMTAw
NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fY29ubmVjdG9yLmMKKysrIGIvZHJpdmVycy9n
cHUvZHJtL2RybV9jb25uZWN0b3IuYwpAQCAtMTE2OSw0MSArMTE2OSw2IEBAIGludCBkcm1fbW9k
ZV9nZXRjb25uZWN0b3Ioc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAlpZiAo
IWNvbm5lY3RvcikKIAkJcmV0dXJuIC1FTk9FTlQ7CiAKLQlkcm1fbW9kZXNldF9sb2NrKCZkZXYt
Pm1vZGVfY29uZmlnLmNvbm5lY3Rpb25fbXV0ZXgsIE5VTEwpOwotCWVuY29kZXIgPSBkcm1fY29u
bmVjdG9yX2dldF9lbmNvZGVyKGNvbm5lY3Rvcik7Ci0JaWYgKGVuY29kZXIpCi0JCW91dF9yZXNw
LT5lbmNvZGVyX2lkID0gZW5jb2Rlci0+YmFzZS5pZDsKLQllbHNlCi0JCW91dF9yZXNwLT5lbmNv
ZGVyX2lkID0gMDsKLQotCXJldCA9IGRybV9tb2RlX29iamVjdF9nZXRfcHJvcGVydGllcygmY29u
bmVjdG9yLT5iYXNlLCBmaWxlX3ByaXYtPmF0b21pYywKLQkJCSh1aW50MzJfdCBfX3VzZXIgKiko
dW5zaWduZWQgbG9uZykob3V0X3Jlc3AtPnByb3BzX3B0ciksCi0JCQkodWludDY0X3QgX191c2Vy
ICopKHVuc2lnbmVkIGxvbmcpKG91dF9yZXNwLT5wcm9wX3ZhbHVlc19wdHIpLAotCQkJJm91dF9y
ZXNwLT5jb3VudF9wcm9wcyk7Ci0JZHJtX21vZGVzZXRfdW5sb2NrKCZkZXYtPm1vZGVfY29uZmln
LmNvbm5lY3Rpb25fbXV0ZXgpOwotCWlmIChyZXQpCi0JCWdvdG8gb3V0X3VucmVmOwotCi0JZm9y
IChpID0gMDsgaSA8IERSTV9DT05ORUNUT1JfTUFYX0VOQ09ERVI7IGkrKykKLQkJaWYgKGNvbm5l
Y3Rvci0+ZW5jb2Rlcl9pZHNbaV0gIT0gMCkKLQkJCWVuY29kZXJzX2NvdW50Kys7Ci0KLQlpZiAo
KG91dF9yZXNwLT5jb3VudF9lbmNvZGVycyA+PSBlbmNvZGVyc19jb3VudCkgJiYgZW5jb2RlcnNf
Y291bnQpIHsKLQkJY29waWVkID0gMDsKLQkJZW5jb2Rlcl9wdHIgPSAodWludDMyX3QgX191c2Vy
ICopKHVuc2lnbmVkIGxvbmcpKG91dF9yZXNwLT5lbmNvZGVyc19wdHIpOwotCQlmb3IgKGkgPSAw
OyBpIDwgRFJNX0NPTk5FQ1RPUl9NQVhfRU5DT0RFUjsgaSsrKSB7Ci0JCQlpZiAoY29ubmVjdG9y
LT5lbmNvZGVyX2lkc1tpXSAhPSAwKSB7Ci0JCQkJaWYgKHB1dF91c2VyKGNvbm5lY3Rvci0+ZW5j
b2Rlcl9pZHNbaV0sCi0JCQkJCSAgICAgZW5jb2Rlcl9wdHIgKyBjb3BpZWQpKSB7Ci0JCQkJCXJl
dCA9IC1FRkFVTFQ7Ci0JCQkJCWdvdG8gb3V0X3VucmVmOwotCQkJCX0KLQkJCQljb3BpZWQrKzsK
LQkJCX0KLQkJfQotCX0KLQlvdXRfcmVzcC0+Y291bnRfZW5jb2RlcnMgPSBlbmNvZGVyc19jb3Vu
dDsKLQogCW91dF9yZXNwLT5jb25uZWN0b3JfaWQgPSBjb25uZWN0b3ItPmJhc2UuaWQ7CiAJb3V0
X3Jlc3AtPmNvbm5lY3Rvcl90eXBlID0gY29ubmVjdG9yLT5jb25uZWN0b3JfdHlwZTsKIAlvdXRf
cmVzcC0+Y29ubmVjdG9yX3R5cGVfaWQgPSBjb25uZWN0b3ItPmNvbm5lY3Rvcl90eXBlX2lkOwpA
QCAtMTI0MCwxNSArMTIwNSw1MCBAQCBpbnQgZHJtX21vZGVfZ2V0Y29ubmVjdG9yKHN0cnVjdCBk
cm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJCQlpZiAoY29weV90b191c2VyKG1vZGVfcHRy
ICsgY29waWVkLAogCQkJCQkgJnVfbW9kZSwgc2l6ZW9mKHVfbW9kZSkpKSB7CiAJCQkJcmV0ID0g
LUVGQVVMVDsKKwkJCQltdXRleF91bmxvY2soJmRldi0+bW9kZV9jb25maWcubXV0ZXgpOwogCQkJ
CWdvdG8gb3V0OwogCQkJfQogCQkJY29waWVkKys7CiAJCX0KIAl9CiAJb3V0X3Jlc3AtPmNvdW50
X21vZGVzID0gbW9kZV9jb3VudDsKLW91dDoKIAltdXRleF91bmxvY2soJmRldi0+bW9kZV9jb25m
aWcubXV0ZXgpOwotb3V0X3VucmVmOgorCisJZHJtX21vZGVzZXRfbG9jaygmZGV2LT5tb2RlX2Nv
bmZpZy5jb25uZWN0aW9uX211dGV4LCBOVUxMKTsKKwllbmNvZGVyID0gZHJtX2Nvbm5lY3Rvcl9n
ZXRfZW5jb2Rlcihjb25uZWN0b3IpOworCWlmIChlbmNvZGVyKQorCQlvdXRfcmVzcC0+ZW5jb2Rl
cl9pZCA9IGVuY29kZXItPmJhc2UuaWQ7CisJZWxzZQorCQlvdXRfcmVzcC0+ZW5jb2Rlcl9pZCA9
IDA7CisKKwlyZXQgPSBkcm1fbW9kZV9vYmplY3RfZ2V0X3Byb3BlcnRpZXMoJmNvbm5lY3Rvci0+
YmFzZSwgZmlsZV9wcml2LT5hdG9taWMsCisJCQkodWludDMyX3QgX191c2VyICopKHVuc2lnbmVk
IGxvbmcpKG91dF9yZXNwLT5wcm9wc19wdHIpLAorCQkJKHVpbnQ2NF90IF9fdXNlciAqKSh1bnNp
Z25lZCBsb25nKShvdXRfcmVzcC0+cHJvcF92YWx1ZXNfcHRyKSwKKwkJCSZvdXRfcmVzcC0+Y291
bnRfcHJvcHMpOworCWRybV9tb2Rlc2V0X3VubG9jaygmZGV2LT5tb2RlX2NvbmZpZy5jb25uZWN0
aW9uX211dGV4KTsKKwlpZiAocmV0KQorCQlnb3RvIG91dDsKKworCWZvciAoaSA9IDA7IGkgPCBE
Uk1fQ09OTkVDVE9SX01BWF9FTkNPREVSOyBpKyspCisJCWlmIChjb25uZWN0b3ItPmVuY29kZXJf
aWRzW2ldICE9IDApCisJCQllbmNvZGVyc19jb3VudCsrOworCisJaWYgKChvdXRfcmVzcC0+Y291
bnRfZW5jb2RlcnMgPj0gZW5jb2RlcnNfY291bnQpICYmIGVuY29kZXJzX2NvdW50KSB7CisJCWNv
cGllZCA9IDA7CisJCWVuY29kZXJfcHRyID0gKHVpbnQzMl90IF9fdXNlciAqKSh1bnNpZ25lZCBs
b25nKShvdXRfcmVzcC0+ZW5jb2RlcnNfcHRyKTsKKwkJZm9yIChpID0gMDsgaSA8IERSTV9DT05O
RUNUT1JfTUFYX0VOQ09ERVI7IGkrKykgeworCQkJaWYgKGNvbm5lY3Rvci0+ZW5jb2Rlcl9pZHNb
aV0gIT0gMCkgeworCQkJCWlmIChwdXRfdXNlcihjb25uZWN0b3ItPmVuY29kZXJfaWRzW2ldLAor
CQkJCQkgICAgIGVuY29kZXJfcHRyICsgY29waWVkKSkgeworCQkJCQlyZXQgPSAtRUZBVUxUOwor
CQkJCQlnb3RvIG91dDsKKwkJCQl9CisJCQkJY29waWVkKys7CisJCQl9CisJCX0KKwl9CisJb3V0
X3Jlc3AtPmNvdW50X2VuY29kZXJzID0gZW5jb2RlcnNfY291bnQ7CitvdXQ6CiAJZHJtX2Nvbm5l
Y3Rvcl91bnJlZmVyZW5jZShjb25uZWN0b3IpOwogCiAJcmV0dXJuIHJldDsKLS0gCjIuOS40Cgpf
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg
bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0
cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK