From: Tvrtko Ursulin Subject: [RFC 1/3] drm/i915: Pass in plane state instead of plane to intel_plane_obj_offset Date: Tue, 16 Jun 2015 14:34:26 +0100 Message-ID: <1434461668-19661-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id D858A6E3B4 for ; Tue, 16 Jun 2015 06:34:34 -0700 (PDT) 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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldlIGRvbid0 IG5lZWQgdGhlIHBsYW5lIGJ1dCBqdXN0IGl0J3Mgc3RhdGUgYW5kIHNvIGl0IHdpbGwgYmUgbW9y ZQpoYW5keSB0byBwYXNzIGl0IGluIGRpcmVjdGx5LgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVy c3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgfCAxMyArKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaCAgICAgfCAgNiArKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3Nwcml0ZS5jICB8ICAzICsrLQogMyBmaWxlcyBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCA5 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBhZmU5 MWE4Li45NWEyMzc1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0yODk3 LDEyICsyODk3LDEzIEBAIHUzMiBpbnRlbF9mYl9zdHJpZGVfYWxpZ25tZW50KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHVpbnQ2NF90IGZiX21vZGlmaWVyLAogCX0KIH0KIAotdW5zaWduZWQgbG9u ZyBpbnRlbF9wbGFuZV9vYmpfb2Zmc2V0KHN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUs Ci0JCQkJICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqKQordW5zaWduZWQgbG9u ZworaW50ZWxfcGxhbmVfb2JqX29mZnNldChzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmludGVs X3BsYW5lX3N0YXRlLAorCQkgICAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikK IHsKIAljb25zdCBzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcgPSAmaTkxNV9nZ3R0X3ZpZXdf bm9ybWFsOwogCi0JaWYgKGludGVsX3JvdGF0aW9uXzkwX29yXzI3MChpbnRlbF9wbGFuZS0+YmFz ZS5zdGF0ZS0+cm90YXRpb24pKQorCWlmIChpbnRlbF9yb3RhdGlvbl85MF9vcl8yNzAoaW50ZWxf cGxhbmVfc3RhdGUtPmJhc2Uucm90YXRpb24pKQogCQl2aWV3ID0gJmk5MTVfZ2d0dF92aWV3X3Jv dGF0ZWQ7CiAKIAlyZXR1cm4gaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0X3ZpZXcob2JqLCB2aWV3 KTsKQEAgLTMwNjMsNyArMzA2NCw3IEBAIHN0YXRpYyB2b2lkIHNreWxha2VfdXBkYXRlX3ByaW1h cnlfcGxhbmUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCW9iaiA9IGludGVsX2ZiX29iaihmYik7 CiAJc3RyaWRlX2RpdiA9IGludGVsX2ZiX3N0cmlkZV9hbGlnbm1lbnQoZGV2LCBmYi0+bW9kaWZp ZXJbMF0sCiAJCQkJCSAgICAgICBmYi0+cGl4ZWxfZm9ybWF0KTsKLQlzdXJmX2FkZHIgPSBpbnRl bF9wbGFuZV9vYmpfb2Zmc2V0KHRvX2ludGVsX3BsYW5lKHBsYW5lKSwgb2JqKTsKKwlzdXJmX2Fk ZHIgPSBpbnRlbF9wbGFuZV9vYmpfb2Zmc2V0KHBsYW5lX3N0YXRlLCBvYmopOwogCiAJLyoKIAkg KiBGSVhNRTogaW50ZWxfcGxhbmVfc3RhdGUtPnNyYywgZHN0IGFyZW4ndCBzZXQgd2hlbiB0cmFu c2l0aW9uYWwKQEAgLTExNTU3LDggKzExNTU4LDggQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3Bh Z2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJaWYgKHJldCkKIAkJZ290byBjbGVhbnVw X3BlbmRpbmc7CiAKLQl3b3JrLT5ndHRfb2Zmc2V0ID0gaW50ZWxfcGxhbmVfb2JqX29mZnNldCh0 b19pbnRlbF9wbGFuZShwcmltYXJ5KSwgb2JqKQotCQkJCQkJICArIGludGVsX2NydGMtPmRzcGFk ZHJfb2Zmc2V0OworCXdvcmstPmd0dF9vZmZzZXQgPSBpbnRlbF9wbGFuZV9vYmpfb2Zmc2V0KHRv X2ludGVsX3BsYW5lX3N0YXRlKHByaW1hcnktPnN0YXRlKSwKKwkJCQkJCSAgb2JqKSArIGludGVs X2NydGMtPmRzcGFkZHJfb2Zmc2V0OwogCiAJaWYgKG1taW9fZmxpcCkgewogCQlyZXQgPSBpbnRl bF9xdWV1ZV9tbWlvX2ZsaXAoZGV2LCBjcnRjLCBmYiwgb2JqLCByaW5nLApkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kcnYuaAppbmRleCBiMjgwMjlhLi41NTk5ZjQzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaApAQCAtMTE1Myw4ICsxMTUzLDEwIEBAIGludCBza2xfdXBkYXRlX3NjYWxlcl91c2Vycyhz dHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUg KnBsYW5lX3N0YXRlLCBpbnQgZm9yY2VfZGV0YWNoKTsKIGludCBza2xfbWF4X3NjYWxlKHN0cnVj dCBpbnRlbF9jcnRjICpjcnRjLCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7 CiAKLXVuc2lnbmVkIGxvbmcgaW50ZWxfcGxhbmVfb2JqX29mZnNldChzdHJ1Y3QgaW50ZWxfcGxh bmUgKmludGVsX3BsYW5lLAotCQkJCSAgICAgc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9i aik7Cit1bnNpZ25lZCBsb25nCitpbnRlbF9wbGFuZV9vYmpfb2Zmc2V0KHN0cnVjdCBpbnRlbF9w bGFuZV9zdGF0ZSAqaW50ZWxfcGxhbmVfc3RhdGUsCisJCSAgICAgICBzdHJ1Y3QgZHJtX2k5MTVf Z2VtX29iamVjdCAqb2JqKTsKKwogdTMyIHNrbF9wbGFuZV9jdGxfZm9ybWF0KHVpbnQzMl90IHBp eGVsX2Zvcm1hdCk7CiB1MzIgc2tsX3BsYW5lX2N0bF90aWxpbmcodWludDY0X3QgZmJfbW9kaWZp ZXIpOwogdTMyIHNrbF9wbGFuZV9jdGxfcm90YXRpb24odW5zaWduZWQgaW50IHJvdGF0aW9uKTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggODE5M2EzNS4uZjEyMzA5MCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTIyNSw3ICsyMjUsOCBAQCBza2xfdXBk YXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRybV9wbGFuZSwgc3RydWN0IGRybV9jcnRjICpj cnRjLAogCWVsc2UgaWYgKGtleS0+ZmxhZ3MgJiBJOTE1X1NFVF9DT0xPUktFWV9TT1VSQ0UpCiAJ CXBsYW5lX2N0bCB8PSBQTEFORV9DVExfS0VZX0VOQUJMRV9TT1VSQ0U7CiAKLQlzdXJmX2FkZHIg PSBpbnRlbF9wbGFuZV9vYmpfb2Zmc2V0KGludGVsX3BsYW5lLCBvYmopOworCXN1cmZfYWRkciA9 IGludGVsX3BsYW5lX29ial9vZmZzZXQodG9faW50ZWxfcGxhbmVfc3RhdGUoZHJtX3BsYW5lLT5z dGF0ZSksCisJCQkJCSAgIG9iaik7CiAKIAlpZiAoaW50ZWxfcm90YXRpb25fOTBfb3JfMjcwKHJv dGF0aW9uKSkgewogCQkvKiBzdHJpZGU6IFN1cmZhY2UgaGVpZ2h0IGluIHRpbGVzICovCi0tIAoy LjQuMgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK