From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tursulin@ursulin.net>
Subject: [PATCH 8/9] drm/i915: Make intel_calculate_wm return
	unsigned int
Date: Fri,  7 Oct 2016 14:34:11 +0100
Message-ID: <1475847252-31580-9-git-send-email-tvrtko.ursulin@linux.intel.com>
References: <1475847252-31580-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com
 [IPv6:2a00:1450:400c:c09::243])
 by gabe.freedesktop.org (Postfix) with ESMTPS id CC3556EB9B
 for <Intel-gfx@lists.freedesktop.org>; Fri,  7 Oct 2016 13:34:29 +0000 (UTC)
Received: by mail-wm0-x243.google.com with SMTP id i130so3028923wmg.0
 for <Intel-gfx@lists.freedesktop.org>; Fri, 07 Oct 2016 06:34:29 -0700 (PDT)
In-Reply-To: <1475847252-31580-1-git-send-email-tvrtko.ursulin@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://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: <https://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

RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkVpdGhlciB1
bnNpZ25lZCBpbnQgaXMgZW5vdWdoIG9yIGl0IGlzbid0LiBUaGVyZSBpcyBubyBwb2ludCBpbgp1
c2luZyBhbiB1bnNpZ25lZCBsb25nIGhlcmUuCgpBbHNvIHJlcGxhY2UgbG9jYWwgbG9uZyB2YXJp
YWJsZXMgd2l0aCBpbnRlZ2Vycy4gTm8gbmVlZCB0byBoYXZlCmEgZGlmZmVyZW5jZSBiZXR3ZWVu
IDMyLSBhbmQgNjQtYml0IGJ1aWxkIGluIGFueSBjYXNlLgoKU2lnbmVkLW9mZi1ieTogVHZydGtv
IFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9wbS5jIHwgMzYgKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0t
CiAxIGZpbGUgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgMTkgZGVsZXRpb25zKC0pCgpkaWZm
IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX3BtLmMKaW5kZXggZmFhMzc5ZTU0MzIyLi4zMDhlZGM0Mzc4ZmEgMTAwNjQ0
Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtNTgyLDEyICs1ODIsMTIgQEAgc3RhdGljIGNvbnN0IHN0
cnVjdCBpbnRlbF93YXRlcm1hcmtfcGFyYW1zIGk4NDVfd21faW5mbyA9IHsKICAqIHBhc3QgdGhl
IHdhdGVybWFyayBwb2ludC4gIElmIHRoZSBGSUZPIGRyYWlucyBjb21wbGV0ZWx5LCBhIEZJRk8g
dW5kZXJydW4KICAqIHdpbGwgb2NjdXIsIGFuZCBhIGRpc3BsYXkgZW5naW5lIGhhbmcgY291bGQg
cmVzdWx0LgogICovCi1zdGF0aWMgdW5zaWduZWQgbG9uZyBpbnRlbF9jYWxjdWxhdGVfd20odW5z
aWduZWQgaW50IGNsb2NrX2luX2toeiwKLQkJCQkJY29uc3Qgc3RydWN0IGludGVsX3dhdGVybWFy
a19wYXJhbXMgKndtLAotCQkJCQl1bnNpZ25lZCBpbnQgZmlmb19zaXplLCBpbnQgY3BwLAotCQkJ
CQl1bnNpZ25lZCBpbnQgbGF0ZW5jeV9ucykKK3N0YXRpYyB1bnNpZ25lZCBpbnQgaW50ZWxfY2Fs
Y3VsYXRlX3dtKHVuc2lnbmVkIGludCBjbG9ja19pbl9raHosCisJCQkJICAgICAgIGNvbnN0IHN0
cnVjdCBpbnRlbF93YXRlcm1hcmtfcGFyYW1zICp3bSwKKwkJCQkgICAgICAgdW5zaWduZWQgaW50
IGZpZm9fc2l6ZSwgaW50IGNwcCwKKwkJCQkgICAgICAgdW5zaWduZWQgaW50IGxhdGVuY3lfbnMp
CiB7Ci0JbG9uZyBlbnRyaWVzX3JlcXVpcmVkLCB3bV9zaXplOworCWludCBlbnRyaWVzX3JlcXVp
cmVkLCB3bV9zaXplOwogCiAJLyoKIAkgKiBOb3RlOiB3ZSBuZWVkIHRvIG1ha2Ugc3VyZSB3ZSBk
b24ndCBvdmVyZmxvdyBmb3IgdmFyaW91cyBjbG9jayAmCkBAIC01OTUsMTggKzU5NSwxNyBAQCBz
dGF0aWMgdW5zaWduZWQgbG9uZyBpbnRlbF9jYWxjdWxhdGVfd20odW5zaWduZWQgaW50IGNsb2Nr
X2luX2toeiwKIAkgKiBjbG9ja3MgZ28gZnJvbSBhIGZldyB0aG91c2FuZCB0byBzZXZlcmFsIGh1
bmRyZWQgdGhvdXNhbmQuCiAJICogbGF0ZW5jeSBpcyB1c3VhbGx5IGEgZmV3IHRob3VzYW5kCiAJ
ICovCi0JZW50cmllc19yZXF1aXJlZCA9ICgoY2xvY2tfaW5fa2h6IC8gMTAwMCkgKiBjcHAgKiBs
YXRlbmN5X25zKSAvCi0JCTEwMDA7CisJZW50cmllc19yZXF1aXJlZCA9ICgoY2xvY2tfaW5fa2h6
IC8gMTAwMCkgKiBjcHAgKiBsYXRlbmN5X25zKSAvIDEwMDA7CiAJZW50cmllc19yZXF1aXJlZCA9
IERJVl9ST1VORF9VUChlbnRyaWVzX3JlcXVpcmVkLCB3bS0+Y2FjaGVsaW5lX3NpemUpOwogCi0J
RFJNX0RFQlVHX0tNUygiRklGTyBlbnRyaWVzIHJlcXVpcmVkIGZvciBtb2RlOiAlbGRcbiIsIGVu
dHJpZXNfcmVxdWlyZWQpOworCURSTV9ERUJVR19LTVMoIkZJRk8gZW50cmllcyByZXF1aXJlZCBm
b3IgbW9kZTogJWRcbiIsIGVudHJpZXNfcmVxdWlyZWQpOwogCiAJd21fc2l6ZSA9IGZpZm9fc2l6
ZSAtIChlbnRyaWVzX3JlcXVpcmVkICsgd20tPmd1YXJkX3NpemUpOwogCi0JRFJNX0RFQlVHX0tN
UygiRklGTyB3YXRlcm1hcmsgbGV2ZWw6ICVsZFxuIiwgd21fc2l6ZSk7CisJRFJNX0RFQlVHX0tN
UygiRklGTyB3YXRlcm1hcmsgbGV2ZWw6ICVkXG4iLCB3bV9zaXplKTsKIAogCS8qIERvbid0IHBy
b21vdGUgd21fc2l6ZSB0byB1bnNpZ25lZC4uLiAqLwotCWlmICh3bV9zaXplID4gKGxvbmcpd20t
Pm1heF93bSkKKwlpZiAod21fc2l6ZSA+IChpbnQpd20tPm1heF93bSkKIAkJd21fc2l6ZSA9IHdt
LT5tYXhfd207CiAJaWYgKHdtX3NpemUgPD0gMCkKIAkJd21fc2l6ZSA9IHdtLT5kZWZhdWx0X3dt
OwpAQCAtNjQ2LDcgKzY0NSw3IEBAIHN0YXRpYyB2b2lkIHBpbmV2aWV3X3VwZGF0ZV93bShzdHJ1
Y3QgZHJtX2NydGMgKnVudXNlZF9jcnRjKQogCXN0cnVjdCBkcm1fY3J0YyAqY3J0YzsKIAljb25z
dCBzdHJ1Y3QgY3hzcl9sYXRlbmN5ICpsYXRlbmN5OwogCXUzMiByZWc7Ci0JdW5zaWduZWQgbG9u
ZyB3bTsKKwl1bnNpZ25lZCBpbnQgd207CiAKIAlsYXRlbmN5ID0gaW50ZWxfZ2V0X2N4c3JfbGF0
ZW5jeShJU19QSU5FVklFV19HKGRldiksIGRldl9wcml2LT5pc19kZHIzLAogCQkJCQkgZGV2X3By
aXYtPmZzYl9mcmVxLCBkZXZfcHJpdi0+bWVtX2ZyZXEpOwpAQCAtMTUyMiw4ICsxNTIxLDcgQEAg
c3RhdGljIHZvaWQgaTl4eF91cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICp1bnVzZWRfY3J0YykK
IAl1aW50MzJfdCBmd2F0ZXJfbG87CiAJdWludDMyX3QgZndhdGVyX2hpOwogCWludCBjd20sIHNy
d20gPSAxOwotCXVuc2lnbmVkIGludCBmaWZvX3NpemU7Ci0JaW50IHBsYW5lYV93bSwgcGxhbmVi
X3dtOworCXVuc2lnbmVkIGludCBmaWZvX3NpemUsIHBsYW5lYV93bSwgcGxhbmViX3dtOwogCXN0
cnVjdCBkcm1fY3J0YyAqY3J0YywgKmVuYWJsZWQgPSBOVUxMOwogCiAJaWYgKElTX0k5NDVHTShk
ZXYpKQpAQCAtMTU0OCw3ICsxNTQ2LDcgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfd20oc3Ry
dWN0IGRybV9jcnRjICp1bnVzZWRfY3J0YykKIAkJZW5hYmxlZCA9IGNydGM7CiAJfSBlbHNlIHsK
IAkJcGxhbmVhX3dtID0gZmlmb19zaXplIC0gd21faW5mby0+Z3VhcmRfc2l6ZTsKLQkJaWYgKHBs
YW5lYV93bSA+IChsb25nKXdtX2luZm8tPm1heF93bSkKKwkJaWYgKHBsYW5lYV93bSA+IHdtX2lu
Zm8tPm1heF93bSkKIAkJCXBsYW5lYV93bSA9IHdtX2luZm8tPm1heF93bTsKIAl9CiAKQEAgLTE1
NzMsMTEgKzE1NzEsMTEgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfd20oc3RydWN0IGRybV9j
cnRjICp1bnVzZWRfY3J0YykKIAkJCWVuYWJsZWQgPSBOVUxMOwogCX0gZWxzZSB7CiAJCXBsYW5l
Yl93bSA9IGZpZm9fc2l6ZSAtIHdtX2luZm8tPmd1YXJkX3NpemU7Ci0JCWlmIChwbGFuZWJfd20g
PiAobG9uZyl3bV9pbmZvLT5tYXhfd20pCisJCWlmIChwbGFuZWJfd20gPiB3bV9pbmZvLT5tYXhf
d20pCiAJCQlwbGFuZWJfd20gPSB3bV9pbmZvLT5tYXhfd207CiAJfQogCi0JRFJNX0RFQlVHX0tN
UygiRklGTyB3YXRlcm1hcmtzIC0gQTogJWQsIEI6ICVkXG4iLCBwbGFuZWFfd20sIHBsYW5lYl93
bSk7CisJRFJNX0RFQlVHX0tNUygiRklGTyB3YXRlcm1hcmtzIC0gQTogJXUsIEI6ICV1XG4iLCBw
bGFuZWFfd20sIHBsYW5lYl93bSk7CiAKIAlpZiAoSVNfSTkxNUdNKGRldikgJiYgZW5hYmxlZCkg
ewogCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwpAQCAtMTY1Myw4ICsxNjUxLDgg
QEAgc3RhdGljIHZvaWQgaTg0NV91cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICp1bnVzZWRfY3J0
YykKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJ
c3RydWN0IGRybV9jcnRjICpjcnRjOwogCWNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICph
ZGp1c3RlZF9tb2RlOwotCXVpbnQzMl90IGZ3YXRlcl9sbzsKLQlpbnQgcGxhbmVhX3dtOworCXUz
MiBmd2F0ZXJfbG87CisJdW5zaWduZWQgaW50IHBsYW5lYV93bTsKIAogCWNydGMgPSBzaW5nbGVf
ZW5hYmxlZF9jcnRjKGRldik7CiAJaWYgKGNydGMgPT0gTlVMTCkKQEAgLTE2NjgsNyArMTY2Niw3
IEBAIHN0YXRpYyB2b2lkIGk4NDVfdXBkYXRlX3dtKHN0cnVjdCBkcm1fY3J0YyAqdW51c2VkX2Ny
dGMpCiAJZndhdGVyX2xvID0gSTkxNV9SRUFEKEZXX0JMQykgJiB+MHhmZmY7CiAJZndhdGVyX2xv
IHw9ICgzPDw4KSB8IHBsYW5lYV93bTsKIAotCURSTV9ERUJVR19LTVMoIlNldHRpbmcgRklGTyB3
YXRlcm1hcmtzIC0gQTogJWRcbiIsIHBsYW5lYV93bSk7CisJRFJNX0RFQlVHX0tNUygiU2V0dGlu
ZyBGSUZPIHdhdGVybWFya3MgLSBBOiAldVxuIiwgcGxhbmVhX3dtKTsKIAogCUk5MTVfV1JJVEUo
RldfQkxDLCBmd2F0ZXJfbG8pOwogfQotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4
QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls
bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=