From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Stultz Subject: [PATCH hwc 3/4] drm_hwcomposer: Cleanup gl precompositor init and provide uses_GL flag Date: Thu, 26 Apr 2018 12:05:56 -0700 Message-ID: <1524769557-6108-3-git-send-email-john.stultz@linaro.org> References: <1524769557-6108-1-git-send-email-john.stultz@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pg0-x241.google.com (mail-pg0-x241.google.com [IPv6:2607:f8b0:400e:c05::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 752076E0AA for ; Thu, 26 Apr 2018 19:06:06 +0000 (UTC) Received: by mail-pg0-x241.google.com with SMTP id a13so12161816pgu.4 for ; Thu, 26 Apr 2018 12:06:06 -0700 (PDT) In-Reply-To: <1524769557-6108-1-git-send-email-john.stultz@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel Cc: Rob Herring , Matt Szczesiak , Dmitry Shmidt , Sean Paul , Robert Foss , Alexandru-Cosmin Gheorghe , Liviu Dudau , Alistair Strachan , Marissa Wall , David Hanna List-Id: dri-devel@lists.freedesktop.org VGhlIGRybV9od2NvbXBvc2VyIGhhcyBpdHMgb3duIEdMIHByZS1jb21wb3NpdG9yIHdoaWNoIGlz IHVzZWQKdG8gc3F1aXNoIGxheWVycyB3aGVuIHRoZXJlIGFyZSBtb3JlIGxheWVycyB0aGVuIHBs YW5lcyBvbiB0aGUKZGlzcGxheSBoYXJkd2FyZS4gSW4gbWFueSB3YXlzIHRoaXMgZHVwbGljYXRl cyB0aGUgY2xpZW50LXNpZGUKR0wgY29tcG9zaXRpbmcgdGhhdCBpcyBkb25lIGluIFN1cmZhY2VG bGluZ2VyLCBidXQgaW4gdGhlb3J5IGNhbgpiZSBtb3JlIGhpZ2hseSBvcHRpbWl6ZWQgZm9yIHRo ZSBoYXJkd2FyZS4KClVuZm9ydHVuYXRlbHksIGR1ZSB0byB0aGVzZSBvcHRpbWl6YXRpb25zLCB0 aGUgZHJtX2h3Y29tcG9zZXIncwpwcmUtY29tcG9zaXRvciBiZWNvbWVzIHNvbWV3aGF0IGhhcmR3 YXJlIHNwZWNpZmljIChvcmlnaW5hbGx5CnRhcmdldGluZyBudmlkaWEgaGFyZHdhcmUsIEkgYmVs aWV2ZSkuCgpTbyBvbiBzb21lIGhhcmR3YXJlLCB0aGUgZ2wgcHJlY29tcG9zaXRvciBtYXkgbm90 IGFjdHVhbGx5CmluaXRpYWxpemUgZHVlIHRvIGhhcmR3YXJlIG1pc3NpbmcgZmVhdHVyZXMsIG9y IHRoZSBoYXJkd2FyZQpzdXBwb3J0aW5nIGRpZmZlcmVudCBzaGFkZXIgQVBJcy4KClJhdGhlciB0 aGVuIHRyeSB0byByZXdvcmsgdGhlIGRybV9od2NvbXBvc2VycyBwcmVjb21wb3NpdG9yCnRvIGJl IG1vcmUgZ2VuZXJpYywgSSBpbnN0ZWFkIHN1Z2dlc3QgdGhhdCB3aGVuIHRoZQpwcmVjb21wb3Np dG9yIGZhaWxzIHRvIGluaXRpYWxpemUsIHdlIHNpbXBseSBmYWxsIGJhY2sgdG8gdGhlCmFscmVh ZHkgbW9yZSB3aWRlbHkgY29tcGF0aWJsZSBjbGllbnQgY29tcG9zaXRvciBpbgpTdXJmYWNlRmxp bmdlci4KClRodXMsIHRoaXMgcGF0Y2ggY2xlYW5zIHVwIHNvbWUgb2YgdGhlIHByZWNvbXBvc2l0 b3IKaW5pdGlhbGl6YXRpb24sIHdoaWNoIGRpZG4ndCBoYW5kbGUgZmFpbHVyZXMgd2VsbC4KCkNj OiBNYXJpc3NhIFdhbGwgPG1hcmlzc2F3QGdvb2dsZS5jb20+CkNjOiBTZWFuIFBhdWwgPHNlYW5w YXVsQGdvb2dsZS5jb20+CkNjOiBEbWl0cnkgU2htaWR0IDxkaW1pdHJ5c2hAZ29vZ2xlLmNvbT4K Q2M6IFJvYmVydCBGb3NzIDxyb2JlcnQuZm9zc0Bjb2xsYWJvcmEuY29tPgpDYzogTWF0dCBTemN6 ZXNpYWsgPG1hdHQuc3pjemVzaWFrQGFybS5jb20+CkNjOiBMaXZpdSBEdWRhdSA8TGl2aXUuRHVk YXVAYXJtLmNvbT4KQ2M6IERhdmlkIEhhbm5hIDxkYXZpZC5oYW5uYTExQGdtYWlsLmNvbT4KQ2M6 IFJvYiBIZXJyaW5nIDxyb2IuaGVycmluZ0BsaW5hcm8ub3JnPgpDYzogQWxleGFuZHJ1LUNvc21p biBHaGVvcmdoZSA8QWxleGFuZHJ1LUNvc21pbi5HaGVvcmdoZUBhcm0uY29tPgpDYzogQWxpc3Rh aXIgU3RyYWNoYW4gPGFzdHJhY2hhbkBnb29nbGUuY29tPgpSZXZpZXdlZC1ieTogUm9iIEhlcnJp bmcgPHJvYmhAa2VybmVsLm9yZz4KU2lnbmVkLW9mZi1ieTogSm9obiBTdHVsdHogPGpvaG4uc3R1 bHR6QGxpbmFyby5vcmc+Ci0tLQogZHJtZGlzcGxheWNvbXBvc2l0b3IuY3BwIHwgNDAgKysrKysr KysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJtZGlzcGxheWNvbXBvc2l0b3Iu aCAgIHwgIDMgKysrCiAyIGZpbGVzIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDE5IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RybWRpc3BsYXljb21wb3NpdG9yLmNwcCBiL2RybWRpc3Bs YXljb21wb3NpdG9yLmNwcAppbmRleCBlNTcwOTIzLi40MGFmM2JlIDEwMDY0NAotLS0gYS9kcm1k aXNwbGF5Y29tcG9zaXRvci5jcHAKKysrIGIvZHJtZGlzcGxheWNvbXBvc2l0b3IuY3BwCkBAIC0y MjIsNiArMjIyLDEzIEBAIGludCBEcm1EaXNwbGF5Q29tcG9zaXRvcjo6SW5pdChEcm1SZXNvdXJj ZXMgKmRybSwgaW50IGRpc3BsYXkpIHsKICAgICByZXR1cm4gcmV0OwogICB9CiAKKyAgcHJlX2Nv bXBvc2l0b3JfLnJlc2V0KG5ldyBHTFdvcmtlckNvbXBvc2l0b3IoKSk7CisgIHJldCA9IHByZV9j b21wb3NpdG9yXy0+SW5pdCgpOworICBpZiAocmV0KSB7CisgICAgQUxPR0UoIkZhaWxlZCB0byBp bml0aWFsaXplIE9wZW5HTCBjb21wb3NpdG9yICVkIiwgcmV0KTsKKyAgICBwcmVfY29tcG9zaXRv cl8ucmVzZXQoKTsKKyAgfQorCiAgIGluaXRpYWxpemVkXyA9IHRydWU7CiAgIHJldHVybiAwOwog fQpAQCAtMjk0LDE0ICszMDEsMTYgQEAgaW50IERybURpc3BsYXlDb21wb3NpdG9yOjpBcHBseVNx dWFzaChEcm1EaXNwbGF5Q29tcG9zaXRpb24gKmRpc3BsYXlfY29tcCkgewogICB9CiAKICAgc3Rk Ojp2ZWN0b3I8RHJtQ29tcG9zaXRpb25SZWdpb24+ICZyZWdpb25zID0gZGlzcGxheV9jb21wLT5z cXVhc2hfcmVnaW9ucygpOwotICByZXQgPSBwcmVfY29tcG9zaXRvcl8tPkNvbXBvc2l0ZShkaXNw bGF5X2NvbXAtPmxheWVycygpLmRhdGEoKSwKKyAgaWYgKHByZV9jb21wb3NpdG9yXykgeworICAg IHJldCA9IHByZV9jb21wb3NpdG9yXy0+Q29tcG9zaXRlKGRpc3BsYXlfY29tcC0+bGF5ZXJzKCku ZGF0YSgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWdpb25zLmRhdGEo KSwgcmVnaW9ucy5zaXplKCksIGZiLmJ1ZmZlcigpLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBkaXNwbGF5X2NvbXAtPmltcG9ydGVyKCkpOwotICBwcmVfY29tcG9zaXRvcl8t PkZpbmlzaCgpOworICAgIHByZV9jb21wb3NpdG9yXy0+RmluaXNoKCk7CiAKLSAgaWYgKHJldCkg ewotICAgIEFMT0dFKCJGYWlsZWQgdG8gc3F1YXNoIGxheWVycyIpOwotICAgIHJldHVybiByZXQ7 CisgICAgaWYgKHJldCkgeworICAgICAgQUxPR0UoIkZhaWxlZCB0byBzcXVhc2ggbGF5ZXJzIik7 CisgICAgICByZXR1cm4gcmV0OworICAgIH0KICAgfQogCiAgIHJldCA9IGRpc3BsYXlfY29tcC0+ Q3JlYXRlTmV4dFRpbWVsaW5lRmVuY2UoKTsKQEAgLTMyOCwxNCArMzM3LDE2IEBAIGludCBEcm1E aXNwbGF5Q29tcG9zaXRvcjo6QXBwbHlQcmVDb21wb3NpdGUoCiAgIH0KIAogICBzdGQ6OnZlY3Rv cjxEcm1Db21wb3NpdGlvblJlZ2lvbj4gJnJlZ2lvbnMgPSBkaXNwbGF5X2NvbXAtPnByZV9jb21w X3JlZ2lvbnMoKTsKLSAgcmV0ID0gcHJlX2NvbXBvc2l0b3JfLT5Db21wb3NpdGUoZGlzcGxheV9j b21wLT5sYXllcnMoKS5kYXRhKCksCisgIGlmIChwcmVfY29tcG9zaXRvcl8pIHsKKyAgICByZXQg PSBwcmVfY29tcG9zaXRvcl8tPkNvbXBvc2l0ZShkaXNwbGF5X2NvbXAtPmxheWVycygpLmRhdGEo KSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVnaW9ucy5kYXRhKCksIHJl Z2lvbnMuc2l6ZSgpLCBmYi5idWZmZXIoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZGlzcGxheV9jb21wLT5pbXBvcnRlcigpKTsKLSAgcHJlX2NvbXBvc2l0b3JfLT5GaW5p c2goKTsKKyAgICBwcmVfY29tcG9zaXRvcl8tPkZpbmlzaCgpOwogCi0gIGlmIChyZXQpIHsKLSAg ICBBTE9HRSgiRmFpbGVkIHRvIHByZS1jb21wb3NpdGUgbGF5ZXJzIik7Ci0gICAgcmV0dXJuIHJl dDsKKyAgICBpZiAocmV0KSB7CisgICAgICBBTE9HRSgiRmFpbGVkIHRvIHByZS1jb21wb3NpdGUg bGF5ZXJzIik7CisgICAgICByZXR1cm4gcmV0OworICAgIH0KICAgfQogCiAgIHJldCA9IGRpc3Bs YXlfY29tcC0+Q3JlYXRlTmV4dFRpbWVsaW5lRmVuY2UoKTsKQEAgLTM5NSwxNSArNDA2LDYgQEAg aW50IERybURpc3BsYXlDb21wb3NpdG9yOjpQcmVwYXJlRnJhbWUoRHJtRGlzcGxheUNvbXBvc2l0 aW9uICpkaXNwbGF5X2NvbXApIHsKICAgc3RkOjp2ZWN0b3I8RHJtQ29tcG9zaXRpb25SZWdpb24+ ICZwcmVfY29tcF9yZWdpb25zID0KICAgICAgIGRpc3BsYXlfY29tcC0+cHJlX2NvbXBfcmVnaW9u cygpOwogCi0gIGlmICghcHJlX2NvbXBvc2l0b3JfKSB7Ci0gICAgcHJlX2NvbXBvc2l0b3JfLnJl c2V0KG5ldyBHTFdvcmtlckNvbXBvc2l0b3IoKSk7Ci0gICAgaW50IHJldCA9IHByZV9jb21wb3Np dG9yXy0+SW5pdCgpOwotICAgIGlmIChyZXQpIHsKLSAgICAgIEFMT0dFKCJGYWlsZWQgdG8gaW5p dGlhbGl6ZSBPcGVuR0wgY29tcG9zaXRvciAlZCIsIHJldCk7Ci0gICAgICByZXR1cm4gcmV0Owot ICAgIH0KLSAgfQotCiAgIGludCBzcXVhc2hfbGF5ZXJfaW5kZXggPSAtMTsKICAgaWYgKHNxdWFz aF9yZWdpb25zLnNpemUoKSA+IDApIHsKICAgICBzcXVhc2hfZnJhbWVidWZmZXJfaW5kZXhfID0g KHNxdWFzaF9mcmFtZWJ1ZmZlcl9pbmRleF8gKyAxKSAlIDI7CmRpZmYgLS1naXQgYS9kcm1kaXNw bGF5Y29tcG9zaXRvci5oIGIvZHJtZGlzcGxheWNvbXBvc2l0b3IuaAppbmRleCBmMTk2NWZiLi5l ZDZjNWY5IDEwMDY0NAotLS0gYS9kcm1kaXNwbGF5Y29tcG9zaXRvci5oCisrKyBiL2RybWRpc3Bs YXljb21wb3NpdG9yLmgKQEAgLTk4LDYgKzk4LDkgQEAgY2xhc3MgRHJtRGlzcGxheUNvbXBvc2l0 b3IgewogICAgIHJldHVybiAmc3F1YXNoX3N0YXRlXzsKICAgfQogCisgIGJvb2wgdXNlc19HTCgp IHsKKyAgICByZXR1cm4gISFwcmVfY29tcG9zaXRvcl87CisgIH0KICBwcml2YXRlOgogICBzdHJ1 Y3QgTW9kZVN0YXRlIHsKICAgICBib29sIG5lZWRzX21vZGVzZXQgPSBmYWxzZTsKLS0gCjIuNy40 CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2 ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK