From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gert Wollny Subject: [PATCH] drm/radeon, evergreen: ensure equal sizes for depth-stencil npot textures Date: Mon, 6 Aug 2018 10:01:02 +0200 Message-ID: <20180806080102.607-1-gw.fossdev@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7B3AF6E1A0 for ; Mon, 6 Aug 2018 08:01:39 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id r16-v6so11397548wrt.11 for ; Mon, 06 Aug 2018 01:01:39 -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: Gert Wollny List-Id: dri-devel@lists.freedesktop.org RnJvbTogR2VydCBXb2xsbnkgPGdlcnQud29sbG55QGNvbGxhYm9yYS5jb20+CgpPbiBldmVyZ3Jl ZW4gZGVwdGgtc3RlbmNpbCB0ZXh0dXJlcyBhcmUgYWxsb2NhdGVkIGFzIHR3byBvYmplY3RzLCBh bmQKd2hlbiB1c2luZyB0aGUgZWdfc3VyZmFjZV9pbml0XzFkX21pcHRyZWVzIGNvZGUgcGF0aCB0 aGUgc2l6ZSBldmFsdWF0aW9uCnVzZXMgdGhlIGdlbmVyYWxpemVkIHN1cmZfbWluaWZ5IGZ1bmN0 aW9uLiBIZXJlIHdoZW4gYWxsb2NhdGluZyB0aGUKZGVwdGggdGV4dHVyZSB0aGUgYWxpZ25tZW50 IHRha2VzIHRoZSBkZXB0aCBicGUgdmFsdWUgaW50byBhY2NvdW50LCBhbmQKdXNlcyBicGU9MSBm b3IgdGhlIHN0ZW5jaWwgdGV4dHVyZS4gQXMgYSByZXN1bHQgdGhlIHRleHR1cmUgcGFpciBtYXkK Y29uc2lzdCBvZiB0ZXh0dXJlcyB3aXRoIHR3byBkaWZmZXJlbnQgbmJsa194IHNpemVzIGFuZCB0 aGlzIHNlZW1zIHRvCmJlIGEgcHJvYmxlbSB3aXRoIG5wb3QgdGV4dHVyZXMsIGkuZS4gaWYgdGhl IHNvIGFsbG9jYXRlZCBkZXB0aCB0ZXh0dXJlCmlzIGxhcmdlciB0aGFuIHRoZSBzdGVuY2lsIHRl eHR1cmUsIHRoZW4gdGhlIGtlcm5lbCBtYXkgcmVqZWN0IHNlbnQgZGF0YQp3aXRoIGFuIGVycm9y IG1lc3NhZ2UgbGlrZToKCiBldmVyZ3JlZW5fY3NfdHJhY2tfdmFsaWRhdGVfc3RlbmNpbDo2MjIg c3RlbmNpbCByZWFkIGJvIHRvbwogIHNtYWxsIChsYXllciBzaXplIDEzMTA3Miwgb2Zmc2V0IDUy NDI4OCwgbWF4IGxheWVyIDEsIGJvIHNpemUgNjA2MjA4KQoKYmVjYXVzZSBhcHBhcmVudGx5IHRo ZSBleHBlY3RlZCBsYXllciBzaXplIGlzIGV2YWx1YXRlZCBmcm9tIHRoZSBkZXB0aAp0ZXh0dXJl IHNpemUsIGJ1dCB0aGUgYWN0dWFsIGJvIHNpemUgaXMgZXZhbHVhdGVkIGJhc2VkIG9uIHRoZSB0 cnVlIHRleHR1cmUKc2l6ZSB2YWx1ZXMuIElmLCBvbiB0aGUgb3RoZXIgaGFuZCwgdGhlIHN0ZW5j aWwgdGV4dHVyZSBpcyBsYXJnZXIgdGhhbiB0aGUKZGVwdGggdGV4dHVyZSwgdGhlbiB0aGUgZGF0 YSBpcyBzZW5kIHdpdGggYSB3cm9uZyBhbGlnbm1lbnQsIGFuZCBjZXJ0YWluCmRFUVAtR0xFUzMx IHRlc3RzIGZhaWwuCgpJbiBvcmRlciB0byBvYnRhaW4gZXF1YWwgbnBvdCB0ZXh0dXJlIHNpemVz IG1hZ25pZnkgdGhlIGRlcHRoIHRleHR1cmUgYWxpZ25tZW50CnJlcXVpcmVtZW50IGluIHRoZXNl IGNhc2VzIGJ5IGl0cyBicGUsIHNvIHRoYXQgdGhlIHJlbGF0aXZlIGFsaWdubWVudCBpcwp0aGUg c2FtZSBmb3IgZGVwdGggYW5kIHN0ZW5jaWwgdGV4dHVyZS4KCkZpeGVzIG9uIEJBUlRTOgogIGRF UVAtR0xFUzMxLmZ1bmN0aW9uYWwuc3RlbmNpbF90ZXh0dXJpbmcuZm9ybWF0CiAgICAuZGVwdGgz MmZfc3RlbmNpbDhfMmQKICAgIC5kZXB0aDMyZl9zdGVuY2lsOF8yZF9hcnJheQogICAgLmRlcHRo MjRfc3RlbmNpbDhfMmQgUGFzcwogICAgLmRlcHRoMjRfc3RlbmNpbDhfMmRfYXJyYXkKICAgIC5z dGVuY2lsX2luZGV4OF8yZAogICAgLnN0ZW5jaWxfaW5kZXg4XzJkX2FycmF5CiAgICAuZGVwdGgz MmZfc3RlbmNpbDhfZHJhdwogICAgLmRlcHRoMjRfc3RlbmNpbDhfZHJhdwoKICBkRVFQLUdMRVMz MS5mdW5jdGlvbmFsLnRleHR1cmUuYm9yZGVyX2NsYW1wLmZvcm1hdHMKICAgIC5zdGVuY2lsX2lu ZGV4OC5uZWFyZXN0X3NpemVfbnBvdAogICAgLmRlcHRoMjRfc3RlbmNpbDhfc2FtcGxlX3N0ZW5j aWwubmVhcmVzdF9zaXplX25wb3QKICAgIC5kZXB0aDMyZl9zdGVuY2lsOF9zYW1wbGVfc3RlbmNp bC5uZWFyZXN0X3NpemVfbnBvdAoKICBkRVFQLUdMRVMzMS5mdW5jdGlvbmFsLnRleHR1cmUuYm9y ZGVyX2NsYW1wLnBlcl9heGlzX3dyYXBfbW9kZS50ZXh0dXJlXzJkCiAgICAudWludF9zdGVuY2ls Lm5lYXJlc3Quc19jbGFtcF90b19lZGdlX3RfY2xhbXBfdG9fYm9yZGVyX25wb3QKICAgIC51aW50 X3N0ZW5jaWwubmVhcmVzdC5zX3JlcGVhdF90X2NsYW1wX3RvX2JvcmRlcl9ucG90CiAgICAudWlu dF9zdGVuY2lsLm5lYXJlc3Quc19taXJyb3JlZF9yZXBlYXRfdF9jbGFtcF90b19ib3JkZXJfbnBv dAoKU2lnbmVkLW9mZi1ieTogR2VydCBXb2xsbnkgPGdlcnQud29sbG55QGNvbGxhYm9yYS5jb20+ Ci0tLQpQUzogSSBoYXZlIGNvbW1pdCByaWdodHMgZm9yIG1lc2EsIEknbSBub3Qgc3VyZSB3aGV0 aGVyIHRoaXMgYWxzbyBpbmNsdWRlcyBkcm0uIAoKVGhhbmtzIGZvciByZXZpZXdpbmcgYW5kIGFu eSBjb21tZW50cywKR2VydAoKIHJhZGVvbi9yYWRlb25fc3VyZmFjZS5jIHwgMzggKysrKysrKysr KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNyBpbnNlcnRp b25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9yYWRlb24vcmFkZW9uX3N1cmZh Y2UuYyBiL3JhZGVvbi9yYWRlb25fc3VyZmFjZS5jCmluZGV4IDNjYWZjZmNiLi4wNTc5Mzg5YyAx MDA2NDQKLS0tIGEvcmFkZW9uL3JhZGVvbl9zdXJmYWNlLmMKKysrIGIvcmFkZW9uL3JhZGVvbl9z dXJmYWNlLmMKQEAgLTYxMiw2ICs2MTIsNyBAQCBzdGF0aWMgaW50IGVnX3N1cmZhY2VfaW5pdF8x ZChzdHJ1Y3QgcmFkZW9uX3N1cmZhY2VfbWFuYWdlciAqc3VyZl9tYW4sCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzdHJ1Y3QgcmFkZW9uX3N1cmZhY2UgKnN1cmYsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBzdHJ1Y3QgcmFkZW9uX3N1cmZhY2VfbGV2ZWwgKmxldmVsLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgYnBlLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgdW5zaWduZWQgYWxpZ25fbWFnaW5pZnksCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB1aW50NjRfdCBvZmZzZXQsIHVuc2lnbmVkIHN0YXJ0X2xldmVsKQog ewogICAgIHVpbnQzMl90IHhhbGlnbiwgeWFsaWduLCB6YWxpZ24sIHRpbGV3OwpAQCAtNjIwLDcg KzYyMSw3IEBAIHN0YXRpYyBpbnQgZWdfc3VyZmFjZV9pbml0XzFkKHN0cnVjdCByYWRlb25fc3Vy ZmFjZV9tYW5hZ2VyICpzdXJmX21hbiwKICAgICAvKiBjb21wdXRlIGFsaWdubWVudCAqLwogICAg IHRpbGV3ID0gODsKICAgICB4YWxpZ24gPSBzdXJmX21hbi0+aHdfaW5mby5ncm91cF9ieXRlcyAv ICh0aWxldyAqIGJwZSAqIHN1cmYtPm5zYW1wbGVzKTsKLSAgICB4YWxpZ24gPSBNQVgyKHRpbGV3 LCB4YWxpZ24pOworICAgIHhhbGlnbiA9IE1BWDIodGlsZXcsIHhhbGlnbiAqIGFsaWduX21hZ2lu aWZ5KTsKICAgICB5YWxpZ24gPSB0aWxldzsKICAgICB6YWxpZ24gPSAxOwogICAgIGlmIChzdXJm LT5mbGFncyAmIFJBREVPTl9TVVJGX1NDQU5PVVQpIHsKQEAgLTY1Miw3ICs2NTMsOCBAQCBzdGF0 aWMgaW50IGVnX3N1cmZhY2VfaW5pdF8xZChzdHJ1Y3QgcmFkZW9uX3N1cmZhY2VfbWFuYWdlciAq c3VyZl9tYW4sCiBzdGF0aWMgaW50IGVnX3N1cmZhY2VfaW5pdF8yZChzdHJ1Y3QgcmFkZW9uX3N1 cmZhY2VfbWFuYWdlciAqc3VyZl9tYW4sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBz dHJ1Y3QgcmFkZW9uX3N1cmZhY2UgKnN1cmYsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBzdHJ1Y3QgcmFkZW9uX3N1cmZhY2VfbGV2ZWwgKmxldmVsLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgdW5zaWduZWQgYnBlLCB1bnNpZ25lZCB0aWxlX3NwbGl0LAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgYnBlLCB1bnNpZ25lZCBhbGlnbl9tYWduaWZ5 LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgdGlsZV9zcGxpdCwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQ2NF90IG9mZnNldCwgdW5zaWduZWQgc3Rh cnRfbGV2ZWwpCiB7CiAgICAgdW5zaWduZWQgdGlsZXcsIHRpbGVoLCB0aWxlYjsKQEAgLTY5MSw3 ICs2OTMsNyBAQCBzdGF0aWMgaW50IGVnX3N1cmZhY2VfaW5pdF8yZChzdHJ1Y3QgcmFkZW9uX3N1 cmZhY2VfbWFuYWdlciAqc3VyZl9tYW4sCiAgICAgICAgIGxldmVsW2ldLm1vZGUgPSBSQURFT05f U1VSRl9NT0RFXzJEOwogICAgICAgICBlZ19zdXJmX21pbmlmeShzdXJmLCBsZXZlbCtpLCBicGUs IGksIHNsaWNlX3B0LCBtdGlsZXcsIG10aWxlaCwgbXRpbGViLCBvZmZzZXQpOwogICAgICAgICBp ZiAobGV2ZWxbaV0ubW9kZSA9PSBSQURFT05fU1VSRl9NT0RFXzFEKSB7Ci0gICAgICAgICAgICBy ZXR1cm4gZWdfc3VyZmFjZV9pbml0XzFkKHN1cmZfbWFuLCBzdXJmLCBsZXZlbCwgYnBlLCBvZmZz ZXQsIGkpOworICAgICAgICAgICAgcmV0dXJuIGVnX3N1cmZhY2VfaW5pdF8xZChzdXJmX21hbiwg c3VyZiwgbGV2ZWwsIGJwZSwgYWxpZ25fbWFnbmlmeSwgb2Zmc2V0LCBpKTsKICAgICAgICAgfQog ICAgICAgICAvKiBsZXZlbDAgYW5kIGZpcnN0IG1pcG1hcCBuZWVkIHRvIGhhdmUgYWxpZ25tZW50 ICovCiAgICAgICAgIG9mZnNldCA9IHN1cmYtPmJvX3NpemU7CkBAIC03OTMsMTYgKzc5NSwyNCBA QCBzdGF0aWMgaW50IGVnX3N1cmZhY2VfaW5pdF8xZF9taXB0cmVlcyhzdHJ1Y3QgcmFkZW9uX3N1 cmZhY2VfbWFuYWdlciAqc3VyZl9tYW4sCiAgICAgLyogT2xkIGxpYmRybV9tYWNyb3MuaGVhZGVy cyBkaWRuJ3QgaGF2ZSBzdGVuY2lsX2xldmVsIGluIGl0LiBUaGlzIHByZXZlbnRzIGNyYXNoZXMu ICovCiAgICAgc3RydWN0IHJhZGVvbl9zdXJmYWNlX2xldmVsIHRtcFtSQURFT05fU1VSRl9NQVhf TEVWRUxdOwogICAgIHN0cnVjdCByYWRlb25fc3VyZmFjZV9sZXZlbCAqc3RlbmNpbF9sZXZlbCA9 Ci0gICAgICAgIChzdXJmLT5mbGFncyAmIFJBREVPTl9TVVJGX0hBU19TQlVGRkVSX01JUFRSRUUp ID8gc3VyZi0+c3RlbmNpbF9sZXZlbCA6IHRtcDsKKyAgICAgICAgICAoc3VyZi0+ZmxhZ3MgJiBS QURFT05fU1VSRl9IQVNfU0JVRkZFUl9NSVBUUkVFKSA/IHN1cmYtPnN0ZW5jaWxfbGV2ZWwgOiB0 bXA7CiAKLSAgICByID0gZWdfc3VyZmFjZV9pbml0XzFkKHN1cmZfbWFuLCBzdXJmLCBzdXJmLT5s ZXZlbCwgc3VyZi0+YnBlLCAwLCAwKTsKKyAgICBpbnQgbWFnbmlmeV9hbGlnbiA9IGlzX2RlcHRo X3N0ZW5jaWwgJiYgKHN1cmYtPm5waXhfeCAmIChzdXJmLT5ucGl4X3ggLSAxKSk7CisKKyAgICAv KiBXaXRoIGNlcnRhaW4gc2l6ZXMgdGhlIGRlcHRoIGFuZCB0aGUgc3RlbmNpbCB0ZXh0dXJlIGVu ZCB1cCBiZWluZyBvZgorICAgICAqIGRpZmZlcmVudCBibG9jayBzaXplcyB3aGljaCBsYXRlciBy ZXN1bHRzIGluIHdyb25nIHJlbmRlcmluZyBmb3IgbnBvdAorICAgICAqIHRleHR1cmVzLiBJbmZs YXRlIHRoZSBhbGlnbm1lbnQgcmVxdWlyZW1lbnQgZm9yIHRoZSBkZXB0aCBzdXJmYWNlIGJ5Cisg ICAgICogaXRzIGJwZSBpbiBvcmRlciB0byBtYWtlIGl0IGFsbG9jYXRlIGEgdGV4dHVyZSB0aGF0 IGlzIG9mIHRoZSBzYW1lCisgICAgICogYmxvY2sgc2l6ZSBsaWtlIHRoZSBzdGVuY2lsIHRleHR1 cmUgKi8KKyAgICByID0gZWdfc3VyZmFjZV9pbml0XzFkKHN1cmZfbWFuLCBzdXJmLCBzdXJmLT5s ZXZlbCwgc3VyZi0+YnBlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgbWFnbmlmeV9hbGln biA/IHN1cmYtPmJwZSA6IDEsIDAsIDApOwogICAgIGlmIChyKQogICAgICAgICByZXR1cm4gcjsK IAogICAgIGlmIChpc19kZXB0aF9zdGVuY2lsKSB7Ci0gICAgICAgIHIgPSBlZ19zdXJmYWNlX2lu aXRfMWQoc3VyZl9tYW4sIHN1cmYsIHN0ZW5jaWxfbGV2ZWwsIDEsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgc3VyZi0+Ym9fc2l6ZSwgMCk7Ci0gICAgICAgIHN1cmYtPnN0ZW5jaWxf b2Zmc2V0ID0gc3RlbmNpbF9sZXZlbFswXS5vZmZzZXQ7CisgICAgICAgciA9IGVnX3N1cmZhY2Vf aW5pdF8xZChzdXJmX21hbiwgc3VyZiwgc3RlbmNpbF9sZXZlbCwgMSwgMSwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHN1cmYtPmJvX3NpemUsIDApOworICAgICAgIHN1cmYtPnN0ZW5j aWxfb2Zmc2V0ID0gc3RlbmNpbF9sZXZlbFswXS5vZmZzZXQ7CiAgICAgfQogICAgIHJldHVybiBy OwogfQpAQCAtODE2LDE2ICs4MjYsMjIgQEAgc3RhdGljIGludCBlZ19zdXJmYWNlX2luaXRfMmRf bWlwdHJlZXMoc3RydWN0IHJhZGVvbl9zdXJmYWNlX21hbmFnZXIgKnN1cmZfbWFuLAogICAgIHN0 cnVjdCByYWRlb25fc3VyZmFjZV9sZXZlbCB0bXBbUkFERU9OX1NVUkZfTUFYX0xFVkVMXTsKICAg ICBzdHJ1Y3QgcmFkZW9uX3N1cmZhY2VfbGV2ZWwgKnN0ZW5jaWxfbGV2ZWwgPQogICAgICAgICAo c3VyZi0+ZmxhZ3MgJiBSQURFT05fU1VSRl9IQVNfU0JVRkZFUl9NSVBUUkVFKSA/IHN1cmYtPnN0 ZW5jaWxfbGV2ZWwgOiB0bXA7CisgICAgaW50IG1hZ25pZnlfYWxpZ24gPSBpc19kZXB0aF9zdGVu Y2lsICYmIChzdXJmLT5ucGl4X3ggJiAoc3VyZi0+bnBpeF94IC0gMSkpOwogCisgICAgLyogSW5m bGF0ZSB0aGUgYWxpZ25tZW50IHJlcXVpcmVtZW50IGZvciBucG90IHRleHR1cmVzIHRvIGluc3Vy ZSB0aGF0CisgICAgICogc3RlbmNpbCBhbmQgZGVwdGggdGV4dHVyZSBoYXZlIHRoZSBzYW1lIGJs b2NrIHNpemUuIFVzZSB0aGlzIG9ubHkgaW4KKyAgICAgKiB0aGUgMWQgY29kZSBwYXRoIHRoYXQg dXNlcyB0aGUgbm9uLXNwZWNpZmljIG1pbmlmeS4gKi8KICAgICByID0gZWdfc3VyZmFjZV9pbml0 XzJkKHN1cmZfbWFuLCBzdXJmLCBzdXJmLT5sZXZlbCwgc3VyZi0+YnBlLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgbWFnbmlmeV9hbGlnbiA/IHN1cmYtPmJwZSA6IDEsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzdXJmLT50aWxlX3NwbGl0LCAwLCAwKTsKICAgICBpZiAocikKICAg ICAgICAgcmV0dXJuIHI7CiAKICAgICBpZiAoaXNfZGVwdGhfc3RlbmNpbCkgewotICAgICAgICBy ID0gZWdfc3VyZmFjZV9pbml0XzJkKHN1cmZfbWFuLCBzdXJmLCBzdGVuY2lsX2xldmVsLCAxLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN1cmYtPnN0ZW5jaWxfdGlsZV9zcGxpdCwg c3VyZi0+Ym9fc2l6ZSwgMCk7Ci0gICAgICAgIHN1cmYtPnN0ZW5jaWxfb2Zmc2V0ID0gc3RlbmNp bF9sZXZlbFswXS5vZmZzZXQ7CisgICAgICAgciA9IGVnX3N1cmZhY2VfaW5pdF8yZChzdXJmX21h biwgc3VyZiwgc3RlbmNpbF9sZXZlbCwgMSwgMSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHN1cmYtPnN0ZW5jaWxfdGlsZV9zcGxpdCwgc3VyZi0+Ym9fc2l6ZSwgMCk7CisgICAgICAg c3VyZi0+c3RlbmNpbF9vZmZzZXQgPSBzdGVuY2lsX2xldmVsWzBdLm9mZnNldDsKKwogICAgIH0K ICAgICByZXR1cm4gcjsKIH0KLS0gCjIuMTYuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCg==