From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matt Roper <matthew.d.roper@intel.com>
Subject: [PATCH 1/2] drm/i915: Drop parameters to
	intel_update_sprite_watermarks()
Date: Mon, 22 Jun 2015 18:30:32 -0700
Message-ID: <1435023033-18043-2-git-send-email-matthew.d.roper@intel.com>
References: <1435023033-18043-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id 6A8C56E5ED
 for <intel-gfx@lists.freedesktop.org>; Mon, 22 Jun 2015 18:31:12 -0700 (PDT)
In-Reply-To: <1435023033-18043-1-git-send-email-matthew.d.roper@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

VGhlIHZhbHVlcyB0aGF0IHVsdGltYXRlbHkgZ2V0IHBhc3NlZCB0bwppbnRlbF91cGRhdGVfc3By
aXRlX3dhdGVybWFya3MoKSBhcmUgcHVsbGVkIG91dCBvZiB0aGUgcGxhbmUgc3RhdGUKKHdoaWNo
IGhhcyBhbHJlYWR5IGJlZW4gc3dhcHBlZCBpbnRvIHBsYW5lLT5zdGF0ZSkgYXMgd2UgdXBkYXRl
IHRoZQpwbGFuZSBwcm9ncmFtbWluZy4gIERyb3AgdGhlIGZ1bmN0aW9uIHBhcmFtZXRlcnMgYW5k
IGp1c3QgcHVsbCB0aGUKcmVsZXZhbnQgdmFsdWVzIG91dCBvZiB0aGUgc3RhdGUgc3RydWN0dXJl
IGluc2lkZSB0aGUgZnVuY3Rpb24uCgpUaGlzIGNoYW5nZSB3aWxsIG1ha2UgaXQgZWFzaWVyIGZv
ciBhIGZ1dHVyZSBwYXRjaCB0byBwdWxsIHRoZSBzcHJpdGUKV00gcHJvZ3JhbW1pbmcgb3V0IG9m
IHRoZSBsb3ctbGV2ZWwgZm9vX3VwZGF0ZV9wbGFuZSgpIGZ1bmN0aW9ucyAod2hpY2gKYXJlIHJ1
biB1bmRlciB2YmxhbmsgZXZhc2lvbiBhbmQgc2hvdWxkbid0IGJlIGNhbGxpbmcgcG90ZW50aWFs
bHkKYmxvY2tpbmcgd2F0ZXJtYXJrIGZ1bmN0aW9ucykuCgpTaWduZWQtb2ZmLWJ5OiBNYXR0IFJv
cGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2Rpc3BsYXkuYyB8ICAzICstLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2
LmggICAgIHwgIDYgKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAg
fCAxNyArKysrKysrKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRl
LmMgIHwgMjEgKysrKysrLS0tLS0tLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDIwIGluc2Vy
dGlvbnMoKyksIDI3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku
YwppbmRleCBkZTZmOGNjLi41ZThlMDFjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh
eS5jCkBAIC00NzE5LDggKzQ3MTksNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wb3N0X3BsYW5lX3Vw
ZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJaW50ZWxfcG9zdF9lbmFibGVfcHJpbWFy
eSgmY3J0Yy0+YmFzZSk7CiAKIAlkcm1fZm9yX2VhY2hfcGxhbmVfbWFzayhwbGFuZSwgZGV2LCBh
dG9taWMtPnVwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcykKLQkJaW50ZWxfdXBkYXRlX3Nwcml0ZV93
YXRlcm1hcmtzKHBsYW5lLCAmY3J0Yy0+YmFzZSwKLQkJCQkJICAgICAgIDAsIDAsIDAsIGZhbHNl
LCBmYWxzZSk7CisJCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhwbGFuZSwgJmNydGMt
PmJhc2UpOwogCiAJbWVtc2V0KGF0b21pYywgMCwgc2l6ZW9mKCphdG9taWMpKTsKIH0KZGlmZiAt
LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggZTIxNzRmZC4uZmRmYTJjOSAxMDA2NDQKLS0tIGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfZHJ2LmgKQEAgLTEzNTUsMTEgKzEzNTUsNyBAQCB2b2lkIGludGVsX3N1c3BlbmRfaHco
c3RydWN0IGRybV9kZXZpY2UgKmRldik7CiBpbnQgaWxrX3dtX21heF9sZXZlbChjb25zdCBzdHJ1
Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZvaWQgaW50ZWxfdXBkYXRlX3dhdGVybWFya3Moc3RydWN0
IGRybV9jcnRjICpjcnRjKTsKIHZvaWQgaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKHN0
cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAotCQkJCSAgICBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCi0J
CQkJICAgIHVpbnQzMl90IHNwcml0ZV93aWR0aCwKLQkJCQkgICAgdWludDMyX3Qgc3ByaXRlX2hl
aWdodCwKLQkJCQkgICAgaW50IHBpeGVsX3NpemUsCi0JCQkJICAgIGJvb2wgZW5hYmxlZCwgYm9v
bCBzY2FsZWQpOworCQkJCSAgICBzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwogdm9pZCBpbnRlbF9p
bml0X3BtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBpbnRlbF9wbV9zZXR1cChzdHJ1
Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZvaWQgaW50ZWxfZ3B1X2lwc19pbml0KHN0cnVjdCBkcm1f
aTkxNV9wcml2YXRlICpkZXZfcHJpdik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCAzMmZm
MDM0Li40ZDNjYjcwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j
CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTM3NTUsMTMgKzM3NTUs
MjAgQEAgdm9pZCBpbnRlbF91cGRhdGVfd2F0ZXJtYXJrcyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMp
CiB9CiAKIHZvaWQgaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKHN0cnVjdCBkcm1fcGxh
bmUgKnBsYW5lLAotCQkJCSAgICBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCi0JCQkJICAgIHVpbnQz
Ml90IHNwcml0ZV93aWR0aCwKLQkJCQkgICAgdWludDMyX3Qgc3ByaXRlX2hlaWdodCwKLQkJCQkg
ICAgaW50IHBpeGVsX3NpemUsCi0JCQkJICAgIGJvb2wgZW5hYmxlZCwgYm9vbCBzY2FsZWQpCisJ
CQkJICAgIHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0
ZSAqZGV2X3ByaXYgPSBwbGFuZS0+ZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgaW50ZWxfcGxh
bmVfc3RhdGUgKnN0YXRlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUocGxhbmUtPnN0YXRlKTsKKwlz
dHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHN0YXRlLT5iYXNlLmZiOworCXVpbnQzMl90IHNw
cml0ZV93aWR0aCA9IGRybV9yZWN0X3dpZHRoKCZzdGF0ZS0+ZHN0KTsKKwl1aW50MzJfdCBzcHJp
dGVfaGVpZ2h0ID0gZHJtX3JlY3RfaGVpZ2h0KCZzdGF0ZS0+ZHN0KTsKKwlpbnQgcGl4ZWxfc2l6
ZSA9IGZiID8gZHJtX2Zvcm1hdF9wbGFuZV9jcHAoZmItPnBpeGVsX2Zvcm1hdCwgMCkgOiAwOwor
CWJvb2wgZW5hYmxlZCA9IHN0YXRlLT52aXNpYmxlOworCXVuc2lnbmVkIGludCBzcmNfdyA9IGRy
bV9yZWN0X3dpZHRoKCZzdGF0ZS0+c3JjKSA+PiAxNjsKKwl1bnNpZ25lZCBpbnQgc3JjX2ggPSBk
cm1fcmVjdF9oZWlnaHQoJnN0YXRlLT5zcmMpID4+IDE2OworCXVuc2lnbmVkIGludCBkc3RfdyA9
IGRybV9yZWN0X3dpZHRoKCZzdGF0ZS0+ZHN0KTsKKwl1bnNpZ25lZCBpbnQgZHN0X2ggPSBkcm1f
cmVjdF9oZWlnaHQoJnN0YXRlLT5kc3QpOworCWJvb2wgc2NhbGVkID0gKHNyY193ICE9IGRzdF93
IHx8IHNyY19oICE9IGRzdF9oKTsKIAogCWlmIChkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfc3By
aXRlX3dtKQogCQlkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfc3ByaXRlX3dtKHBsYW5lLCBjcnRj
LApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCBlMDA0NWFhLi5iNjI3MDY3IDEw
MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMTgxLDcgKzE4MSw2IEBAIHNrbF91
cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHJtX3BsYW5lLCBzdHJ1Y3QgZHJtX2NydGMg
KmNydGMsCiAJY29uc3QgaW50IHBpcGUgPSBpbnRlbF9wbGFuZS0+cGlwZTsKIAljb25zdCBpbnQg
cGxhbmUgPSBpbnRlbF9wbGFuZS0+cGxhbmUgKyAxOwogCXUzMiBwbGFuZV9jdGwsIHN0cmlkZV9k
aXYsIHN0cmlkZTsKLQlpbnQgcGl4ZWxfc2l6ZSA9IGRybV9mb3JtYXRfcGxhbmVfY3BwKGZiLT5w
aXhlbF9mb3JtYXQsIDApOwogCWNvbnN0IHN0cnVjdCBkcm1faW50ZWxfc3ByaXRlX2NvbG9ya2V5
ICprZXkgPQogCQkmdG9faW50ZWxfcGxhbmVfc3RhdGUoZHJtX3BsYW5lLT5zdGF0ZSktPmNrZXk7
CiAJdW5zaWduZWQgbG9uZyBzdXJmX2FkZHI7CkBAIC0yMDAsOSArMTk5LDcgQEAgc2tsX3VwZGF0
ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcm1fcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0
YywKIAlyb3RhdGlvbiA9IGRybV9wbGFuZS0+c3RhdGUtPnJvdGF0aW9uOwogCXBsYW5lX2N0bCB8
PSBza2xfcGxhbmVfY3RsX3JvdGF0aW9uKHJvdGF0aW9uKTsKIAotCWludGVsX3VwZGF0ZV9zcHJp
dGVfd2F0ZXJtYXJrcyhkcm1fcGxhbmUsIGNydGMsIHNyY193LCBzcmNfaCwKLQkJCQkgICAgICAg
cGl4ZWxfc2l6ZSwgdHJ1ZSwKLQkJCQkgICAgICAgc3JjX3cgIT0gY3J0Y193IHx8IHNyY19oICE9
IGNydGNfaCk7CisJaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKGRybV9wbGFuZSwgY3J0
Yyk7CiAKIAlzdHJpZGVfZGl2ID0gaW50ZWxfZmJfc3RyaWRlX2FsaWdubWVudChkZXYsIGZiLT5t
b2RpZmllclswXSwKIAkJCQkJICAgICAgIGZiLT5waXhlbF9mb3JtYXQpOwpAQCAtMjg2LDcgKzI4
Myw3IEBAIHNrbF9kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRwbGFuZSwgc3RydWN0
IGRybV9jcnRjICpjcnRjKQogCUk5MTVfV1JJVEUoUExBTkVfU1VSRihwaXBlLCBwbGFuZSksIDAp
OwogCVBPU1RJTkdfUkVBRChQTEFORV9TVVJGKHBpcGUsIHBsYW5lKSk7CiAKLQlpbnRlbF91cGRh
dGVfc3ByaXRlX3dhdGVybWFya3MoZHBsYW5lLCBjcnRjLCAwLCAwLCAwLCBmYWxzZSwgZmFsc2Up
OworCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhkcGxhbmUsIGNydGMpOwogfQogCiBz
dGF0aWMgdm9pZApAQCAtNDAyLDkgKzM5OSw3IEBAIHZsdl91cGRhdGVfcGxhbmUoc3RydWN0IGRy
bV9wbGFuZSAqZHBsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJaWYgKG9iai0+dGlsaW5n
X21vZGUgIT0gSTkxNV9USUxJTkdfTk9ORSkKIAkJc3ByY3RsIHw9IFNQX1RJTEVEOwogCi0JaW50
ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKGRwbGFuZSwgY3J0Yywgc3JjX3csIHNyY19oLAot
CQkJCSAgICAgICBwaXhlbF9zaXplLCB0cnVlLAotCQkJCSAgICAgICBzcmNfdyAhPSBjcnRjX3cg
fHwgc3JjX2ggIT0gY3J0Y19oKTsKKwlpbnRlbF91cGRhdGVfc3ByaXRlX3dhdGVybWFya3MoZHBs
YW5lLCBjcnRjKTsKIAogCS8qIFNpemVzIGFyZSAwIGJhc2VkICovCiAJc3JjX3ctLTsKQEAgLTQ3
MSw3ICs0NjYsNyBAQCB2bHZfZGlzYWJsZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcGxhbmUs
IHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlJOTE1X1dSSVRFKFNQU1VSRihwaXBlLCBwbGFuZSks
IDApOwogCVBPU1RJTkdfUkVBRChTUFNVUkYocGlwZSwgcGxhbmUpKTsKIAotCWludGVsX3VwZGF0
ZV9zcHJpdGVfd2F0ZXJtYXJrcyhkcGxhbmUsIGNydGMsIDAsIDAsIDAsIGZhbHNlLCBmYWxzZSk7
CisJaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKGRwbGFuZSwgY3J0Yyk7CiB9CiAKIHN0
YXRpYyB2b2lkCkBAIC01MzUsOSArNTMwLDcgQEAgaXZiX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJt
X3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCWlmIChJU19IQVNXRUxMKGRl
dikgfHwgSVNfQlJPQURXRUxMKGRldikpCiAJCXNwcmN0bCB8PSBTUFJJVEVfUElQRV9DU0NfRU5B
QkxFOwogCi0JaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKHBsYW5lLCBjcnRjLCBzcmNf
dywgc3JjX2gsIHBpeGVsX3NpemUsCi0JCQkJICAgICAgIHRydWUsCi0JCQkJICAgICAgIHNyY193
ICE9IGNydGNfdyB8fCBzcmNfaCAhPSBjcnRjX2gpOworCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0
ZXJtYXJrcyhwbGFuZSwgY3J0Yyk7CiAKIAkvKiBTaXplcyBhcmUgMCBiYXNlZCAqLwogCXNyY193
LS07CkBAIC02NzIsOSArNjY1LDcgQEAgaWxrX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5l
ICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCWlmIChJU19HRU42KGRldikpCiAJCWR2
c2NudHIgfD0gRFZTX1RSSUNLTEVfRkVFRF9ESVNBQkxFOyAvKiBtdXN0IGRpc2FibGUgKi8KIAot
CWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhwbGFuZSwgY3J0Yywgc3JjX3csIHNyY19o
LAotCQkJCSAgICAgICBwaXhlbF9zaXplLCB0cnVlLAotCQkJCSAgICAgICBzcmNfdyAhPSBjcnRj
X3cgfHwgc3JjX2ggIT0gY3J0Y19oKTsKKwlpbnRlbF91cGRhdGVfc3ByaXRlX3dhdGVybWFya3Mo
cGxhbmUsIGNydGMpOwogCiAJLyogU2l6ZXMgYXJlIDAgYmFzZWQgKi8KIAlzcmNfdy0tOwotLSAK
Mi4xLjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu
dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw
Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==