From mboxrd@z Thu Jan  1 00:00:00 1970
From: Paulo Zanoni <przanoni@gmail.com>
Subject: [PATCH 8/8] drm/i915: protect FBC functions with
	HAS_FBC checks
Date: Thu,  2 Jul 2015 19:25:14 -0300
Message-ID: <1435875914-11516-9-git-send-email-przanoni@gmail.com>
References: <1435875914-11516-1-git-send-email-przanoni@gmail.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-qk0-f181.google.com (mail-qk0-f181.google.com
 [209.85.220.181])
 by gabe.freedesktop.org (Postfix) with ESMTPS id E45BB6ED0C
 for <intel-gfx@lists.freedesktop.org>; Thu,  2 Jul 2015 15:26:06 -0700 (PDT)
Received: by qkbp125 with SMTP id p125so62123364qkb.2
 for <intel-gfx@lists.freedesktop.org>; Thu, 02 Jul 2015 15:26:06 -0700 (PDT)
In-Reply-To: <1435875914-11516-1-git-send-email-przanoni@gmail.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+CgpOb3cgYWxsIHRo
ZSBmdW5jdGlvbnMgY2FsbGVkIGJ5IG90aGVyIGZpbGVzIGhhdmUgdGhlIEhBU19GQkMKcHJvdGVj
dGlvbi4gVGhpcyBhbGxvd3MgdXMgdG8gZHJvcCB0aGUgY2hlY2tzIGZvciB0aGUgbG93IGxldmVs
CmZ1bmN0aW9uIHBvaW50ZXJzLgoKU3VnZ2VzdGVkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNo
cmlzLXdpbHNvbi5jby51az4KU2lnbmVkLW9mZi1ieTogUGF1bG8gWmFub25pIDxwYXVsby5yLnph
bm9uaUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJjLmMgfCAy
NyArKysrKysrKysrKysrKysrKystLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxOCBpbnNlcnRp
b25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2ZiYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJjLmMKaW5kZXggY2M5
YjdlZi4uYmMzY2RiMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJj
LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJjLmMKQEAgLTM4OCw5ICszODgs
NiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9mYmNfZW5hYmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykK
IAogCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmZGV2X3ByaXYtPmZiYy5sb2NrKSk7CiAKLQlp
ZiAoIWRldl9wcml2LT5kaXNwbGF5LmVuYWJsZV9mYmMpCi0JCXJldHVybjsKLQogCWludGVsX2Zi
Y19jYW5jZWxfd29yayhkZXZfcHJpdik7CiAKIAl3b3JrID0ga3phbGxvYyhzaXplb2YoKndvcmsp
LCBHRlBfS0VSTkVMKTsKQEAgLTQzMCw5ICs0MjcsNiBAQCBzdGF0aWMgdm9pZCBfX2ludGVsX2Zi
Y19kaXNhYmxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAlpbnRlbF9mYmNfY2FuY2VsX3dv
cmsoZGV2X3ByaXYpOwogCi0JaWYgKCFkZXZfcHJpdi0+ZGlzcGxheS5kaXNhYmxlX2ZiYykKLQkJ
cmV0dXJuOwotCiAJZGV2X3ByaXYtPmRpc3BsYXkuZGlzYWJsZV9mYmMoZGV2KTsKIAlkZXZfcHJp
di0+ZmJjLmNydGMgPSBOVUxMOwogfQpAQCAtNDQ3LDYgKzQ0MSw5IEBAIHZvaWQgaW50ZWxfZmJj
X2Rpc2FibGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJp
dmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCisJaWYgKCFIQVNfRkJDKGRldl9w
cml2KSkKKwkJcmV0dXJuOworCiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPmZiYy5sb2NrKTsKIAlf
X2ludGVsX2ZiY19kaXNhYmxlKGRldik7CiAJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+ZmJjLmxv
Y2spOwpAQCAtNDYzLDYgKzQ2MCw5IEBAIHZvaWQgaW50ZWxfZmJjX2Rpc2FibGVfY3J0YyhzdHJ1
Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+YmFz
ZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJp
dmF0ZTsKIAorCWlmICghSEFTX0ZCQyhkZXZfcHJpdikpCisJCXJldHVybjsKKwogCW11dGV4X2xv
Y2soJmRldl9wcml2LT5mYmMubG9jayk7CiAJaWYgKGRldl9wcml2LT5mYmMuY3J0YyA9PSBjcnRj
KQogCQlfX2ludGVsX2ZiY19kaXNhYmxlKGRldik7CkBAIC02NjEsNiArNjYxLDkgQEAgdm9pZCBp
bnRlbF9mYmNfY2xlYW51cF9jZmIoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3Qg
ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCisJaWYgKCFI
QVNfRkJDKGRldl9wcml2KSkKKwkJcmV0dXJuOworCiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPmZi
Yy5sb2NrKTsKIAlfX2ludGVsX2ZiY19jbGVhbnVwX2NmYihkZXYpOwogCW11dGV4X3VubG9jaygm
ZGV2X3ByaXYtPmZiYy5sb2NrKTsKQEAgLTcwOCw5ICs3MTEsNiBAQCBzdGF0aWMgdm9pZCBfX2lu
dGVsX2ZiY191cGRhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAljb25zdCBzdHJ1Y3QgZHJt
X2Rpc3BsYXlfbW9kZSAqYWRqdXN0ZWRfbW9kZTsKIAl1bnNpZ25lZCBpbnQgbWF4X3dpZHRoLCBt
YXhfaGVpZ2h0OwogCi0JaWYgKCFIQVNfRkJDKGRldikpCi0JCXJldHVybjsKLQogCVdBUk5fT04o
IW11dGV4X2lzX2xvY2tlZCgmZGV2X3ByaXYtPmZiYy5sb2NrKSk7CiAKIAkvKiBkaXNhYmxlIGZy
YW1lYnVmZmVyIGNvbXByZXNzaW9uIGluIHZHUFUgKi8KQEAgLTg1Nyw2ICs4NTcsOSBAQCB2b2lk
IGludGVsX2ZiY191cGRhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlzdHJ1Y3QgZHJt
X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCisJaWYgKCFIQVNf
RkJDKGRldl9wcml2KSkKKwkJcmV0dXJuOworCiAJbXV0ZXhfbG9jaygmZGV2X3ByaXYtPmZiYy5s
b2NrKTsKIAlfX2ludGVsX2ZiY191cGRhdGUoZGV2KTsKIAltdXRleF91bmxvY2soJmRldl9wcml2
LT5mYmMubG9jayk7CkBAIC04NjksNiArODcyLDkgQEAgdm9pZCBpbnRlbF9mYmNfaW52YWxpZGF0
ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJc3RydWN0IGRybV9kZXZpY2Ug
KmRldiA9IGRldl9wcml2LT5kZXY7CiAJdW5zaWduZWQgaW50IGZiY19iaXRzOwogCisJaWYgKCFI
QVNfRkJDKGRldl9wcml2KSkKKwkJcmV0dXJuOworCiAJaWYgKG9yaWdpbiA9PSBPUklHSU5fR1RU
KQogCQlyZXR1cm47CiAKQEAgLTg5NSw2ICs5MDEsOSBAQCB2b2lkIGludGVsX2ZiY19mbHVzaChz
dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiB7CiAJc3RydWN0IGRybV9kZXZpY2Ug
KmRldiA9IGRldl9wcml2LT5kZXY7CiAKKwlpZiAoIUhBU19GQkMoZGV2X3ByaXYpKQorCQlyZXR1
cm47CisKIAltdXRleF9sb2NrKCZkZXZfcHJpdi0+ZmJjLmxvY2spOwogCiAJaWYgKCFkZXZfcHJp
di0+ZmJjLmJ1c3lfYml0cykKLS0gCjIuMS40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0
cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp
c3RpbmZvL2ludGVsLWdmeAo=