From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH 2/6] drm/i915: fix the FBC work allocation failure path Date: Wed, 8 Jul 2015 17:58:55 -0300 Message-ID: <1436389139-16282-3-git-send-email-przanoni@gmail.com> References: <1436389139-16282-1-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qg0-f45.google.com (mail-qg0-f45.google.com [209.85.192.45]) by gabe.freedesktop.org (Postfix) with ESMTPS id C0C416EBE4 for ; Wed, 8 Jul 2015 13:59:41 -0700 (PDT) Received: by qgeg89 with SMTP id g89so106363609qge.3 for ; Wed, 08 Jul 2015 13:59:41 -0700 (PDT) In-Reply-To: <1436389139-16282-1-git-send-email-przanoni@gmail.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 Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org RnJvbTogUGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBpbnRlbC5jb20+CgpXZSB3ZXJlIGZv cmdldHRpbmcgdG8gc2V0IGZiYy5jcnRjLCBmYmMuZmJfaWQgYW5kIGZiYy55IHdoZW4gdGhlCmt6 YWxsb2MgY2FsbCBmYWlsZWQuIEx1Y2tpbHksIHRoaXMgaXMgbm90IGEgdmVyeSBjb21tb24gY2Fz ZSwgSSBob3BlLgoKU2lnbmVkLW9mZi1ieTogUGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBp bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJjLmMgfCAyNyArKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNyBpbnNlcnRpb25zKCsp LCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9mYmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jCmluZGV4IDE0NDg3NDYu LjY0ZjMxN2EgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jCkBAIC0zMDgsNiArMzA4LDE4IEBA IGJvb2wgaW50ZWxfZmJjX2VuYWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogCXJldHVybiBkZXZfcHJpdi0+ZmJjLmVuYWJsZWQ7CiB9CiAKK3N0YXRpYyB2b2lkIGludGVs X2ZiY19lbmFibGUoc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCQkgICAgIHN0cnVjdCBkcm1f ZnJhbWVidWZmZXIgKmZiKQoreworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IGNydGMtPmJhc2UuZGV2LT5kZXZfcHJpdmF0ZTsKKworCWRldl9wcml2LT5mYmMuZW5hYmxlX2Zi YyhjcnRjKTsKKworCWRldl9wcml2LT5mYmMuY3J0YyA9IGNydGM7CisJZGV2X3ByaXYtPmZiYy5m Yl9pZCA9IGZiLT5iYXNlLmlkOworCWRldl9wcml2LT5mYmMueSA9IGNydGMtPmJhc2UueTsKK30K Kwogc3RhdGljIHZvaWQgaW50ZWxfZmJjX3dvcmtfZm4oc3RydWN0IHdvcmtfc3RydWN0ICpfX3dv cmspCiB7CiAJc3RydWN0IGludGVsX2ZiY193b3JrICp3b3JrID0KQEAgLTMyMSwxMyArMzMzLDgg QEAgc3RhdGljIHZvaWQgaW50ZWxfZmJjX3dvcmtfZm4oc3RydWN0IHdvcmtfc3RydWN0ICpfX3dv cmspCiAJCS8qIERvdWJsZSBjaGVjayB0aGF0IHdlIGhhdmVuJ3Qgc3dpdGNoZWQgZmIgd2l0aG91 dCBjYW5jZWxsaW5nCiAJCSAqIHRoZSBwcmlvciB3b3JrLgogCQkgKi8KLQkJaWYgKGNydGNfZmIg PT0gd29yay0+ZmIpIHsKLQkJCWRldl9wcml2LT5mYmMuZW5hYmxlX2ZiYyh3b3JrLT5jcnRjKTsK LQotCQkJZGV2X3ByaXYtPmZiYy5jcnRjID0gd29yay0+Y3J0YzsKLQkJCWRldl9wcml2LT5mYmMu ZmJfaWQgPSBjcnRjX2ZiLT5iYXNlLmlkOwotCQkJZGV2X3ByaXYtPmZiYy55ID0gd29yay0+Y3J0 Yy0+YmFzZS55OwotCQl9CisJCWlmIChjcnRjX2ZiID09IHdvcmstPmZiKQorCQkJaW50ZWxfZmJj X2VuYWJsZSh3b3JrLT5jcnRjLCB3b3JrLT5mYik7CiAKIAkJZGV2X3ByaXYtPmZiYy5mYmNfd29y ayA9IE5VTEw7CiAJfQpAQCAtMzYxLDcgKzM2OCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2ZiY19j YW5jZWxfd29yayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJZGV2X3ByaXYt PmZiYy5mYmNfd29yayA9IE5VTEw7CiB9CiAKLXN0YXRpYyB2b2lkIGludGVsX2ZiY19lbmFibGUo c3RydWN0IGludGVsX2NydGMgKmNydGMpCitzdGF0aWMgdm9pZCBpbnRlbF9mYmNfc2NoZWR1bGVf ZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogewogCXN0cnVjdCBpbnRlbF9mYmNfd29y ayAqd29yazsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBjcnRjLT5iYXNl LmRldi0+ZGV2X3ByaXZhdGU7CkBAIC0zNzMsNyArMzgwLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxf ZmJjX2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAl3b3JrID0ga3phbGxvYyhzaXpl b2YoKndvcmspLCBHRlBfS0VSTkVMKTsKIAlpZiAod29yayA9PSBOVUxMKSB7CiAJCURSTV9FUlJP UigiRmFpbGVkIHRvIGFsbG9jYXRlIEZCQyB3b3JrIHN0cnVjdHVyZVxuIik7Ci0JCWRldl9wcml2 LT5mYmMuZW5hYmxlX2ZiYyhjcnRjKTsKKwkJaW50ZWxfZmJjX2VuYWJsZShjcnRjLCBjcnRjLT5i YXNlLnByaW1hcnktPmZiKTsKIAkJcmV0dXJuOwogCX0KIApAQCAtODI2LDcgKzgzMyw3IEBAIHN0 YXRpYyB2b2lkIF9faW50ZWxfZmJjX3VwZGF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiAJCV9faW50ZWxfZmJjX2Rpc2FibGUoZGV2X3ByaXYpOwogCX0KIAotCWludGVsX2Zi Y19lbmFibGUoaW50ZWxfY3J0Yyk7CisJaW50ZWxfZmJjX3NjaGVkdWxlX2VuYWJsZShpbnRlbF9j cnRjKTsKIAlkZXZfcHJpdi0+ZmJjLm5vX2ZiY19yZWFzb24gPSBGQkNfT0s7CiAJcmV0dXJuOwog Ci0tIAoyLjEuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK