From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH 3/3] drm/i915: fix FBC buffer size checks Date: Wed, 30 Sep 2015 17:05:45 -0300 Message-ID: <1443643545-3603-3-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 22C496E8D1 for ; Wed, 30 Sep 2015 13:05:59 -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 QWNjb3JkaW5nIHRvIG15IGV4cGVyaW1lbnRzIChhbmQgbGF0ZXIgY29uZmlybWF0aW9uIGZyb20g dGhlIGhhcmR3YXJlCmRldmVsb3BlcnMpLCB0aGUgbWF4aW11bSBzaXplcyBtZW50aW9uZWQgaW4g dGhlIHNwZWNpZmljYXRpb24gZGVsaW1pdApob3cgZmFyIGluIHRoZSBidWZmZXIgdGhlIGhhcmR3 YXJlIHRyYWNraW5nIGNhbiBnby4gQW5kIHRoZSBoYXJkd2FyZQpjYWxjdWxhdGVzIHRoZSBzaXpl IGJhc2VkIG9uIHRoZSBwbGFuZSBhZGRyZXNzIHdlIHByb3ZpZGUgLSBhbmQgdGhlCnByb3ZpZGVk IHBsYW5lIGFkZHJlc3MgbWlnaHQgbm90IGJlIHRoZSByZWFsIHg6MCx5OjAgcG9pbnQgZHVlIHRv IHRoZQpjb21wdXRlX3BhZ2Vfb2Zmc2V0KCkgZnVuY3Rpb24uCgpPbiBwbGF0Zm9ybXMgdGhhdCBk byB0aGUgeC95IG9mZnNldCBhZGp1c3RtZW50IHRyaWNrIGl0IHdpbGwgYmUgcmVhbGx5CmhhcmQg dG8gcmVwcm9kdWNlIGEgYnVnLCBidXQgb24gdGhlIGN1cnJlbnQgU0tMIHdlIGNhbiByZXByb2R1 Y2UgdGhlCmJ1ZyB3aXRoIGlndC9rbXNfZnJvbnRidWZmZXJfdHJhY2tpbmcvZmJjLWZhcmZyb21m ZW5jZS4gV2l0aCB0aGlzCnBhdGNoLCB3ZSdsbCBnbyBmcm9tICJDUkMgYXNzZXJ0aW9uIGZhaWx1 cmUiIHRvICJGQkMgdW5leHBlY3RlZGx5CmRpc2FibGVkIiwgd2hpY2ggaXMgc3RpbGwgYSBmYWls dXJlIG9uIHRoZSB0ZXN0IHN1aXRlIGJ1dCBpcyBub3QgYQpwZXJjZWl2ZWQgdXNlciBidWcgLSB5 b3Ugd2lsbCBqdXN0IG5vdCBzYXZlIGFzIG11Y2ggcG93ZXIgYXMgeW91IGNvdWxkCmlmIEZCQyBp cyBkaXNhYmxlZC4KCnYyLCByZXdyaXRlIHBhdGNoIGFmdGVyIGNsYXJpZmljYXRpb24gZnJvbSB0 aGUgSGFkd2FyZSBndXlzOgogIC0gUmVuYW1lIGZ1bmN0aW9uIHNvIGl0J3MgY2xlYXIgd2hhdCB0 aGUgY2hlY2sgaXMgZm9yLgogIC0gVXNlIHRoZSBuZXcgaW50ZWxfZmJjX2dldF9wbGFuZV9zb3Vy Y2Vfc2l6ZXMoKSBmdW5jdGlvbiBpbiBvcmRlcgogICAgdG8gZ2V0IHRoZSBwcm9wZXIgc2l6ZXMg YXMgc2VlbiBieSBGQkMuCgpUZXN0Y2FzZTogaWd0L2ttc19mcm9udGJ1ZmZlcl90cmFja2luZy9m YmMtZmFyZnJvbWZlbmNlIChTS0wpClNpZ25lZC1vZmYtYnk6IFBhdWxvIFphbm9uaSA8cGF1bG8u ci56YW5vbmlAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5j IHwgMTkgKysrKysrKysrKysrKystLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE0IGluc2VydGlvbnMo KyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZmJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYwppbmRleCBkNTNmNzNm Li4zMTNlZjkxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYwpAQCAtODA1LDEwICs4MDUsMTYg QEAgc3RhdGljIGJvb2wgcGl4ZWxfZm9ybWF0X2lzX3ZhbGlkKHN0cnVjdCBkcm1fZnJhbWVidWZm ZXIgKmZiKQogCX0KIH0KIAotc3RhdGljIGJvb2wgcGlwZV9zaXplX2lzX3ZhbGlkKHN0cnVjdCBp bnRlbF9jcnRjICpjcnRjKQorLyoKKyAqIEZvciBzb21lIHJlYXNvbiwgdGhlIGhhcmR3YXJlIHRy YWNraW5nIHN0YXJ0cyBsb29raW5nIGF0IHdoYXRldmVyIHdlCisgKiBwcm9ncmFtbWVkIGFzIHRo ZSBkaXNwbGF5IHBsYW5lIGJhc2UgYWRkcmVzcyByZWdpc3Rlci4gSXQgZG9lcyBub3QgbG9vayBh dAorICogdGhlIFggYW5kIFkgb2Zmc2V0IHJlZ2lzdGVycy4gVGhhdCdzIHdoeSB3ZSBsb29rIGF0 IHRoZSBjcnRjLT5hZGp1c3RlZHt4LHl9CisgKiB2YXJpYWJsZXMgaW5zdGVhZCBvZiBqdXN0IGxv b2tpbmcgYXQgdGhlIHBpcGUgc2l6ZS4KKyAqLworc3RhdGljIGJvb2wgaW50ZWxfZmJjX2h3X3Ry YWNraW5nX2NvdmVyc19zY3JlZW4oc3RydWN0IGludGVsX2NydGMgKmNydGMpCiB7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gY3J0Yy0+YmFzZS5kZXYtPmRldl9wcml2YXRl OwotCXVuc2lnbmVkIGludCBtYXhfdywgbWF4X2g7CisJdW5zaWduZWQgaW50IHVzZWRfdywgdXNl ZF9oLCBtYXhfdywgbWF4X2g7CiAKIAlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA+PSA4 IHx8IElTX0hBU1dFTEwoZGV2X3ByaXYpKSB7CiAJCW1heF93ID0gNDA5NjsKQEAgLTgyMSw4ICs4 MjcsMTEgQEAgc3RhdGljIGJvb2wgcGlwZV9zaXplX2lzX3ZhbGlkKHN0cnVjdCBpbnRlbF9jcnRj ICpjcnRjKQogCQltYXhfaCA9IDE1MzY7CiAJfQogCi0JcmV0dXJuIGNydGMtPmNvbmZpZy0+cGlw ZV9zcmNfdyA8PSBtYXhfdyAmJgotCSAgICAgICBjcnRjLT5jb25maWctPnBpcGVfc3JjX2ggPD0g bWF4X2g7CisJaW50ZWxfZmJjX2dldF9wbGFuZV9zb3VyY2Vfc2l6ZXMoY3J0YywgJnVzZWRfdywg JnVzZWRfaCk7CisJdXNlZF93ICs9IGNydGMtPmFkanVzdGVkX3g7CisJdXNlZF9oICs9IGNydGMt PmFkanVzdGVkX3k7CisKKwlyZXR1cm4gdXNlZF93IDw9IG1heF93ICYmIHVzZWRfaCA8PSBtYXhf aDsKIH0KIAogLyoqCkBAIC04OTksNyArOTA4LDcgQEAgc3RhdGljIHZvaWQgX19pbnRlbF9mYmNf dXBkYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJZ290byBvdXRfZGlz YWJsZTsKIAl9CiAKLQlpZiAoIXBpcGVfc2l6ZV9pc192YWxpZChpbnRlbF9jcnRjKSkgeworCWlm ICghaW50ZWxfZmJjX2h3X3RyYWNraW5nX2NvdmVyc19zY3JlZW4oaW50ZWxfY3J0YykpIHsKIAkJ c2V0X25vX2ZiY19yZWFzb24oZGV2X3ByaXYsIEZCQ19NT0RFX1RPT19MQVJHRSk7CiAJCWdvdG8g b3V0X2Rpc2FibGU7CiAJfQotLSAKMi41LjMKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==