From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH v2 10/18] drm/i915: Don't pass plane+plane_state to intel_pin_and_fence_fb_obj() Date: Wed, 20 Jan 2016 21:05:31 +0200 Message-ID: <1453316739-13296-11-git-send-email-ville.syrjala@linux.intel.com> References: <1453316739-13296-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: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 9C2E96E9E3 for ; Wed, 20 Jan 2016 11:06:11 -0800 (PST) In-Reply-To: <1453316739-13296-1-git-send-email-ville.syrjala@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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCmlu dGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKCkgb25seSBuZWVkcyB0aGUgZnJhbWVidWZmZXIsIGFu ZCB0aGUgZGVzaXJkCnJvdGF0aW9uICh0byBmaW5kIHRoZSByaWdodCBHVFQgdmlldyBmb3IgaXQp LCBzbyBubyBuZWVkIHRvIHBhc3MgYWxsCmtpbmRzIG9mIHBsYW5lIHN0dWZmLgoKVGhlIG1haW4g bW90aXZhdGlvbiBpcyB0byBnZXQgcmlkIG9mIHRoZSB1Z2d5IE5VTEwgcGxhbmVfc3RhdGUgaGFu ZGxpbmcKZHVlIHRvIGZiZGV2LgoKdjI6IEFkZCBhIG5vdGUgd2h5IEkgcmVhbGx5IHdhbnQgdGhp cwoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4Lmlu dGVsLmNvbT4KR3J1bXBpbHktUmV2aWV3ZWQtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0 ZXJAZmZ3bGwuY2g+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwg NDEgKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgNSArKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZmJkZXYuYyAgIHwgIDIgKy0KIDMgZmlsZXMgY2hhbmdlZCwgMjAgaW5zZXJ0aW9ucygrKSwg MjggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGEx MDJmYWJjZTViNC4uMjk3ODdlZTg4OGQzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCkBAIC0yMjkyLDggKzIyOTIsOSBAQCBpbnRlbF9mYl9hbGlnbl9oZWlnaHQoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwgdW5zaWduZWQgaW50IGhlaWdodCwKIH0KIAogc3RhdGljIHZvaWQKLWlu dGVsX2ZpbGxfZmJfZ2d0dF92aWV3KHN0cnVjdCBpOTE1X2dndHRfdmlldyAqdmlldywgc3RydWN0 IGRybV9mcmFtZWJ1ZmZlciAqZmIsCi0JCQljb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpw bGFuZV9zdGF0ZSkKK2ludGVsX2ZpbGxfZmJfZ2d0dF92aWV3KHN0cnVjdCBpOTE1X2dndHRfdmll dyAqdmlldywKKwkJCWNvbnN0IHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLAorCQkJdW5zaWdu ZWQgaW50IHJvdGF0aW9uKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoZmItPmRldik7CiAJc3RydWN0IGludGVsX3JvdGF0aW9uX2luZm8gKmluZm8gPSAm dmlldy0+cGFyYW1zLnJvdGF0ZWQ7CkBAIC0yMzAxLDEwICsyMzAyLDcgQEAgaW50ZWxfZmlsbF9m Yl9nZ3R0X3ZpZXcoc3RydWN0IGk5MTVfZ2d0dF92aWV3ICp2aWV3LCBzdHJ1Y3QgZHJtX2ZyYW1l YnVmZmVyICpmYiwKIAogCSp2aWV3ID0gaTkxNV9nZ3R0X3ZpZXdfbm9ybWFsOwogCi0JaWYgKCFw bGFuZV9zdGF0ZSkKLQkJcmV0dXJuOwotCi0JaWYgKCFpbnRlbF9yb3RhdGlvbl85MF9vcl8yNzAo cGxhbmVfc3RhdGUtPnJvdGF0aW9uKSkKKwlpZiAoIWludGVsX3JvdGF0aW9uXzkwX29yXzI3MChy b3RhdGlvbikpCiAJCXJldHVybjsKIAogCSp2aWV3ID0gaTkxNV9nZ3R0X3ZpZXdfcm90YXRlZDsK QEAgLTIzNjksOSArMjM2Nyw4IEBAIHN0YXRpYyB1bnNpZ25lZCBpbnQgaW50ZWxfc3VyZl9hbGln bm1lbnQoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2CiB9CiAKIGludAot aW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCi0JCQkg ICBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKLQkJCSAgIGNvbnN0IHN0cnVjdCBkcm1fcGxh bmVfc3RhdGUgKnBsYW5lX3N0YXRlKQoraW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooc3RydWN0 IGRybV9mcmFtZWJ1ZmZlciAqZmIsCisJCQkgICB1bnNpZ25lZCBpbnQgcm90YXRpb24pCiB7CiAJ c3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGZiLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKQEAgLTIzODQsNyArMjM4MSw3IEBAIGlu dGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCiAJYWxp Z25tZW50ID0gaW50ZWxfc3VyZl9hbGlnbm1lbnQoZGV2X3ByaXYsIGZiLT5tb2RpZmllclswXSk7 CiAKLQlpbnRlbF9maWxsX2ZiX2dndHRfdmlldygmdmlldywgZmIsIHBsYW5lX3N0YXRlKTsKKwlp bnRlbF9maWxsX2ZiX2dndHRfdmlldygmdmlldywgZmIsIHJvdGF0aW9uKTsKIAogCS8qIE5vdGUg dGhhdCB0aGUgdy9hIGFsc28gcmVxdWlyZXMgNjQgUFRFIG9mIHBhZGRpbmcgZm9sbG93aW5nIHRo ZQogCSAqIGJvLiBXZSBjdXJyZW50bHkgZmlsbCBhbGwgdW51c2VkIFBURSB3aXRoIHRoZSBzaGFk b3cgcGFnZSBhbmQgc28KQEAgLTI0NDIsMTUgKzI0MzksMTQgQEAgZXJyX3BtOgogCXJldHVybiBy ZXQ7CiB9CiAKLXN0YXRpYyB2b2lkIGludGVsX3VucGluX2ZiX29iaihzdHJ1Y3QgZHJtX2ZyYW1l YnVmZmVyICpmYiwKLQkJCSAgICAgICBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFu ZV9zdGF0ZSkKK3N0YXRpYyB2b2lkIGludGVsX3VucGluX2ZiX29iaihzdHJ1Y3QgZHJtX2ZyYW1l YnVmZmVyICpmYiwgdW5zaWduZWQgaW50IHJvdGF0aW9uKQogewogCXN0cnVjdCBkcm1faTkxNV9n ZW1fb2JqZWN0ICpvYmogPSBpbnRlbF9mYl9vYmooZmIpOwogCXN0cnVjdCBpOTE1X2dndHRfdmll dyB2aWV3OwogCiAJV0FSTl9PTighbXV0ZXhfaXNfbG9ja2VkKCZvYmotPmJhc2UuZGV2LT5zdHJ1 Y3RfbXV0ZXgpKTsKIAotCWludGVsX2ZpbGxfZmJfZ2d0dF92aWV3KCZ2aWV3LCBmYiwgcGxhbmVf c3RhdGUpOworCWludGVsX2ZpbGxfZmJfZ2d0dF92aWV3KCZ2aWV3LCBmYiwgcm90YXRpb24pOwog CiAJaWYgKHZpZXcudHlwZSA9PSBJOTE1X0dHVFRfVklFV19OT1JNQUwpCiAJCWk5MTVfZ2VtX29i amVjdF91bnBpbl9mZW5jZShvYmopOwpAQCAtMzAwMiw3ICsyOTk4LDcgQEAgdTMyIGludGVsX3Bs YW5lX29ial9vZmZzZXQoc3RydWN0IGludGVsX3BsYW5lICppbnRlbF9wbGFuZSwKIAl1NjQgb2Zm c2V0OwogCiAJaW50ZWxfZmlsbF9mYl9nZ3R0X3ZpZXcoJnZpZXcsIGludGVsX3BsYW5lLT5iYXNl LnN0YXRlLT5mYiwKLQkJCQlpbnRlbF9wbGFuZS0+YmFzZS5zdGF0ZSk7CisJCQkJaW50ZWxfcGxh bmUtPmJhc2Uuc3RhdGUtPnJvdGF0aW9uKTsKIAogCXZtYSA9IGk5MTVfZ2VtX29ial90b19nZ3R0 X3ZpZXcob2JqLCAmdmlldyk7CiAJaWYgKFdBUk4oIXZtYSwgImdndHQgdm1hIGZvciBkaXNwbGF5 IG9iamVjdCBub3QgZm91bmQhICh2aWV3PSV1KVxuIiwKQEAgLTEwOTY5LDcgKzEwOTY1LDcgQEAg c3RhdGljIHZvaWQgaW50ZWxfdW5waW5fd29ya19mbihzdHJ1Y3Qgd29ya19zdHJ1Y3QgKl9fd29y aykKIAlzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5ID0gY3J0Yy0+YmFzZS5wcmltYXJ5OwogCiAJ bXV0ZXhfbG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwotCWludGVsX3VucGluX2ZiX29iaih3b3Jr LT5vbGRfZmIsIHByaW1hcnktPnN0YXRlKTsKKwlpbnRlbF91bnBpbl9mYl9vYmood29yay0+b2xk X2ZiLCBwcmltYXJ5LT5zdGF0ZS0+cm90YXRpb24pOwogCWRybV9nZW1fb2JqZWN0X3VucmVmZXJl bmNlKCZ3b3JrLT5wZW5kaW5nX2ZsaXBfb2JqLT5iYXNlKTsKIAogCWlmICh3b3JrLT5mbGlwX3F1 ZXVlZF9yZXEpCkBAIC0xMTczMyw4ICsxMTcyOSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19w YWdlX2ZsaXAoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJZ290byBjbGVhbnVwX3BlbmRpbmc7 CiAJfQogCi0JcmV0ID0gaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooY3J0Yy0+cHJpbWFyeSwg ZmIsCi0JCQkJCSBjcnRjLT5wcmltYXJ5LT5zdGF0ZSk7CisJcmV0ID0gaW50ZWxfcGluX2FuZF9m ZW5jZV9mYl9vYmooZmIsIHByaW1hcnktPnN0YXRlLT5yb3RhdGlvbik7CiAJaWYgKHJldCkKIAkJ Z290byBjbGVhbnVwX3BlbmRpbmc7CiAKQEAgLTExNzgzLDcgKzExNzc4LDcgQEAgc3RhdGljIGlu dCBpbnRlbF9jcnRjX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJcmV0dXJuIDA7 CiAKIGNsZWFudXBfdW5waW46Ci0JaW50ZWxfdW5waW5fZmJfb2JqKGZiLCBjcnRjLT5wcmltYXJ5 LT5zdGF0ZSk7CisJaW50ZWxfdW5waW5fZmJfb2JqKGZiLCBjcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ cm90YXRpb24pOwogY2xlYW51cF9wZW5kaW5nOgogCWlmIChyZXF1ZXN0KQogCQlpOTE1X2dlbV9y ZXF1ZXN0X2NhbmNlbChyZXF1ZXN0KTsKQEAgLTEzOTI0LDcgKzEzOTE5LDcgQEAgaW50ZWxfcHJl cGFyZV9wbGFuZV9mYihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAkJaWYgKHJldCkKIAkJCURS TV9ERUJVR19LTVMoImZhaWxlZCB0byBhdHRhY2ggcGh5cyBvYmplY3RcbiIpOwogCX0gZWxzZSB7 Ci0JCXJldCA9IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKHBsYW5lLCBmYiwgbmV3X3N0YXRl KTsKKwkJcmV0ID0gaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooZmIsIG5ld19zdGF0ZS0+cm90 YXRpb24pOwogCX0KIAogCWlmIChyZXQgPT0gMCkgewpAQCAtMTM5NjgsNyArMTM5NjMsNyBAQCBp bnRlbF9jbGVhbnVwX3BsYW5lX2ZiKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCiAJaWYgKG9s ZF9vYmogJiYgKHBsYW5lLT50eXBlICE9IERSTV9QTEFORV9UWVBFX0NVUlNPUiB8fAogCSAgICAh SU5URUxfSU5GTyhkZXYpLT5jdXJzb3JfbmVlZHNfcGh5c2ljYWwpKQotCQlpbnRlbF91bnBpbl9m Yl9vYmoob2xkX3N0YXRlLT5mYiwgb2xkX3N0YXRlKTsKKwkJaW50ZWxfdW5waW5fZmJfb2JqKG9s ZF9zdGF0ZS0+ZmIsIG9sZF9zdGF0ZS0+cm90YXRpb24pOwogCiAJLyogcHJlcGFyZV9mYiBhYm9y dGVkPyAqLwogCWlmICgob2xkX29iaiAmJiAob2xkX29iai0+ZnJvbnRidWZmZXJfYml0cyAmIGlu dGVsX3BsYW5lLT5mcm9udGJ1ZmZlcl9iaXQpKSB8fApAQCAtMTM5NzYsNyArMTM5NzEsNiBAQCBp bnRlbF9jbGVhbnVwX3BsYW5lX2ZiKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQlpOTE1X2dl bV90cmFja19mYihvbGRfb2JqLCBvYmosIGludGVsX3BsYW5lLT5mcm9udGJ1ZmZlcl9iaXQpOwog CiAJaTkxNV9nZW1fcmVxdWVzdF9hc3NpZ24oJm9sZF9pbnRlbF9zdGF0ZS0+d2FpdF9yZXEsIE5V TEwpOwotCiB9CiAKIGludApAQCAtMTYwNzMsOSArMTYwNjcsOCBAQCB2b2lkIGludGVsX21vZGVz ZXRfZ2VtX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCWNvbnRpbnVlOwogCiAJCW11 dGV4X2xvY2soJmRldi0+c3RydWN0X211dGV4KTsKLQkJcmV0ID0gaW50ZWxfcGluX2FuZF9mZW5j ZV9mYl9vYmooYy0+cHJpbWFyeSwKLQkJCQkJCSBjLT5wcmltYXJ5LT5mYiwKLQkJCQkJCSBjLT5w cmltYXJ5LT5zdGF0ZSk7CisJCXJldCA9IGludGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKGMtPnBy aW1hcnktPmZiLAorCQkJCQkJIGMtPnByaW1hcnktPnN0YXRlLT5yb3RhdGlvbik7CiAJCW11dGV4 X3VubG9jaygmZGV2LT5zdHJ1Y3RfbXV0ZXgpOwogCQlpZiAocmV0KSB7CiAJCQlEUk1fRVJST1Io ImZhaWxlZCB0byBwaW4gYm9vdCBmYiBvbiBwaXBlICVkXG4iLApkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaAppbmRleCAyMjM2OTNkYmZlN2MuLjJkM2VjYjU5MmE5MSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHJ2LmgKQEAgLTExMDYsOSArMTEwNiw4IEBAIGJvb2wgaW50ZWxfZ2V0X2xvYWRfZGV0ZWN0 X3BpcGUoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKIHZvaWQgaW50ZWxfcmVsZWFz ZV9sb2FkX2RldGVjdF9waXBlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJCQkJ ICAgIHN0cnVjdCBpbnRlbF9sb2FkX2RldGVjdF9waXBlICpvbGQsCiAJCQkJICAgIHN0cnVjdCBk cm1fbW9kZXNldF9hY3F1aXJlX2N0eCAqY3R4KTsKLWludCBpbnRlbF9waW5fYW5kX2ZlbmNlX2Zi X29iaihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKLQkJCSAgICAgICBzdHJ1Y3QgZHJtX2ZyYW1l YnVmZmVyICpmYiwKLQkJCSAgICAgICBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwbGFu ZV9zdGF0ZSk7CitpbnQgaW50ZWxfcGluX2FuZF9mZW5jZV9mYl9vYmooc3RydWN0IGRybV9mcmFt ZWJ1ZmZlciAqZmIsCisJCQkgICAgICAgdW5zaWduZWQgaW50IHJvdGF0aW9uKTsKIHN0cnVjdCBk cm1fZnJhbWVidWZmZXIgKgogX19pbnRlbF9mcmFtZWJ1ZmZlcl9jcmVhdGUoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwKIAkJCSAgIHN0cnVjdCBkcm1fbW9kZV9mYl9jbWQyICptb2RlX2NtZCwKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCmluZGV4IDA5ODQwZjQzODBmOS4uMDgyZGViMzFjOTAw IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmRldi5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiZGV2LmMKQEAgLTIyMCw3ICsyMjAsNyBAQCBzdGF0 aWMgaW50IGludGVsZmJfY3JlYXRlKHN0cnVjdCBkcm1fZmJfaGVscGVyICpoZWxwZXIsCiAJICog VGhpcyBhbHNvIHZhbGlkYXRlcyB0aGF0IGFueSBleGlzdGluZyBmYiBpbmhlcml0ZWQgZnJvbSB0 aGUKIAkgKiBCSU9TIGlzIHN1aXRhYmxlIGZvciBvd24gYWNjZXNzLgogCSAqLwotCXJldCA9IGlu dGVsX3Bpbl9hbmRfZmVuY2VfZmJfb2JqKE5VTEwsICZpZmJkZXYtPmZiLT5iYXNlLCBOVUxMKTsK KwlyZXQgPSBpbnRlbF9waW5fYW5kX2ZlbmNlX2ZiX29iaigmaWZiZGV2LT5mYi0+YmFzZSwgQklU KERSTV9ST1RBVEVfMCkpOwogCWlmIChyZXQpCiAJCWdvdG8gb3V0X3VubG9jazsKIAotLSAKMi40 LjEwCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=