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: Thu, 5 Mar 2015 14:07:32 +0000 Message-ID: <1425564456-3660-4-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1425564456-3660-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 8FBC86E7CE for ; Thu, 5 Mar 2015 06:08:01 -0800 (PST) In-Reply-To: <1425564456-3660-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 L2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGQxYzZlZjMuLjgxMDcyYzQgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTIyNDcsNiArMjI0Nyw3IEBAIGludGVsX2ZiX2Fs aWduX2hlaWdodChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgaGVpZ2h0LAog aW50CiBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwK IAkJCSAgIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAorCQkJICAgY29uc3Qgc3RydWN0IGRy bV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUsCiAJCQkgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpwaXBlbGluZWQpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGZiLT5kZXY7CkBAIC0y MzM0LDggKzIzMzUsMTEgQEAgZXJyX2ludGVycnVwdGlibGU6CiAJcmV0dXJuIHJldDsKIH0KIAot c3RhdGljIHZvaWQgaW50ZWxfdW5waW5fZmJfb2JqKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0 ICpvYmopCitzdGF0aWMgdm9pZCBpbnRlbF91bnBpbl9mYl9vYmooc3RydWN0IGRybV9mcmFtZWJ1 ZmZlciAqZmIsCisJCQkgICAgICAgY29uc3Qgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVf c3RhdGUpCiB7CisJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGludGVsX2ZiX29i aihmYik7CisKIAlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJm9iai0+YmFzZS5kZXYtPnN0cnVj dF9tdXRleCkpOwogCiAJaTkxNV9nZW1fb2JqZWN0X3VucGluX2ZlbmNlKG9iaik7CkBAIC05MjI1 LDcgKzkyMjksNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF91bnBpbl93b3JrX2ZuKHN0cnVjdCB3b3Jr X3N0cnVjdCAqX193b3JrKQogCWVudW0gcGlwZSBwaXBlID0gdG9faW50ZWxfY3J0Yyh3b3JrLT5j cnRjKS0+cGlwZTsKIAogCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQlpbnRlbF91 bnBpbl9mYl9vYmooaW50ZWxfZmJfb2JqKHdvcmstPm9sZF9mYikpOworCWludGVsX3VucGluX2Zi X29iaih3b3JrLT5vbGRfZmIsIHdvcmstPmNydGMtPnByaW1hcnktPnN0YXRlKTsKIAlkcm1fZ2Vt X29iamVjdF91bnJlZmVyZW5jZSgmd29yay0+cGVuZGluZ19mbGlwX29iai0+YmFzZSk7CiAJZHJt X2ZyYW1lYnVmZmVyX3VucmVmZXJlbmNlKHdvcmstPm9sZF9mYik7CiAKQEAgLTk5MzMsNyArOTkz Nyw4IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19wYWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpj cnRjLAogCQlyaW5nID0gJmRldl9wcml2LT5yaW5nW1JDU107CiAJfQogCi0JcmV0ID0gaW50ZWxf cGluX2FuZF9mZW5jZV9mYl9vYmooY3J0Yy0+cHJpbWFyeSwgZmIsIHJpbmcpOworCXJldCA9IGlu dGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKGNydGMtPnByaW1hcnksIGZiLAorCQkJCQkgY3J0Yy0+ cHJpbWFyeS0+c3RhdGUsIHJpbmcpOwogCWlmIChyZXQpCiAJCWdvdG8gY2xlYW51cF9wZW5kaW5n OwogCkBAIC05OTczLDcgKzk5NzgsNyBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfcGFnZV9mbGlw KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlyZXR1cm4gMDsKIAogY2xlYW51cF91bnBpbjoKLQlp bnRlbF91bnBpbl9mYl9vYmoob2JqKTsKKwlpbnRlbF91bnBpbl9mYl9vYmooZmIsIGNydGMtPnBy aW1hcnktPnN0YXRlKTsKIGNsZWFudXBfcGVuZGluZzoKIAlhdG9taWNfZGVjKCZpbnRlbF9jcnRj LT51bnBpbl93b3JrX2NvdW50KTsKIAljcnRjLT5wcmltYXJ5LT5mYiA9IG9sZF9mYjsKQEAgLTEx OTI4LDcgKzExOTMzLDcgQEAgaW50ZWxfcHJlcGFyZV9wbGFuZV9mYihzdHJ1Y3QgZHJtX3BsYW5l ICpwbGFuZSwKIAkJaWYgKHJldCkKIAkJCURSTV9ERUJVR19LTVMoImZhaWxlZCB0byBhdHRhY2gg cGh5cyBvYmplY3RcbiIpOwogCX0gZWxzZSB7Ci0JCXJldCA9IGludGVsX3Bpbl9hbmRfZmVuY2Vf ZmJfb2JqKHBsYW5lLCBmYiwgTlVMTCk7CisJCXJldCA9IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJf b2JqKHBsYW5lLCBmYiwgbmV3X3N0YXRlLCBOVUxMKTsKIAl9CiAKIAlpZiAocmV0ID09IDApCkBA IC0xMTk2MCw3ICsxMTk2NSw3IEBAIGludGVsX2NsZWFudXBfcGxhbmVfZmIoc3RydWN0IGRybV9w bGFuZSAqcGxhbmUsCiAJaWYgKHBsYW5lLT50eXBlICE9IERSTV9QTEFORV9UWVBFX0NVUlNPUiB8 fAogCSAgICAhSU5URUxfSU5GTyhkZXYpLT5jdXJzb3JfbmVlZHNfcGh5c2ljYWwpIHsKIAkJbXV0 ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCQlpbnRlbF91bnBpbl9mYl9vYmoob2JqKTsK KwkJaW50ZWxfdW5waW5fZmJfb2JqKGZiLCBvbGRfc3RhdGUpOwogCQltdXRleF91bmxvY2soJmRl di0+c3RydWN0X211dGV4KTsKIAl9CiB9CkBAIC0xMzg1MCw2ICsxMzg1NSw3IEBAIHZvaWQgaW50 ZWxfbW9kZXNldF9nZW1faW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJCWlmIChpbnRl bF9waW5fYW5kX2ZlbmNlX2ZiX29iaihjLT5wcmltYXJ5LAogCQkJCQkgICAgICAgYy0+cHJpbWFy eS0+ZmIsCisJCQkJCSAgICAgICBjLT5wcmltYXJ5LT5zdGF0ZSwKIAkJCQkJICAgICAgIE5VTEwp KSB7CiAJCQlEUk1fRVJST1IoImZhaWxlZCB0byBwaW4gYm9vdCBmYiBvbiBwaXBlICVkXG4iLAog CQkJCSAgdG9faW50ZWxfY3J0YyhjKS0+cGlwZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmlu ZGV4IDE2NzdlYTEuLjliOTZkNDggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC05NTgs NiArOTU4LDcgQEAgdm9pZCBpbnRlbF9yZWxlYXNlX2xvYWRfZGV0ZWN0X3BpcGUoc3RydWN0IGRy bV9jb25uZWN0b3IgKmNvbm5lY3RvciwKIAkJCQkgICAgc3RydWN0IGludGVsX2xvYWRfZGV0ZWN0 X3BpcGUgKm9sZCk7CiBpbnQgaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooc3RydWN0IGRybV9w bGFuZSAqcGxhbmUsCiAJCQkgICAgICAgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCisJCQkg ICAgICAgY29uc3Qgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUsCiAJCQkgICAg ICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcGlwZWxpbmVkKTsKIHN0cnVjdCBkcm1fZnJhbWVi dWZmZXIgKgogX19pbnRlbF9mcmFtZWJ1ZmZlcl9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCmluZGV4IDIzNGE2OTkuLmQ4MjA0YWUgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYwpAQCAtMTI2LDcgKzEyNiw3IEBAIHN0YXRpYyBp bnQgaW50ZWxmYl9hbGxvYyhzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqaGVscGVyLAogCX0KIAogCS8q IEZsdXNoIGV2ZXJ5dGhpbmcgb3V0LCB3ZSdsbCBiZSBkb2luZyBHVFQgb25seSBmcm9tIG5vdyBv biAqLwotCXJldCA9IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKE5VTEwsIGZiLCBOVUxMKTsK KwlyZXQgPSBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihOVUxMLCBmYiwgTlVMTCwgTlVMTCk7 CiAJaWYgKHJldCkgewogCQlEUk1fRVJST1IoImZhaWxlZCB0byBwaW4gb2JqOiAlZFxuIiwgcmV0 KTsKIAkJZ290byBvdXRfZmI7Ci0tIAoyLjMuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK