From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH 8/8] drm/i915: protect FBC functions with FBC checks Date: Fri, 3 Jul 2015 15:40:54 -0300 Message-ID: <1435948854-4943-1-git-send-email-przanoni@gmail.com> References: <20150703182304.GW14231@nuc-i3427.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qg0-f41.google.com (mail-qg0-f41.google.com [209.85.192.41]) by gabe.freedesktop.org (Postfix) with ESMTPS id 88D246E615 for ; Fri, 3 Jul 2015 11:41:48 -0700 (PDT) Received: by qget71 with SMTP id t71so49505237qge.2 for ; Fri, 03 Jul 2015 11:41:47 -0700 (PDT) In-Reply-To: <20150703182304.GW14231@nuc-i3427.alporthouse.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+CgpOb3cgYWxsIHRo ZSBmdW5jdGlvbnMgY2FsbGVkIGJ5IG90aGVyIGZpbGVzIGNoZWNrIHdoZXRoZXIgRkJDIGhhcyBi ZWVuCmluaXRpYWxpemVkLiBUaGlzIGFsbG93cyB1cyB0byBkcm9wIHRoZSBjaGVja3Mgb24gdGhl IHN0YXRpYwpmdW5jdGlvbnMuCgp2MjoKIC0gcy9IQVNfRkJDL2Rldl9wcml2LT5kaXNwbGF5LmVu YWJsZV9mYmMvIGV2ZXJ5d2hlcmUgYnV0IHRoZSBpbml0CiAgIGZ1bmN0aW9uIChDaHJpcykuCgpT dWdnZXN0ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpTaWdu ZWQtb2ZmLWJ5OiBQYXVsbyBaYW5vbmkgPHBhdWxvLnIuemFub25pQGludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYyB8IDI3ICsrKysrKysrKysrKysrKysrKy0t LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0p CgoKSSdtIG5vdCAxMDAlIHN1cmUgdGhpcyBpcyB3aGF0IENocmlzIHdhcyBhc2tpbmcgZm9yIHYy LCBzbyBwbGVhc2UgY2xhcmlmeSBpZgp0aGlzIGlzIG5vdCB3aGF0IHdlIHdhbnQuCgoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZmJjLmMKaW5kZXggY2M5YjdlZi4uNjVmMDhlMyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZmJjLmMKQEAgLTM4OCw5ICszODgsNiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9mYmNfZW5h YmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAogCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgm ZGV2X3ByaXYtPmZiYy5sb2NrKSk7CiAKLQlpZiAoIWRldl9wcml2LT5kaXNwbGF5LmVuYWJsZV9m YmMpCi0JCXJldHVybjsKLQogCWludGVsX2ZiY19jYW5jZWxfd29yayhkZXZfcHJpdik7CiAKIAl3 b3JrID0ga3phbGxvYyhzaXplb2YoKndvcmspLCBHRlBfS0VSTkVMKTsKQEAgLTQzMCw5ICs0Mjcs NiBAQCBzdGF0aWMgdm9pZCBfX2ludGVsX2ZiY19kaXNhYmxlKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAKIAlpbnRlbF9mYmNfY2FuY2VsX3dvcmsoZGV2X3ByaXYpOwogCi0JaWYgKCFkZXZfcHJp di0+ZGlzcGxheS5kaXNhYmxlX2ZiYykKLQkJcmV0dXJuOwotCiAJZGV2X3ByaXYtPmRpc3BsYXku ZGlzYWJsZV9mYmMoZGV2KTsKIAlkZXZfcHJpdi0+ZmJjLmNydGMgPSBOVUxMOwogfQpAQCAtNDQ3 LDYgKzQ0MSw5IEBAIHZvaWQgaW50ZWxfZmJjX2Rpc2FibGUoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2 YXRlOwogCisJaWYgKCFkZXZfcHJpdi0+ZGlzcGxheS5lbmFibGVfZmJjKQorCQlyZXR1cm47CisK IAltdXRleF9sb2NrKCZkZXZfcHJpdi0+ZmJjLmxvY2spOwogCV9faW50ZWxfZmJjX2Rpc2FibGUo ZGV2KTsKIAltdXRleF91bmxvY2soJmRldl9wcml2LT5mYmMubG9jayk7CkBAIC00NjMsNiArNDYw LDkgQEAgdm9pZCBpbnRlbF9mYmNfZGlzYWJsZV9jcnRjKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRj KQogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKIAlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCisJaWYgKCFkZXZf cHJpdi0+ZGlzcGxheS5lbmFibGVfZmJjKQorCQlyZXR1cm47CisKIAltdXRleF9sb2NrKCZkZXZf cHJpdi0+ZmJjLmxvY2spOwogCWlmIChkZXZfcHJpdi0+ZmJjLmNydGMgPT0gY3J0YykKIAkJX19p bnRlbF9mYmNfZGlzYWJsZShkZXYpOwpAQCAtNjYxLDYgKzY2MSw5IEBAIHZvaWQgaW50ZWxfZmJj X2NsZWFudXBfY2ZiKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAorCWlmICghZGV2X3ByaXYt PmRpc3BsYXkuZW5hYmxlX2ZiYykKKwkJcmV0dXJuOworCiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYt PmZiYy5sb2NrKTsKIAlfX2ludGVsX2ZiY19jbGVhbnVwX2NmYihkZXYpOwogCW11dGV4X3VubG9j aygmZGV2X3ByaXYtPmZiYy5sb2NrKTsKQEAgLTcwOCw5ICs3MTEsNiBAQCBzdGF0aWMgdm9pZCBf X2ludGVsX2ZiY191cGRhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAljb25zdCBzdHJ1Y3Qg ZHJtX2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZTsKIAl1bnNpZ25lZCBpbnQgbWF4X3dpZHRo LCBtYXhfaGVpZ2h0OwogCi0JaWYgKCFIQVNfRkJDKGRldikpCi0JCXJldHVybjsKLQogCVdBUk5f T04oIW11dGV4X2lzX2xvY2tlZCgmZGV2X3ByaXYtPmZiYy5sb2NrKSk7CiAKIAkvKiBkaXNhYmxl IGZyYW1lYnVmZmVyIGNvbXByZXNzaW9uIGluIHZHUFUgKi8KQEAgLTg1Nyw2ICs4NTcsOSBAQCB2 b2lkIGludGVsX2ZiY191cGRhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCisJaWYgKCFk ZXZfcHJpdi0+ZGlzcGxheS5lbmFibGVfZmJjKQorCQlyZXR1cm47CisKIAltdXRleF9sb2NrKCZk ZXZfcHJpdi0+ZmJjLmxvY2spOwogCV9faW50ZWxfZmJjX3VwZGF0ZShkZXYpOwogCW11dGV4X3Vu bG9jaygmZGV2X3ByaXYtPmZiYy5sb2NrKTsKQEAgLTg2OSw2ICs4NzIsOSBAQCB2b2lkIGludGVs X2ZiY19pbnZhbGlkYXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYtPmRldjsKIAl1bnNpZ25lZCBpbnQgZmJjX2Jp dHM7CiAKKwlpZiAoIWRldl9wcml2LT5kaXNwbGF5LmVuYWJsZV9mYmMpCisJCXJldHVybjsKKwog CWlmIChvcmlnaW4gPT0gT1JJR0lOX0dUVCkKIAkJcmV0dXJuOwogCkBAIC04OTUsNiArOTAxLDkg QEAgdm9pZCBpbnRlbF9mYmNfZmx1c2goc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 LAogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkZXZfcHJpdi0+ZGV2OwogCisJaWYgKCFk ZXZfcHJpdi0+ZGlzcGxheS5lbmFibGVfZmJjKQorCQlyZXR1cm47CisKIAltdXRleF9sb2NrKCZk ZXZfcHJpdi0+ZmJjLmxvY2spOwogCiAJaWYgKCFkZXZfcHJpdi0+ZmJjLmJ1c3lfYml0cykKLS0g CjIuMS40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=