From: Jani Nikula Subject: [PATCH] drm/i915/fbc: fix the check for already reserved fbc size Date: Thu, 5 Feb 2015 12:04:27 +0200 Message-ID: <1423130667-7065-1-git-send-email-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 158006E79C for ; Thu, 5 Feb 2015 02:03:26 -0800 (PST) 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 Cc: jani.nikula@intel.com, Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org VGhlIGNoZWNrIGZvciBwcmV2aW91c2x5IHJlc2VydmVkIHN0b2xlbiBzcGFjZSBzaXplIGZvciBG QkMgaW4KaTkxNV9nZW1fc3RvbGVuX3NldHVwX2NvbXByZXNzaW9uKCkgZGlkIG5vdCB0YWtlIHRo ZSBjb21wcmVzc2lvbgp0aHJlc2hvbGQgaW50byBhY2NvdW50LiBGaXggdGhpcyBieSBzdG9yaW5n IGFuZCBjb21wYXJpbmcgdG8KdW5jb21wcmVzc2VkIHNpemUgaW5zdGVhZC4KClRoZSBidWcgaGFz IGJlZW4gaW50cm9kdWNlZCBpbgoKY29tbWl0IDVlNTlmNzE3NWY5NjU1MGVkZTkxZjU4ZDI2N2Qy YjU1MWNiNmZiYmEKQXV0aG9yOiBCZW4gV2lkYXdza3kgPGJlbmphbWluLndpZGF3c2t5QGludGVs LmNvbT4KRGF0ZTogICBNb24gSnVuIDMwIDEwOjQxOjI0IDIwMTQgLTA3MDAKCiAgICBkcm0vaTkx NTogVHJ5IGhhcmRlciB0byBnZXQgRkJDCgpCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNr dG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg5NzUKU3VnZ2VzdGVkLWJ5OiBDaHJpcyBXaWxzb24g PGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IEJlbiBXaWRhd3NreSA8YmVuamFtaW4ud2lk YXdza3lAaW50ZWwuY29tPgpDYzogc3RhYmxlQHZnZXIua2VybmVsLm9yZyAjIDMuMTcrClNpZ25l ZC1vZmYtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9zdG9sZW4uYyB8IDggKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2ZiYy5jICAgICAgIHwgMyArKy0KIDMgZmlsZXMgY2hhbmdlZCwgNyBpbnNlcnRpb25z KCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGNhNjRiOTk5 NDAzZi4uOTdjZTUwYTE3NmE3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTc3Miw3ICs3 NzIsNyBAQCBzdHJ1Y3QgaW50ZWxfY29udGV4dCB7CiB9OwogCiBzdHJ1Y3QgaTkxNV9mYmMgewot CXVuc2lnbmVkIGxvbmcgc2l6ZTsKKwl1bnNpZ25lZCBsb25nIHVuY29tcHJlc3NlZF9zaXplOwog CXVuc2lnbmVkIHRocmVzaG9sZDsKIAl1bnNpZ25lZCBpbnQgZmJfaWQ7CiAJZW51bSBwbGFuZSBw bGFuZTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc3RvbGVuLmMKaW5kZXggYTIwNDU4NDhi ZDFhLi41OTQwMWYzYjkwMmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX3N0b2xlbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5j CkBAIC0yMzEsNyArMjMxLDcgQEAgc3RhdGljIGludCBpOTE1X3NldHVwX2NvbXByZXNzaW9uKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBzaXplLCBpbnQgZmJfY3BwKQogCQkJICAgZGV2X3By aXYtPm1tLnN0b2xlbl9iYXNlICsgY29tcHJlc3NlZF9sbGItPnN0YXJ0KTsKIAl9CiAKLQlkZXZf cHJpdi0+ZmJjLnNpemUgPSBzaXplIC8gZGV2X3ByaXYtPmZiYy50aHJlc2hvbGQ7CisJZGV2X3By aXYtPmZiYy51bmNvbXByZXNzZWRfc2l6ZSA9IHNpemU7CiAKIAlEUk1fREVCVUdfS01TKCJyZXNl cnZlZCAlZCBieXRlcyBvZiBjb250aWd1b3VzIHN0b2xlbiBzcGFjZSBmb3IgRkJDXG4iLAogCQkg ICAgICBzaXplKTsKQEAgLTI1Myw3ICsyNTMsNyBAQCBpbnQgaTkxNV9nZW1fc3RvbGVuX3NldHVw X2NvbXByZXNzaW9uKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBzaXplLCBpbnQgZmJfYwog CWlmICghZHJtX21tX2luaXRpYWxpemVkKCZkZXZfcHJpdi0+bW0uc3RvbGVuKSkKIAkJcmV0dXJu IC1FTk9ERVY7CiAKLQlpZiAoc2l6ZSA8IGRldl9wcml2LT5mYmMuc2l6ZSkKKwlpZiAoc2l6ZSA8 IGRldl9wcml2LT5mYmMudW5jb21wcmVzc2VkX3NpemUpCiAJCXJldHVybiAwOwogCiAJLyogUmVs ZWFzZSBhbnkgY3VycmVudCBibG9jayAqLwpAQCAtMjY2LDcgKzI2Niw3IEBAIHZvaWQgaTkxNV9n ZW1fc3RvbGVuX2NsZWFudXBfY29tcHJlc3Npb24oc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsK IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwog Ci0JaWYgKGRldl9wcml2LT5mYmMuc2l6ZSA9PSAwKQorCWlmIChkZXZfcHJpdi0+ZmJjLnVuY29t cHJlc3NlZF9zaXplID09IDApCiAJCXJldHVybjsKIAogCWRybV9tbV9yZW1vdmVfbm9kZSgmZGV2 X3ByaXYtPmZiYy5jb21wcmVzc2VkX2ZiKTsKQEAgLTI3Niw3ICsyNzYsNyBAQCB2b2lkIGk5MTVf Z2VtX3N0b2xlbl9jbGVhbnVwX2NvbXByZXNzaW9uKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJ CWtmcmVlKGRldl9wcml2LT5mYmMuY29tcHJlc3NlZF9sbGIpOwogCX0KIAotCWRldl9wcml2LT5m YmMuc2l6ZSA9IDA7CisJZGV2X3ByaXYtPmZiYy51bmNvbXByZXNzZWRfc2l6ZSA9IDA7CiB9CiAK IHZvaWQgaTkxNV9nZW1fY2xlYW51cF9zdG9sZW4oc3RydWN0IGRybV9kZXZpY2UgKmRldikKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZmJjLmMKaW5kZXggNjI0ZDFkOTJkMjg0Li5iNTcyYmI2ZWJjZmYgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jCkBAIC03OCw3ICs3OCw4IEBAIHN0YXRpYyB2b2lkIGk4 eHhfZmJjX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAKIAlkZXZfcHJpdi0+ZmJjLmVu YWJsZWQgPSB0cnVlOwogCi0JY2ZiX3BpdGNoID0gZGV2X3ByaXYtPmZiYy5zaXplIC8gRkJDX0xM X1NJWkU7CisJLyogTm90ZTogZmJjLnRocmVzaG9sZCA9PSAxIGZvciBpOHh4ICovCisJY2ZiX3Bp dGNoID0gZGV2X3ByaXYtPmZiYy51bmNvbXByZXNzZWRfc2l6ZSAvIEZCQ19MTF9TSVpFOwogCWlm IChmYi0+cGl0Y2hlc1swXSA8IGNmYl9waXRjaCkKIAkJY2ZiX3BpdGNoID0gZmItPnBpdGNoZXNb MF07CiAKLS0gCjIuMS40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=