From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Subject: [PATCH 1/2] radeon: fix mipmap level 0 and 1 alignment for SI and CIK Date: Fri, 15 Nov 2013 18:55:26 +0100 Message-ID: <1384538127-11532-1-git-send-email-maraeo@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ea0-f169.google.com (mail-ea0-f169.google.com [209.85.215.169]) by gabe.freedesktop.org (Postfix) with ESMTP id 01929FB961 for ; Fri, 15 Nov 2013 09:55:33 -0800 (PST) Received: by mail-ea0-f169.google.com with SMTP id l9so1177147eaj.28 for ; Fri, 15 Nov 2013 09:55:33 -0800 (PST) Received: from peklo.amd.com ([194.228.11.93]) by mx.google.com with ESMTPSA id g8sm8441602eep.20.2013.11.15.09.55.32 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Nov 2013 09:55:32 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+CgpTaWduZWQtb2Zm LWJ5OiBNYXJlayBPbMWhw6FrIDxtYXJlay5vbHNha0BhbWQuY29tPgotLS0KIHJhZGVvbi9yYWRl b25fc3VyZmFjZS5jIHwgMjcgKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvcmFk ZW9uL3JhZGVvbl9zdXJmYWNlLmMgYi9yYWRlb24vcmFkZW9uX3N1cmZhY2UuYwppbmRleCBkNWM0 NWM0Li41NmUyZTRhIDEwMDY0NAotLS0gYS9yYWRlb24vcmFkZW9uX3N1cmZhY2UuYworKysgYi9y YWRlb24vcmFkZW9uX3N1cmZhY2UuYwpAQCAtMTU0MCw2ICsxNTQwLDcgQEAgc3RhdGljIGludCBz aV9zdXJmYWNlX2luaXRfMWQoc3RydWN0IHJhZGVvbl9zdXJmYWNlX21hbmFnZXIgKnN1cmZfbWFu LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludDY0X3Qgb2Zmc2V0LCB1bnNpZ25l ZCBzdGFydF9sZXZlbCkKIHsKICAgICB1aW50MzJfdCB4YWxpZ24sIHlhbGlnbiwgemFsaWduLCBz bGljZV9hbGlnbjsKKyAgICB1bnNpZ25lZCBhbGlnbm1lbnQgPSBNQVgyKDI1Niwgc3VyZl9tYW4t Pmh3X2luZm8uZ3JvdXBfYnl0ZXMpOwogICAgIHVuc2lnbmVkIGk7CiAKICAgICAvKiBjb21wdXRl IGFsaWdubWVudCAqLwpAQCAtMTU1MSwxMSArMTU1MiwxMSBAQCBzdGF0aWMgaW50IHNpX3N1cmZh Y2VfaW5pdF8xZChzdHJ1Y3QgcmFkZW9uX3N1cmZhY2VfbWFuYWdlciAqc3VyZl9tYW4sCiAgICAg ICAgIHhhbGlnbiA9IE1BWDIoKGJwZSA9PSAxKSA/IDY0IDogMzIsIHhhbGlnbik7CiAgICAgfQog Ci0gICAgaWYgKCFzdGFydF9sZXZlbCkgewotICAgICAgICBzdXJmLT5ib19hbGlnbm1lbnQgPSBN QVgyKDI1Niwgc3VyZl9tYW4tPmh3X2luZm8uZ3JvdXBfYnl0ZXMpOworICAgIGlmIChzdGFydF9s ZXZlbCA8PSAxKSB7CisgICAgICAgIHN1cmYtPmJvX2FsaWdubWVudCA9IE1BWDIoc3VyZi0+Ym9f YWxpZ25tZW50LCBhbGlnbm1lbnQpOwogCiAgICAgICAgIGlmIChvZmZzZXQpIHsKLSAgICAgICAg ICAgIG9mZnNldCA9IEFMSUdOKG9mZnNldCwgc3VyZi0+Ym9fYWxpZ25tZW50KTsKKyAgICAgICAg ICAgIG9mZnNldCA9IEFMSUdOKG9mZnNldCwgYWxpZ25tZW50KTsKICAgICAgICAgfQogICAgIH0K IApAQCAtMTU2Niw3ICsxNTY3LDcgQEAgc3RhdGljIGludCBzaV9zdXJmYWNlX2luaXRfMWQoc3Ry dWN0IHJhZGVvbl9zdXJmYWNlX21hbmFnZXIgKnN1cmZfbWFuLAogICAgICAgICAvKiBsZXZlbDAg YW5kIGZpcnN0IG1pcG1hcCBuZWVkIHRvIGhhdmUgYWxpZ25tZW50ICovCiAgICAgICAgIG9mZnNl dCA9IHN1cmYtPmJvX3NpemU7CiAgICAgICAgIGlmICgoaSA9PSAwKSkgewotICAgICAgICAgICAg b2Zmc2V0ID0gQUxJR04ob2Zmc2V0LCBzdXJmLT5ib19hbGlnbm1lbnQpOworICAgICAgICAgICAg b2Zmc2V0ID0gQUxJR04ob2Zmc2V0LCBhbGlnbm1lbnQpOwogICAgICAgICB9CiAgICAgICAgIGlm IChzdXJmLT5mbGFncyAmIFJBREVPTl9TVVJGX0hBU19USUxFX01PREVfSU5ERVgpIHsKICAgICAg ICAgICAgIGlmIChzdXJmLT5sZXZlbCA9PSBsZXZlbCkgewpAQCAtMTYwOCw2ICsxNjA5LDcgQEAg c3RhdGljIGludCBzaV9zdXJmYWNlX2luaXRfMmQoc3RydWN0IHJhZGVvbl9zdXJmYWNlX21hbmFn ZXIgKnN1cmZfbWFuLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludDY0X3Qgb2Zm c2V0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgc3RhcnRfbGV2ZWwp CiB7CisgICAgdWludDY0X3QgYWxpZ25lZF9vZmZzZXQgPSBvZmZzZXQ7CiAgICAgdW5zaWduZWQg dGlsZXcsIHRpbGVoLCB0aWxlYjsKICAgICB1bnNpZ25lZCBtdGlsZXcsIG10aWxlaCwgbXRpbGVi OwogICAgIHVuc2lnbmVkIHNsaWNlX3B0OwpAQCAtMTYzMSwxOSArMTYzMywxOSBAQCBzdGF0aWMg aW50IHNpX3N1cmZhY2VfaW5pdF8yZChzdHJ1Y3QgcmFkZW9uX3N1cmZhY2VfbWFuYWdlciAqc3Vy Zl9tYW4sCiAgICAgLyogbWFjcm8gdGlsZSBieXRlcyAqLwogICAgIG10aWxlYiA9IChtdGlsZXcg LyB0aWxldykgKiAobXRpbGVoIC8gdGlsZWgpICogdGlsZWI7CiAKLSAgICBpZiAoIXN0YXJ0X2xl dmVsKSB7CisgICAgaWYgKHN0YXJ0X2xldmVsIDw9IDEpIHsKICAgICAgICAgdW5zaWduZWQgYWxp Z25tZW50ID0gTUFYMigyNTYsIG10aWxlYik7CiAgICAgICAgIHN1cmYtPmJvX2FsaWdubWVudCA9 IE1BWDIoc3VyZi0+Ym9fYWxpZ25tZW50LCBhbGlnbm1lbnQpOwogCi0gICAgICAgIGlmIChvZmZz ZXQpIHsKLSAgICAgICAgICAgIG9mZnNldCA9IEFMSUdOKG9mZnNldCwgYWxpZ25tZW50KTsKKyAg ICAgICAgaWYgKGFsaWduZWRfb2Zmc2V0KSB7CisgICAgICAgICAgICBhbGlnbmVkX29mZnNldCA9 IEFMSUdOKGFsaWduZWRfb2Zmc2V0LCBhbGlnbm1lbnQpOwogICAgICAgICB9CiAgICAgfQogCiAg ICAgLyogYnVpbGQgbWlwbWFwIHRyZWUgKi8KICAgICBmb3IgKGkgPSBzdGFydF9sZXZlbDsgaSA8 PSBzdXJmLT5sYXN0X2xldmVsOyBpKyspIHsKICAgICAgICAgbGV2ZWxbaV0ubW9kZSA9IFJBREVP Tl9TVVJGX01PREVfMkQ7Ci0gICAgICAgIHNpX3N1cmZfbWluaWZ5XzJkKHN1cmYsIGxldmVsK2ks IGJwZSwgaSwgc2xpY2VfcHQsIG10aWxldywgbXRpbGVoLCAxLCBtdGlsZWIsIG9mZnNldCk7Cisg ICAgICAgIHNpX3N1cmZfbWluaWZ5XzJkKHN1cmYsIGxldmVsK2ksIGJwZSwgaSwgc2xpY2VfcHQs IG10aWxldywgbXRpbGVoLCAxLCBtdGlsZWIsIGFsaWduZWRfb2Zmc2V0KTsKICAgICAgICAgaWYg KGxldmVsW2ldLm1vZGUgPT0gUkFERU9OX1NVUkZfTU9ERV8xRCkgewogICAgICAgICAgICAgc3dp dGNoICh0aWxlX21vZGUpIHsKICAgICAgICAgICAgIGNhc2UgU0lfVElMRV9NT0RFX0NPTE9SXzJE XzhCUFA6CkBAIC0xNjU3LDEwICsxNjU5LDcgQEAgc3RhdGljIGludCBzaV9zdXJmYWNlX2luaXRf MmQoc3RydWN0IHJhZGVvbl9zdXJmYWNlX21hbmFnZXIgKnN1cmZfbWFuLAogICAgICAgICAgICAg ICAgIHRpbGVfbW9kZSA9IFNJX1RJTEVfTU9ERV9DT0xPUl8xRF9TQ0FOT1VUOwogICAgICAgICAg ICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBTSV9USUxFX01PREVfREVQVEhfU1RFTkNJ TF8yRDoKLSAgICAgICAgICAgICAgICBpZiAoc3VyZl9tYW4tPmZhbWlseSA+PSBDSElQX0JPTkFJ UkUpCi0gICAgICAgICAgICAgICAgICAgIHRpbGVfbW9kZSA9IENJS19USUxFX01PREVfREVQVEhf U1RFTkNJTF8xRDsKLSAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgIHRp bGVfbW9kZSA9IFNJX1RJTEVfTU9ERV9ERVBUSF9TVEVOQ0lMXzFEOworICAgICAgICAgICAgICAg IHRpbGVfbW9kZSA9IFNJX1RJTEVfTU9ERV9ERVBUSF9TVEVOQ0lMXzFEOwogICAgICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgICAgICByZXR1cm4g LUVJTlZBTDsKQEAgLTE2NjgsOSArMTY2Nyw5IEBAIHN0YXRpYyBpbnQgc2lfc3VyZmFjZV9pbml0 XzJkKHN0cnVjdCByYWRlb25fc3VyZmFjZV9tYW5hZ2VyICpzdXJmX21hbiwKICAgICAgICAgICAg IHJldHVybiBzaV9zdXJmYWNlX2luaXRfMWQoc3VyZl9tYW4sIHN1cmYsIGxldmVsLCBicGUsIHRp bGVfbW9kZSwgb2Zmc2V0LCBpKTsKICAgICAgICAgfQogICAgICAgICAvKiBsZXZlbDAgYW5kIGZp cnN0IG1pcG1hcCBuZWVkIHRvIGhhdmUgYWxpZ25tZW50ICovCi0gICAgICAgIG9mZnNldCA9IHN1 cmYtPmJvX3NpemU7CisgICAgICAgIGFsaWduZWRfb2Zmc2V0ID0gc3VyZi0+Ym9fc2l6ZTsKICAg ICAgICAgaWYgKChpID09IDApKSB7Ci0gICAgICAgICAgICBvZmZzZXQgPSBBTElHTihvZmZzZXQs IHN1cmYtPmJvX2FsaWdubWVudCk7CisgICAgICAgICAgICBhbGlnbmVkX29mZnNldCA9IEFMSUdO KGFsaWduZWRfb2Zmc2V0LCBzdXJmLT5ib19hbGlnbm1lbnQpOwogICAgICAgICB9CiAgICAgICAg IGlmIChzdXJmLT5mbGFncyAmIFJBREVPTl9TVVJGX0hBU19USUxFX01PREVfSU5ERVgpIHsKICAg ICAgICAgICAgIGlmIChzdXJmLT5sZXZlbCA9PSBsZXZlbCkgewotLSAKMS44LjMuMgoKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxp bmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK