From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Subject: [PATCH 3/7] drm/i915: Pass in plane state when
	(un)pinning frame buffers
Date: Tue, 17 Mar 2015 15:45:13 +0000
Message-ID: <1426607117-10626-4-git-send-email-tvrtko.ursulin@linux.intel.com>
References: <1426607117-10626-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id A71A56E707
 for <Intel-gfx@lists.freedesktop.org>; Tue, 17 Mar 2015 08:45:25 -0700 (PDT)
In-Reply-To: <1426607117-10626-1-git-send-email-tvrtko.ursulin@linux.intel.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
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClBsYW5lIHN0
YXRlIGNhcnJpZXMgdGhlIHJvdGF0aW9uIGluZm9ybWF0aW9uIHdoaWNoIGlzIG5lZWRlZCBmb3Ig
ZGV0ZXJtaW5pbmcKdGhlIGFwcHJvcHJpYXRlIEdHVFQgdmlldyB0eXBlLgoKVGhpcyBqdXN0IGFk
ZHMgdGhlIHBhcmFtZXRlciB3aXRoIHRoZSBhY3R1YWwgdXNhZ2UgY29taW5nIGluIGZ1dHVyZSBw
YXRjaGVzLgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGlu
dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAxOCAr
KysrKysrKysrKystLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8
ICAxICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgICB8ICAyICstCiAzIGZp
bGVzIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0
IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDE2ZjM0NDMuLjg2MmFhNDYgMTAwNjQ0Ci0tLSBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTIyNTIsNiArMjI1Miw3IEBAIGludGVsX2ZiX2Fs
aWduX2hlaWdodChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgaGVpZ2h0LAog
aW50CiBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwK
IAkJCSAgIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAorCQkJICAgY29uc3Qgc3RydWN0IGRy
bV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUsCiAJCQkgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz
ICpwaXBlbGluZWQpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGZiLT5kZXY7CkBAIC0y
MzM5LDggKzIzNDAsMTEgQEAgZXJyX2ludGVycnVwdGlibGU6CiAJcmV0dXJuIHJldDsKIH0KIAot
c3RhdGljIHZvaWQgaW50ZWxfdW5waW5fZmJfb2JqKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0
ICpvYmopCitzdGF0aWMgdm9pZCBpbnRlbF91bnBpbl9mYl9vYmooc3RydWN0IGRybV9mcmFtZWJ1
ZmZlciAqZmIsCisJCQkgICAgICAgY29uc3Qgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVf
c3RhdGUpCiB7CisJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGludGVsX2ZiX29i
aihmYik7CisKIAlXQVJOX09OKCFtdXRleF9pc19sb2NrZWQoJm9iai0+YmFzZS5kZXYtPnN0cnVj
dF9tdXRleCkpOwogCiAJaTkxNV9nZW1fb2JqZWN0X3VucGluX2ZlbmNlKG9iaik7CkBAIC05Mjc3
LDcgKzkyODEsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF91bnBpbl93b3JrX2ZuKHN0cnVjdCB3b3Jr
X3N0cnVjdCAqX193b3JrKQogCWVudW0gcGlwZSBwaXBlID0gdG9faW50ZWxfY3J0Yyh3b3JrLT5j
cnRjKS0+cGlwZTsKIAogCW11dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQlpbnRlbF91
bnBpbl9mYl9vYmooaW50ZWxfZmJfb2JqKHdvcmstPm9sZF9mYikpOworCWludGVsX3VucGluX2Zi
X29iaih3b3JrLT5vbGRfZmIsIHdvcmstPmNydGMtPnByaW1hcnktPnN0YXRlKTsKIAlkcm1fZ2Vt
X29iamVjdF91bnJlZmVyZW5jZSgmd29yay0+cGVuZGluZ19mbGlwX29iai0+YmFzZSk7CiAKIAlp
bnRlbF9mYmNfdXBkYXRlKGRldik7CkBAIC05OTg1LDcgKzk5ODksOCBAQCBzdGF0aWMgaW50IGlu
dGVsX2NydGNfcGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJcmluZyA9ICZkZXZf
cHJpdi0+cmluZ1tSQ1NdOwogCX0KIAotCXJldCA9IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2Jq
KGNydGMtPnByaW1hcnksIGZiLCByaW5nKTsKKwlyZXQgPSBpbnRlbF9waW5fYW5kX2ZlbmNlX2Zi
X29iaihjcnRjLT5wcmltYXJ5LCBmYiwKKwkJCQkJIGNydGMtPnByaW1hcnktPnN0YXRlLCByaW5n
KTsKIAlpZiAocmV0KQogCQlnb3RvIGNsZWFudXBfcGVuZGluZzsKIApAQCAtMTAwMjUsNyArMTAw
MzAsNyBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfcGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAq
Y3J0YywKIAlyZXR1cm4gMDsKIAogY2xlYW51cF91bnBpbjoKLQlpbnRlbF91bnBpbl9mYl9vYmoo
b2JqKTsKKwlpbnRlbF91bnBpbl9mYl9vYmooZmIsIGNydGMtPnByaW1hcnktPnN0YXRlKTsKIGNs
ZWFudXBfcGVuZGluZzoKIAlhdG9taWNfZGVjKCZpbnRlbF9jcnRjLT51bnBpbl93b3JrX2NvdW50
KTsKIAltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKQEAgLTExOTgxLDcgKzExOTg2
LDcgQEAgaW50ZWxfcHJlcGFyZV9wbGFuZV9mYihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJ
aWYgKHJldCkKIAkJCURSTV9ERUJVR19LTVMoImZhaWxlZCB0byBhdHRhY2ggcGh5cyBvYmplY3Rc
biIpOwogCX0gZWxzZSB7Ci0JCXJldCA9IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKHBsYW5l
LCBmYiwgTlVMTCk7CisJCXJldCA9IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKHBsYW5lLCBm
YiwgbmV3X3N0YXRlLCBOVUxMKTsKIAl9CiAKIAlpZiAocmV0ID09IDApCkBAIC0xMjAxMyw3ICsx
MjAxOCw3IEBAIGludGVsX2NsZWFudXBfcGxhbmVfZmIoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUs
CiAJaWYgKHBsYW5lLT50eXBlICE9IERSTV9QTEFORV9UWVBFX0NVUlNPUiB8fAogCSAgICAhSU5U
RUxfSU5GTyhkZXYpLT5jdXJzb3JfbmVlZHNfcGh5c2ljYWwpIHsKIAkJbXV0ZXhfbG9jaygmZGV2
LT5zdHJ1Y3RfbXV0ZXgpOwotCQlpbnRlbF91bnBpbl9mYl9vYmoob2JqKTsKKwkJaW50ZWxfdW5w
aW5fZmJfb2JqKGZiLCBvbGRfc3RhdGUpOwogCQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211
dGV4KTsKIAl9CiB9CkBAIC0xMzkwNiw2ICsxMzkxMSw3IEBAIHZvaWQgaW50ZWxfbW9kZXNldF9n
ZW1faW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJCWlmIChpbnRlbF9waW5fYW5kX2Zl
bmNlX2ZiX29iaihjLT5wcmltYXJ5LAogCQkJCQkgICAgICAgYy0+cHJpbWFyeS0+ZmIsCisJCQkJ
CSAgICAgICBjLT5wcmltYXJ5LT5zdGF0ZSwKIAkJCQkJICAgICAgIE5VTEwpKSB7CiAJCQlEUk1f
RVJST1IoImZhaWxlZCB0byBwaW4gYm9vdCBmYiBvbiBwaXBlICVkXG4iLAogCQkJCSAgdG9faW50
ZWxfY3J0YyhjKS0+cGlwZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDUyNTQ1NDAu
LjM3MjE4NzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisr
KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC05NjIsNiArOTYyLDcgQEAg
dm9pZCBpbnRlbF9yZWxlYXNlX2xvYWRfZGV0ZWN0X3BpcGUoc3RydWN0IGRybV9jb25uZWN0b3Ig
KmNvbm5lY3RvciwKIAkJCQkgICAgc3RydWN0IGludGVsX2xvYWRfZGV0ZWN0X3BpcGUgKm9sZCk7
CiBpbnQgaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooc3RydWN0IGRybV9wbGFuZSAqcGxhbmUs
CiAJCQkgICAgICAgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCisJCQkgICAgICAgY29uc3Qg
c3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUsCiAJCQkgICAgICAgc3RydWN0IGlu
dGVsX2VuZ2luZV9jcyAqcGlwZWxpbmVkKTsKIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKgogX19p
bnRlbF9mcmFtZWJ1ZmZlcl9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKZGlmZiAtLWdp
dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9mYmRldi5jCmluZGV4IDc1N2MwZDIuLjRlN2U3ZGEgMTAwNjQ0Ci0tLSBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfZmJkZXYuYwpAQCAtMTUxLDcgKzE1MSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxmYl9h
bGxvYyhzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqaGVscGVyLAogCX0KIAogCS8qIEZsdXNoIGV2ZXJ5
dGhpbmcgb3V0LCB3ZSdsbCBiZSBkb2luZyBHVFQgb25seSBmcm9tIG5vdyBvbiAqLwotCXJldCA9
IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKE5VTEwsIGZiLCBOVUxMKTsKKwlyZXQgPSBpbnRl
bF9waW5fYW5kX2ZlbmNlX2ZiX29iaihOVUxMLCBmYiwgTlVMTCwgTlVMTCk7CiAJaWYgKHJldCkg
ewogCQlEUk1fRVJST1IoImZhaWxlZCB0byBwaW4gb2JqOiAlZFxuIiwgcmV0KTsKIAkJZ290byBv
dXRfZmI7Ci0tIAoyLjMuMgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0
b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl
bC1nZngK