From: ville.syrjala@linux.intel.com Subject: [PATCH v2 06/12] drm/i915: Pass plane to vlv_compute_drain_latency() Date: Thu, 5 Mar 2015 21:19:46 +0200 Message-ID: <1425583192-2584-7-git-send-email-ville.syrjala@linux.intel.com> References: <1425583192-2584-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id DF0E96E3DB for ; Thu, 5 Mar 2015 11:20:31 -0800 (PST) In-Reply-To: <1425583192-2584-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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk5v dyB0aGF0IHdlIGhhdmUgZHJtX3BsYW5lcyBmb3IgdGhlIGN1cnNvciBhbmQgcHJpbWFyeSB3ZSBj YW4gbW92ZSB0aGUKcGl4ZWxfc2l6ZSBoYW5kbGluZyBpbnRvIHZsdl9jb21wdXRlX2RyYWluX2xh dGVuY3koKSBhbmQganVzdCBwYXNzIHRoZQphcHByb3ByaWF0ZSBwbGFuZSB0byBpdC4KCnYyOiBD aGVjayBwbGFuZS0+c3RhdGUtPmZiIGluc3RlYWQgb2YgcGxhbmUtPmZiCgpSZXZpZXdlZC1ieTog SmVzc2UgQmFybmVzIDxqYmFybmVzQHZpcnR1b3VzZ2Vlay5vcmc+ICh2MSkKU2lnbmVkLW9mZi1i eTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIHwgNDIgKysrKysrKysrKysrKysrKy0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCAy NiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCA1NTE1ZDEwLi5mOGY2 Y2VlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTcyNywxNiArNzI3LDI2IEBAIHN0YXRp YyB2b2lkIHZsdl93cml0ZV93bV92YWx1ZXMoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiB9CiAK IHN0YXRpYyB1aW50OF90IHZsdl9jb21wdXRlX2RyYWluX2xhdGVuY3koc3RydWN0IGRybV9jcnRj ICpjcnRjLAotCQkJCQkgaW50IHBpeGVsX3NpemUpCisJCQkJCSBzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZSkKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwotCWludCBlbnRy aWVzLCBwcmVjX211bHQsIGRyYWluX2xhdGVuY3k7Ci0JaW50IGNsb2NrID0gdG9faW50ZWxfY3J0 YyhjcnRjKS0+Y29uZmlnLT5iYXNlLmFkanVzdGVkX21vZGUuY3J0Y19jbG9jazsKKwlzdHJ1Y3Qg aW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CisJaW50IGVudHJp ZXMsIHByZWNfbXVsdCwgZHJhaW5fbGF0ZW5jeSwgcGl4ZWxfc2l6ZTsKKwlpbnQgY2xvY2sgPSBp bnRlbF9jcnRjLT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZS5jcnRjX2Nsb2NrOwogCWNvbnN0 IGludCBoaWdoX3ByZWNpc2lvbiA9IElTX0NIRVJSWVZJRVcoZGV2KSA/IDE2IDogNjQ7CiAKKwkv KgorCSAqIEZJWE1FIHRoZSBwbGFuZSBtaWdodCBoYXZlIGFuIGZiCisJICogYnV0IGJlIGludmlz aWJsZSAoZWcuIGR1ZSB0byBjbGlwcGluZykKKwkgKi8KKwlpZiAoIWludGVsX2NydGMtPmFjdGl2 ZSB8fCAhcGxhbmUtPnN0YXRlLT5mYikKKwkJcmV0dXJuIDA7CisKIAlpZiAoV0FSTihjbG9jayA9 PSAwLCAiUGl4ZWwgY2xvY2sgaXMgemVybyFcbiIpKQogCQlyZXR1cm4gMDsKIAorCXBpeGVsX3Np emUgPSBkcm1fZm9ybWF0X3BsYW5lX2NwcChwbGFuZS0+c3RhdGUtPmZiLT5waXhlbF9mb3JtYXQs IDApOworCiAJaWYgKFdBUk4ocGl4ZWxfc2l6ZSA9PSAwLCAiUGl4ZWwgc2l6ZSBpcyB6ZXJvIVxu IikpCiAJCXJldHVybiAwOwogCkBAIC03NzAsMzEgKzc4MCwxMSBAQCBzdGF0aWMgdm9pZCB2bHZf dXBkYXRlX2RyYWluX2xhdGVuY3koc3RydWN0IGRybV9jcnRjICpjcnRjKQogCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9 IHRvX2ludGVsX2NydGMoY3J0Yyk7Ci0JaW50IHBpeGVsX3NpemU7CiAJZW51bSBwaXBlIHBpcGUg PSBpbnRlbF9jcnRjLT5waXBlOwogCXN0cnVjdCB2bHZfd21fdmFsdWVzIHdtID0gZGV2X3ByaXYt PndtLnZsdjsKIAotCXdtLmRkbFtwaXBlXS5wcmltYXJ5ID0gMDsKLQl3bS5kZGxbcGlwZV0uY3Vy c29yID0gMDsKLQotCWlmICghaW50ZWxfY3J0Y19hY3RpdmUoY3J0YykpIHsKLQkJdmx2X3dyaXRl X3dtX3ZhbHVlcyhpbnRlbF9jcnRjLCAmd20pOwotCQlyZXR1cm47Ci0JfQotCi0JLyogUHJpbWFy eSBwbGFuZSBEcmFpbiBMYXRlbmN5ICovCi0JcGl4ZWxfc2l6ZSA9IGNydGMtPnByaW1hcnktPmZi LT5iaXRzX3Blcl9waXhlbCAvIDg7CS8qIEJQUCAqLwotCXdtLmRkbFtwaXBlXS5wcmltYXJ5ID0g dmx2X2NvbXB1dGVfZHJhaW5fbGF0ZW5jeShjcnRjLCBwaXhlbF9zaXplKTsKLQotCS8qIEN1cnNv ciBEcmFpbiBMYXRlbmN5Ci0JICogQlBQIGlzIGFsd2F5cyA0IGZvciBjdXJzb3IKLQkgKi8KLQlw aXhlbF9zaXplID0gNDsKLQotCS8qIFByb2dyYW0gY3Vyc29yIERMIG9ubHkgaWYgaXQgaXMgZW5h YmxlZCAqLwotCWlmIChpbnRlbF9jcnRjLT5jdXJzb3JfYmFzZSkKLQkJd20uZGRsW3BpcGVdLmN1 cnNvciA9Ci0JCQl2bHZfY29tcHV0ZV9kcmFpbl9sYXRlbmN5KGNydGMsIHBpeGVsX3NpemUpOwor CXdtLmRkbFtwaXBlXS5wcmltYXJ5ID0gdmx2X2NvbXB1dGVfZHJhaW5fbGF0ZW5jeShjcnRjLCBj cnRjLT5wcmltYXJ5KTsKKwl3bS5kZGxbcGlwZV0uY3Vyc29yID0gdmx2X2NvbXB1dGVfZHJhaW5f bGF0ZW5jeShjcnRjLCBjcnRjLT5jdXJzb3IpOwogCiAJdmx2X3dyaXRlX3dtX3ZhbHVlcyhpbnRl bF9jcnRjLCAmd20pOwogfQpAQCAtOTYxLDcgKzk1MSw3IEBAIHN0YXRpYyB2b2lkIHZhbGxleXZp ZXdfdXBkYXRlX3Nwcml0ZV93bShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAogCWlmIChlbmFi bGVkKQogCQl3bS5kZGxbcGlwZV0uc3ByaXRlW3Nwcml0ZV0gPQotCQkJdmx2X2NvbXB1dGVfZHJh aW5fbGF0ZW5jeShjcnRjLCBwaXhlbF9zaXplKTsKKwkJCXZsdl9jb21wdXRlX2RyYWluX2xhdGVu Y3koY3J0YywgcGxhbmUpOwogCWVsc2UKIAkJd20uZGRsW3BpcGVdLnNwcml0ZVtzcHJpdGVdID0g MDsKIAotLSAKMi4wLjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==