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: Thu, 1 Oct 2015 19:57:12 -0300 Message-ID: <1443740232-3918-1-git-send-email-paulo.r.zanoni@intel.com> References: <1443722639.2442.22.camel@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C8866ED50 for ; Thu, 1 Oct 2015 15:57:23 -0700 (PDT) In-Reply-To: <1443722639.2442.22.camel@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 YXMgc2VlbiBieSBGQkMuCnYzOgogIC0gUmViYXNlIGFmdGVyIHRoZSBzL3NpemVzL3NpemUvIG9u IHRoZSBwcmV2aW91cyBwYXRjaC4KICAtIEFkanVzdCBjb21tZW50IHdvcmRpbmcgKFZpbGxlKS4K ICAtIHMvdXNlZF8vZWZmZWN0aXZlXy8gKFZpbGxlKS4KClRlc3RjYXNlOiBpZ3Qva21zX2Zyb250 YnVmZmVyX3RyYWNraW5nL2ZiYy1mYXJmcm9tZmVuY2UgKFNLTCkKUmV2aWV3ZWQtYnk6IFZpbGxl IFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6 IFBhdWxvIFphbm9uaSA8cGF1bG8uci56YW5vbmlAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2ZiYy5jIHwgMTkgKysrKysrKysrKysrKystLS0tLQogMSBmaWxlIGNo YW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9mYmMuYwppbmRleCAxOGUyMjhiLi5jZjQ3MzUyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9mYmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMu YwpAQCAtNzk5LDEwICs3OTksMTYgQEAgc3RhdGljIGJvb2wgcGl4ZWxfZm9ybWF0X2lzX3ZhbGlk KHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiKQogCX0KIH0KIAotc3RhdGljIGJvb2wgcGlwZV9z aXplX2lzX3ZhbGlkKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQorLyoKKyAqIEZvciBzb21lIHJl YXNvbiwgdGhlIGhhcmR3YXJlIHRyYWNraW5nIHN0YXJ0cyBsb29raW5nIGF0IHdoYXRldmVyIHdl CisgKiBwcm9ncmFtbWVkIGFzIHRoZSBkaXNwbGF5IHBsYW5lIGJhc2UgYWRkcmVzcyByZWdpc3Rl ci4gSXQgZG9lcyBub3QgbG9vayBhdAorICogdGhlIFggYW5kIFkgb2Zmc2V0IHJlZ2lzdGVycy4g VGhhdCdzIHdoeSB3ZSBsb29rIGF0IHRoZSBjcnRjLT5hZGp1c3RlZHt4LHl9CisgKiB2YXJpYWJs ZXMgaW5zdGVhZCBvZiBqdXN0IGxvb2tpbmcgYXQgdGhlIHBpcGUvcGxhbmUgc2l6ZS4KKyAqLwor c3RhdGljIGJvb2wgaW50ZWxfZmJjX2h3X3RyYWNraW5nX2NvdmVyc19zY3JlZW4oc3RydWN0IGlu dGVsX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g Y3J0Yy0+YmFzZS5kZXYtPmRldl9wcml2YXRlOwotCXVuc2lnbmVkIGludCBtYXhfdywgbWF4X2g7 CisJdW5zaWduZWQgaW50IGVmZmVjdGl2ZV93LCBlZmZlY3RpdmVfaCwgbWF4X3csIG1heF9oOwog CiAJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPj0gOCB8fCBJU19IQVNXRUxMKGRldl9w cml2KSkgewogCQltYXhfdyA9IDQwOTY7CkBAIC04MTUsOCArODIxLDExIEBAIHN0YXRpYyBib29s IHBpcGVfc2l6ZV9pc192YWxpZChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJbWF4X2ggPSAx NTM2OwogCX0KIAotCXJldHVybiBjcnRjLT5jb25maWctPnBpcGVfc3JjX3cgPD0gbWF4X3cgJiYK LQkgICAgICAgY3J0Yy0+Y29uZmlnLT5waXBlX3NyY19oIDw9IG1heF9oOworCWludGVsX2ZiY19n ZXRfcGxhbmVfc291cmNlX3NpemUoY3J0YywgJmVmZmVjdGl2ZV93LCAmZWZmZWN0aXZlX2gpOwor CWVmZmVjdGl2ZV93ICs9IGNydGMtPmFkanVzdGVkX3g7CisJZWZmZWN0aXZlX2ggKz0gY3J0Yy0+ YWRqdXN0ZWRfeTsKKworCXJldHVybiBlZmZlY3RpdmVfdyA8PSBtYXhfdyAmJiBlZmZlY3RpdmVf aCA8PSBtYXhfaDsKIH0KIAogLyoqCkBAIC04OTMsNyArOTAyLDcgQEAgc3RhdGljIHZvaWQgX19p bnRlbF9mYmNfdXBkYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJZ290 byBvdXRfZGlzYWJsZTsKIAl9CiAKLQlpZiAoIXBpcGVfc2l6ZV9pc192YWxpZChpbnRlbF9jcnRj KSkgeworCWlmICghaW50ZWxfZmJjX2h3X3RyYWNraW5nX2NvdmVyc19zY3JlZW4oaW50ZWxfY3J0 YykpIHsKIAkJc2V0X25vX2ZiY19yZWFzb24oZGV2X3ByaXYsIEZCQ19NT0RFX1RPT19MQVJHRSk7 CiAJCWdvdG8gb3V0X2Rpc2FibGU7CiAJfQotLSAKMi41LjMKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==