From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH v5 23/25] drm/i915: Nuke FBC from SW_FINISH ioctl Date: Wed, 18 Jun 2014 20:58:56 +0300 Message-ID: <1403114338-30513-24-git-send-email-ville.syrjala@linux.intel.com> References: <1403114338-30513-1-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id AF3176E759 for ; Wed, 18 Jun 2014 11:00:22 -0700 (PDT) In-Reply-To: <1403114338-30513-1-git-send-email-ville.syrjala@linux.intel.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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkZC QyBob3N0IG1vZGlmaWNhdGlvbiB0cmFja2luZyBvbmx5IHdvcmtzIHRocm91Z2ggR1RUIG1tYXBz LCBzbyBhbnkKZGlyZWN0IENQVSBhY2Nlc3MgbmVlZHMgdG8gbWFudWFsbHkgbnVrZSB0aGUgY29t cHJlc3NlZCBmcmFtZWJ1ZmZlcgpvbiBtb2RpZmljYXRpb25zLiBEbyB0aGUgbnVraW5nIGZyb20g dGhlIFNXX0ZJTklTSCBpb2N0bC4KCnYyOiBudWtlIGZyb20gU1dfRklOSVNIIGluc3RlZCBvZiBE SVJUWUZCIGlvY3RsCnYzOiBDYWxsIGludGVsX2ZiY19udWtlKCkgb25seSB3aGVuIHBpbl9kaXNw bGF5IGlzIHRydWUKdjQ6IERvbid0IG9vcHMgaWYgZGV2X3ByaXYtPmZiYy5mYiBpcyBOVUxMCnY1 OiBSZXdvcmsgYmFzZWQgb24gZmJjLm11dGV4IGFuZCBmYmMub2JqCgpSZXZpZXdlZC1ieTogQ2hy aXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClNpZ25lZC1vZmYtYnk6IFZpbGxl IFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgfCAgOCArKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmggfCAgMSArCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICB8 IDMxICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDMgZmlsZXMgY2hhbmdlZCwgNDAg aW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDBjZTY2ZGEuLmExNzUz ZGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtMTQzNCw2ICsxNDM0LDcgQEAgaW50CiBp OTE1X2dlbV9zd19maW5pc2hfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0 YSwKIAkJCSBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUpCiB7CisJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3N3 X2ZpbmlzaCAqYXJncyA9IGRhdGE7CiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iajsK IAlpbnQgcmV0ID0gMDsKQEAgLTE0NTcsNiArMTQ1OCwxMyBAQCBpOTE1X2dlbV9zd19maW5pc2hf aW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAlkcm1fZ2VtX29iamVj dF91bnJlZmVyZW5jZSgmb2JqLT5iYXNlKTsKIHVubG9jazoKIAltdXRleF91bmxvY2soJmRldi0+ c3RydWN0X211dGV4KTsKKworCWlmIChyZXQgPT0gMCkgeworCQltdXRleF9sb2NrKCZkZXZfcHJp di0+ZmJjLm11dGV4KTsKKwkJaW50ZWxfZmJjX251a2Uob2JqKTsKKwkJbXV0ZXhfdW5sb2NrKCZk ZXZfcHJpdi0+ZmJjLm11dGV4KTsKKwl9CisKIAlyZXR1cm4gcmV0OwogfQogCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rydi5oCmluZGV4IGU5ZGU4YjEuLjE2MTYzOWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2Rydi5oCkBAIC05NzcsNiArOTc3LDcgQEAgdm9pZCBpbnRlbF9mYmNfcG9zdF9wbGFuZV9lbmFi bGUoc3RydWN0IGludGVsX2NydGMgKmNydGMpOwogdm9pZCBpbnRlbF9mYmNfZGlzYWJsZShzdHJ1 Y3QgaW50ZWxfY3J0YyAqY3J0Yyk7CiB2b2lkIGludGVsX2ZiY19zY2hlZHVsZV91cGRhdGUoc3Ry dWN0IGRybV9kZXZpY2UgKmRldik7CiBzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfZmJjX2Jlc3Rf Y3J0YyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKK3ZvaWQgaW50ZWxfZmJjX251a2Uoc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaik7CiB2b2lkIGludGVsX2dwdV9pcHNfaW5pdChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9pZCBpbnRlbF9ncHVfaXBzX3RlYXJk b3duKHZvaWQpOwogaW50IGludGVsX3Bvd2VyX2RvbWFpbnNfaW5pdChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDNiZGUzY2UuLmYzZDc2YWEg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMzYyLDYgKzM2MiwzNyBAQCB2b2lkIGludGVs X2ZiY19kaXNhYmxlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCV9faW50ZWxfZmJjX2Rpc2Fi bGUoY3J0Yyk7CiB9CiAKK3ZvaWQgaW50ZWxfZmJjX251a2Uoc3RydWN0IGRybV9pOTE1X2dlbV9v YmplY3QgKm9iaikKK3sKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gb2JqLT5iYXNlLmRldjsK KwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwor CXN0cnVjdCBpbnRlbF9jcnRjICpjcnRjID0gZGV2X3ByaXYtPmZiYy5jcnRjOworCXVuc2lnbmVk IGludCBwZW5kaW5nX3Njb3JlOworCWludCByZXQ7CisKKwlsb2NrZGVwX2Fzc2VydF9oZWxkKCZk ZXZfcHJpdi0+ZmJjLm11dGV4KTsKKworCWlmIChkZXZfcHJpdi0+ZmJjLm9iaiAhPSBvYmopCisJ CXJldHVybjsKKworCWlmICghY3J0YykKKwkJcmV0dXJuOworCisJV0FSTl9PTihjcnRjLT5mYmMu cGVuZGluZ19zY29yZSA9PSAwKTsKKworCXBlbmRpbmdfc2NvcmUgPSBjcnRjLT5mYmMucGVuZGlu Z19zY29yZTsKKwlpbnRlbF9mYmNfZGlzYWJsZShjcnRjKTsKKwljcnRjLT5mYmMucGVuZGluZ19z Y29yZSA9IHBlbmRpbmdfc2NvcmU7CisKKwkvKgorCSAqIE11c3Qgd2FpdCB1bnRpbCB0aGUgbmV4 dCB2YmxhbmsgYmVmb3JlIHJlLWVuYWJsaW5nCisJICogb3RoZXJ3aXNlIHRoZSBudWtpbmcgd29u J3QgYWN0dWFsbHkgaGFwcGVuLgorCSAqLworCWNydGMtPmZiYy5ub3RpZnkudmJsX2NvdW50ID0g aW50ZWxfY3J0Y192YmxfY291bnRfcmVsX3RvX2FicyhjcnRjLCAxKTsKKwlyZXQgPSBpbnRlbF92 Ymxhbmtfbm90aWZ5X2FkZChjcnRjLCAmY3J0Yy0+ZmJjLm5vdGlmeSk7CisJV0FSTl9PTihyZXQg IT0gMCk7Cit9CisKIHN0YXRpYyBib29sIHNldF9ub19mYmNfcmVhc29uKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCSAgICAgIGVudW0gbm9fZmJjX3JlYXNvbiByZWFzb24p CiB7Ci0tIAoxLjguNS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=