From: Tvrtko Ursulin Subject: [PATCH 4/8] drm/i915: Pass in plane state when (un)pinning frame buffers Date: Tue, 3 Mar 2015 14:22:34 +0000 Message-ID: <1425392558-15601-5-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1425392558-15601-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 4FC2F6E5B9 for ; Tue, 3 Mar 2015 06:22:47 -0800 (PST) In-Reply-To: <1425392558-15601-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 dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAxOCAr KysrKysrKysrKystLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8 ICAxICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgICB8ICAyICstCiAzIGZp bGVzIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDhiMjEwZmMuLmRhYTdlZTIgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTIyNDcsNiArMjI0Nyw3IEBAIGludGVsX2ZiX2Fs aWduX2hlaWdodChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgaGVpZ2h0LCB1aW50MzJfdCBw aXhlbF9mb3JtYXQsCiBpbnQKIGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKHN0cnVjdCBkcm1f cGxhbmUgKnBsYW5lLAogCQkJICAgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCisJCQkgICBj b25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSwKIAkJCSAgIHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKnBpcGVsaW5lZCkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0g ZmItPmRldjsKQEAgLTIzMzQsOCArMjMzNSwxMSBAQCBlcnJfaW50ZXJydXB0aWJsZToKIAlyZXR1 cm4gcmV0OwogfQogCi1zdGF0aWMgdm9pZCBpbnRlbF91bnBpbl9mYl9vYmooc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKm9iaikKK3N0YXRpYyB2b2lkIGludGVsX3VucGluX2ZiX29iaihzdHJ1 Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKKwkJCSAgICAgICBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5l X3N0YXRlICpwbGFuZV9zdGF0ZSkKIHsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2Jq ID0gaW50ZWxfZmJfb2JqKGZiKTsKKwogCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmb2JqLT5i YXNlLmRldi0+c3RydWN0X211dGV4KSk7CiAKIAlpOTE1X2dlbV9vYmplY3RfdW5waW5fZmVuY2Uo b2JqKTsKQEAgLTkyMjQsNyArOTIyOCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3VucGluX3dvcmtf Zm4oc3RydWN0IHdvcmtfc3RydWN0ICpfX3dvcmspCiAJZW51bSBwaXBlIHBpcGUgPSB0b19pbnRl bF9jcnRjKHdvcmstPmNydGMpLT5waXBlOwogCiAJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0 ZXgpOwotCWludGVsX3VucGluX2ZiX29iaihpbnRlbF9mYl9vYmood29yay0+b2xkX2ZiKSk7CisJ aW50ZWxfdW5waW5fZmJfb2JqKHdvcmstPm9sZF9mYiwgd29yay0+Y3J0Yy0+cHJpbWFyeS0+c3Rh dGUpOwogCWRybV9nZW1fb2JqZWN0X3VucmVmZXJlbmNlKCZ3b3JrLT5wZW5kaW5nX2ZsaXBfb2Jq LT5iYXNlKTsKIAlkcm1fZnJhbWVidWZmZXJfdW5yZWZlcmVuY2Uod29yay0+b2xkX2ZiKTsKIApA QCAtOTkzMiw3ICs5OTM2LDggQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3BhZ2VfZmxpcChzdHJ1 Y3QgZHJtX2NydGMgKmNydGMsCiAJCXJpbmcgPSAmZGV2X3ByaXYtPnJpbmdbUkNTXTsKIAl9CiAK LQlyZXQgPSBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihjcnRjLT5wcmltYXJ5LCBmYiwgcmlu Zyk7CisJcmV0ID0gaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooY3J0Yy0+cHJpbWFyeSwgZmIs CisJCQkJCSBjcnRjLT5wcmltYXJ5LT5zdGF0ZSwgcmluZyk7CiAJaWYgKHJldCkKIAkJZ290byBj bGVhbnVwX3BlbmRpbmc7CiAKQEAgLTk5NzIsNyArOTk3Nyw3IEBAIHN0YXRpYyBpbnQgaW50ZWxf Y3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXJldHVybiAwOwogCiBjbGVh bnVwX3VucGluOgotCWludGVsX3VucGluX2ZiX29iaihvYmopOworCWludGVsX3VucGluX2ZiX29i aihmYiwgY3J0Yy0+cHJpbWFyeS0+c3RhdGUpOwogY2xlYW51cF9wZW5kaW5nOgogCWF0b21pY19k ZWMoJmludGVsX2NydGMtPnVucGluX3dvcmtfY291bnQpOwogCWNydGMtPnByaW1hcnktPmZiID0g b2xkX2ZiOwpAQCAtMTE5MzQsNyArMTE5MzksNyBAQCBpbnRlbF9wcmVwYXJlX3BsYW5lX2ZiKHN0 cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQlpZiAocmV0KQogCQkJRFJNX0RFQlVHX0tNUygiZmFp bGVkIHRvIGF0dGFjaCBwaHlzIG9iamVjdFxuIik7CiAJfSBlbHNlIHsKLQkJcmV0ID0gaW50ZWxf cGluX2FuZF9mZW5jZV9mYl9vYmoocGxhbmUsIGZiLCBOVUxMKTsKKwkJcmV0ID0gaW50ZWxfcGlu X2FuZF9mZW5jZV9mYl9vYmoocGxhbmUsIGZiLCBuZXdfc3RhdGUsIE5VTEwpOwogCX0KIAogCWlm IChyZXQgPT0gMCkKQEAgLTExOTY2LDcgKzExOTcxLDcgQEAgaW50ZWxfY2xlYW51cF9wbGFuZV9m YihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAlpZiAocGxhbmUtPnR5cGUgIT0gRFJNX1BMQU5F X1RZUEVfQ1VSU09SIHx8CiAJICAgICFJTlRFTF9JTkZPKGRldiktPmN1cnNvcl9uZWVkc19waHlz aWNhbCkgewogCQltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JCWludGVsX3VucGlu X2ZiX29iaihvYmopOworCQlpbnRlbF91bnBpbl9mYl9vYmooZmIsIG9sZF9zdGF0ZSk7CiAJCW11 dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCX0KIH0KQEAgLTEzODYzLDYgKzEzODY4 LDcgQEAgdm9pZCBpbnRlbF9tb2Rlc2V0X2dlbV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAKIAkJaWYgKGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKGMtPnByaW1hcnksCiAJCQkJCSAg ICAgICBjLT5wcmltYXJ5LT5mYiwKKwkJCQkJICAgICAgIGMtPnByaW1hcnktPnN0YXRlLAogCQkJ CQkgICAgICAgTlVMTCkpIHsKIAkJCURSTV9FUlJPUigiZmFpbGVkIHRvIHBpbiBib290IGZiIG9u IHBpcGUgJWRcbiIsCiAJCQkJICB0b19pbnRlbF9jcnRjKGMpLT5waXBlKTsKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmgKaW5kZXggOGUwYzNmOS4uNWI4MjQ3MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmgKQEAgLTk1Niw2ICs5NTYsNyBAQCB2b2lkIGludGVsX3JlbGVhc2VfbG9hZF9kZXRlY3Rf cGlwZShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCQkJCSAgICBzdHJ1Y3QgaW50 ZWxfbG9hZF9kZXRlY3RfcGlwZSAqb2xkKTsKIGludCBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29i aihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJCSAgICAgICBzdHJ1Y3QgZHJtX2ZyYW1lYnVm ZmVyICpmYiwKKwkJCSAgICAgICBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFuZV9z dGF0ZSwKIAkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpwaXBlbGluZWQpOwogc3Ry dWN0IGRybV9mcmFtZWJ1ZmZlciAqCiBfX2ludGVsX2ZyYW1lYnVmZmVyX2NyZWF0ZShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZmJkZXYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKaW5kZXggMjM0YTY5 OS4uZDgyMDRhZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCkBAIC0xMjYsNyArMTI2 LDcgQEAgc3RhdGljIGludCBpbnRlbGZiX2FsbG9jKHN0cnVjdCBkcm1fZmJfaGVscGVyICpoZWxw ZXIsCiAJfQogCiAJLyogRmx1c2ggZXZlcnl0aGluZyBvdXQsIHdlJ2xsIGJlIGRvaW5nIEdUVCBv bmx5IGZyb20gbm93IG9uICovCi0JcmV0ID0gaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooTlVM TCwgZmIsIE5VTEwpOworCXJldCA9IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKE5VTEwsIGZi LCBOVUxMLCBOVUxMKTsKIAlpZiAocmV0KSB7CiAJCURSTV9FUlJPUigiZmFpbGVkIHRvIHBpbiBv Ymo6ICVkXG4iLCByZXQpOwogCQlnb3RvIG91dF9mYjsKLS0gCjIuMy4wCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0 CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=