From: Brian Starkey Subject: [PATCH i-g-t 2/7] lib/igt_kms: Fix override_mode handling Date: Tue, 25 Apr 2017 17:45:08 +0100 Message-ID: <1493138713-2319-3-git-send-email-brian.starkey@arm.com> References: <1493138713-2319-1-git-send-email-brian.starkey@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by gabe.freedesktop.org (Postfix) with ESMTP id A5DA46E5A7 for ; Tue, 25 Apr 2017 16:45:21 +0000 (UTC) In-Reply-To: <1493138713-2319-1-git-send-email-brian.starkey@arm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: liviu.dudau@arm.com List-Id: intel-gfx@lists.freedesktop.org aWd0X2Rpc3BsYXlfY29tbWl0IGlzbid0IHJlZnJlc2hpbmcgYWxsIG91dHB1dHMgYW55bW9yZSwg d2hpY2ggbWVhbnMKdGhhdCBhbiBvdmVycmlkZSBtb2RlIG1heSBuZXZlciBnZXQgcGlja2VkIHVw LgoKSW5zdGVhZCBvZiBmb3JjaW5nIGEgcmVwcm9iZSB0byBoYW5kbGUgY29weWluZyB0aGUgb3Zl cnJpZGVfbW9kZSBpbnRvCmRlZmF1bHRfbW9kZSwganVzdCBjaGFuZ2UgaWd0X291dHB1dF9nZXRf bW9kZSgpIHRvIHJldHVybiB0aGUKb3ZlcnJpZGVfbW9kZSBpZiBpdCdzIGJlZW4gc2V0LCBhbmQg cmVtb3ZlIHRoZSBvbGQgY29kZSB3aGljaCB3b3VsZApkaXJlY3RseSBvdmVyd3JpdGUgZGVmYXVs dF9tb2RlLgoKVGhpcyBzaG91bGQgYmUgbW9yZSByb2J1c3QsIGFzIGlndF9vdXRwdXRfZ2V0X21v ZGUoKSB3aWxsIGFsd2F5cyByZXR1cm4KdGhlIGNvcnJlY3QgbW9kZSwgd2l0aG91dCBuZWVkaW5n IHRoZSBvdXRwdXQgdG8gYmUgcmVwcm9iZWQuCgpUaGlzIGNoYW5nZSBtZWFucyB0aGF0IG91dHB1 dC0+Y29uZmlnLmRlZmF1bHRfbW9kZSBhbHdheXMgY29udGFpbnMgdGhlCiJub24tb3ZlcnJpZGRl biIgZGVmYXVsdCBtb2RlLgoKU2lnbmVkLW9mZi1ieTogQnJpYW4gU3RhcmtleSA8YnJpYW4uc3Rh cmtleUBhcm0uY29tPgotLS0KIGxpYi9pZ3Rfa21zLmMgfCAgIDEyICsrKystLS0tLS0tLQogMSBm aWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9saWIvaWd0X2ttcy5jIGIvbGliL2lndF9rbXMuYwppbmRleCA1ODM3YTlmMTEyYTYuLjQ3NGFh MDA1YjlmYSAxMDA2NDQKLS0tIGEvbGliL2lndF9rbXMuYworKysgYi9saWIvaWd0X2ttcy5jCkBA IC0xNTc1LDkgKzE1NzUsNiBAQCBzdGF0aWMgdm9pZCBpZ3Rfb3V0cHV0X3JlZnJlc2goaWd0X291 dHB1dF90ICpvdXRwdXQpCiAJCWlndF9hdG9taWNfZmlsbF9jb25uZWN0b3JfcHJvcHMoZGlzcGxh eSwgb3V0cHV0LAogCQkJSUdUX05VTV9DT05ORUNUT1JfUFJPUFMsIGlndF9jb25uZWN0b3JfcHJv cF9uYW1lcyk7CiAKLQlpZiAob3V0cHV0LT51c2Vfb3ZlcnJpZGVfbW9kZSkKLQkJb3V0cHV0LT5j b25maWcuZGVmYXVsdF9tb2RlID0gb3V0cHV0LT5vdmVycmlkZV9tb2RlOwotCiAJaWYgKG91dHB1 dC0+Y29uZmlnLnBpcGUgPT0gUElQRV9OT05FKQogCQlyZXR1cm47CiAKQEAgLTI4MTYsNyArMjgx MywxMCBAQCBjb25zdCBjaGFyICppZ3Rfb3V0cHV0X25hbWUoaWd0X291dHB1dF90ICpvdXRwdXQp CiAKIGRybU1vZGVNb2RlSW5mbyAqaWd0X291dHB1dF9nZXRfbW9kZShpZ3Rfb3V0cHV0X3QgKm91 dHB1dCkKIHsKLQlyZXR1cm4gJm91dHB1dC0+Y29uZmlnLmRlZmF1bHRfbW9kZTsKKwlpZiAob3V0 cHV0LT51c2Vfb3ZlcnJpZGVfbW9kZSkKKwkJcmV0dXJuICZvdXRwdXQtPm92ZXJyaWRlX21vZGU7 CisJZWxzZQorCQlyZXR1cm4gJm91dHB1dC0+Y29uZmlnLmRlZmF1bHRfbW9kZTsKIH0KIAogLyoq CkBAIC0yODM0LDEwICsyODM0LDYgQEAgdm9pZCBpZ3Rfb3V0cHV0X292ZXJyaWRlX21vZGUoaWd0 X291dHB1dF90ICpvdXRwdXQsIGRybU1vZGVNb2RlSW5mbyAqbW9kZSkKIAogCWlmIChtb2RlKQog CQlvdXRwdXQtPm92ZXJyaWRlX21vZGUgPSAqbW9kZTsKLQllbHNlIC8qIHJlc3RvcmUgZGVmYXVs dF9tb2RlLCBtYXkgaGF2ZSBiZWVuIG92ZXJ3cml0dGVuIGluIGlndF9vdXRwdXRfcmVmcmVzaCAq LwotCQlrbXN0ZXN0X2dldF9jb25uZWN0b3JfZGVmYXVsdF9tb2RlKG91dHB1dC0+ZGlzcGxheS0+ ZHJtX2ZkLAotCQkJCQkJICAgb3V0cHV0LT5jb25maWcuY29ubmVjdG9yLAotCQkJCQkJICAgJm91 dHB1dC0+Y29uZmlnLmRlZmF1bHRfbW9kZSk7CiAKIAlvdXRwdXQtPnVzZV9vdmVycmlkZV9tb2Rl ID0gISFtb2RlOwogCi0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK