From: Matt Roper Subject: [PATCH 3/3] drm/i915: Use plane->state->fb in watermark code Date: Fri, 27 Feb 2015 08:54:21 -0800 Message-ID: <1425056061-16292-4-git-send-email-matthew.d.roper@intel.com> References: <1425056061-16292-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 5E1476E91D for ; Fri, 27 Feb 2015 08:55:05 -0800 (PST) In-Reply-To: <1425056061-16292-1-git-send-email-matthew.d.roper@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 cGxhbmUtPmZiIGlzIGEgbGVnYWN5IHBvaW50ZXIgdGhhdCBub3QgYWx3YXlzIGJlIHVwLXRvLWRh dGUgKG9yIHVwZGF0ZWQKZWFybHkgZW5vdWdoKS4gIE1ha2Ugc3VyZSB0aGUgd2F0ZXJtYXJrIGNv ZGUgdXNlcyBwbGFuZS0+c3RhdGUtPmZiIHNvCnRoYXQgd2UncmUgYWx3YXlzIGRvaW5nIG91ciBj YWxjdWxhdGlvbnMgYmFzZWQgb24gdGhlIGNvcnJlY3QKZnJhbWVidWZmZXJzLgoKVGhpcyBwYXRj aCB3YXMgZ2VuZXJhdGVkIGJ5IENvY2NpbmVsbGUgd2l0aCB0aGUgZm9sbG93aW5nIHNlbWFudGlj CnBhdGNoOgoKICAgICAgICBAQAogICAgICAgIHN0cnVjdCBkcm1fcGxhbmUgKlA7CiAgICAgICAg QEAKICAgICAgICAtIFAtPmZiCiAgICAgICAgKyBQLT5zdGF0ZS0+ZmIKClNpZ25lZC1vZmYtYnk6 IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfd20uYyB8IDIyICsrKysrKysrKysrLS0tLS0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCAxMSBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93bS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfd20uYwppbmRleCBkY2M2YTA1Li44NmFkOGI0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF93bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dtLmMK QEAgLTQ5Niw3ICs0OTYsNyBAQCBzdGF0aWMgdm9pZCBwaW5ldmlld191cGRhdGVfd20oc3RydWN0 IGRybV9jcnRjICp1bnVzZWRfY3J0YykKIAljcnRjID0gc2luZ2xlX2VuYWJsZWRfY3J0YyhkZXYp OwogCWlmIChjcnRjKSB7CiAJCWNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3Rl ZF9tb2RlOwotCQlpbnQgcGl4ZWxfc2l6ZSA9IGNydGMtPnByaW1hcnktPmZiLT5iaXRzX3Blcl9w aXhlbCAvIDg7CisJCWludCBwaXhlbF9zaXplID0gY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiLT5i aXRzX3Blcl9waXhlbCAvIDg7CiAJCWludCBjbG9jazsKIAogCQlhZGp1c3RlZF9tb2RlID0gJnRv X2ludGVsX2NydGMoY3J0YyktPmNvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlOwpAQCAtNTcyLDcg KzU3Miw3IEBAIHN0YXRpYyBib29sIGc0eF9jb21wdXRlX3dtMChzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAogCWNsb2NrID0gYWRqdXN0ZWRfbW9kZS0+Y3J0Y19jbG9jazsKIAlodG90YWwgPSBhZGp1 c3RlZF9tb2RlLT5jcnRjX2h0b3RhbDsKIAloZGlzcGxheSA9IHRvX2ludGVsX2NydGMoY3J0Yykt PmNvbmZpZy0+cGlwZV9zcmNfdzsKLQlwaXhlbF9zaXplID0gY3J0Yy0+cHJpbWFyeS0+ZmItPmJp dHNfcGVyX3BpeGVsIC8gODsKKwlwaXhlbF9zaXplID0gY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZi LT5iaXRzX3Blcl9waXhlbCAvIDg7CiAKIAkvKiBVc2UgdGhlIHNtYWxsIGJ1ZmZlciBtZXRob2Qg dG8gY2FsY3VsYXRlIHBsYW5lIHdhdGVybWFyayAqLwogCWVudHJpZXMgPSAoKGNsb2NrICogcGl4 ZWxfc2l6ZSAvIDEwMDApICogZGlzcGxheV9sYXRlbmN5X25zKSAvIDEwMDA7CkBAIC02NTksNyAr NjU5LDcgQEAgc3RhdGljIGJvb2wgZzR4X2NvbXB1dGVfc3J3bShzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAogCWNsb2NrID0gYWRqdXN0ZWRfbW9kZS0+Y3J0Y19jbG9jazsKIAlodG90YWwgPSBhZGp1 c3RlZF9tb2RlLT5jcnRjX2h0b3RhbDsKIAloZGlzcGxheSA9IHRvX2ludGVsX2NydGMoY3J0Yykt PmNvbmZpZy0+cGlwZV9zcmNfdzsKLQlwaXhlbF9zaXplID0gY3J0Yy0+cHJpbWFyeS0+ZmItPmJp dHNfcGVyX3BpeGVsIC8gODsKKwlwaXhlbF9zaXplID0gY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZi LT5iaXRzX3Blcl9waXhlbCAvIDg7CiAKIAlsaW5lX3RpbWVfdXMgPSBtYXgoaHRvdGFsICogMTAw MCAvIGNsb2NrLCAxKTsKIAlsaW5lX2NvdW50ID0gKGxhdGVuY3lfbnMgLyBsaW5lX3RpbWVfdXMg KyAxMDAwKSAvIDEwMDA7CkBAIC03NDIsNyArNzQyLDcgQEAgc3RhdGljIHZvaWQgdmx2X3VwZGF0 ZV9kcmFpbl9sYXRlbmN5KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAl9CiAKIAkvKiBQcmltYXJ5 IHBsYW5lIERyYWluIExhdGVuY3kgKi8KLQlwaXhlbF9zaXplID0gY3J0Yy0+cHJpbWFyeS0+ZmIt PmJpdHNfcGVyX3BpeGVsIC8gODsJLyogQlBQICovCisJcGl4ZWxfc2l6ZSA9IGNydGMtPnByaW1h cnktPnN0YXRlLT5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4OwkvKiBCUFAgKi8KIAlpZiAodmx2X2Nv bXB1dGVfZHJhaW5fbGF0ZW5jeShjcnRjLCBwaXhlbF9zaXplLCAmcHJlY19tdWx0LCAmZHJhaW5f bGF0ZW5jeSkpIHsKIAkJcGxhbmVfcHJlYyA9IChwcmVjX211bHQgPT0gaGlnaF9wcmVjaXNpb24p ID8KIAkJCQkJICAgRERMX1BMQU5FX1BSRUNJU0lPTl9ISUdIIDoKQEAgLTEwMjMsNyArMTAyMyw3 IEBAIHN0YXRpYyB2b2lkIGk5NjVfdXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0YyAqdW51c2VkX2Ny dGMpCiAJCWludCBjbG9jayA9IGFkanVzdGVkX21vZGUtPmNydGNfY2xvY2s7CiAJCWludCBodG90 YWwgPSBhZGp1c3RlZF9tb2RlLT5jcnRjX2h0b3RhbDsKIAkJaW50IGhkaXNwbGF5ID0gdG9faW50 ZWxfY3J0YyhjcnRjKS0+Y29uZmlnLT5waXBlX3NyY193OwotCQlpbnQgcGl4ZWxfc2l6ZSA9IGNy dGMtPnByaW1hcnktPmZiLT5iaXRzX3Blcl9waXhlbCAvIDg7CisJCWludCBwaXhlbF9zaXplID0g Y3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiLT5iaXRzX3Blcl9waXhlbCAvIDg7CiAJCXVuc2lnbmVk IGxvbmcgbGluZV90aW1lX3VzOwogCQlpbnQgZW50cmllczsKIApAQCAtMTEwMCw3ICsxMTAwLDcg QEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICp1bnVzZWRfY3J0 YykKIAljcnRjID0gaW50ZWxfZ2V0X2NydGNfZm9yX3BsYW5lKGRldiwgMCk7CiAJaWYgKGludGVs X2NydGNfYWN0aXZlKGNydGMpKSB7CiAJCWNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICph ZGp1c3RlZF9tb2RlOwotCQlpbnQgY3BwID0gY3J0Yy0+cHJpbWFyeS0+ZmItPmJpdHNfcGVyX3Bp eGVsIC8gODsKKwkJaW50IGNwcCA9IGNydGMtPnByaW1hcnktPnN0YXRlLT5mYi0+Yml0c19wZXJf cGl4ZWwgLyA4OwogCQlpZiAoSVNfR0VOMihkZXYpKQogCQkJY3BwID0gNDsKIApAQCAtMTEyMiw3 ICsxMTIyLDcgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICp1 bnVzZWRfY3J0YykKIAljcnRjID0gaW50ZWxfZ2V0X2NydGNfZm9yX3BsYW5lKGRldiwgMSk7CiAJ aWYgKGludGVsX2NydGNfYWN0aXZlKGNydGMpKSB7CiAJCWNvbnN0IHN0cnVjdCBkcm1fZGlzcGxh eV9tb2RlICphZGp1c3RlZF9tb2RlOwotCQlpbnQgY3BwID0gY3J0Yy0+cHJpbWFyeS0+ZmItPmJp dHNfcGVyX3BpeGVsIC8gODsKKwkJaW50IGNwcCA9IGNydGMtPnByaW1hcnktPnN0YXRlLT5mYi0+ Yml0c19wZXJfcGl4ZWwgLyA4OwogCQlpZiAoSVNfR0VOMihkZXYpKQogCQkJY3BwID0gNDsKIApA QCAtMTE0NSw3ICsxMTQ1LDcgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfd20oc3RydWN0IGRy bV9jcnRjICp1bnVzZWRfY3J0YykKIAlpZiAoSVNfSTkxNUdNKGRldikgJiYgZW5hYmxlZCkgewog CQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwogCi0JCW9iaiA9IGludGVsX2ZiX29i aihlbmFibGVkLT5wcmltYXJ5LT5mYik7CisJCW9iaiA9IGludGVsX2ZiX29iaihlbmFibGVkLT5w cmltYXJ5LT5zdGF0ZS0+ZmIpOwogCiAJCS8qIHNlbGYtcmVmcmVzaCBzZWVtcyBidXN0ZWQgd2l0 aCB1bnRpbGVkICovCiAJCWlmIChvYmotPnRpbGluZ19tb2RlID09IEk5MTVfVElMSU5HX05PTkUp CkBAIC0xMTY5LDcgKzExNjksNyBAQCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV93bShzdHJ1Y3Qg ZHJtX2NydGMgKnVudXNlZF9jcnRjKQogCQlpbnQgY2xvY2sgPSBhZGp1c3RlZF9tb2RlLT5jcnRj X2Nsb2NrOwogCQlpbnQgaHRvdGFsID0gYWRqdXN0ZWRfbW9kZS0+Y3J0Y19odG90YWw7CiAJCWlu dCBoZGlzcGxheSA9IHRvX2ludGVsX2NydGMoZW5hYmxlZCktPmNvbmZpZy0+cGlwZV9zcmNfdzsK LQkJaW50IHBpeGVsX3NpemUgPSBlbmFibGVkLT5wcmltYXJ5LT5mYi0+Yml0c19wZXJfcGl4ZWwg LyA4OworCQlpbnQgcGl4ZWxfc2l6ZSA9IGVuYWJsZWQtPnByaW1hcnktPnN0YXRlLT5mYi0+Yml0 c19wZXJfcGl4ZWwgLyA4OwogCQl1bnNpZ25lZCBsb25nIGxpbmVfdGltZV91czsKIAkJaW50IGVu dHJpZXM7CiAKQEAgLTE4NzQsNyArMTg3NCw3IEBAIHN0YXRpYyB2b2lkIGlsa19jb21wdXRlX3dt X3BhcmFtZXRlcnMoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXAtPmFjdGl2ZSA9IHRydWU7CiAJ cC0+cGlwZV9odG90YWwgPSBpbnRlbF9jcnRjLT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZS5j cnRjX2h0b3RhbDsKIAlwLT5waXhlbF9yYXRlID0gaWxrX3BpcGVfcGl4ZWxfcmF0ZShkZXYsIGNy dGMpOwotCXAtPnByaS5ieXRlc19wZXJfcGl4ZWwgPSBjcnRjLT5wcmltYXJ5LT5mYi0+Yml0c19w ZXJfcGl4ZWwgLyA4OworCXAtPnByaS5ieXRlc19wZXJfcGl4ZWwgPSBjcnRjLT5wcmltYXJ5LT5z dGF0ZS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKIAlwLT5jdXIuYnl0ZXNfcGVyX3BpeGVsID0g NDsKIAlwLT5wcmkuaG9yaXpfcGl4ZWxzID0gaW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3NyY193 OwogCXAtPmN1ci5ob3Jpel9waXhlbHMgPSBpbnRlbF9jcnRjLT5iYXNlLmN1cnNvci0+c3RhdGUt PmNydGNfdzsKQEAgLTI2MzIsNyArMjYzMiw3IEBAIHN0YXRpYyB2b2lkIHNrbF9jb21wdXRlX3dt X3BpcGVfcGFyYW1ldGVycyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCSAqLwogCQlwLT5wbGFu ZVswXS5lbmFibGVkID0gdHJ1ZTsKIAkJcC0+cGxhbmVbMF0uYnl0ZXNfcGVyX3BpeGVsID0KLQkJ CWNydGMtPnByaW1hcnktPmZiLT5iaXRzX3Blcl9waXhlbCAvIDg7CisJCQljcnRjLT5wcmltYXJ5 LT5zdGF0ZS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKIAkJcC0+cGxhbmVbMF0uaG9yaXpfcGl4 ZWxzID0gaW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3NyY193OwogCQlwLT5wbGFuZVswXS52ZXJ0 X3BpeGVscyA9IGludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfaDsKIAotLSAKMS44LjUuMQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK