From mboxrd@z Thu Jan  1 00:00:00 1970
From: Paulo Zanoni <przanoni@gmail.com>
Subject: [PATCH 2/6] drm/i915: fix the FBC work allocation
	failure path
Date: Thu,  9 Jul 2015 16:27:34 -0300
Message-ID: <1436470054-6806-1-git-send-email-przanoni@gmail.com>
References: <20150708220526.GA10256@nuc-i3427.alporthouse.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mail-qg0-f54.google.com (mail-qg0-f54.google.com
 [209.85.192.54])
 by gabe.freedesktop.org (Postfix) with ESMTPS id CC7126E1F3
 for <intel-gfx@lists.freedesktop.org>; Thu,  9 Jul 2015 12:28:20 -0700 (PDT)
Received: by qget71 with SMTP id t71so119836625qge.2
 for <intel-gfx@lists.freedesktop.org>; Thu, 09 Jul 2015 12:28:19 -0700 (PDT)
In-Reply-To: <20150708220526.GA10256@nuc-i3427.alporthouse.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogUGF1bG8gWmFub25pIDxwYXVsby5yLnphbm9uaUBpbnRlbC5jb20+CgpBbHdheXMgdXBk
YXRlIHRoZSBjdXJycmVudCBjcnRjLCBmYiBhbmQgdmVydGljYWwgb2Zmc2V0IGFmdGVyIGNhbGxp
bmcKZW5hYmxlX2ZiYy4gV2Ugd2VyZSBmb3JnZXR0aW5nIHRvIGRvIHNvIGFsb25nIHRoZSBmYWls
dXJlIHBhdGhzIHdoZW4KZW5hYmxpbmcgZmJjIHN5bmNocm9ub3VzbHkuIEZpeCB0aGlzIHdpdGgg
YSBuZXcgaGVscGVyIHRvIGVuYWJsZV9mYmMoKQphbmQgdXBkYXRlIHRoZSBzdGF0ZSBzaW11bHRh
bmVvdXNseS4KCnYyOiBJbXByb3ZlIGNvbW1pdCBtZXNzYWdlIChDaHJpcykuCgpTaWduZWQtb2Zm
LWJ5OiBQYXVsbyBaYW5vbmkgPHBhdWxvLnIuemFub25pQGludGVsLmNvbT4KLS0tCiBkcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYyB8IDI3ICsrKysrKysrKysrKysrKysrLS0tLS0tLS0t
LQogMSBmaWxlIGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlm
ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfZmJjLmMKaW5kZXggMTQ0ODc0Ni4uNjRmMzE3YSAxMDA2NDQKLS0tIGEv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfZmJjLmMKQEAgLTMwOCw2ICszMDgsMTggQEAgYm9vbCBpbnRlbF9mYmNfZW5hYmxl
ZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJcmV0dXJuIGRldl9wcml2LT5m
YmMuZW5hYmxlZDsKIH0KIAorc3RhdGljIHZvaWQgaW50ZWxfZmJjX2VuYWJsZShzdHJ1Y3QgaW50
ZWxfY3J0YyAqY3J0YywKKwkJCSAgICAgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIpCit7CisJ
c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gY3J0Yy0+YmFzZS5kZXYtPmRldl9w
cml2YXRlOworCisJZGV2X3ByaXYtPmZiYy5lbmFibGVfZmJjKGNydGMpOworCisJZGV2X3ByaXYt
PmZiYy5jcnRjID0gY3J0YzsKKwlkZXZfcHJpdi0+ZmJjLmZiX2lkID0gZmItPmJhc2UuaWQ7CisJ
ZGV2X3ByaXYtPmZiYy55ID0gY3J0Yy0+YmFzZS55OworfQorCiBzdGF0aWMgdm9pZCBpbnRlbF9m
YmNfd29ya19mbihzdHJ1Y3Qgd29ya19zdHJ1Y3QgKl9fd29yaykKIHsKIAlzdHJ1Y3QgaW50ZWxf
ZmJjX3dvcmsgKndvcmsgPQpAQCAtMzIxLDEzICszMzMsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9m
YmNfd29ya19mbihzdHJ1Y3Qgd29ya19zdHJ1Y3QgKl9fd29yaykKIAkJLyogRG91YmxlIGNoZWNr
IHRoYXQgd2UgaGF2ZW4ndCBzd2l0Y2hlZCBmYiB3aXRob3V0IGNhbmNlbGxpbmcKIAkJICogdGhl
IHByaW9yIHdvcmsuCiAJCSAqLwotCQlpZiAoY3J0Y19mYiA9PSB3b3JrLT5mYikgewotCQkJZGV2
X3ByaXYtPmZiYy5lbmFibGVfZmJjKHdvcmstPmNydGMpOwotCi0JCQlkZXZfcHJpdi0+ZmJjLmNy
dGMgPSB3b3JrLT5jcnRjOwotCQkJZGV2X3ByaXYtPmZiYy5mYl9pZCA9IGNydGNfZmItPmJhc2Uu
aWQ7Ci0JCQlkZXZfcHJpdi0+ZmJjLnkgPSB3b3JrLT5jcnRjLT5iYXNlLnk7Ci0JCX0KKwkJaWYg
KGNydGNfZmIgPT0gd29yay0+ZmIpCisJCQlpbnRlbF9mYmNfZW5hYmxlKHdvcmstPmNydGMsIHdv
cmstPmZiKTsKIAogCQlkZXZfcHJpdi0+ZmJjLmZiY193b3JrID0gTlVMTDsKIAl9CkBAIC0zNjEs
NyArMzY4LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZmJjX2NhbmNlbF93b3JrKHN0cnVjdCBkcm1f
aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlkZXZfcHJpdi0+ZmJjLmZiY193b3JrID0gTlVMTDsK
IH0KIAotc3RhdGljIHZvaWQgaW50ZWxfZmJjX2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0
YykKK3N0YXRpYyB2b2lkIGludGVsX2ZiY19zY2hlZHVsZV9lbmFibGUoc3RydWN0IGludGVsX2Ny
dGMgKmNydGMpCiB7CiAJc3RydWN0IGludGVsX2ZiY193b3JrICp3b3JrOwogCXN0cnVjdCBkcm1f
aTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGNydGMtPmJhc2UuZGV2LT5kZXZfcHJpdmF0ZTsKQEAg
LTM3Myw3ICszODAsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9mYmNfZW5hYmxlKHN0cnVjdCBpbnRl
bF9jcnRjICpjcnRjKQogCXdvcmsgPSBremFsbG9jKHNpemVvZigqd29yayksIEdGUF9LRVJORUwp
OwogCWlmICh3b3JrID09IE5VTEwpIHsKIAkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gYWxsb2NhdGUg
RkJDIHdvcmsgc3RydWN0dXJlXG4iKTsKLQkJZGV2X3ByaXYtPmZiYy5lbmFibGVfZmJjKGNydGMp
OworCQlpbnRlbF9mYmNfZW5hYmxlKGNydGMsIGNydGMtPmJhc2UucHJpbWFyeS0+ZmIpOwogCQly
ZXR1cm47CiAJfQogCkBAIC04MjYsNyArODMzLDcgQEAgc3RhdGljIHZvaWQgX19pbnRlbF9mYmNf
dXBkYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJX19pbnRlbF9mYmNf
ZGlzYWJsZShkZXZfcHJpdik7CiAJfQogCi0JaW50ZWxfZmJjX2VuYWJsZShpbnRlbF9jcnRjKTsK
KwlpbnRlbF9mYmNfc2NoZWR1bGVfZW5hYmxlKGludGVsX2NydGMpOwogCWRldl9wcml2LT5mYmMu
bm9fZmJjX3JlYXNvbiA9IEZCQ19PSzsKIAlyZXR1cm47CiAKLS0gCjIuMS40CgpfX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs
aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNr
dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=