From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm: Restore GNOME monitors.xml support Date: Tue, 06 Jun 2017 12:26:57 +0300 Message-ID: <87zidlfov2.fsf@intel.com> References: <20170604153445.GA8094@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170604153445.GA8094@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: "H.J. Lu" , intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gU3VuLCAwNCBKdW4gMjAxNywgIkguSi4gTHUiIDxoamwudG9vbHNAZ21haWwuY29tPiB3cm90 ZToKPiBQbGVhc2UgQ0MgbWUgc2luY2UgSSBhbSBub3Qgb24gdGhpcyBtYWlsaW5nIGxpc3QuCgpT b3JyeSwgc2hvdWxkJ3ZlIGluc3RydWN0ZWQgeW91IHRvIHNlbmQgdG8gZHJpLWRldmVsIGluc3Rl YWQgb2YKaW50ZWwtZ2Z4LCBiZWNhdXNlIHRoZSBwYXRjaCB0b3VjaGVzIGRybSBoZWxwZXJzLiBD YydkLgoKQlIsCkphbmkuCgo+Cj4gSC5KLgo+IC0tLQo+IE15IH4vLmNvbmZpZy9tb25pdG9ycy54 bWwgc3dhcHMgcHJpbWFyeS9zZWNvbmRhcnkgZGlzcGxheXMgYXMgd2VsbCBhcwo+IHRoZWlyIGhv cml6b250YWwgcG9zaXRpb25zLiAgSXQgd29ya3MgZmluZSB1bnRpbDoKPgo+IGNvbW1pdCA5MWVl ZmMwNWYwYWM3MTkwMjkwNmIyMDU4MzYwZTYxYmQyNTEzN2ZlCj4gQXV0aG9yOiBEYW5pZWwgVmV0 dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgo+IERhdGU6ICAgV2VkIERlYyAxNCAwMDowODox MCAyMDE2ICswMTAwCj4KPiAgICAgZHJtOiBUaWdodGVuIGxvY2tpbmcgaW4gZHJtX21vZGVfZ2V0 Y29ubmVjdG9yCj4KPiB3aGljaCBtYWtlcyB+Ly5jb25maWcvbW9uaXRvcnMueG1sIG5vdCBlZmZl Y3RpdmUuICBUaGlzIHBhdGNoIHJlb3JkZXJzCj4gZHJtX21vZGVfZ2V0Y29ubmVjdG9yIGFuZCBy ZXN0b3JlcyBtb25pdG9ycy54bWwgc3VwcG9ydC4KPgo+IFRoaXMgbWF5IGFsc28gZml4Ogo+Cj4g aHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNTc2Cj4KPiBT aWduZWQtb2ZmLWJ5OiBILkouIEx1IDxoamwudG9vbHNAZ21haWwuY29tPgo+IC0tLQo+ICBkcml2 ZXJzL2dwdS9kcm0vZHJtX2Nvbm5lY3Rvci5jIHwgNzQgKysrKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDM3IGluc2VydGlvbnMoKyksIDM3 IGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fY29ubmVj dG9yLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2Nvbm5lY3Rvci5jCj4gaW5kZXggNDU0NjRjOC4u NGZlOGZmMyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2Nvbm5lY3Rvci5jCj4g KysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9jb25uZWN0b3IuYwo+IEBAIC0xMTY5LDQxICsxMTY5 LDYgQEAgaW50IGRybV9tb2RlX2dldGNvbm5lY3RvcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2 b2lkICpkYXRhLAo+ICAJaWYgKCFjb25uZWN0b3IpCj4gIAkJcmV0dXJuIC1FTk9FTlQ7Cj4gIAo+ IC0JZHJtX21vZGVzZXRfbG9jaygmZGV2LT5tb2RlX2NvbmZpZy5jb25uZWN0aW9uX211dGV4LCBO VUxMKTsKPiAtCWVuY29kZXIgPSBkcm1fY29ubmVjdG9yX2dldF9lbmNvZGVyKGNvbm5lY3Rvcik7 Cj4gLQlpZiAoZW5jb2RlcikKPiAtCQlvdXRfcmVzcC0+ZW5jb2Rlcl9pZCA9IGVuY29kZXItPmJh c2UuaWQ7Cj4gLQllbHNlCj4gLQkJb3V0X3Jlc3AtPmVuY29kZXJfaWQgPSAwOwo+IC0KPiAtCXJl dCA9IGRybV9tb2RlX29iamVjdF9nZXRfcHJvcGVydGllcygmY29ubmVjdG9yLT5iYXNlLCBmaWxl X3ByaXYtPmF0b21pYywKPiAtCQkJKHVpbnQzMl90IF9fdXNlciAqKSh1bnNpZ25lZCBsb25nKShv dXRfcmVzcC0+cHJvcHNfcHRyKSwKPiAtCQkJKHVpbnQ2NF90IF9fdXNlciAqKSh1bnNpZ25lZCBs b25nKShvdXRfcmVzcC0+cHJvcF92YWx1ZXNfcHRyKSwKPiAtCQkJJm91dF9yZXNwLT5jb3VudF9w cm9wcyk7Cj4gLQlkcm1fbW9kZXNldF91bmxvY2soJmRldi0+bW9kZV9jb25maWcuY29ubmVjdGlv bl9tdXRleCk7Cj4gLQlpZiAocmV0KQo+IC0JCWdvdG8gb3V0X3VucmVmOwo+IC0KPiAtCWZvciAo aSA9IDA7IGkgPCBEUk1fQ09OTkVDVE9SX01BWF9FTkNPREVSOyBpKyspCj4gLQkJaWYgKGNvbm5l Y3Rvci0+ZW5jb2Rlcl9pZHNbaV0gIT0gMCkKPiAtCQkJZW5jb2RlcnNfY291bnQrKzsKPiAtCj4g LQlpZiAoKG91dF9yZXNwLT5jb3VudF9lbmNvZGVycyA+PSBlbmNvZGVyc19jb3VudCkgJiYgZW5j b2RlcnNfY291bnQpIHsKPiAtCQljb3BpZWQgPSAwOwo+IC0JCWVuY29kZXJfcHRyID0gKHVpbnQz Ml90IF9fdXNlciAqKSh1bnNpZ25lZCBsb25nKShvdXRfcmVzcC0+ZW5jb2RlcnNfcHRyKTsKPiAt CQlmb3IgKGkgPSAwOyBpIDwgRFJNX0NPTk5FQ1RPUl9NQVhfRU5DT0RFUjsgaSsrKSB7Cj4gLQkJ CWlmIChjb25uZWN0b3ItPmVuY29kZXJfaWRzW2ldICE9IDApIHsKPiAtCQkJCWlmIChwdXRfdXNl cihjb25uZWN0b3ItPmVuY29kZXJfaWRzW2ldLAo+IC0JCQkJCSAgICAgZW5jb2Rlcl9wdHIgKyBj b3BpZWQpKSB7Cj4gLQkJCQkJcmV0ID0gLUVGQVVMVDsKPiAtCQkJCQlnb3RvIG91dF91bnJlZjsK PiAtCQkJCX0KPiAtCQkJCWNvcGllZCsrOwo+IC0JCQl9Cj4gLQkJfQo+IC0JfQo+IC0Jb3V0X3Jl c3AtPmNvdW50X2VuY29kZXJzID0gZW5jb2RlcnNfY291bnQ7Cj4gLQo+ICAJb3V0X3Jlc3AtPmNv bm5lY3Rvcl9pZCA9IGNvbm5lY3Rvci0+YmFzZS5pZDsKPiAgCW91dF9yZXNwLT5jb25uZWN0b3Jf dHlwZSA9IGNvbm5lY3Rvci0+Y29ubmVjdG9yX3R5cGU7Cj4gIAlvdXRfcmVzcC0+Y29ubmVjdG9y X3R5cGVfaWQgPSBjb25uZWN0b3ItPmNvbm5lY3Rvcl90eXBlX2lkOwo+IEBAIC0xMjQwLDE1ICsx MjA1LDUwIEBAIGludCBkcm1fbW9kZV9nZXRjb25uZWN0b3Ioc3RydWN0IGRybV9kZXZpY2UgKmRl diwgdm9pZCAqZGF0YSwKPiAgCQkJaWYgKGNvcHlfdG9fdXNlcihtb2RlX3B0ciArIGNvcGllZCwK PiAgCQkJCQkgJnVfbW9kZSwgc2l6ZW9mKHVfbW9kZSkpKSB7Cj4gIAkJCQlyZXQgPSAtRUZBVUxU Owo+ICsJCQkJbXV0ZXhfdW5sb2NrKCZkZXYtPm1vZGVfY29uZmlnLm11dGV4KTsKPiAgCQkJCWdv dG8gb3V0Owo+ICAJCQl9Cj4gIAkJCWNvcGllZCsrOwo+ICAJCX0KPiAgCX0KPiAgCW91dF9yZXNw LT5jb3VudF9tb2RlcyA9IG1vZGVfY291bnQ7Cj4gLW91dDoKPiAgCW11dGV4X3VubG9jaygmZGV2 LT5tb2RlX2NvbmZpZy5tdXRleCk7Cj4gLW91dF91bnJlZjoKPiArCj4gKwlkcm1fbW9kZXNldF9s b2NrKCZkZXYtPm1vZGVfY29uZmlnLmNvbm5lY3Rpb25fbXV0ZXgsIE5VTEwpOwo+ICsJZW5jb2Rl ciA9IGRybV9jb25uZWN0b3JfZ2V0X2VuY29kZXIoY29ubmVjdG9yKTsKPiArCWlmIChlbmNvZGVy KQo+ICsJCW91dF9yZXNwLT5lbmNvZGVyX2lkID0gZW5jb2Rlci0+YmFzZS5pZDsKPiArCWVsc2UK PiArCQlvdXRfcmVzcC0+ZW5jb2Rlcl9pZCA9IDA7Cj4gKwo+ICsJcmV0ID0gZHJtX21vZGVfb2Jq ZWN0X2dldF9wcm9wZXJ0aWVzKCZjb25uZWN0b3ItPmJhc2UsIGZpbGVfcHJpdi0+YXRvbWljLAo+ ICsJCQkodWludDMyX3QgX191c2VyICopKHVuc2lnbmVkIGxvbmcpKG91dF9yZXNwLT5wcm9wc19w dHIpLAo+ICsJCQkodWludDY0X3QgX191c2VyICopKHVuc2lnbmVkIGxvbmcpKG91dF9yZXNwLT5w cm9wX3ZhbHVlc19wdHIpLAo+ICsJCQkmb3V0X3Jlc3AtPmNvdW50X3Byb3BzKTsKPiArCWRybV9t b2Rlc2V0X3VubG9jaygmZGV2LT5tb2RlX2NvbmZpZy5jb25uZWN0aW9uX211dGV4KTsKPiArCWlm IChyZXQpCj4gKwkJZ290byBvdXQ7Cj4gKwo+ICsJZm9yIChpID0gMDsgaSA8IERSTV9DT05ORUNU T1JfTUFYX0VOQ09ERVI7IGkrKykKPiArCQlpZiAoY29ubmVjdG9yLT5lbmNvZGVyX2lkc1tpXSAh PSAwKQo+ICsJCQllbmNvZGVyc19jb3VudCsrOwo+ICsKPiArCWlmICgob3V0X3Jlc3AtPmNvdW50 X2VuY29kZXJzID49IGVuY29kZXJzX2NvdW50KSAmJiBlbmNvZGVyc19jb3VudCkgewo+ICsJCWNv cGllZCA9IDA7Cj4gKwkJZW5jb2Rlcl9wdHIgPSAodWludDMyX3QgX191c2VyICopKHVuc2lnbmVk IGxvbmcpKG91dF9yZXNwLT5lbmNvZGVyc19wdHIpOwo+ICsJCWZvciAoaSA9IDA7IGkgPCBEUk1f Q09OTkVDVE9SX01BWF9FTkNPREVSOyBpKyspIHsKPiArCQkJaWYgKGNvbm5lY3Rvci0+ZW5jb2Rl cl9pZHNbaV0gIT0gMCkgewo+ICsJCQkJaWYgKHB1dF91c2VyKGNvbm5lY3Rvci0+ZW5jb2Rlcl9p ZHNbaV0sCj4gKwkJCQkJICAgICBlbmNvZGVyX3B0ciArIGNvcGllZCkpIHsKPiArCQkJCQlyZXQg PSAtRUZBVUxUOwo+ICsJCQkJCWdvdG8gb3V0Owo+ICsJCQkJfQo+ICsJCQkJY29waWVkKys7Cj4g KwkJCX0KPiArCQl9Cj4gKwl9Cj4gKwlvdXRfcmVzcC0+Y291bnRfZW5jb2RlcnMgPSBlbmNvZGVy c19jb3VudDsKPiArb3V0Ogo+ICAJZHJtX2Nvbm5lY3Rvcl91bnJlZmVyZW5jZShjb25uZWN0b3Ip Owo+ICAKPiAgCXJldHVybiByZXQ7CgotLSAKSmFuaSBOaWt1bGEsIEludGVsIE9wZW4gU291cmNl IFRlY2hub2xvZ3kgQ2VudGVyCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=