From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH 2/3] drm/i915: fix CFB size calculation Date: Wed, 30 Sep 2015 17:05:44 -0300 Message-ID: <1443643545-3603-2-git-send-email-paulo.r.zanoni@intel.com> References: <1443023547-19896-1-git-send-email-paulo.r.zanoni@intel.com> <1443643545-3603-1-git-send-email-paulo.r.zanoni@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id A94B66E8D1 for ; Wed, 30 Sep 2015 13:05:57 -0700 (PDT) In-Reply-To: <1443643545-3603-1-git-send-email-paulo.r.zanoni@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org V2Ugd2VyZSBjb25zaWRlcmluZyB0aGUgd2hvbGUgZnJhbWVidWZmZXIgaGVpZ2h0LCBidXQgdGhl IHNwZWMgc2F5cyB3ZQpzaG91bGQgb25seSBjb25zaWRlciB0aGUgYWN0aXZlIGRpc3BsYXkgaGVp Z2h0IHNpemUuIFRoZXJlIHdlcmUgc3RpbGwKc29tZSB1bmNsZWFyIHF1ZXN0aW9ucyBiYXNlZCBv biB0aGUgc3BlYywgYnV0IHRoZSBoYXJkd2FyZSBndXlzCmNsYXJpZmllZCB0aGVtIGZvciB1cy4g QWNjb3JkaW5nIHRvIHRoZW06CgotIENGQiBzaXplID0gQ0ZCIHN0cmlkZSAqIE51bWJlciBvZiBs aW5lcyBGQkMgd3JpdGVzIHRvIENGQgotIENGQiBzdHJpZGUgPSBwbGFuZSBzdHJpZGUgLyBjb21w cmVzc2lvbiBsaW1pdAotIE51bWJlciBvZiBsaW5lcyBGQkMgd3JpdGVzIHRvIENGQiA9IE1JTihw bGFuZSBzb3VyY2UgaGVpZ2h0LCBtYXhpbXVtCiAgbnVtYmVyIG9mIGxpbmVzIEZCQyB3cml0ZXMg dG8gQ0ZCKQotIFBsYW5lIHNvdXJjZSBoZWlnaHQgPQogIC0gcGlwZSBzb3VyY2UgaGVpZ2h0IChQ SVBFX1NSQ1NaIHJlZ2lzdGVyKSAoYmVmb3JlIFNLTCkKICAtIHBsYW5lIHNpemUgcmVnaXN0ZXIg aGVpZ2h0IChQTEFORV9TSVpFIHJlZ2lzdGVyKSAoU0tMKykKLSBNYXhpbXVtIG51bWJlciBvZiBs aW5lcyBGQkMgd3JpdGVzIHRvIENGQiA9CiAgLSBwbGFuZSBzb3VyY2UgaGVpZ2h0IChiZWZvcmUg SFNXKQogIC0gMjA0OCAoSFNXKykKCkZvciB0aGUgcGxhbmUgc291cmNlIGhlaWdodCwgSSBjb3Vs ZCBqdXN0IGhhdmUgbWFkZSBvdXIgY29kZSBkbwpJOTE1X1JFQUQoKSBpbiBvcmRlciB0byBiZSBt b3JlIGZ1dHVyZSBwcm9vZiwgYnV0IHNpbmNlIGl0J3Mgbm90IGNvb2wKdG8gZG8gcmVnaXN0ZXIg cmVhZHMgSSBkZWNpZGVkIHRvIGp1c3QgcmVjYWxjdWxhdGUgdGhlIHZhbHVlcyB3ZSB1c2UKd2hl biB3ZSBhY3R1YWxseSB3cml0ZSB0byB0aG9zZSByZWdpc3RlcnMuCgpXaXRoIHRoaXMgcGF0Y2gs IGRlcGVuZGluZyBvbiB5b3VyIG1hY2hpbmUgY29uZmlndXJhdGlvbiwgYSBsb3Qgb2YgdGhlCmtt c19mcm9udGJ1ZmZlcl90cmFja2luZyBzdWJ0ZXN0cyB0aGF0IHVzZWQgdG8gcmVzdWx0IGluIGEg U0tJUCBkdWUgdG8Kbm90IGVub3VnaCBzdG9sZW4gbWVtb3J5IHN0aWxsIHN0YXJ0IHJlc3VsdGlu ZyBpbiBhIFBBU1MuCgp2MjogVXNlIHRoZSBjbGlwcGVkIHNyYyBzaXplIGluc3RlYWQgb2YgcGlw ZV9zcmNfaCAoVmlsbGUpLgp2MzogVXNlIHRoZSBhcHByb3ByaWF0ZSBpbmZvcm1hdGlvbiBwcm92 aWRlZCBieSB0aGUgaGFyZHdhcmUgZ3V5cy4KCkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5 cmphbGFAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBQYXVsbyBaYW5vbmkgPHBhdWxv LnIuemFub25pQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMu YyB8IDU4ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0KIDEgZmlsZSBj aGFuZ2VkLCA1NCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZmJjLmMKaW5kZXggMWIyZWJiMi4uZDUzZjczZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZmJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJj LmMKQEAgLTY5OCw5ICs2OTgsNjAgQEAgdm9pZCBpbnRlbF9mYmNfY2xlYW51cF9jZmIoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPmZi Yy5sb2NrKTsKIH0KIAotc3RhdGljIGludCBpbnRlbF9mYmNfc2V0dXBfY2ZiKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwgaW50IHNpemUsCi0JCQkgICAgICAgaW50IGZiX2NwcCkK Ky8qCisgKiBGb3IgU0tMKywgdGhlIHBsYW5lIHNvdXJjZSBzaXplIHVzZWQgYnkgdGhlIGhhcmR3 YXJlIGlzIGJhc2VkIG9uIHRoZSB2YWx1ZSB3ZQorICogd3JpdGUgdG8gdGhlIFBJUEVfU0laRSBy ZWdpc3Rlci4gRm9yIEJEVy0sIHRoZSBoYXJkd2FyZSBsb29rcyBhdCB0aGUgdmFsdWUgd2UKKyAq IHdyb3RlIHRvIFBJUEVTUkMuCisgKi8KK3N0YXRpYyB2b2lkIGludGVsX2ZiY19nZXRfcGxhbmVf c291cmNlX3NpemVzKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAorCQkJCQkgICAgIGludCAqd2lk dGgsIGludCAqaGVpZ2h0KQogeworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IGNydGMtPmJhc2UuZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUg KnBsYW5lX3N0YXRlID0KKwkJCXRvX2ludGVsX3BsYW5lX3N0YXRlKGNydGMtPmJhc2UucHJpbWFy eS0+c3RhdGUpOworCWludCB3LCBoOworCisJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4g Pj0gOSkgeworCQlpZiAoaW50ZWxfcm90YXRpb25fOTBfb3JfMjcwKHBsYW5lX3N0YXRlLT5iYXNl LnJvdGF0aW9uKSkgeworCQkJdyA9IGRybV9yZWN0X2hlaWdodCgmcGxhbmVfc3RhdGUtPnNyYykg Pj4gMTY7CisJCQloID0gZHJtX3JlY3Rfd2lkdGgoJnBsYW5lX3N0YXRlLT5zcmMpID4+IDE2Owor CQl9IGVsc2UgeworCQkJdyA9IGRybV9yZWN0X3dpZHRoKCZwbGFuZV9zdGF0ZS0+c3JjKSA+PiAx NjsKKwkJCWggPSBkcm1fcmVjdF9oZWlnaHQoJnBsYW5lX3N0YXRlLT5zcmMpID4+IDE2OworCQl9 CisJfSBlbHNlIHsKKwkJdyA9IGNydGMtPmNvbmZpZy0+cGlwZV9zcmNfdzsKKwkJaCA9IGNydGMt PmNvbmZpZy0+cGlwZV9zcmNfaDsKKwl9CisKKwlpZiAod2lkdGgpCisJCSp3aWR0aCA9IHc7CisJ aWYgKGhlaWdodCkKKwkJKmhlaWdodCA9IGg7Cit9CisKK3N0YXRpYyBpbnQgaW50ZWxfZmJjX2Nh bGN1bGF0ZV9jZmJfc2l6ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKK3sKKwlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBjcnRjLT5iYXNlLmRldi0+ZGV2X3ByaXZhdGU7CisJ c3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBjcnRjLT5iYXNlLnByaW1hcnktPmZiOworCWlu dCBsaW5lczsKKworCWludGVsX2ZiY19nZXRfcGxhbmVfc291cmNlX3NpemVzKGNydGMsIE5VTEws ICZsaW5lcyk7CisJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPj0gNykKKwkJbGluZXMg PSBtaW4obGluZXMsIDIwNDgpOworCisJcmV0dXJuIGxpbmVzICogZmItPnBpdGNoZXNbMF07Cit9 CisKK3N0YXRpYyBpbnQgaW50ZWxfZmJjX3NldHVwX2NmYihzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0 YykKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBjcnRjLT5iYXNlLmRl di0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBjcnRjLT5iYXNl LnByaW1hcnktPmZiOworCWludCBzaXplLCBmYl9jcHA7CisKKwlzaXplID0gaW50ZWxfZmJjX2Nh bGN1bGF0ZV9jZmJfc2l6ZShjcnRjKTsKKwlmYl9jcHAgPSBkcm1fZm9ybWF0X3BsYW5lX2NwcChm Yi0+cGl4ZWxfZm9ybWF0LCAwKTsKKwogCWlmIChzaXplIDw9IGRldl9wcml2LT5mYmMudW5jb21w cmVzc2VkX3NpemUpCiAJCXJldHVybiAwOwogCkBAIC04OTcsOCArOTQ4LDcgQEAgc3RhdGljIHZv aWQgX19pbnRlbF9mYmNfdXBkYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IAkJZ290byBvdXRfZGlzYWJsZTsKIAl9CiAKLQlpZiAoaW50ZWxfZmJjX3NldHVwX2NmYihkZXZf cHJpdiwgb2JqLT5iYXNlLnNpemUsCi0JCQkJZHJtX2Zvcm1hdF9wbGFuZV9jcHAoZmItPnBpeGVs X2Zvcm1hdCwgMCkpKSB7CisJaWYgKGludGVsX2ZiY19zZXR1cF9jZmIoaW50ZWxfY3J0YykpIHsK IAkJc2V0X25vX2ZiY19yZWFzb24oZGV2X3ByaXYsIEZCQ19TVE9MRU5fVE9PX1NNQUxMKTsKIAkJ Z290byBvdXRfZGlzYWJsZTsKIAl9Ci0tIAoyLjUuMwoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK