From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mario Kleiner Subject: [PATCH 2/5] drm/vc4: Fix handling of interlaced video modes. Date: Tue, 19 Jul 2016 20:58:58 +0200 Message-ID: <1468954741-30993-3-git-send-email-mario.kleiner.de@gmail.com> References: <1468954741-30993-1-git-send-email-mario.kleiner.de@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 321A66E024 for ; Tue, 19 Jul 2016 18:59:37 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id o80so3820745wme.0 for ; Tue, 19 Jul 2016 11:59:37 -0700 (PDT) In-Reply-To: <1468954741-30993-1-git-send-email-mario.kleiner.de@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org V2UgbXVzdCBub3QgYXBwbHkgQ1JUQ19JTlRFUkxBQ0VfSEFMVkVfViB0byBpbnRlcmxhY2VkIG1v ZGVzIGR1cmluZwptb2RlIGVudW1lcmF0aW9uLCBhcyBkcm1faGVscGVyX3Byb2JlX3NpbmdsZV9j b25uZWN0b3JfbW9kZXMKZG9lcywgc28gd3JhcCBpdCBhbmQgcmVzZXQgdGhlIGVmZmVjdCBvZiBD UlRDX0lOVEVSTEFDRV9IQUxWRV9WCm9uIGFmZmVjdGVkIGludGVybGFjZWQgbW9kZXMuCgpBbHNv IG1vZGVfZml4dXAgaW50ZXJsYWNlZCBtb2RlcyBwYXNzZWQgaW4gZnJvbSB1c2VyIHNwYWNlLgoK VGhpcyBmaXhlcyB0aGUgdmJsYW5rIHRpbWVzdGFtcGluZyBjb25zdGFudHMgYW5kIGVudHJpZXMg aW4KdGhlIG1vZGUtPmNydGNfeHh4IGZpZWxkcyBuZWVkZWQgZm9yIHByZWNpc2UgdmJsYW5rIHRp bWVzdGFtcGluZy4KClNpZ25lZC1vZmYtYnk6IE1hcmlvIEtsZWluZXIgPG1hcmlvLmtsZWluZXIu ZGVAZ21haWwuY29tPgpDYzogRXJpYyBBbmhvbHQgPGVyaWNAYW5ob2x0Lm5ldD4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vdmM0L3ZjNF9jcnRjLmMgfCAxOCArKysrKysrKysrKysrKysrKysKIGRyaXZl cnMvZ3B1L2RybS92YzQvdmM0X2hkbWkuYyB8IDI5ICsrKysrKysrKysrKysrKysrKysrKysrKysr Ky0tCiAyIGZpbGVzIGNoYW5nZWQsIDQ1IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfY3J0Yy5jIGIvZHJpdmVycy9ncHUv ZHJtL3ZjNC92YzRfY3J0Yy5jCmluZGV4IDhmYzJiNzMuLmE0NzlkM2QgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS92YzQvdmM0X2NydGMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdmM0L3Zj NF9jcnRjLmMKQEAgLTUzMiw2ICs1MzIsMjMgQEAgc3RhdGljIHZvaWQgdmM0X2NydGNfZW5hYmxl KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkJICAgQ1JUQ19SRUFEKFBWX1ZfQ09OVFJPTCkgfCBQ Vl9WQ09OVFJPTF9WSURFTik7CiB9CiAKK3N0YXRpYyBib29sIHZjNF9jcnRjX21vZGVfZml4dXAo c3RydWN0IGRybV9jcnRjICpjcnRjLAorCQkJCWNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2Rl ICptb2RlLAorCQkJCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2RlKQorewor CS8qCisJICogSW50ZXJsYWNlZCB2aWRlbyBtb2RlcyBnb3QgQ1JUQ19JTlRFUkxBQ0VfSEFMVkVf ViBhcHBsaWVkIHdoZW4KKwkgKiBjb21pbmcgZnJvbSB1c2VyIHNwYWNlLiBXZSBkb24ndCB3YW50 IHRoaXMsIGFzIGl0IHNjcmV3cyB1cAorCSAqIHZibGFuayB0aW1lc3RhbXBpbmcsIHNvIGZpeCBp dCB1cC4KKwkgKi8KKwlkcm1fbW9kZV9zZXRfY3J0Y2luZm8oYWRqdXN0ZWRfbW9kZSwgMCk7CisK KwlEUk1fREVCVUdfS01TKCJbQ1JUQzolZF0gYWRqdXN0ZWRfbW9kZSA6XG4iLCBjcnRjLT5iYXNl LmlkKTsKKwlkcm1fbW9kZV9kZWJ1Z19wcmludG1vZGVsaW5lKGFkanVzdGVkX21vZGUpOworCisJ cmV0dXJuIHRydWU7Cit9CisKIHN0YXRpYyBpbnQgdmM0X2NydGNfYXRvbWljX2NoZWNrKHN0cnVj dCBkcm1fY3J0YyAqY3J0YywKIAkJCQkgc3RydWN0IGRybV9jcnRjX3N0YXRlICpzdGF0ZSkKIHsK QEAgLTgxOSw2ICs4MzYsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9jcnRjX2hlbHBlcl9m dW5jcyB2YzRfY3J0Y19oZWxwZXJfZnVuY3MgPSB7CiAJLm1vZGVfc2V0X25vZmIgPSB2YzRfY3J0 Y19tb2RlX3NldF9ub2ZiLAogCS5kaXNhYmxlID0gdmM0X2NydGNfZGlzYWJsZSwKIAkuZW5hYmxl ID0gdmM0X2NydGNfZW5hYmxlLAorCS5tb2RlX2ZpeHVwID0gdmM0X2NydGNfbW9kZV9maXh1cCwK IAkuYXRvbWljX2NoZWNrID0gdmM0X2NydGNfYXRvbWljX2NoZWNrLAogCS5hdG9taWNfZmx1c2gg PSB2YzRfY3J0Y19hdG9taWNfZmx1c2gsCiB9OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L3ZjNC92YzRfaGRtaS5jIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfaGRtaS5jCmluZGV4IDQ0 NTJmMzYuLjY4YWQxMDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2hkbWku YworKysgYi9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9oZG1pLmMKQEAgLTIwOCwxMCArMjA4LDM1 IEBAIHN0YXRpYyBpbnQgdmM0X2hkbWlfY29ubmVjdG9yX2dldF9tb2RlcyhzdHJ1Y3QgZHJtX2Nv bm5lY3RvciAqY29ubmVjdG9yKQogCXJldHVybiByZXQ7CiB9CiAKKy8qCisgKiBkcm1faGVscGVy X3Byb2JlX3NpbmdsZV9jb25uZWN0b3JfbW9kZXMoKSBhcHBsaWVzIGRybV9tb2RlX3NldF9jcnRj aW5mbyB0bworICogYWxsIG1vZGVzIHdpdGggZmxhZyBDUlRDX0lOVEVSTEFDRV9IQUxWRV9WLiBX ZSBkb24ndCB3YW50IHRoaXMsIGFzIGl0CisgKiBzY3Jld3MgdXAgdmJsYW5rIHRpbWVzdGFtcGlu ZyBmb3IgaW50ZXJsYWNlZCBtb2Rlcywgc28gZml4IGl0IHVwLgorICovCitzdGF0aWMgaW50IHZj NF9oZG1pX2Nvbm5lY3Rvcl9wcm9iZV9tb2RlcyhzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVj dG9yLAorCQkJCQkgIHVpbnQzMl90IG1heFgsIHVpbnQzMl90IG1heFkpCit7CisJc3RydWN0IGRy bV9kaXNwbGF5X21vZGUgKm1vZGU7CisJaW50IGNvdW50OworCisJY291bnQgPSBkcm1faGVscGVy X3Byb2JlX3NpbmdsZV9jb25uZWN0b3JfbW9kZXMoY29ubmVjdG9yLCBtYXhYLCBtYXhZKTsKKwlp ZiAoY291bnQgPT0gMCkKKwkJcmV0dXJuIDA7CisKKwlEUk1fREVCVUdfS01TKCJbQ09OTkVDVE9S OiVkOiVzXSBwcm9iZWQgYWRhcHRlZCBtb2RlcyA6XG4iLAorCQkgICAgICBjb25uZWN0b3ItPmJh c2UuaWQsIGNvbm5lY3Rvci0+bmFtZSk7CisJbGlzdF9mb3JfZWFjaF9lbnRyeShtb2RlLCAmY29u bmVjdG9yLT5tb2RlcywgaGVhZCkgeworCQlkcm1fbW9kZV9zZXRfY3J0Y2luZm8obW9kZSwgMCk7 CisJCWRybV9tb2RlX2RlYnVnX3ByaW50bW9kZWxpbmUobW9kZSk7CisJfQorCisJcmV0dXJuIGNv dW50OworfQorCiBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9jb25uZWN0b3JfZnVuY3MgdmM0X2hk bWlfY29ubmVjdG9yX2Z1bmNzID0gewogCS5kcG1zID0gZHJtX2F0b21pY19oZWxwZXJfY29ubmVj dG9yX2RwbXMsCiAJLmRldGVjdCA9IHZjNF9oZG1pX2Nvbm5lY3Rvcl9kZXRlY3QsCi0JLmZpbGxf bW9kZXMgPSBkcm1faGVscGVyX3Byb2JlX3NpbmdsZV9jb25uZWN0b3JfbW9kZXMsCisJLmZpbGxf bW9kZXMgPSB2YzRfaGRtaV9jb25uZWN0b3JfcHJvYmVfbW9kZXMsCiAJLmRlc3Ryb3kgPSB2YzRf aGRtaV9jb25uZWN0b3JfZGVzdHJveSwKIAkucmVzZXQgPSBkcm1fYXRvbWljX2hlbHBlcl9jb25u ZWN0b3JfcmVzZXQsCiAJLmF0b21pY19kdXBsaWNhdGVfc3RhdGUgPSBkcm1fYXRvbWljX2hlbHBl cl9jb25uZWN0b3JfZHVwbGljYXRlX3N0YXRlLApAQCAtMjQ2LDcgKzI3MSw3IEBAIHN0YXRpYyBz dHJ1Y3QgZHJtX2Nvbm5lY3RvciAqdmM0X2hkbWlfY29ubmVjdG9yX2luaXQoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKIAljb25uZWN0b3ItPnBvbGxlZCA9IChEUk1fQ09OTkVDVE9SX1BPTExfQ09O TkVDVCB8CiAJCQkgICAgIERSTV9DT05ORUNUT1JfUE9MTF9ESVNDT05ORUNUKTsKIAotCWNvbm5l Y3Rvci0+aW50ZXJsYWNlX2FsbG93ZWQgPSAwOworCWNvbm5lY3Rvci0+aW50ZXJsYWNlX2FsbG93 ZWQgPSAxOwogCWNvbm5lY3Rvci0+ZG91Ymxlc2Nhbl9hbGxvd2VkID0gMDsKIAogCWRybV9tb2Rl X2Nvbm5lY3Rvcl9hdHRhY2hfZW5jb2Rlcihjb25uZWN0b3IsIGVuY29kZXIpOwotLSAKMi43LjAK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZl bCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=