From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH 11/22] drm/i915: Don't pass plane+plane_state to
	intel_pin_and_fence_fb_obj()
Date: Wed, 14 Oct 2015 19:29:03 +0300
Message-ID: <1444840154-7804-12-git-send-email-ville.syrjala@linux.intel.com>
References: <1444840154-7804-1-git-send-email-ville.syrjala@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 mga01.intel.com (mga01.intel.com [192.55.52.88])
 by gabe.freedesktop.org (Postfix) with ESMTP id BECF16ED2F
 for <intel-gfx@lists.freedesktop.org>; Wed, 14 Oct 2015 09:30:00 -0700 (PDT)
In-Reply-To: <1444840154-7804-1-git-send-email-ville.syrjala@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

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCmlu
dGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKCkgb25seSBuZWVkcyB0aGUgZnJhbWVidWZmZXIsIGFu
ZCB0aGUgZGVzaXJkCnJvdGF0aW9uICh0byBmaW5kIHRoZSByaWdodCBHVFQgdmlldyBmb3IgaXQp
LCBzbyBubyBuZWVkIHRvIHBhc3MgYWxsCmtpbmRzIG9mIHBsYW5lIHN0dWZmLgoKU2lnbmVkLW9m
Zi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0t
CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAzOSArKysrKysrKysrKysr
KysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o
ICAgICB8ICA1ICsrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jICAgfCAg
MiArLQogMyBmaWxlcyBjaGFuZ2VkLCAyMCBpbnNlcnRpb25zKCspLCAyNiBkZWxldGlvbnMoLSkK
CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggODVlMTQ3My4uODBlOWYyZSAx
MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMjI3NSw4ICsyMjc1LDkgQEAg
aW50ZWxfZmJfYWxpZ25faGVpZ2h0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGlu
dCBoZWlnaHQsCiB9CiAKIHN0YXRpYyBpbnQKLWludGVsX2ZpbGxfZmJfZ2d0dF92aWV3KHN0cnVj
dCBpOTE1X2dndHRfdmlldyAqdmlldywgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCi0JCQlj
b25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKK2ludGVsX2ZpbGxfZmJf
Z2d0dF92aWV3KHN0cnVjdCBpOTE1X2dndHRfdmlldyAqdmlldywKKwkJCWNvbnN0IHN0cnVjdCBk
cm1fZnJhbWVidWZmZXIgKmZiLAorCQkJdW5zaWduZWQgaW50IHJvdGF0aW9uKQogewogCXN0cnVj
dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZmItPmRldik7CiAJc3RydWN0
IGludGVsX3JvdGF0aW9uX2luZm8gKmluZm8gPSAmdmlldy0+cm90YXRpb25faW5mbzsKQEAgLTIy
ODQsMTAgKzIyODUsNyBAQCBpbnRlbF9maWxsX2ZiX2dndHRfdmlldyhzdHJ1Y3QgaTkxNV9nZ3R0
X3ZpZXcgKnZpZXcsIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAogCiAJKnZpZXcgPSBpOTE1
X2dndHRfdmlld19ub3JtYWw7CiAKLQlpZiAoIXBsYW5lX3N0YXRlKQotCQlyZXR1cm4gMDsKLQot
CWlmICghaW50ZWxfcm90YXRpb25fOTBfb3JfMjcwKHBsYW5lX3N0YXRlLT5yb3RhdGlvbikpCisJ
aWYgKCFpbnRlbF9yb3RhdGlvbl85MF9vcl8yNzAocm90YXRpb24pKQogCQlyZXR1cm4gMDsKIAog
CSp2aWV3ID0gaTkxNV9nZ3R0X3ZpZXdfcm90YXRlZDsKQEAgLTIzNTQsOSArMjM1Miw4IEBAIHN0
YXRpYyB1bnNpZ25lZCBpbnQgaW50ZWxfc3VyZl9hbGlnbm1lbnQoY29uc3Qgc3RydWN0IGRybV9p
OTE1X3ByaXZhdGUgKmRldl9wcml2CiB9CiAKIGludAotaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9v
Ymooc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCi0JCQkgICBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVy
ICpmYiwKLQkJCSAgIGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlLAor
aW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsCisJ
CQkgICB1bnNpZ25lZCBpbnQgcm90YXRpb24sCiAJCQkgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz
ICpwaXBlbGluZWQsCiAJCQkgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKipwaXBlbGlu
ZWRfcmVxdWVzdCkKIHsKQEAgLTIzNzEsNyArMjM2OCw3IEBAIGludGVsX3Bpbl9hbmRfZmVuY2Vf
ZmJfb2JqKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCiAJYWxpZ25tZW50ID0gaW50ZWxfc3Vy
Zl9hbGlnbm1lbnQoZGV2X3ByaXYsIGZiLT5tb2RpZmllclswXSk7CiAKLQlyZXQgPSBpbnRlbF9m
aWxsX2ZiX2dndHRfdmlldygmdmlldywgZmIsIHBsYW5lX3N0YXRlKTsKKwlyZXQgPSBpbnRlbF9m
aWxsX2ZiX2dndHRfdmlldygmdmlldywgZmIsIHJvdGF0aW9uKTsKIAlpZiAocmV0KQogCQlyZXR1
cm4gcmV0OwogCkBAIC0yNDMyLDggKzI0MjksNyBAQCBlcnJfaW50ZXJydXB0aWJsZToKIAlyZXR1
cm4gcmV0OwogfQogCi1zdGF0aWMgdm9pZCBpbnRlbF91bnBpbl9mYl9vYmooc3RydWN0IGRybV9m
cmFtZWJ1ZmZlciAqZmIsCi0JCQkgICAgICAgY29uc3Qgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAq
cGxhbmVfc3RhdGUpCitzdGF0aWMgdm9pZCBpbnRlbF91bnBpbl9mYl9vYmooc3RydWN0IGRybV9m
cmFtZWJ1ZmZlciAqZmIsIHVuc2lnbmVkIGludCByb3RhdGlvbikKIHsKIAlzdHJ1Y3QgZHJtX2k5
MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmJfb2JqKGZiKTsKIAlzdHJ1Y3QgaTkxNV9nZ3R0
X3ZpZXcgdmlldzsKQEAgLTI0NDEsNyArMjQzNyw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3VucGlu
X2ZiX29iaihzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKIAogCVdBUk5fT04oIW11dGV4X2lz
X2xvY2tlZCgmb2JqLT5iYXNlLmRldi0+c3RydWN0X211dGV4KSk7CiAKLQlyZXQgPSBpbnRlbF9m
aWxsX2ZiX2dndHRfdmlldygmdmlldywgZmIsIHBsYW5lX3N0YXRlKTsKKwlyZXQgPSBpbnRlbF9m
aWxsX2ZiX2dndHRfdmlldygmdmlldywgZmIsIHJvdGF0aW9uKTsKIAlXQVJOX09OQ0UocmV0LCAi
Q291bGRuJ3QgZ2V0IHZpZXcgZnJvbSBwbGFuZSBzdGF0ZSEiKTsKIAogCWk5MTVfZ2VtX29iamVj
dF91bnBpbl9mZW5jZShvYmopOwpAQCAtMTA3ODAsNyArMTA3NzYsNyBAQCBzdGF0aWMgdm9pZCBp
bnRlbF91bnBpbl93b3JrX2ZuKHN0cnVjdCB3b3JrX3N0cnVjdCAqX193b3JrKQogCXN0cnVjdCBk
cm1fcGxhbmUgKnByaW1hcnkgPSBjcnRjLT5iYXNlLnByaW1hcnk7CiAKIAltdXRleF9sb2NrKCZk
ZXYtPnN0cnVjdF9tdXRleCk7Ci0JaW50ZWxfdW5waW5fZmJfb2JqKHdvcmstPm9sZF9mYiwgcHJp
bWFyeS0+c3RhdGUpOworCWludGVsX3VucGluX2ZiX29iaih3b3JrLT5vbGRfZmIsIHByaW1hcnkt
PnN0YXRlLT5yb3RhdGlvbik7CiAJZHJtX2dlbV9vYmplY3RfdW5yZWZlcmVuY2UoJndvcmstPnBl
bmRpbmdfZmxpcF9vYmotPmJhc2UpOwogCiAJaWYgKHdvcmstPmZsaXBfcXVldWVkX3JlcSkKQEAg
LTExNTIxLDggKzExNTE3LDcgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3BhZ2VfZmxpcChzdHJ1
Y3QgZHJtX2NydGMgKmNydGMsCiAJICogc3luY2hyb25pc2F0aW9uLCBzbyBhbGwgd2Ugd2FudCBo
ZXJlIGlzIHRvIHBpbiB0aGUgZnJhbWVidWZmZXIKIAkgKiBpbnRvIHRoZSBkaXNwbGF5IHBsYW5l
IGFuZCBza2lwIGFueSB3YWl0cy4KIAkgKi8KLQlyZXQgPSBpbnRlbF9waW5fYW5kX2ZlbmNlX2Zi
X29iaihjcnRjLT5wcmltYXJ5LCBmYiwKLQkJCQkJIGNydGMtPnByaW1hcnktPnN0YXRlLAorCXJl
dCA9IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKGZiLCBwcmltYXJ5LT5zdGF0ZS0+cm90YXRp
b24sCiAJCQkJCSBtbWlvX2ZsaXAgPyBpOTE1X2dlbV9yZXF1ZXN0X2dldF9yaW5nKG9iai0+bGFz
dF93cml0ZV9yZXEpIDogcmluZywgJnJlcXVlc3QpOwogCWlmIChyZXQpCiAJCWdvdG8gY2xlYW51
cF9wZW5kaW5nOwpAQCAtMTE1NzMsNyArMTE1NjgsNyBAQCBzdGF0aWMgaW50IGludGVsX2NydGNf
cGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlyZXR1cm4gMDsKIAogY2xlYW51cF91
bnBpbjoKLQlpbnRlbF91bnBpbl9mYl9vYmooZmIsIGNydGMtPnByaW1hcnktPnN0YXRlKTsKKwlp
bnRlbF91bnBpbl9mYl9vYmooZmIsIGNydGMtPnByaW1hcnktPnN0YXRlLT5yb3RhdGlvbik7CiBj
bGVhbnVwX3BlbmRpbmc6CiAJaWYgKHJlcXVlc3QpCiAJCWk5MTVfZ2VtX3JlcXVlc3RfY2FuY2Vs
KHJlcXVlc3QpOwpAQCAtMTM0NTcsNyArMTM0NTIsOCBAQCBpbnRlbF9wcmVwYXJlX3BsYW5lX2Zi
KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQlpZiAocmV0KQogCQkJRFJNX0RFQlVHX0tNUygi
ZmFpbGVkIHRvIGF0dGFjaCBwaHlzIG9iamVjdFxuIik7CiAJfSBlbHNlIHsKLQkJcmV0ID0gaW50
ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmoocGxhbmUsIGZiLCBuZXdfc3RhdGUsIE5VTEwsIE5VTEwp
OworCQlyZXQgPSBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihmYiwgbmV3X3N0YXRlLT5yb3Rh
dGlvbiwKKwkJCQkJCSBOVUxMLCBOVUxMKTsKIAl9CiAKIAlpZiAocmV0ID09IDApCkBAIC0xMzQ4
OCw3ICsxMzQ4NCw3IEBAIGludGVsX2NsZWFudXBfcGxhbmVfZmIoc3RydWN0IGRybV9wbGFuZSAq
cGxhbmUsCiAJaWYgKHBsYW5lLT50eXBlICE9IERSTV9QTEFORV9UWVBFX0NVUlNPUiB8fAogCSAg
ICAhSU5URUxfSU5GTyhkZXYpLT5jdXJzb3JfbmVlZHNfcGh5c2ljYWwpIHsKIAkJbXV0ZXhfbG9j
aygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCQlpbnRlbF91bnBpbl9mYl9vYmoob2xkX3N0YXRlLT5m
Yiwgb2xkX3N0YXRlKTsKKwkJaW50ZWxfdW5waW5fZmJfb2JqKG9sZF9zdGF0ZS0+ZmIsIG9sZF9z
dGF0ZS0+cm90YXRpb24pOwogCQltdXRleF91bmxvY2soJmRldi0+c3RydWN0X211dGV4KTsKIAl9
CiB9CkBAIC0xNTQ3NCw5ICsxNTQ3MCw4IEBAIHZvaWQgaW50ZWxfbW9kZXNldF9nZW1faW5pdChz
dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJY29udGludWU7CiAKIAkJbXV0ZXhfbG9jaygmZGV2
LT5zdHJ1Y3RfbXV0ZXgpOwotCQlyZXQgPSBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihjLT5w
cmltYXJ5LAotCQkJCQkJIGMtPnByaW1hcnktPmZiLAotCQkJCQkJIGMtPnByaW1hcnktPnN0YXRl
LAorCQlyZXQgPSBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihjLT5wcmltYXJ5LT5mYiwKKwkJ
CQkJCSBjLT5wcmltYXJ5LT5zdGF0ZS0+cm90YXRpb24sCiAJCQkJCQkgTlVMTCwgTlVMTCk7CiAJ
CW11dGV4X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCQlpZiAocmV0KSB7CmRpZmYgLS1n
aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2Rydi5oCmluZGV4IGVkNDdjYTMuLmIwZDkyZTAgMTAwNjQ0Ci0tLSBhL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX2Rydi5oCkBAIC0xMDY3LDkgKzEwNjcsOCBAQCBib29sIGludGVsX2dldF9sb2FkX2RldGVj
dF9waXBlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiB2b2lkIGludGVsX3JlbGVh
c2VfbG9hZF9kZXRlY3RfcGlwZShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAogCQkJ
CSAgICBzdHJ1Y3QgaW50ZWxfbG9hZF9kZXRlY3RfcGlwZSAqb2xkLAogCQkJCSAgICBzdHJ1Y3Qg
ZHJtX21vZGVzZXRfYWNxdWlyZV9jdHggKmN0eCk7Ci1pbnQgaW50ZWxfcGluX2FuZF9mZW5jZV9m
Yl9vYmooc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCi0JCQkgICAgICAgc3RydWN0IGRybV9mcmFt
ZWJ1ZmZlciAqZmIsCi0JCQkgICAgICAgY29uc3Qgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcGxh
bmVfc3RhdGUsCitpbnQgaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooc3RydWN0IGRybV9mcmFt
ZWJ1ZmZlciAqZmIsCisJCQkgICAgICAgdW5zaWduZWQgaW50IHJvdGF0aW9uLAogCQkJICAgICAg
IHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnBpcGVsaW5lZCwKIAkJCSAgICAgICBzdHJ1Y3QgZHJt
X2k5MTVfZ2VtX3JlcXVlc3QgKipwaXBlbGluZWRfcmVxdWVzdCk7CiBzdHJ1Y3QgZHJtX2ZyYW1l
YnVmZmVyICoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCmluZGV4IDRmZDVmZGYuLjZiZWY4
MjAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKKysrIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZmJkZXYuYwpAQCAtMTYxLDcgKzE2MSw3IEBAIHN0
YXRpYyBpbnQgaW50ZWxmYl9hbGxvYyhzdHJ1Y3QgZHJtX2ZiX2hlbHBlciAqaGVscGVyLAogCX0K
IAogCS8qIEZsdXNoIGV2ZXJ5dGhpbmcgb3V0LCB3ZSdsbCBiZSBkb2luZyBHVFQgb25seSBmcm9t
IG5vdyBvbiAqLwotCXJldCA9IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKE5VTEwsIGZiLCBO
VUxMLCBOVUxMLCBOVUxMKTsKKwlyZXQgPSBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaihmYiwg
QklUKERSTV9ST1RBVEVfMCksIE5VTEwsIE5VTEwpOwogCWlmIChyZXQpIHsKIAkJRFJNX0VSUk9S
KCJmYWlsZWQgdG8gcGluIG9iajogJWRcbiIsIHJldCk7CiAJCWdvdG8gb3V0X2ZiOwotLSAKMi40
LjkKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs
LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8v
bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==