From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adrian Salido Subject: [PATCH hwc] drm_hwcomposer: make sure primary plane is allocated for squash Date: Mon, 2 Oct 2017 11:31:27 -0700 Message-ID: <20171002183127.176139-1-salidoa@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pg0-x22c.google.com (mail-pg0-x22c.google.com [IPv6:2607:f8b0:400e:c05::22c]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5A19E6E390 for ; Mon, 2 Oct 2017 18:31:34 +0000 (UTC) Received: by mail-pg0-x22c.google.com with SMTP id b11so3392419pgn.12 for ; Mon, 02 Oct 2017 11:31:34 -0700 (PDT) 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: Adrian Salido List-Id: dri-devel@lists.freedesktop.org VGhlcmUgYXJlIGluc3RhbmNlcyB3aGVyZSB0aGUgcHJpbWFyeSBwbGFuZSBtYXkgaGF2ZSBiZWVu IGRpc2FibGVkLCBsb29rCnRocm91Z2ggZGlzYWJsZWQgcGxhbmVzIGFzIHdlbGwgdG8gZmluZCBw cmltYXJ5IHBsYW5lIHRvIHVzZSBmb3Igc3F1YXNoLgoKU2lnbmVkLW9mZi1ieTogQWRyaWFuIFNh bGlkbyA8c2FsaWRvYUBnb29nbGUuY29tPgotLS0KIGRybWRpc3BsYXljb21wb3NpdG9yLmNwcCB8 IDE2ICsrKysrKysrKystLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCA2 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RybWRpc3BsYXljb21wb3NpdG9yLmNwcCBiL2Ry bWRpc3BsYXljb21wb3NpdG9yLmNwcAppbmRleCBhMDdkMzU4OGQxZjUuLjgwZTNlYmE2MGNjZiAx MDA2NDQKLS0tIGEvZHJtZGlzcGxheWNvbXBvc2l0b3IuY3BwCisrKyBiL2RybWRpc3BsYXljb21w b3NpdG9yLmNwcApAQCAtOTMzLDEwICs5MzMsMTMgQEAgaW50IERybURpc3BsYXlDb21wb3NpdG9y OjpTcXVhc2hGcmFtZShEcm1EaXNwbGF5Q29tcG9zaXRpb24gKnNyYywKICAgICAgIGdvdG8gbW92 ZV9sYXllcnNfYmFjazsKICAgICB9CiAKLSAgICBpZiAoY29tcF9wbGFuZS50eXBlKCkgPT0gRHJt Q29tcG9zaXRpb25QbGFuZTo6VHlwZTo6a0Rpc2FibGUpIHsKKyAgICBpZiAoY29tcF9wbGFuZS5w bGFuZSgpLT50eXBlKCkgPT0gRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSkKKyAgICAgIHNxdWFzaGVk X2NvbXAuc2V0X3BsYW5lKGNvbXBfcGxhbmUucGxhbmUoKSk7CisgICAgZWxzZQogICAgICAgZHN0 LT5BZGRQbGFuZURpc2FibGUoY29tcF9wbGFuZS5wbGFuZSgpKTsKKworICAgIGlmIChjb21wX3Bs YW5lLnR5cGUoKSA9PSBEcm1Db21wb3NpdGlvblBsYW5lOjpUeXBlOjprRGlzYWJsZSkKICAgICAg IGNvbnRpbnVlOwotICAgIH0KIAogICAgIGZvciAoYXV0byBpIDogY29tcF9wbGFuZS5zb3VyY2Vf bGF5ZXJzKCkpIHsKICAgICAgIERybUh3Y0xheWVyICZsYXllciA9IHNyY19sYXllcnNbaV07CkBA IC05NTUsMTEgKzk1OCwxMiBAQCBpbnQgRHJtRGlzcGxheUNvbXBvc2l0b3I6OlNxdWFzaEZyYW1l KERybURpc3BsYXlDb21wb3NpdGlvbiAqc3JjLAogICAgICAgc3F1YXNoZWRfY29tcC5zb3VyY2Vf bGF5ZXJzKCkucHVzaF9iYWNrKAogICAgICAgICAgIHNxdWFzaGVkX2NvbXAuc291cmNlX2xheWVy cygpLnNpemUoKSk7CiAgICAgfQorICB9CiAKLSAgICBpZiAoY29tcF9wbGFuZS5wbGFuZSgpLT50 eXBlKCkgPT0gRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSkKLSAgICAgIHNxdWFzaGVkX2NvbXAuc2V0 X3BsYW5lKGNvbXBfcGxhbmUucGxhbmUoKSk7Ci0gICAgZWxzZQotICAgICAgZHN0LT5BZGRQbGFu ZURpc2FibGUoY29tcF9wbGFuZS5wbGFuZSgpKTsKKyAgaWYgKHNxdWFzaGVkX2NvbXAucGxhbmUo KSA9PSBOVUxMKSB7CisgICAgQUxPR0UoIlByaW1hcnkgcGxhbmUgbm90IGZvdW5kIGZvciBzcXVh c2giKTsKKyAgICByZXQgPSAtRU5PVFNVUDsKKyAgICBnb3RvIG1vdmVfbGF5ZXJzX2JhY2s7CiAg IH0KIAogICByZXQgPSBkc3QtPlNldExheWVycyhkc3RfbGF5ZXJzLmRhdGEoKSwgZHN0X2xheWVy cy5zaXplKCksIGZhbHNlKTsKLS0gCjIuMTQuMi44MjIuZzYwYmU1ZDQzZTYtZ29vZwoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxp bmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==