From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Clark Subject: [PATCH] drm/msm/mdp5: handle non-fullscreen base plane case Date: Thu, 13 Oct 2016 12:48:46 -0400 Message-ID: <1476377326-17877-1-git-send-email-robdclark@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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 Cc: freedreno@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org SWYgdGhlIGJvdHRvbS1tb3N0IGxheWVyIGlzIG5vdCBmdWxsc2NyZWVuLCB3ZSBuZWVkIHRvIHVz ZSB0aGUgQkFTRQptaXhlciBzdGFnZSBmb3Igc29saWQgZmlsbCAoaWUuIE1EUDVfQ1RMX0JMRU5E X09QX0ZMQUdfQk9SREVSX09VVCkuICBUaGUKYmxlbmRfc2V0dXAoKSBjb2RlIHByZXR0eSBtdWNo IGhhbmRsZWQgdGhpcyBhbHJlYWR5LCB3ZSBqdXN0IGhhZCB0bwpmaWd1cmUgdGhpcyBvdXQgaW4g X2F0b21pY19jaGVjaygpIGFuZCBhc3NpZ24gdGhlIHN0YWdlcyBhcHByb3ByaWF0ZWx5LgoKU2ln bmVkLW9mZi1ieTogUm9iIENsYXJrIDxyb2JkY2xhcmtAZ21haWwuY29tPgotLS0KVE9ETyBtZHA0 IG1pZ2h0IG5lZWQgc2ltaWxhciB0cmVhdG1lbnQ/CgogZHJpdmVycy9ncHUvZHJtL21zbS9tZHAv bWRwNS9tZHA1X2NydGMuYyB8IDQ0ICsrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgMjcgaW5zZXJ0aW9ucygrKSwgMTcgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9tZHAvbWRwNS9tZHA1X2NydGMuYyBiL2RyaXZlcnMv Z3B1L2RybS9tc20vbWRwL21kcDUvbWRwNV9jcnRjLmMKaW5kZXggZmEyYmU3Yy4uZTQyZjYyZCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21zbS9tZHAvbWRwNS9tZHA1X2NydGMuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vbXNtL21kcC9tZHA1L21kcDVfY3J0Yy5jCkBAIC0yMjMsMTEgKzIy Myw2IEBAIHN0YXRpYyB2b2lkIGJsZW5kX3NldHVwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkJ cGxhbmVfY250Kys7CiAJfQogCi0JLyoKLQkqIElmIHRoZXJlIGlzIG5vIGJhc2UgbGF5ZXIsIGVu YWJsZSBib3JkZXIgY29sb3IuCi0JKiBBbHRob3VnaCBpdCdzIG5vdCBwb3NzYmlsZSBpbiBjdXJy ZW50IGJsZW5kIGxvZ2ljLAotCSogcHV0IGl0IGhlcmUgYXMgYSByZW1pbmRlci4KLQkqLwogCWlm ICghcHN0YXRlc1tTVEFHRV9CQVNFXSAmJiBwbGFuZV9jbnQpIHsKIAkJY3RsX2JsZW5kX2ZsYWdz IHw9IE1EUDVfQ1RMX0JMRU5EX09QX0ZMQUdfQk9SREVSX09VVDsKIAkJREJHKCJCb3JkZXIgQ29s b3IgaXMgZW5hYmxlZCIpOwpAQCAtMzY1LDYgKzM2MCwxNSBAQCBzdGF0aWMgaW50IHBzdGF0ZV9j bXAoY29uc3Qgdm9pZCAqYSwgY29uc3Qgdm9pZCAqYikKIAlyZXR1cm4gcGEtPnN0YXRlLT56cG9z IC0gcGItPnN0YXRlLT56cG9zOwogfQogCisvKiBpcyB0aGVyZSBhIGhlbHBlciBmb3IgdGhpcz8g Ki8KK3N0YXRpYyBib29sIGlzX2Z1bGxzY3JlZW4oc3RydWN0IGRybV9jcnRjX3N0YXRlICpjc3Rh dGUsCisJCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBzdGF0ZSkKK3sKKwlyZXR1cm4gKHBzdGF0 ZS0+Y3J0Y194ID09IDApICYmIChwc3RhdGUtPmNydGNfeSA9PSAwKSAmJgorCQkocHN0YXRlLT5j cnRjX3cgPT0gY3N0YXRlLT5tb2RlLmhkaXNwbGF5KSAmJgorCQkocHN0YXRlLT5jcnRjX2ggPT0g Y3N0YXRlLT5tb2RlLnZkaXNwbGF5KTsKK30KKwogc3RhdGljIGludCBtZHA1X2NydGNfYXRvbWlj X2NoZWNrKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJc3RydWN0IGRybV9jcnRjX3N0YXRlICpz dGF0ZSkKIHsKQEAgLTM3NSwyMSArMzc5LDExIEBAIHN0YXRpYyBpbnQgbWRwNV9jcnRjX2F0b21p Y19jaGVjayhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJc3RydWN0IHBsYW5lX3N0YXRlIHBzdGF0 ZXNbU1RBR0VfTUFYICsgMV07CiAJY29uc3Qgc3RydWN0IG1kcDVfY2ZnX2h3ICpod19jZmc7CiAJ Y29uc3Qgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcHN0YXRlOwotCWludCBjbnQgPSAwLCBpOwor CWludCBjbnQgPSAwLCBiYXNlID0gMCwgaTsKIAogCURCRygiJXM6IGNoZWNrIiwgbWRwNV9jcnRj LT5uYW1lKTsKIAotCS8qIHZlcmlmeSB0aGF0IHRoZXJlIGFyZSBub3QgdG9vIG1hbnkgcGxhbmVz IGF0dGFjaGVkIHRvIGNydGMKLQkgKiBhbmQgdGhhdCB3ZSBkb24ndCBoYXZlIGNvbmZsaWN0aW5n IG1peGVyIHN0YWdlczoKLQkgKi8KLQlod19jZmcgPSBtZHA1X2NmZ19nZXRfaHdfY29uZmlnKG1k cDVfa21zLT5jZmcpOwogCWRybV9hdG9taWNfY3J0Y19zdGF0ZV9mb3JfZWFjaF9wbGFuZV9zdGF0 ZShwbGFuZSwgcHN0YXRlLCBzdGF0ZSkgewotCQlpZiAoY250ID49IChod19jZmctPmxtLm5iX3N0 YWdlcykpIHsKLQkJCWRldl9lcnIoZGV2LT5kZXYsICJ0b28gbWFueSBwbGFuZXMhXG4iKTsKLQkJ CXJldHVybiAtRUlOVkFMOwotCQl9Ci0KLQogCQlwc3RhdGVzW2NudF0ucGxhbmUgPSBwbGFuZTsK IAkJcHN0YXRlc1tjbnRdLnN0YXRlID0gdG9fbWRwNV9wbGFuZV9zdGF0ZShwc3RhdGUpOwogCkBA IC0zOTksOCArMzkzLDI0IEBAIHN0YXRpYyBpbnQgbWRwNV9jcnRjX2F0b21pY19jaGVjayhzdHJ1 Y3QgZHJtX2NydGMgKmNydGMsCiAJLyogYXNzaWduIGEgc3RhZ2UgYmFzZWQgb24gc29ydGVkIHpw b3MgcHJvcGVydHkgKi8KIAlzb3J0KHBzdGF0ZXMsIGNudCwgc2l6ZW9mKHBzdGF0ZXNbMF0pLCBw c3RhdGVfY21wLCBOVUxMKTsKIAorCS8qIGlmIHRoZSBib3R0b20tbW9zdCBsYXllciBpcyBub3Qg ZnVsbHNjcmVlbiwgd2UgbmVlZCB0byB1c2UKKwkgKiBpdCBmb3Igc29saWQtY29sb3I6CisJICov CisJaWYgKCFpc19mdWxsc2NyZWVuKHN0YXRlLCAmcHN0YXRlc1swXS5zdGF0ZS0+YmFzZSkpCisJ CWJhc2UrKzsKKworCS8qIHZlcmlmeSB0aGF0IHRoZXJlIGFyZSBub3QgdG9vIG1hbnkgcGxhbmVz IGF0dGFjaGVkIHRvIGNydGMKKwkgKiBhbmQgdGhhdCB3ZSBkb24ndCBoYXZlIGNvbmZsaWN0aW5n IG1peGVyIHN0YWdlczoKKwkgKi8KKwlod19jZmcgPSBtZHA1X2NmZ19nZXRfaHdfY29uZmlnKG1k cDVfa21zLT5jZmcpOworCisJaWYgKChjbnQgKyBiYXNlKSA+PSBod19jZmctPmxtLm5iX3N0YWdl cykgeworCQlkZXZfZXJyKGRldi0+ZGV2LCAidG9vIG1hbnkgcGxhbmVzIVxuIik7CisJCXJldHVy biAtRUlOVkFMOworCX0KKwogCWZvciAoaSA9IDA7IGkgPCBjbnQ7IGkrKykgewotCQlwc3RhdGVz W2ldLnN0YXRlLT5zdGFnZSA9IFNUQUdFX0JBU0UgKyBpOworCQlwc3RhdGVzW2ldLnN0YXRlLT5z dGFnZSA9IFNUQUdFX0JBU0UgKyBpICsgYmFzZTsKIAkJREJHKCIlczogYXNzaWduIHBpcGUgJXMg b24gc3RhZ2U9JWQiLCBtZHA1X2NydGMtPm5hbWUsCiAJCQkJcGlwZTJuYW1lKG1kcDVfcGxhbmVf cGlwZShwc3RhdGVzW2ldLnBsYW5lKSksCiAJCQkJcHN0YXRlc1tpXS5zdGF0ZS0+c3RhZ2UpOwot LSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=