From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Subject: [RFC 5/5] drm/i915: Make intel_pin_and_fence_fb_obj
	take plane and framebuffer
Date: Thu, 30 Oct 2014 16:39:38 +0000
Message-ID: <1414687178-18562-6-git-send-email-tvrtko.ursulin@linux.intel.com>
References: <1414687178-18562-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 mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTP id 5A75C6E525
 for <Intel-gfx@lists.freedesktop.org>; Thu, 30 Oct 2014 09:40:08 -0700 (PDT)
In-Reply-To: <1414687178-18562-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
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkl0IHdpbGwg
aGVscCBmdXR1cmUgY29kZSBpZiB0aGlzIGZ1bmN0aW9uIGtub3dzIHNvbWV0aGluZyBhYm91dCBv
ZiB0aGUgY29udGV4dApvZiB0aGUgZGlzcGxheSBzZXR1cCBvYmplY3QgaXMgYmVpbmcgcGlubmVk
IGZvci4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRl
bC5jb20+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgotLS0KIGRy
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDI1ICsrKysrKysrKysrKystLS0t
LS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAgICB8ICA0ICsrLS0K
IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgICB8IDIwICsrKysrKysrKystLS0t
LS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgfCAgMiArLQogNCBm
aWxlcyBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspLCAyNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n
aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggYTQ3MzdjMy4uYTI0Zjg0YyAxMDA2NDQKLS0t
IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMjIxOCwxMSArMjIxOCwxMyBAQCBpbnRlbF9m
Yl9hbGlnbl9oZWlnaHQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IGJpdHNfcGVyX3BpeGVs
LCBpbnQgaGVpZ2h0LAogfQogCiBpbnQKLWludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKHN0cnVj
dCBkcm1fZGV2aWNlICpkZXYsCi0JCQkgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2Jq
LAoraW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCisJ
CQkgICBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKIAkJCSAgIHN0cnVjdCBpbnRlbF9lbmdp
bmVfY3MgKnBpcGVsaW5lZCkKIHsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZmItPmRldjsK
IAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwor
CXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9mYl9vYmooZmIpOwogCXUz
MiBhbGlnbm1lbnQ7CiAJaW50IHJldDsKIApAQCAtMjk1Miw3ICsyOTU0LDYgQEAgaW50ZWxfcGlw
ZV9zZXRfYmFzZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIGludCB4LCBpbnQgeSwKIAlzdHJ1Y3Qg
aW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAJZW51bSBwaXBl
IHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKm9sZF9m
YiA9IGNydGMtPnByaW1hcnktPmZiOwotCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmog
PSBpbnRlbF9mYl9vYmooZmIpOwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvbGRfb2Jq
ID0gaW50ZWxfZmJfb2JqKG9sZF9mYik7CiAJaW50IHJldDsKIApAQCAtMjk3NSw5ICsyOTc2LDkg
QEAgaW50ZWxfcGlwZV9zZXRfYmFzZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIGludCB4LCBpbnQg
eSwKIAl9CiAKIAltdXRleF9sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7Ci0JcmV0ID0gaW50ZWxf
cGluX2FuZF9mZW5jZV9mYl9vYmooZGV2LCBvYmosIE5VTEwpOworCXJldCA9IGludGVsX3Bpbl9h
bmRfZmVuY2VfZmJfb2JqKGNydGMtPnByaW1hcnksIGZiLCBOVUxMKTsKIAlpZiAocmV0ID09IDAp
Ci0JCWk5MTVfZ2VtX3RyYWNrX2ZiKG9sZF9vYmosIG9iaiwKKwkJaTkxNV9nZW1fdHJhY2tfZmIo
b2xkX29iaiwgaW50ZWxfZmJfb2JqKGZiKSwKIAkJCQkgIElOVEVMX0ZST05UQlVGRkVSX1BSSU1B
UlkocGlwZSkpOwogCW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCWlmIChyZXQg
IT0gMCkgewpAQCAtMTAyMjAsNyArMTAyMjEsNyBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfcGFn
ZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJcmluZyA9ICZkZXZfcHJpdi0+cmluZ1tS
Q1NdOwogCX0KIAotCXJldCA9IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKGRldiwgb2JqLCBy
aW5nKTsKKwlyZXQgPSBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihjcnRjLT5wcmltYXJ5LCBm
YiwgcmluZyk7CiAJaWYgKHJldCkKIAkJZ290byBjbGVhbnVwX3BlbmRpbmc7CiAKQEAgLTExNDI3
LDkgKzExNDI4LDcgQEAgc3RhdGljIGludCBfX2ludGVsX3NldF9tb2RlKHN0cnVjdCBkcm1fY3J0
YyAqY3J0YywKIAkJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGludGVsX2ZiX29i
aihmYik7CiAKIAkJbXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCQlyZXQgPSBpbnRl
bF9waW5fYW5kX2ZlbmNlX2ZiX29iaihkZXYsCi0JCQkJCQkgb2JqLAotCQkJCQkJIE5VTEwpOwor
CQlyZXQgPSBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihjcnRjLT5wcmltYXJ5LCBmYiwgTlVM
TCk7CiAJCWlmIChyZXQgIT0gMCkgewogCQkJRFJNX0VSUk9SKCJwaW4gJiBmZW5jZSBmYWlsZWRc
biIpOwogCQkJbXV0ZXhfdW5sb2NrKCZkZXYtPnN0cnVjdF9tdXRleCk7CkBAIC0xMjEwOSw3ICsx
MjEwOCw3IEBAIGludGVsX2NvbW1pdF9wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBs
YW5lLAogCQkgKiBmYWlsLgogCQkgKi8KIAkJaWYgKHBsYW5lLT5mYiAhPSBmYikgewotCQkJcmV0
ID0gaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooZGV2LCBvYmosIE5VTEwpOworCQkJcmV0ID0g
aW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmoocGxhbmUsIGZiLCBOVUxMKTsKIAkJCWlmIChyZXQp
IHsKIAkJCQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAkJCQlyZXR1cm4gcmV0
OwpAQCAtMTM3ODIsNyArMTM3ODEsOSBAQCB2b2lkIGludGVsX21vZGVzZXRfZ2VtX2luaXQoc3Ry
dWN0IGRybV9kZXZpY2UgKmRldikKIAkJaWYgKG9iaiA9PSBOVUxMKQogCQkJY29udGludWU7CiAK
LQkJaWYgKGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKGRldiwgb2JqLCBOVUxMKSkgeworCQlp
ZiAoaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooYy0+cHJpbWFyeSwKKwkJCQkJICAgICAgIGMt
PnByaW1hcnktPmZiLAorCQkJCQkgICAgICAgTlVMTCkpIHsKIAkJCURSTV9FUlJPUigiZmFpbGVk
IHRvIHBpbiBib290IGZiIG9uIHBpcGUgJWRcbiIsCiAJCQkJICB0b19pbnRlbF9jcnRjKGMpLT5w
aXBlKTsKIAkJCWRybV9mcmFtZWJ1ZmZlcl91bnJlZmVyZW5jZShjLT5wcmltYXJ5LT5mYik7CmRp
ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDdlMjA4ZDZkLi41NjNkNjdlIDEwMDY0NAotLS0g
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9kcnYuaApAQCAtODkxLDggKzg5MSw4IEBAIGJvb2wgaW50ZWxfZ2V0X2xvYWRf
ZGV0ZWN0X3BpcGUoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKIAkJCQlzdHJ1Y3Qg
ZHJtX21vZGVzZXRfYWNxdWlyZV9jdHggKmN0eCk7CiB2b2lkIGludGVsX3JlbGVhc2VfbG9hZF9k
ZXRlY3RfcGlwZShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCQkJCSAgICBzdHJ1
Y3QgaW50ZWxfbG9hZF9kZXRlY3RfcGlwZSAqb2xkKTsKLWludCBpbnRlbF9waW5fYW5kX2ZlbmNl
X2ZiX29iaihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAotCQkJICAgICAgIHN0cnVjdCBkcm1faTkx
NV9nZW1fb2JqZWN0ICpvYmosCitpbnQgaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooc3RydWN0
IGRybV9wbGFuZSAqcGxhbmUsCisJCQkgICAgICAgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIs
CiAJCQkgICAgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcGlwZWxpbmVkKTsKIHZvaWQgaW50
ZWxfdW5waW5fZmJfb2JqKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopOwogc3RydWN0
IGRybV9mcmFtZWJ1ZmZlciAqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9mYmRldi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYwppbmRleCAwMDdj
NjA2Li5hMmE3ZTQ4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRl
di5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKQEAgLTExOSwyNSAr
MTE5LDI1IEBAIHN0YXRpYyBpbnQgaW50ZWxmYl9hbGxvYyhzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAq
aGVscGVyLAogCQlnb3RvIG91dDsKIAl9CiAKLQkvKiBGbHVzaCBldmVyeXRoaW5nIG91dCwgd2Un
bGwgYmUgZG9pbmcgR1RUIG9ubHkgZnJvbSBub3cgb24gKi8KLQlyZXQgPSBpbnRlbF9waW5fYW5k
X2ZlbmNlX2ZiX29iaihkZXYsIG9iaiwgTlVMTCk7Ci0JaWYgKHJldCkgewotCQlEUk1fRVJST1Io
ImZhaWxlZCB0byBwaW4gb2JqOiAlZFxuIiwgcmV0KTsKLQkJZ290byBvdXRfdW5yZWY7Ci0JfQot
CiAJZmIgPSBfX2ludGVsX2ZyYW1lYnVmZmVyX2NyZWF0ZShkZXYsICZtb2RlX2NtZCwgb2JqKTsK
IAlpZiAoSVNfRVJSKGZiKSkgewogCQlyZXQgPSBQVFJfRVJSKGZiKTsKLQkJZ290byBvdXRfdW5w
aW47CisJCWdvdG8gb3V0X3VucmVmOworCX0KKworCS8qIEZsdXNoIGV2ZXJ5dGhpbmcgb3V0LCB3
ZSdsbCBiZSBkb2luZyBHVFQgb25seSBmcm9tIG5vdyBvbiAqLworCXJldCA9IGludGVsX3Bpbl9h
bmRfZmVuY2VfZmJfb2JqKE5VTEwsIGZiLCBOVUxMKTsKKwlpZiAocmV0KSB7CisJCURSTV9FUlJP
UigiZmFpbGVkIHRvIHBpbiBvYmo6ICVkXG4iLCByZXQpOworCQlnb3RvIG91dF9mYjsKIAl9CiAK
IAlpZmJkZXYtPmZiID0gdG9faW50ZWxfZnJhbWVidWZmZXIoZmIpOwogCiAJcmV0dXJuIDA7CiAK
LW91dF91bnBpbjoKLQlpOTE1X2dlbV9vYmplY3RfZ2d0dF91bnBpbihvYmopOworb3V0X2ZiOgor
CWRybV9mcmFtZWJ1ZmZlcl9yZW1vdmUoZmIpOwogb3V0X3VucmVmOgogCWRybV9nZW1fb2JqZWN0
X3VucmVmZXJlbmNlKCZvYmotPmJhc2UpOwogb3V0OgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJp
dGUuYwppbmRleCA1NzNiZTk1Li42ZjdiZmFmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJp
dGUuYwpAQCAtMTIzOSw3ICsxMjM5LDcgQEAgaW50ZWxfY29tbWl0X3Nwcml0ZV9wbGFuZShzdHJ1
Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJICogdGhlIHNwcml0ZSBwbGFuZXMgb25seSByZXF1aXJl
IDEyOEtpQiBhbGlnbm1lbnQgYW5kIDMyIFBURQogCQkgKiBwYWRkaW5nLgogCQkgKi8KLQkJcmV0
ID0gaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooZGV2LCBvYmosIE5VTEwpOworCQlyZXQgPSBp
bnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihwbGFuZSwgZmIsIE5VTEwpOwogCQlpZiAocmV0ID09
IDApCiAJCQlpOTE1X2dlbV90cmFja19mYihvbGRfb2JqLCBvYmosCiAJCQkJCSAgSU5URUxfRlJP
TlRCVUZGRVJfU1BSSVRFKHBpcGUpKTsKLS0gCjIuMS4xCgpfX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm
eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls
bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=