From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH v2 8/9] drm/i915: Use state->visible in wm
	calculation
Date: Thu, 19 Mar 2015 16:31:57 +0200
Message-ID: <1426775517-25242-1-git-send-email-ville.syrjala@linux.intel.com>
References: <1425986129-15547-9-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
 by gabe.freedesktop.org (Postfix) with ESMTP id 24DDD6EA89
 for <intel-gfx@lists.freedesktop.org>; Thu, 19 Mar 2015 07:32:02 -0700 (PDT)
In-Reply-To: <1425986129-15547-9-git-send-email-ville.syrjala@linux.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCnYy
OiBSZWJhc2UgYW5kIHVwZGF0ZSB0aGUgdmx2L2NodiBjb2RlIGFzIHdlbGwKCkNjOiBNYXR0IFJv
cGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJq
w6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX3BtLmMgfCA0MiArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDI0IGRlbGV0aW9ucygt
KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IGUxOGYwZmQuLmE4YzY1NzggMTAwNjQ0Ci0t
LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfcG0uYwpAQCAtOTE1LDE4ICs5MTUsMTYgQEAgc3RhdGljIHVpbnQ4X3Qgdmx2
X2NvbXB1dGVfZHJhaW5fbGF0ZW5jeShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJaW50IGVudHJp
ZXMsIHByZWNfbXVsdCwgZHJhaW5fbGF0ZW5jeSwgcGl4ZWxfc2l6ZTsKIAlpbnQgY2xvY2sgPSBp
bnRlbF9jcnRjLT5jb25maWctPmJhc2UuYWRqdXN0ZWRfbW9kZS5jcnRjX2Nsb2NrOwogCWNvbnN0
IGludCBoaWdoX3ByZWNpc2lvbiA9IElTX0NIRVJSWVZJRVcoZGV2KSA/IDE2IDogNjQ7CisJY29u
c3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzdGF0ZSA9CisJCXRvX2ludGVsX3BsYW5lX3N0
YXRlKHBsYW5lLT5zdGF0ZSk7CiAKLQkvKgotCSAqIEZJWE1FIHRoZSBwbGFuZSBtaWdodCBoYXZl
IGFuIGZiCi0JICogYnV0IGJlIGludmlzaWJsZSAoZWcuIGR1ZSB0byBjbGlwcGluZykKLQkgKi8K
LQlpZiAoIWludGVsX2NydGMtPmFjdGl2ZSB8fCAhcGxhbmUtPnN0YXRlLT5mYikKKwlpZiAoIXN0
YXRlLT52aXNpYmxlKQogCQlyZXR1cm4gMDsKIAogCWlmIChXQVJOKGNsb2NrID09IDAsICJQaXhl
bCBjbG9jayBpcyB6ZXJvIVxuIikpCiAJCXJldHVybiAwOwogCi0JcGl4ZWxfc2l6ZSA9IGRybV9m
b3JtYXRfcGxhbmVfY3BwKHBsYW5lLT5zdGF0ZS0+ZmItPnBpeGVsX2Zvcm1hdCwgMCk7CisJcGl4
ZWxfc2l6ZSA9IGRybV9mb3JtYXRfcGxhbmVfY3BwKHN0YXRlLT5iYXNlLmZiLT5waXhlbF9mb3Jt
YXQsIDApOwogCiAJaWYgKFdBUk4ocGl4ZWxfc2l6ZSA9PSAwLCAiUGl4ZWwgc2l6ZSBpcyB6ZXJv
IVxuIikpCiAJCXJldHVybiAwOwpAQCAtOTUzLDE1ICs5NTEsMTMgQEAgc3RhdGljIGludCB2bHZf
Y29tcHV0ZV93bShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJCSAgaW50IGZpZm9fc2l6ZSkK
IHsKIAlpbnQgY2xvY2ssIGVudHJpZXMsIHBpeGVsX3NpemU7CisJY29uc3Qgc3RydWN0IGludGVs
X3BsYW5lX3N0YXRlICpzdGF0ZSA9CisJCXRvX2ludGVsX3BsYW5lX3N0YXRlKHBsYW5lLT5iYXNl
LnN0YXRlKTsKIAotCS8qCi0JICogRklYTUUgdGhlIHBsYW5lIG1pZ2h0IGhhdmUgYW4gZmIKLQkg
KiBidXQgYmUgaW52aXNpYmxlIChlZy4gZHVlIHRvIGNsaXBwaW5nKQotCSAqLwotCWlmICghY3J0
Yy0+YWN0aXZlIHx8ICFwbGFuZS0+YmFzZS5zdGF0ZS0+ZmIpCisJaWYgKCFzdGF0ZS0+dmlzaWJs
ZSkKIAkJcmV0dXJuIDA7CiAKLQlwaXhlbF9zaXplID0gZHJtX2Zvcm1hdF9wbGFuZV9jcHAocGxh
bmUtPmJhc2Uuc3RhdGUtPmZiLT5waXhlbF9mb3JtYXQsIDApOworCXBpeGVsX3NpemUgPSBkcm1f
Zm9ybWF0X3BsYW5lX2NwcChzdGF0ZS0+YmFzZS5mYi0+cGl4ZWxfZm9ybWF0LCAwKTsKIAljbG9j
ayA9IGNydGMtPmNvbmZpZy0+YmFzZS5hZGp1c3RlZF9tb2RlLmNydGNfY2xvY2s7CiAKIAllbnRy
aWVzID0gRElWX1JPVU5EX1VQKGNsb2NrLCAxMDAwKSAqIHBpeGVsX3NpemU7CkBAIC0yMDM3LDYg
KzIwMzMsNyBAQCBzdGF0aWMgdm9pZCBpbGtfY29tcHV0ZV93bV9wYXJhbWV0ZXJzKHN0cnVjdCBk
cm1fY3J0YyAqY3J0YywKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVs
X2NydGMoY3J0Yyk7CiAJZW51bSBwaXBlIHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCXN0cnVj
dCBkcm1fcGxhbmUgKnBsYW5lOworCWNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3Rh
dGU7CiAKIAlpZiAoIWludGVsX2NydGMtPmFjdGl2ZSkKIAkJcmV0dXJuOwpAQCAtMjA0NSwyNCAr
MjA0MiwyMSBAQCBzdGF0aWMgdm9pZCBpbGtfY29tcHV0ZV93bV9wYXJhbWV0ZXJzKHN0cnVjdCBk
cm1fY3J0YyAqY3J0YywKIAlwLT5waXBlX2h0b3RhbCA9IGludGVsX2NydGMtPmNvbmZpZy0+YmFz
ZS5hZGp1c3RlZF9tb2RlLmNydGNfaHRvdGFsOwogCXAtPnBpeGVsX3JhdGUgPSBpbGtfcGlwZV9w
aXhlbF9yYXRlKGRldiwgY3J0Yyk7CiAKLQlpZiAoY3J0Yy0+cHJpbWFyeS0+c3RhdGUtPmZiKSB7
CisJc3RhdGUgPSB0b19pbnRlbF9wbGFuZV9zdGF0ZShjcnRjLT5wcmltYXJ5LT5zdGF0ZSk7CisJ
aWYgKHN0YXRlLT52aXNpYmxlKSB7CiAJCXAtPnByaS5lbmFibGVkID0gdHJ1ZTsKIAkJcC0+cHJp
LmJ5dGVzX3Blcl9waXhlbCA9Ci0JCQljcnRjLT5wcmltYXJ5LT5zdGF0ZS0+ZmItPmJpdHNfcGVy
X3BpeGVsIC8gODsKLQl9IGVsc2UgewotCQlwLT5wcmkuZW5hYmxlZCA9IGZhbHNlOwotCQlwLT5w
cmkuYnl0ZXNfcGVyX3BpeGVsID0gMDsKKwkJCWRybV9mb3JtYXRfcGxhbmVfY3BwKHN0YXRlLT5i
YXNlLmZiLT5waXhlbF9mb3JtYXQsIDApOworCQlwLT5wcmkuaG9yaXpfcGl4ZWxzID0gZHJtX3Jl
Y3Rfd2lkdGgoJnN0YXRlLT5kc3QpOwogCX0KIAotCWlmIChjcnRjLT5jdXJzb3ItPnN0YXRlLT5m
YikgeworCXN0YXRlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUoY3J0Yy0+Y3Vyc29yLT5zdGF0ZSk7
CisJaWYgKHN0YXRlLT52aXNpYmxlKSB7CiAJCXAtPmN1ci5lbmFibGVkID0gdHJ1ZTsKLQkJcC0+
Y3VyLmJ5dGVzX3Blcl9waXhlbCA9IDQ7Ci0JfSBlbHNlIHsKLQkJcC0+Y3VyLmVuYWJsZWQgPSBm
YWxzZTsKLQkJcC0+Y3VyLmJ5dGVzX3Blcl9waXhlbCA9IDA7CisJCXAtPmN1ci5ieXRlc19wZXJf
cGl4ZWwgPQorCQkJZHJtX2Zvcm1hdF9wbGFuZV9jcHAoc3RhdGUtPmJhc2UuZmItPnBpeGVsX2Zv
cm1hdCwgMCk7CisJCXAtPmN1ci5ob3Jpel9waXhlbHMgPSBzdGF0ZS0+YmFzZS5jcnRjX3c7CiAJ
fQotCXAtPnByaS5ob3Jpel9waXhlbHMgPSBpbnRlbF9jcnRjLT5jb25maWctPnBpcGVfc3JjX3c7
Ci0JcC0+Y3VyLmhvcml6X3BpeGVscyA9IGludGVsX2NydGMtPmJhc2UuY3Vyc29yLT5zdGF0ZS0+
Y3J0Y193OwogCiAJZHJtX2Zvcl9lYWNoX2xlZ2FjeV9wbGFuZShwbGFuZSwgJmRldi0+bW9kZV9j
b25maWcucGxhbmVfbGlzdCkgewogCQlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0g
dG9faW50ZWxfcGxhbmUocGxhbmUpOwotLSAKMi4wLjUKCl9fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4
QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt
YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==