From: Matt Roper Subject: [PATCH 3/3] drm/i915: Use plane->state->fb in watermark code (v2) Date: Fri, 27 Feb 2015 10:12:01 -0800 Message-ID: <1425060721-12226-4-git-send-email-matthew.d.roper@intel.com> References: <1425060721-12226-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 5F3036E944 for ; Fri, 27 Feb 2015 10:17:05 -0800 (PST) In-Reply-To: <1425060721-12226-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+ZmIKCnYyOiBSZWJhc2UKClNp Z25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfd20uYyB8IDIyICsrKysrKysrKysrLS0tLS0tLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCAxMSBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93bS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfd20uYwppbmRleCA0N2E1MTc1Li5lODc3ZTAyIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3dtLmMKQEAgLTQ5Niw3ICs0OTYsNyBAQCBzdGF0aWMgdm9pZCBwaW5ldmlld191cGRh dGVfd20oc3RydWN0IGRybV9jcnRjICp1bnVzZWRfY3J0YykKIAljcnRjID0gc2luZ2xlX2VuYWJs ZWRfY3J0YyhkZXYpOwogCWlmIChjcnRjKSB7CiAJCWNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9t b2RlICphZGp1c3RlZF9tb2RlOwotCQlpbnQgcGl4ZWxfc2l6ZSA9IGNydGMtPnByaW1hcnktPmZi LT5iaXRzX3Blcl9waXhlbCAvIDg7CisJCWludCBwaXhlbF9zaXplID0gY3J0Yy0+cHJpbWFyeS0+ c3RhdGUtPmZiLT5iaXRzX3Blcl9waXhlbCAvIDg7CiAJCWludCBjbG9jazsKIAogCQlhZGp1c3Rl ZF9tb2RlID0gJnRvX2ludGVsX2NydGMoY3J0YyktPmNvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2Rl OwpAQCAtNTcyLDcgKzU3Miw3IEBAIHN0YXRpYyBib29sIGc0eF9jb21wdXRlX3dtMChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAogCWNsb2NrID0gYWRqdXN0ZWRfbW9kZS0+Y3J0Y19jbG9jazsKIAlo dG90YWwgPSBhZGp1c3RlZF9tb2RlLT5jcnRjX2h0b3RhbDsKIAloZGlzcGxheSA9IHRvX2ludGVs X2NydGMoY3J0YyktPmNvbmZpZy0+cGlwZV9zcmNfdzsKLQlwaXhlbF9zaXplID0gY3J0Yy0+cHJp bWFyeS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKKwlwaXhlbF9zaXplID0gY3J0Yy0+cHJpbWFy eS0+c3RhdGUtPmZiLT5iaXRzX3Blcl9waXhlbCAvIDg7CiAKIAkvKiBVc2UgdGhlIHNtYWxsIGJ1 ZmZlciBtZXRob2QgdG8gY2FsY3VsYXRlIHBsYW5lIHdhdGVybWFyayAqLwogCWVudHJpZXMgPSAo KGNsb2NrICogcGl4ZWxfc2l6ZSAvIDEwMDApICogZGlzcGxheV9sYXRlbmN5X25zKSAvIDEwMDA7 CkBAIC02NTksNyArNjU5LDcgQEAgc3RhdGljIGJvb2wgZzR4X2NvbXB1dGVfc3J3bShzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAogCWNsb2NrID0gYWRqdXN0ZWRfbW9kZS0+Y3J0Y19jbG9jazsKIAlo dG90YWwgPSBhZGp1c3RlZF9tb2RlLT5jcnRjX2h0b3RhbDsKIAloZGlzcGxheSA9IHRvX2ludGVs X2NydGMoY3J0YyktPmNvbmZpZy0+cGlwZV9zcmNfdzsKLQlwaXhlbF9zaXplID0gY3J0Yy0+cHJp bWFyeS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKKwlwaXhlbF9zaXplID0gY3J0Yy0+cHJpbWFy eS0+c3RhdGUtPmZiLT5iaXRzX3Blcl9waXhlbCAvIDg7CiAKIAlsaW5lX3RpbWVfdXMgPSBtYXgo aHRvdGFsICogMTAwMCAvIGNsb2NrLCAxKTsKIAlsaW5lX2NvdW50ID0gKGxhdGVuY3lfbnMgLyBs aW5lX3RpbWVfdXMgKyAxMDAwKSAvIDEwMDA7CkBAIC03NDIsNyArNzQyLDcgQEAgc3RhdGljIHZv aWQgdmx2X3VwZGF0ZV9kcmFpbl9sYXRlbmN5KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAl9CiAK IAkvKiBQcmltYXJ5IHBsYW5lIERyYWluIExhdGVuY3kgKi8KLQlwaXhlbF9zaXplID0gY3J0Yy0+ cHJpbWFyeS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsJLyogQlBQICovCisJcGl4ZWxfc2l6ZSA9 IGNydGMtPnByaW1hcnktPnN0YXRlLT5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4OwkvKiBCUFAgKi8K IAlpZiAodmx2X2NvbXB1dGVfZHJhaW5fbGF0ZW5jeShjcnRjLCBwaXhlbF9zaXplLCAmcHJlY19t dWx0LCAmZHJhaW5fbGF0ZW5jeSkpIHsKIAkJcGxhbmVfcHJlYyA9IChwcmVjX211bHQgPT0gaGln aF9wcmVjaXNpb24pID8KIAkJCQkJICAgRERMX1BMQU5FX1BSRUNJU0lPTl9ISUdIIDoKQEAgLTEw MjMsNyArMTAyMyw3IEBAIHN0YXRpYyB2b2lkIGk5NjVfdXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0 YyAqdW51c2VkX2NydGMpCiAJCWludCBjbG9jayA9IGFkanVzdGVkX21vZGUtPmNydGNfY2xvY2s7 CiAJCWludCBodG90YWwgPSBhZGp1c3RlZF9tb2RlLT5jcnRjX2h0b3RhbDsKIAkJaW50IGhkaXNw bGF5ID0gdG9faW50ZWxfY3J0YyhjcnRjKS0+Y29uZmlnLT5waXBlX3NyY193OwotCQlpbnQgcGl4 ZWxfc2l6ZSA9IGNydGMtPnByaW1hcnktPmZiLT5iaXRzX3Blcl9waXhlbCAvIDg7CisJCWludCBw aXhlbF9zaXplID0gY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiLT5iaXRzX3Blcl9waXhlbCAvIDg7 CiAJCXVuc2lnbmVkIGxvbmcgbGluZV90aW1lX3VzOwogCQlpbnQgZW50cmllczsKIApAQCAtMTEw MCw3ICsxMTAwLDcgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfd20oc3RydWN0IGRybV9jcnRj ICp1bnVzZWRfY3J0YykKIAljcnRjID0gaW50ZWxfZ2V0X2NydGNfZm9yX3BsYW5lKGRldiwgMCk7 CiAJaWYgKGludGVsX2NydGNfYWN0aXZlKGNydGMpKSB7CiAJCWNvbnN0IHN0cnVjdCBkcm1fZGlz cGxheV9tb2RlICphZGp1c3RlZF9tb2RlOwotCQlpbnQgY3BwID0gY3J0Yy0+cHJpbWFyeS0+ZmIt PmJpdHNfcGVyX3BpeGVsIC8gODsKKwkJaW50IGNwcCA9IGNydGMtPnByaW1hcnktPnN0YXRlLT5m Yi0+Yml0c19wZXJfcGl4ZWwgLyA4OwogCQlpZiAoSVNfR0VOMihkZXYpKQogCQkJY3BwID0gNDsK IApAQCAtMTEyMiw3ICsxMTIyLDcgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfd20oc3RydWN0 IGRybV9jcnRjICp1bnVzZWRfY3J0YykKIAljcnRjID0gaW50ZWxfZ2V0X2NydGNfZm9yX3BsYW5l KGRldiwgMSk7CiAJaWYgKGludGVsX2NydGNfYWN0aXZlKGNydGMpKSB7CiAJCWNvbnN0IHN0cnVj dCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2RlOwotCQlpbnQgY3BwID0gY3J0Yy0+cHJp bWFyeS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKKwkJaW50IGNwcCA9IGNydGMtPnByaW1hcnkt PnN0YXRlLT5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4OwogCQlpZiAoSVNfR0VOMihkZXYpKQogCQkJ Y3BwID0gNDsKIApAQCAtMTE0NSw3ICsxMTQ1LDcgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVf d20oc3RydWN0IGRybV9jcnRjICp1bnVzZWRfY3J0YykKIAlpZiAoSVNfSTkxNUdNKGRldikgJiYg ZW5hYmxlZCkgewogCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwogCi0JCW9iaiA9 IGludGVsX2ZiX29iaihlbmFibGVkLT5wcmltYXJ5LT5mYik7CisJCW9iaiA9IGludGVsX2ZiX29i aihlbmFibGVkLT5wcmltYXJ5LT5zdGF0ZS0+ZmIpOwogCiAJCS8qIHNlbGYtcmVmcmVzaCBzZWVt cyBidXN0ZWQgd2l0aCB1bnRpbGVkICovCiAJCWlmIChvYmotPnRpbGluZ19tb2RlID09IEk5MTVf VElMSU5HX05PTkUpCkBAIC0xMTY5LDcgKzExNjksNyBAQCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0 ZV93bShzdHJ1Y3QgZHJtX2NydGMgKnVudXNlZF9jcnRjKQogCQlpbnQgY2xvY2sgPSBhZGp1c3Rl ZF9tb2RlLT5jcnRjX2Nsb2NrOwogCQlpbnQgaHRvdGFsID0gYWRqdXN0ZWRfbW9kZS0+Y3J0Y19o dG90YWw7CiAJCWludCBoZGlzcGxheSA9IHRvX2ludGVsX2NydGMoZW5hYmxlZCktPmNvbmZpZy0+ cGlwZV9zcmNfdzsKLQkJaW50IHBpeGVsX3NpemUgPSBlbmFibGVkLT5wcmltYXJ5LT5mYi0+Yml0 c19wZXJfcGl4ZWwgLyA4OworCQlpbnQgcGl4ZWxfc2l6ZSA9IGVuYWJsZWQtPnByaW1hcnktPnN0 YXRlLT5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4OwogCQl1bnNpZ25lZCBsb25nIGxpbmVfdGltZV91 czsKIAkJaW50IGVudHJpZXM7CiAKQEAgLTE4NzQsNyArMTg3NCw3IEBAIHN0YXRpYyB2b2lkIGls a19jb21wdXRlX3dtX3BhcmFtZXRlcnMoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXAtPmFjdGl2 ZSA9IHRydWU7CiAJcC0+cGlwZV9odG90YWwgPSBpbnRlbF9jcnRjLT5jb25maWctPmJhc2UuYWRq dXN0ZWRfbW9kZS5jcnRjX2h0b3RhbDsKIAlwLT5waXhlbF9yYXRlID0gaWxrX3BpcGVfcGl4ZWxf cmF0ZShkZXYsIGNydGMpOwotCXAtPnByaS5ieXRlc19wZXJfcGl4ZWwgPSBjcnRjLT5wcmltYXJ5 LT5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4OworCXAtPnByaS5ieXRlc19wZXJfcGl4ZWwgPSBjcnRj LT5wcmltYXJ5LT5zdGF0ZS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKIAlwLT5jdXIuYnl0ZXNf cGVyX3BpeGVsID0gNDsKIAlwLT5wcmkuaG9yaXpfcGl4ZWxzID0gaW50ZWxfY3J0Yy0+Y29uZmln LT5waXBlX3NyY193OwogCXAtPmN1ci5ob3Jpel9waXhlbHMgPSBpbnRlbF9jcnRjLT5iYXNlLmN1 cnNvci0+c3RhdGUtPmNydGNfdzsKQEAgLTI2NTksNyArMjY1OSw3IEBAIHN0YXRpYyB2b2lkIHNr bF9jb21wdXRlX3dtX3BpcGVfcGFyYW1ldGVycyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCSAq LwogCQlwLT5wbGFuZVswXS5lbmFibGVkID0gdHJ1ZTsKIAkJcC0+cGxhbmVbMF0uYnl0ZXNfcGVy X3BpeGVsID0KLQkJCWNydGMtPnByaW1hcnktPmZiLT5iaXRzX3Blcl9waXhlbCAvIDg7CisJCQlj cnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmItPmJpdHNfcGVyX3BpeGVsIC8gODsKIAkJcC0+cGxhbmVb MF0uaG9yaXpfcGl4ZWxzID0gaW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3NyY193OwogCQlwLT5w bGFuZVswXS52ZXJ0X3BpeGVscyA9IGludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9zcmNfaDsKIAkJ cC0+cGxhbmVbMF0udGlsaW5nID0gRFJNX0ZPUk1BVF9NT0RfTk9ORTsKLS0gCjEuOC41LjEKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==