From: Wayne Lin Subject: [PATCH V2 1/2] drm/edid: Add aspect ratios to HDMI 4K modes Date: Mon, 18 Nov 2019 18:18:31 +0800 Message-ID: <20191118101832.15487-1-Wayne.Lin@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: ville.syrjala-VuQAYsv1563Yd54FQh9/CA@public.gmane.org, Wayne Lin W1doeV0KSERNSSAyLjAgYWRkcyBhc3BlY3QgcmF0aW8gYXR0cmlidXRlIHRvIGRpc3Rpbmd1aXNo IGRpZmZlcmVudAo0ayBtb2Rlcy4gQWNjb3JkaW5nIHRvIEFwcGVuZGl4IEUgb2YgSERNSSAyLjAg c3BlYywgc291cmNlIHNob3VsZAp1c2UgVlNJRiB0byBpbmRpY2F0ZSB2aWRlbyBtb2RlIG9ubHkg d2hlbiB0aGUgbW9kZSBpcyBvbmUgZGVmaW5lZAppbiBIRE1JIDEuNGIgNEsgbW9kZXMuIE90aGVy d2lzZSwgdXNlIEFWSSBpbmZvZnJhbWVzIHRvIGNvbnZleSBWSUMuCgpDdXJyZW50IGNvZGUgZG9l c24ndCB0YWtlIGFzcGVjdCByYXRpbyBpbnRvIGNvbnNpZGVyYXRpb24gd2hpbGUKY29uc3RydWN0 aW5nIGF2aSBpbmZvZnJhbWUuIFNob3VsZCBtb2RpZnkgdGhhdC4KCltIb3ddCkluaGVyaXQgVmls bGUgU3lyasOkbMOkJ3Mgd29yawoiZHJtL2VkaWQ6IFByZXAgZm9yIEhETUkgVklDIGFzcGVjdCBy YXRpbyIgYXQKaHR0cHM6Ly9wYXRjaHdvcmsua2VybmVsLm9yZy9wYXRjaC8xMTE3NDYzOS8KCkFk ZCBwaWN0dXJlX2FzcGVjdF9yYXRpbyBhdHRyaWJ1dGVzIHRvIGVkaWRfNGtfbW9kZXNbXSBhbmQK Y29uc3RydWN0IFZJQyBhbmQgSERNSV9WSUMgYnkgdGFraW5nIGFzcGVjdCByYXRpbyBpbnRvCmNv bnNpZGVyYXRpb24uCgp2MjogQ29ycmVjdCBtaXNzaW5nIGluaXRpYWxpemVyIGVycm9yIGF0IGFk ZGluZyBhc3BlY3QgcmF0aW8gb2YgClNNUFRFIG1vZGUuCgpTaWduZWQtb2ZmLWJ5OiBXYXluZSBM aW4gPFdheW5lLkxpbkBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fZWRpZC5jIHwg NDUgKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAzNSBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vZHJtX2VkaWQuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZWRpZC5jCmluZGV4IDc3 YTM5ZmM3NjA0NS4uMDMwN2NhZDM2ZjE0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJt X2VkaWQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2VkaWQuYwpAQCAtMTI4OCwyNSArMTI4 OCwyNSBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgZWRpZF80a19tb2Rl c1tdID0gewogCQkgICAzODQwLCA0MDE2LCA0MTA0LCA0NDAwLCAwLAogCQkgICAyMTYwLCAyMTY4 LCAyMTc4LCAyMjUwLCAwLAogCQkgICBEUk1fTU9ERV9GTEFHX1BIU1lOQyB8IERSTV9NT0RFX0ZM QUdfUFZTWU5DKSwKLQkgIC52cmVmcmVzaCA9IDMwLCB9LAorCSAgLnZyZWZyZXNoID0gMzAsIC5w aWN0dXJlX2FzcGVjdF9yYXRpbyA9IEhETUlfUElDVFVSRV9BU1BFQ1RfMTZfOSwgfSwKIAkvKiAy IC0gMzg0MHgyMTYwQDI1SHogKi8KIAl7IERSTV9NT0RFKCIzODQweDIxNjAiLCBEUk1fTU9ERV9U WVBFX0RSSVZFUiwgMjk3MDAwLAogCQkgICAzODQwLCA0ODk2LCA0OTg0LCA1MjgwLCAwLAogCQkg ICAyMTYwLCAyMTY4LCAyMTc4LCAyMjUwLCAwLAogCQkgICBEUk1fTU9ERV9GTEFHX1BIU1lOQyB8 IERSTV9NT0RFX0ZMQUdfUFZTWU5DKSwKLQkgIC52cmVmcmVzaCA9IDI1LCB9LAorCSAgLnZyZWZy ZXNoID0gMjUsIC5waWN0dXJlX2FzcGVjdF9yYXRpbyA9IEhETUlfUElDVFVSRV9BU1BFQ1RfMTZf OSwgfSwKIAkvKiAzIC0gMzg0MHgyMTYwQDI0SHogKi8KIAl7IERSTV9NT0RFKCIzODQweDIxNjAi LCBEUk1fTU9ERV9UWVBFX0RSSVZFUiwgMjk3MDAwLAogCQkgICAzODQwLCA1MTE2LCA1MjA0LCA1 NTAwLCAwLAogCQkgICAyMTYwLCAyMTY4LCAyMTc4LCAyMjUwLCAwLAogCQkgICBEUk1fTU9ERV9G TEFHX1BIU1lOQyB8IERSTV9NT0RFX0ZMQUdfUFZTWU5DKSwKLQkgIC52cmVmcmVzaCA9IDI0LCB9 LAorCSAgLnZyZWZyZXNoID0gMjQsIC5waWN0dXJlX2FzcGVjdF9yYXRpbyA9IEhETUlfUElDVFVS RV9BU1BFQ1RfMTZfOSwgfSwKIAkvKiA0IC0gNDA5NngyMTYwQDI0SHogKFNNUFRFKSAqLwogCXsg RFJNX01PREUoIjQwOTZ4MjE2MCIsIERSTV9NT0RFX1RZUEVfRFJJVkVSLCAyOTcwMDAsCiAJCSAg IDQwOTYsIDUxMTYsIDUyMDQsIDU1MDAsIDAsCiAJCSAgIDIxNjAsIDIxNjgsIDIxNzgsIDIyNTAs IDAsCiAJCSAgIERSTV9NT0RFX0ZMQUdfUEhTWU5DIHwgRFJNX01PREVfRkxBR19QVlNZTkMpLAot CSAgLnZyZWZyZXNoID0gMjQsIH0sCisJICAudnJlZnJlc2ggPSAyNCwgLnBpY3R1cmVfYXNwZWN0 X3JhdGlvID0gSERNSV9QSUNUVVJFX0FTUEVDVF8yNTZfMTM1LCB9LAogfTsKIAogLyoqKiBEREMg ZmV0Y2ggYW5kIGJsb2NrIHZhbGlkYXRpb24gKioqLwpAQCAtMzExMCw2ICszMTEwLDExIEBAIHN0 YXRpYyBlbnVtIGhkbWlfcGljdHVyZV9hc3BlY3QgZHJtX2dldF9jZWFfYXNwZWN0X3JhdGlvKGNv bnN0IHU4IHZpZGVvX2NvZGUpCiAJcmV0dXJuIGVkaWRfY2VhX21vZGVzW3ZpZGVvX2NvZGVdLnBp Y3R1cmVfYXNwZWN0X3JhdGlvOwogfQogCitzdGF0aWMgZW51bSBoZG1pX3BpY3R1cmVfYXNwZWN0 IGRybV9nZXRfaGRtaV9hc3BlY3RfcmF0aW8oY29uc3QgdTggdmlkZW9fY29kZSkKK3sKKwlyZXR1 cm4gZWRpZF80a19tb2Rlc1t2aWRlb19jb2RlXS5waWN0dXJlX2FzcGVjdF9yYXRpbzsKK30KKwog LyoKICAqIENhbGN1bGF0ZSB0aGUgYWx0ZXJuYXRlIGNsb2NrIGZvciBIRE1JIG1vZGVzICh0aG9z ZSBmcm9tIHRoZSBIRE1JIHZlbmRvcgogICogc3BlY2lmaWMgYmxvY2spLgpAQCAtMzEzNiw2ICsz MTQxLDkgQEAgc3RhdGljIHU4IGRybV9tYXRjaF9oZG1pX21vZGVfY2xvY2tfdG9sZXJhbmNlKGNv bnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICp0b18KIAlpZiAoIXRvX21hdGNoLT5jbG9jaykK IAkJcmV0dXJuIDA7CiAKKwlpZiAodG9fbWF0Y2gtPnBpY3R1cmVfYXNwZWN0X3JhdGlvKQorCQlt YXRjaF9mbGFncyB8PSBEUk1fTU9ERV9NQVRDSF9BU1BFQ1RfUkFUSU87CisKIAlmb3IgKHZpYyA9 IDE7IHZpYyA8IEFSUkFZX1NJWkUoZWRpZF80a19tb2Rlcyk7IHZpYysrKSB7CiAJCWNvbnN0IHN0 cnVjdCBkcm1fZGlzcGxheV9tb2RlICpoZG1pX21vZGUgPSAmZWRpZF80a19tb2Rlc1t2aWNdOwog CQl1bnNpZ25lZCBpbnQgY2xvY2sxLCBjbG9jazI7CkBAIC0zMTcxLDYgKzMxNzksOSBAQCBzdGF0 aWMgdTggZHJtX21hdGNoX2hkbWlfbW9kZShjb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAq dG9fbWF0Y2gpCiAJaWYgKCF0b19tYXRjaC0+Y2xvY2spCiAJCXJldHVybiAwOwogCisJaWYgKHRv X21hdGNoLT5waWN0dXJlX2FzcGVjdF9yYXRpbykKKwkJbWF0Y2hfZmxhZ3MgfD0gRFJNX01PREVf TUFUQ0hfQVNQRUNUX1JBVElPOworCiAJZm9yICh2aWMgPSAxOyB2aWMgPCBBUlJBWV9TSVpFKGVk aWRfNGtfbW9kZXMpOyB2aWMrKykgewogCQljb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAq aGRtaV9tb2RlID0gJmVkaWRfNGtfbW9kZXNbdmljXTsKIAkJdW5zaWduZWQgaW50IGNsb2NrMSwg Y2xvY2syOwpAQCAtNTExOCw2ICs1MTI5LDcgQEAgZHJtX2hkbWlfYXZpX2luZm9mcmFtZV9mcm9t X2Rpc3BsYXlfbW9kZShzdHJ1Y3QgaGRtaV9hdmlfaW5mb2ZyYW1lICpmcmFtZSwKIAkJCQkJIGNv bnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlKQogewogCWVudW0gaGRtaV9waWN0dXJl X2FzcGVjdCBwaWN0dXJlX2FzcGVjdDsKKwl1OCB2aWMsIGhkbWlfdmljOwogCWludCBlcnI7CiAK IAlpZiAoIWZyYW1lIHx8ICFtb2RlKQpAQCAtNTEzMCw3ICs1MTQyLDggQEAgZHJtX2hkbWlfYXZp X2luZm9mcmFtZV9mcm9tX2Rpc3BsYXlfbW9kZShzdHJ1Y3QgaGRtaV9hdmlfaW5mb2ZyYW1lICpm cmFtZSwKIAlpZiAobW9kZS0+ZmxhZ3MgJiBEUk1fTU9ERV9GTEFHX0RCTENMSykKIAkJZnJhbWUt PnBpeGVsX3JlcGVhdCA9IDE7CiAKLQlmcmFtZS0+dmlkZW9fY29kZSA9IGRybV9tb2RlX2NlYV92 aWMoY29ubmVjdG9yLCBtb2RlKTsKKwl2aWMgPSBkcm1fbW9kZV9jZWFfdmljKGNvbm5lY3Rvciwg bW9kZSk7CisJaGRtaV92aWMgPSBkcm1fbW9kZV9oZG1pX3ZpYyhjb25uZWN0b3IsIG1vZGUpOwog CiAJZnJhbWUtPnBpY3R1cmVfYXNwZWN0ID0gSERNSV9QSUNUVVJFX0FTUEVDVF9OT05FOwogCkBA IC01MTQ0LDExICs1MTU3LDE1IEBAIGRybV9oZG1pX2F2aV9pbmZvZnJhbWVfZnJvbV9kaXNwbGF5 X21vZGUoc3RydWN0IGhkbWlfYXZpX2luZm9mcmFtZSAqZnJhbWUsCiAKIAkvKgogCSAqIFBvcHVs YXRlIHBpY3R1cmUgYXNwZWN0IHJhdGlvIGZyb20gZWl0aGVyCi0JICogdXNlciBpbnB1dCAoaWYg c3BlY2lmaWVkKSBvciBmcm9tIHRoZSBDRUEgbW9kZSBsaXN0LgorCSAqIHVzZXIgaW5wdXQgKGlm IHNwZWNpZmllZCkgb3IgZnJvbSB0aGUgQ0VBL0hETUkgbW9kZSBsaXN0cy4KIAkgKi8KIAlwaWN0 dXJlX2FzcGVjdCA9IG1vZGUtPnBpY3R1cmVfYXNwZWN0X3JhdGlvOwotCWlmIChwaWN0dXJlX2Fz cGVjdCA9PSBIRE1JX1BJQ1RVUkVfQVNQRUNUX05PTkUpCi0JCXBpY3R1cmVfYXNwZWN0ID0gZHJt X2dldF9jZWFfYXNwZWN0X3JhdGlvKGZyYW1lLT52aWRlb19jb2RlKTsKKwlpZiAocGljdHVyZV9h c3BlY3QgPT0gSERNSV9QSUNUVVJFX0FTUEVDVF9OT05FKSB7CisJCWlmICh2aWMpCisJCQlwaWN0 dXJlX2FzcGVjdCA9IGRybV9nZXRfY2VhX2FzcGVjdF9yYXRpbyh2aWMpOworCQllbHNlIGlmICho ZG1pX3ZpYykKKwkJCXBpY3R1cmVfYXNwZWN0ID0gZHJtX2dldF9oZG1pX2FzcGVjdF9yYXRpbyho ZG1pX3ZpYyk7CisJfQogCiAJLyoKIAkgKiBUaGUgaW5mb2ZyYW1lIGNhbid0IGNvbnZleSBhbnl0 aGluZyBidXQgbm9uZSwgNDozCkBAIC01MTU2LDEyICs1MTczLDIwIEBAIGRybV9oZG1pX2F2aV9p bmZvZnJhbWVfZnJvbV9kaXNwbGF5X21vZGUoc3RydWN0IGhkbWlfYXZpX2luZm9mcmFtZSAqZnJh bWUsCiAJICogd2UgY2FuIG9ubHkgc2F0aXNmeSBpdCBieSBzcGVjaWZ5aW5nIHRoZSByaWdodCBW SUMuCiAJICovCiAJaWYgKHBpY3R1cmVfYXNwZWN0ID4gSERNSV9QSUNUVVJFX0FTUEVDVF8xNl85 KSB7Ci0JCWlmIChwaWN0dXJlX2FzcGVjdCAhPQotCQkgICAgZHJtX2dldF9jZWFfYXNwZWN0X3Jh dGlvKGZyYW1lLT52aWRlb19jb2RlKSkKKwkJaWYgKHZpYykgeworCQkJaWYgKHBpY3R1cmVfYXNw ZWN0ICE9IGRybV9nZXRfY2VhX2FzcGVjdF9yYXRpbyh2aWMpKQorCQkJCXJldHVybiAtRUlOVkFM OworCQl9IGVsc2UgaWYgKGhkbWlfdmljKSB7CisJCQlpZiAocGljdHVyZV9hc3BlY3QgIT0gZHJt X2dldF9oZG1pX2FzcGVjdF9yYXRpbyhoZG1pX3ZpYykpCisJCQkJcmV0dXJuIC1FSU5WQUw7CisJ CX0gZWxzZSB7CiAJCQlyZXR1cm4gLUVJTlZBTDsKKwkJfQorCiAJCXBpY3R1cmVfYXNwZWN0ID0g SERNSV9QSUNUVVJFX0FTUEVDVF9OT05FOwogCX0KIAorCWZyYW1lLT52aWRlb19jb2RlID0gdmlj OwogCWZyYW1lLT5waWN0dXJlX2FzcGVjdCA9IHBpY3R1cmVfYXNwZWN0OwogCWZyYW1lLT5hY3Rp dmVfYXNwZWN0ID0gSERNSV9BQ1RJVkVfQVNQRUNUX1BJQ1RVUkU7CiAJZnJhbWUtPnNjYW5fbW9k ZSA9IEhETUlfU0NBTl9NT0RFX1VOREVSU0NBTjsKLS0gCjIuMTcuMQoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1k LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4