From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH 12/13] drm/i915: Pass plane and crtc to
	intel_update_sprite_watermarks
Date: Tue,  6 Aug 2013 22:24:11 +0300
Message-ID: <1375817052-32310-13-git-send-email-ville.syrjala@linux.intel.com>
References: <1375817052-32310-1-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+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org>
Received: from mga03.intel.com (mga03.intel.com [143.182.124.21])
	by gabe.freedesktop.org (Postfix) with ESMTP id 8623CE5EC1
	for <intel-gfx@lists.freedesktop.org>;
	Tue,  6 Aug 2013 12:24:55 -0700 (PDT)
In-Reply-To: <1375817052-32310-1-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>
Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCldl
J3JlIGdvaW5nIHRvIHdhbnQgdG8ga25vdyB0aGUgY3J0YyBpbiB0aGUgd2F0ZXJtYXJrIGNvZGUg
dG8gYXZvaWQKZG9pbmcgbW9yZSB3b3JrIHRoYW4gd2UgaGF2ZSB0by4gV2Ugc2hvdWxkIGFsc28g
cGFzcyB0aGUgcGxhbmUgd2UncmUKZGlzYWJsaW5nIHNvIHRoYXQgd2Uga25vdyB3aGVyZSB0byBz
dGljayBvdXIgd2F0ZXJtYXJrIHBhcmFtZXRlcnMKd2l0aG91dCBoYXZpbmcgdG8gZ28gbG9vayB0
aGUgcGxhbmUgdXAuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmph
bGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg
ICAgIHwgIDMgKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICB8ICAzICsr
LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgfCAzNCArKysrKysrKysrKysr
KysrLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUu
YyB8ICA4ICsrKystLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDI0IGRl
bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDUzYzM4ZWMuLjZhZWMxMzMg
MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMzU5LDcgKzM1OSw4IEBAIHN0cnVjdCBkcm1f
aTkxNV9kaXNwbGF5X2Z1bmNzIHsKIAkJCSAgc3RydWN0IGRwbGwgKm1hdGNoX2Nsb2NrLAogCQkJ
ICBzdHJ1Y3QgZHBsbCAqYmVzdF9jbG9jayk7CiAJdm9pZCAoKnVwZGF0ZV93bSkoc3RydWN0IGRy
bV9kZXZpY2UgKmRldik7Ci0Jdm9pZCAoKnVwZGF0ZV9zcHJpdGVfd20pKHN0cnVjdCBkcm1fZGV2
aWNlICpkZXYsIGludCBwaXBlLAorCXZvaWQgKCp1cGRhdGVfc3ByaXRlX3dtKShzdHJ1Y3QgZHJt
X3BsYW5lICpwbGFuZSwKKwkJCQkgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJCSB1aW50MzJf
dCBzcHJpdGVfd2lkdGgsIGludCBwaXhlbF9zaXplLAogCQkJCSBib29sIGVuYWJsZSwgYm9vbCBz
Y2FsZWQpOwogCXZvaWQgKCptb2Rlc2V0X2dsb2JhbF9yZXNvdXJjZXMpKHN0cnVjdCBkcm1fZGV2
aWNlICpkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2Lmgg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCAyZTYxNjY1Li5jM2FkMzg4
IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNzc0LDcgKzc3NCw4IEBAIGV4dGVybiB2
b2lkIGludGVsX2RkaV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGVudW0gcG9ydCBwb3J0
KTsKIAogLyogRm9yIHVzZSBieSBJVkIgTFAgd2F0ZXJtYXJrIHdvcmthcm91bmQgaW4gaW50ZWxf
c3ByaXRlLmMgKi8KIGV4dGVybiB2b2lkIGludGVsX3VwZGF0ZV93YXRlcm1hcmtzKHN0cnVjdCBk
cm1fZGV2aWNlICpkZXYpOwotZXh0ZXJuIHZvaWQgaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1h
cmtzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBwaXBlLAorZXh0ZXJuIHZvaWQgaW50ZWxf
dXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAorCQkJCQkg
ICBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkJCSAgIHVpbnQzMl90IHNwcml0ZV93aWR0aCwg
aW50IHBpeGVsX3NpemUsCiAJCQkJCSAgIGJvb2wgZW5hYmxlZCwgYm9vbCBzY2FsZWQpOwogCmRp
ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCA5ZDZmNGJmLi41MDg3N2MyIDEwMDY0NAotLS0gYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX3BtLmMKQEAgLTI4NTYsMjUgKzI4NTYsMTkgQEAgc3RhdGljIHZvaWQgaGFzd2VsbF91
cGRhdGVfd20oc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAloc3dfd3JpdGVfd21fdmFsdWVzKGRl
dl9wcml2LCBiZXN0X3Jlc3VsdHMsIHBhcnRpdGlvbmluZyk7CiB9CiAKLXN0YXRpYyB2b2lkIGhh
c3dlbGxfdXBkYXRlX3Nwcml0ZV93bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgcGlwZSwK
K3N0YXRpYyB2b2lkIGhhc3dlbGxfdXBkYXRlX3Nwcml0ZV93bShzdHJ1Y3QgZHJtX3BsYW5lICpw
bGFuZSwKKwkJCQkgICAgIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCQkgICAgIHVpbnQzMl90
IHNwcml0ZV93aWR0aCwgaW50IHBpeGVsX3NpemUsCiAJCQkJICAgICBib29sIGVuYWJsZWQsIGJv
b2wgc2NhbGVkKQogewotCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwotCi0JbGlzdF9mb3JfZWFj
aF9lbnRyeShwbGFuZSwgJmRldi0+bW9kZV9jb25maWcucGxhbmVfbGlzdCwgaGVhZCkgewotCQlz
dHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9faW50ZWxfcGxhbmUocGxhbmUpOwor
CXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZSk7
CiAKLQkJaWYgKGludGVsX3BsYW5lLT5waXBlID09IHBpcGUpIHsKLQkJCWludGVsX3BsYW5lLT53
bS5lbmFibGVkID0gZW5hYmxlZDsKLQkJCWludGVsX3BsYW5lLT53bS5zY2FsZWQgPSBzY2FsZWQ7
Ci0JCQlpbnRlbF9wbGFuZS0+d20uaG9yaXpfcGl4ZWxzID0gc3ByaXRlX3dpZHRoOwotCQkJaW50
ZWxfcGxhbmUtPndtLmJ5dGVzX3Blcl9waXhlbCA9IHBpeGVsX3NpemU7Ci0JCQlicmVhazsKLQkJ
fQotCX0KKwlpbnRlbF9wbGFuZS0+d20uZW5hYmxlZCA9IGVuYWJsZWQ7CisJaW50ZWxfcGxhbmUt
PndtLnNjYWxlZCA9IHNjYWxlZDsKKwlpbnRlbF9wbGFuZS0+d20uaG9yaXpfcGl4ZWxzID0gc3By
aXRlX3dpZHRoOworCWludGVsX3BsYW5lLT53bS5ieXRlc19wZXJfcGl4ZWwgPSBwaXhlbF9zaXpl
OwogCi0JaGFzd2VsbF91cGRhdGVfd20oZGV2KTsKKwloYXN3ZWxsX3VwZGF0ZV93bShwbGFuZS0+
ZGV2KTsKIH0KIAogc3RhdGljIGJvb2wKQEAgLTI5NTMsMTEgKzI5NDcsMTQgQEAgc2FuZHlicmlk
Z2VfY29tcHV0ZV9zcHJpdGVfc3J3bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBpbnQgcGxhbmUs
CiAJcmV0dXJuICpzcHJpdGVfd20gPiAweDNmZiA/IGZhbHNlIDogdHJ1ZTsKIH0KIAotc3RhdGlj
IHZvaWQgc2FuZHlicmlkZ2VfdXBkYXRlX3Nwcml0ZV93bShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2
LCBpbnQgcGlwZSwKK3N0YXRpYyB2b2lkIHNhbmR5YnJpZGdlX3VwZGF0ZV9zcHJpdGVfd20oc3Ry
dWN0IGRybV9wbGFuZSAqcGxhbmUsCisJCQkJCSBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkJ
CSB1aW50MzJfdCBzcHJpdGVfd2lkdGgsIGludCBwaXhlbF9zaXplLAogCQkJCQkgYm9vbCBlbmFi
bGVkLCBib29sIHNjYWxlZCkKIHsKKwlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcGxhbmUtPmRl
djsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRl
OworCWludCBwaXBlID0gdG9faW50ZWxfcGxhbmUocGxhbmUpLT5waXBlOwogCWludCBsYXRlbmN5
ID0gZGV2X3ByaXYtPndtLnNwcl9sYXRlbmN5WzBdICogMTAwOwkvKiBJbiB1bml0IDAuMXVzICov
CiAJdTMyIHZhbDsKIAlpbnQgc3ByaXRlX3dtLCByZWc7CkBAIC0zMDc2LDE0ICszMDczLDE1IEBA
IHZvaWQgaW50ZWxfdXBkYXRlX3dhdGVybWFya3Moc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJ
ZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3dtKGRldik7CiB9CiAKLXZvaWQgaW50ZWxfdXBkYXRl
X3Nwcml0ZV93YXRlcm1hcmtzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGludCBwaXBlLAordm9p
ZCBpbnRlbF91cGRhdGVfc3ByaXRlX3dhdGVybWFya3Moc3RydWN0IGRybV9wbGFuZSAqcGxhbmUs
CisJCQkJICAgIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCQkgICAgdWludDMyX3Qgc3ByaXRl
X3dpZHRoLCBpbnQgcGl4ZWxfc2l6ZSwKIAkJCQkgICAgYm9vbCBlbmFibGVkLCBib29sIHNjYWxl
ZCkKIHsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2
YXRlOworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHBsYW5lLT5kZXYtPmRl
dl9wcml2YXRlOwogCiAJaWYgKGRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV9zcHJpdGVfd20pCi0J
CWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV9zcHJpdGVfd20oZGV2LCBwaXBlLCBzcHJpdGVfd2lk
dGgsCisJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV9zcHJpdGVfd20ocGxhbmUsIGNydGMsIHNw
cml0ZV93aWR0aCwKIAkJCQkJCSAgIHBpeGVsX3NpemUsIGVuYWJsZWQsIHNjYWxlZCk7CiB9CiAK
ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggMzVhY2JkZS4uNDE4YmY4ZCAxMDA2
NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTEwOSw3ICsxMDksNyBAQCB2bHZfdXBk
YXRlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRj
LAogCiAJc3ByY3RsIHw9IFNQX0VOQUJMRTsKIAotCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJt
YXJrcyhkZXYsIHBpcGUsIHNyY193LCBwaXhlbF9zaXplLCB0cnVlLAorCWludGVsX3VwZGF0ZV9z
cHJpdGVfd2F0ZXJtYXJrcyhkcGxhbmUsIGNydGMsIHNyY193LCBwaXhlbF9zaXplLCB0cnVlLAog
CQkJCSAgICAgICBzcmNfdyAhPSBjcnRjX3cgfHwgc3JjX2ggIT0gY3J0Y19oKTsKIAogCS8qIFNp
emVzIGFyZSAwIGJhc2VkICovCkBAIC0yNjUsNyArMjY1LDcgQEAgaXZiX3VwZGF0ZV9wbGFuZShz
dHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCWlmIChJU19I
QVNXRUxMKGRldikpCiAJCXNwcmN0bCB8PSBTUFJJVEVfUElQRV9DU0NfRU5BQkxFOwogCi0JaW50
ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKGRldiwgcGlwZSwgc3JjX3csIHBpeGVsX3NpemUs
IHRydWUsCisJaW50ZWxfdXBkYXRlX3Nwcml0ZV93YXRlcm1hcmtzKHBsYW5lLCBjcnRjLCBzcmNf
dywgcGl4ZWxfc2l6ZSwgdHJ1ZSwKIAkJCQkgICAgICAgc3JjX3cgIT0gY3J0Y193IHx8IHNyY19o
ICE9IGNydGNfaCk7CiAKIAkvKiBTaXplcyBhcmUgMCBiYXNlZCAqLwpAQCAtMzQwLDcgKzM0MCw3
IEBAIGl2Yl9kaXNhYmxlX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLCBzdHJ1Y3QgZHJt
X2NydGMgKmNydGMpCiAKIAlkZXZfcHJpdi0+c3ByaXRlX3NjYWxpbmdfZW5hYmxlZCAmPSB+KDEg
PDwgcGlwZSk7CiAKLQlpbnRlbF91cGRhdGVfc3ByaXRlX3dhdGVybWFya3MoZGV2LCBwaXBlLCAw
LCAwLCBmYWxzZSwgZmFsc2UpOworCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhwbGFu
ZSwgY3J0YywgMCwgMCwgZmFsc2UsIGZhbHNlKTsKIAogCS8qIHBvdGVudGlhbGx5IHJlLWVuYWJs
ZSBMUCB3YXRlcm1hcmtzICovCiAJaWYgKHNjYWxpbmdfd2FzX2VuYWJsZWQgJiYgIWRldl9wcml2
LT5zcHJpdGVfc2NhbGluZ19lbmFibGVkKQpAQCAtNDU1LDcgKzQ1NSw3IEBAIGlsa191cGRhdGVf
cGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJ
ZHZzY250ciB8PSBEVlNfVFJJQ0tMRV9GRUVEX0RJU0FCTEU7IC8qIG11c3QgZGlzYWJsZSAqLwog
CWR2c2NudHIgfD0gRFZTX0VOQUJMRTsKIAotCWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJr
cyhkZXYsIHBpcGUsIHNyY193LCBwaXhlbF9zaXplLCB0cnVlLAorCWludGVsX3VwZGF0ZV9zcHJp
dGVfd2F0ZXJtYXJrcyhwbGFuZSwgY3J0Yywgc3JjX3csIHBpeGVsX3NpemUsIHRydWUsCiAJCQkJ
ICAgICAgIHNyY193ICE9IGNydGNfdyB8fCBzcmNfaCAhPSBjcnRjX2gpOwogCiAJLyogU2l6ZXMg
YXJlIDAgYmFzZWQgKi8KLS0gCjEuOC4xLjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz
LmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz
dGluZm8vaW50ZWwtZ2Z4Cg==