From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 3/7] drm/i915: Pass in plane state when (un)pinning frame buffers Date: Mon, 23 Mar 2015 11:10:34 +0000 Message-ID: <1427109038-19597-4-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1427109038-19597-1-git-send-email-tvrtko.ursulin@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 [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 3565F72024 for ; Mon, 23 Mar 2015 04:10:53 -0700 (PDT) In-Reply-To: <1427109038-19597-1-git-send-email-tvrtko.ursulin@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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClBsYW5lIHN0 YXRlIGNhcnJpZXMgdGhlIHJvdGF0aW9uIGluZm9ybWF0aW9uIHdoaWNoIGlzIG5lZWRlZCBmb3Ig ZGV0ZXJtaW5pbmcKdGhlIGFwcHJvcHJpYXRlIEdHVFQgdmlldyB0eXBlLgoKVGhpcyBqdXN0IGFk ZHMgdGhlIHBhcmFtZXRlciB3aXRoIHRoZSBhY3R1YWwgdXNhZ2UgY29taW5nIGluIGZ1dHVyZSBw YXRjaGVzLgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGlu dGVsLmNvbT4KUmV2aWV3ZWQtYnk6IEpvb25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxp bnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg fCAxOCArKysrKysrKysrKystLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o ICAgICB8ICAxICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgICB8ICAyICst CiAzIGZpbGVzIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDM5MzgwZjQuLjRkOGEzOTcgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTIyOTEsNiArMjI5MSw3IEBAIGludGVs X2ZiX2FsaWduX2hlaWdodChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgaGVp Z2h0LAogaW50CiBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZSwKIAkJCSAgIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAorCQkJICAgY29uc3Qgc3Ry dWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUsCiAJCQkgICBzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICpwaXBlbGluZWQpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGZiLT5kZXY7 CkBAIC0yMzc4LDggKzIzNzksMTEgQEAgZXJyX2ludGVycnVwdGlibGU6CiAJcmV0dXJuIHJldDsK IH0KIAotc3RhdGljIHZvaWQgaW50ZWxfdW5waW5fZmJfb2JqKHN0cnVjdCBkcm1faTkxNV9nZW1f b2JqZWN0ICpvYmopCitzdGF0aWMgdm9pZCBpbnRlbF91bnBpbl9mYl9vYmooc3RydWN0IGRybV9m cmFtZWJ1ZmZlciAqZmIsCisJCQkgICAgICAgY29uc3Qgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAq cGxhbmVfc3RhdGUpCiB7CisJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGludGVs X2ZiX29iaihmYik7CisKIAlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJm9iai0+YmFzZS5kZXYt PnN0cnVjdF9tdXRleCkpOwogCiAJaTkxNV9nZW1fb2JqZWN0X3VucGluX2ZlbmNlKG9iaik7CkBA IC05MzE4LDcgKzkzMjIsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF91bnBpbl93b3JrX2ZuKHN0cnVj dCB3b3JrX3N0cnVjdCAqX193b3JrKQogCWVudW0gcGlwZSBwaXBlID0gdG9faW50ZWxfY3J0Yyh3 b3JrLT5jcnRjKS0+cGlwZTsKIAogCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQlp bnRlbF91bnBpbl9mYl9vYmooaW50ZWxfZmJfb2JqKHdvcmstPm9sZF9mYikpOworCWludGVsX3Vu cGluX2ZiX29iaih3b3JrLT5vbGRfZmIsIHdvcmstPmNydGMtPnByaW1hcnktPnN0YXRlKTsKIAlk cm1fZ2VtX29iamVjdF91bnJlZmVyZW5jZSgmd29yay0+cGVuZGluZ19mbGlwX29iai0+YmFzZSk7 CiAKIAlpbnRlbF9mYmNfdXBkYXRlKGRldik7CkBAIC0xMDAyNiw3ICsxMDAzMCw4IEBAIHN0YXRp YyBpbnQgaW50ZWxfY3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQlyaW5n ID0gJmRldl9wcml2LT5yaW5nW1JDU107CiAJfQogCi0JcmV0ID0gaW50ZWxfcGluX2FuZF9mZW5j ZV9mYl9vYmooY3J0Yy0+cHJpbWFyeSwgZmIsIHJpbmcpOworCXJldCA9IGludGVsX3Bpbl9hbmRf ZmVuY2VfZmJfb2JqKGNydGMtPnByaW1hcnksIGZiLAorCQkJCQkgY3J0Yy0+cHJpbWFyeS0+c3Rh dGUsIHJpbmcpOwogCWlmIChyZXQpCiAJCWdvdG8gY2xlYW51cF9wZW5kaW5nOwogCkBAIC0xMDA2 Niw3ICsxMDA3MSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRy bV9jcnRjICpjcnRjLAogCXJldHVybiAwOwogCiBjbGVhbnVwX3VucGluOgotCWludGVsX3VucGlu X2ZiX29iaihvYmopOworCWludGVsX3VucGluX2ZiX29iaihmYiwgY3J0Yy0+cHJpbWFyeS0+c3Rh dGUpOwogY2xlYW51cF9wZW5kaW5nOgogCWF0b21pY19kZWMoJmludGVsX2NydGMtPnVucGluX3dv cmtfY291bnQpOwogCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwpAQCAtMTIwMjIs NyArMTIwMjcsNyBAQCBpbnRlbF9wcmVwYXJlX3BsYW5lX2ZiKHN0cnVjdCBkcm1fcGxhbmUgKnBs YW5lLAogCQlpZiAocmV0KQogCQkJRFJNX0RFQlVHX0tNUygiZmFpbGVkIHRvIGF0dGFjaCBwaHlz IG9iamVjdFxuIik7CiAJfSBlbHNlIHsKLQkJcmV0ID0gaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9v YmoocGxhbmUsIGZiLCBOVUxMKTsKKwkJcmV0ID0gaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmoo cGxhbmUsIGZiLCBuZXdfc3RhdGUsIE5VTEwpOwogCX0KIAogCWlmIChyZXQgPT0gMCkKQEAgLTEy MDU0LDcgKzEyMDU5LDcgQEAgaW50ZWxfY2xlYW51cF9wbGFuZV9mYihzdHJ1Y3QgZHJtX3BsYW5l ICpwbGFuZSwKIAlpZiAocGxhbmUtPnR5cGUgIT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SIHx8CiAJ ICAgICFJTlRFTF9JTkZPKGRldiktPmN1cnNvcl9uZWVkc19waHlzaWNhbCkgewogCQltdXRleF9s b2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JCWludGVsX3VucGluX2ZiX29iaihvYmopOworCQlp bnRlbF91bnBpbl9mYl9vYmooZmIsIG9sZF9zdGF0ZSk7CiAJCW11dGV4X3VubG9jaygmZGV2LT5z dHJ1Y3RfbXV0ZXgpOwogCX0KIH0KQEAgLTEzOTQwLDYgKzEzOTQ1LDcgQEAgdm9pZCBpbnRlbF9t b2Rlc2V0X2dlbV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAKIAkJaWYgKGludGVsX3Bp bl9hbmRfZmVuY2VfZmJfb2JqKGMtPnByaW1hcnksCiAJCQkJCSAgICAgICBjLT5wcmltYXJ5LT5m YiwKKwkJCQkJICAgICAgIGMtPnByaW1hcnktPnN0YXRlLAogCQkJCQkgICAgICAgTlVMTCkpIHsK IAkJCURSTV9FUlJPUigiZmFpbGVkIHRvIHBpbiBib290IGZiIG9uIHBpcGUgJWRcbiIsCiAJCQkJ ICB0b19pbnRlbF9jcnRjKGMpLT5waXBlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXgg ZTk3NGRkNi4uYTBkZjU1NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTk1OSw2ICs5 NTksNyBAQCB2b2lkIGludGVsX3JlbGVhc2VfbG9hZF9kZXRlY3RfcGlwZShzdHJ1Y3QgZHJtX2Nv bm5lY3RvciAqY29ubmVjdG9yLAogCQkJCSAgICBzdHJ1Y3QgaW50ZWxfbG9hZF9kZXRlY3RfcGlw ZSAqb2xkKTsKIGludCBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihzdHJ1Y3QgZHJtX3BsYW5l ICpwbGFuZSwKIAkJCSAgICAgICBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKKwkJCSAgICAg ICBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSwKIAkJCSAgICAgICBz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpwaXBlbGluZWQpOwogc3RydWN0IGRybV9mcmFtZWJ1ZmZl ciAqCiBfX2ludGVsX2ZyYW1lYnVmZmVyX2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LApk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKaW5kZXggNzU3YzBkMi4uNGU3ZTdkYSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCkBAIC0xNTEsNyArMTUxLDcgQEAgc3RhdGljIGludCBp bnRlbGZiX2FsbG9jKHN0cnVjdCBkcm1fZmJfaGVscGVyICpoZWxwZXIsCiAJfQogCiAJLyogRmx1 c2ggZXZlcnl0aGluZyBvdXQsIHdlJ2xsIGJlIGRvaW5nIEdUVCBvbmx5IGZyb20gbm93IG9uICov Ci0JcmV0ID0gaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooTlVMTCwgZmIsIE5VTEwpOworCXJl dCA9IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKE5VTEwsIGZiLCBOVUxMLCBOVUxMKTsKIAlp ZiAocmV0KSB7CiAJCURSTV9FUlJPUigiZmFpbGVkIHRvIHBpbiBvYmo6ICVkXG4iLCByZXQpOwog CQlnb3RvIG91dF9mYjsKLS0gCjIuMy4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=