From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH v2] drm/i915: Split plane watermark parameters
	into a separate struct
Date: Wed,  7 Aug 2013 13:29:50 +0300
Message-ID: <1375871390-648-1-git-send-email-ville.syrjala@linux.intel.com>
References: <20130806201019.GG8181@cantiga.alporthouse.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 mga11.intel.com (mga11.intel.com [192.55.52.93])
	by gabe.freedesktop.org (Postfix) with ESMTP id 6AC7EE7045
	for <intel-gfx@lists.freedesktop.org>;
	Wed,  7 Aug 2013 03:29:54 -0700 (PDT)
In-Reply-To: <20130806201019.GG8181@cantiga.alporthouse.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

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkdp
dmUgYSBuYW1lIHRvIHRoZSBwbGFuZSB3YXRlcm1hcmsgcmVsYXRlZCBkYXRhIHdlIGhhdmUgY3Vy
cmVudGx5CnN0b3JlZCB1bmRlciBpbnRlbF9wbGFuZS0+d20uCgpXZSBhbHNvIG9ic2VydmUgdGhh
dCB0aGlzIGRhdGEgaXMgbW9yZSBvciBsZXNzIHRoZSBzYW1lIHRoYXQgd2UgaGF2ZQppbiB0aGUg
aHN3X3BpcGVfd21fcGFyYW1ldGVycyBzdHJ1Y3R1cmUsIHNvIHVzZSBpdCB0aGVyZSBhcyB3ZWxs
LgoKdjI6IE1ha2UgcGFob2xlIGhhcHBpZXIKClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNo
cmlzQGNocmlzLXdpbHNvbi5jby51az4KU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2
aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9kcnYuaCB8IDE0ICsrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt
LmMgIHwgNTcgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxl
cyBjaGFuZ2VkLCAzNSBpbnNlcnRpb25zKCspLCAzNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2Rydi5oCmluZGV4IDdkZjY2MmIuLjNlYThlNWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X2Rydi5oCkBAIC0zMzEsNiArMzMxLDEzIEBAIHN0cnVjdCBpbnRlbF9jcnRjIHsKIAlib29sIHBj
aF9maWZvX3VuZGVycnVuX2Rpc2FibGVkOwogfTsKIAorc3RydWN0IGludGVsX3BsYW5lX3dtX3Bh
cmFtZXRlcnMgeworCXVpbnQzMl90IGhvcml6X3BpeGVsczsKKwl1aW50OF90IGJ5dGVzX3Blcl9w
aXhlbDsKKwlib29sIGVuYWJsZWQ7CisJYm9vbCBzY2FsZWQ7Cit9OworCiBzdHJ1Y3QgaW50ZWxf
cGxhbmUgewogCXN0cnVjdCBkcm1fcGxhbmUgYmFzZTsKIAlpbnQgcGxhbmU7CkBAIC0zNDksMTIg
KzM1Niw3IEBAIHN0cnVjdCBpbnRlbF9wbGFuZSB7CiAJICogYXMgdGhlIG90aGVyIHBpZWNlcyBv
ZiB0aGUgc3RydWN0IG1heSBub3QgcmVmbGVjdCB0aGUgdmFsdWVzIHdlIHdhbnQKIAkgKiBmb3Ig
dGhlIHdhdGVybWFyayBjYWxjdWxhdGlvbnMuIEN1cnJlbnRseSBvbmx5IEhhc3dlbGwgdXNlcyB0
aGlzLgogCSAqLwotCXN0cnVjdCB7Ci0JCWJvb2wgZW5hYmxlZDsKLQkJYm9vbCBzY2FsZWQ7Ci0J
CXVpbnQ4X3QgYnl0ZXNfcGVyX3BpeGVsOwotCQl1aW50MzJfdCBob3Jpel9waXhlbHM7Ci0JfSB3
bTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmVfd21fcGFyYW1ldGVycyB3bTsKIAogCXZvaWQgKCp1cGRh
dGVfcGxhbmUpKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJICAgICBzdHJ1Y3QgZHJtX2Zy
YW1lYnVmZmVyICpmYiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt
LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDlkMDg3YmUuLmFmMDMw
ZTggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMjE2MiwxNSArMjE2MiwxMSBAQCBzdGF0
aWMgdWludDMyX3QgaWxrX3dtX2ZiYyh1aW50MzJfdCBwcmlfdmFsLCB1aW50MzJfdCBob3Jpel9w
aXhlbHMsCiAKIHN0cnVjdCBoc3dfcGlwZV93bV9wYXJhbWV0ZXJzIHsKIAlib29sIGFjdGl2ZTsK
LQlib29sIHNwcml0ZV9lbmFibGVkOwotCXVpbnQ4X3QgcHJpX2J5dGVzX3Blcl9waXhlbDsKLQl1
aW50OF90IHNwcl9ieXRlc19wZXJfcGl4ZWw7Ci0JdWludDhfdCBjdXJfYnl0ZXNfcGVyX3BpeGVs
OwotCXVpbnQzMl90IHByaV9ob3Jpel9waXhlbHM7Ci0JdWludDMyX3Qgc3ByX2hvcml6X3BpeGVs
czsKLQl1aW50MzJfdCBjdXJfaG9yaXpfcGl4ZWxzOwogCXVpbnQzMl90IHBpcGVfaHRvdGFsOwog
CXVpbnQzMl90IHBpeGVsX3JhdGU7CisJc3RydWN0IGludGVsX3BsYW5lX3dtX3BhcmFtZXRlcnMg
cHJpOworCXN0cnVjdCBpbnRlbF9wbGFuZV93bV9wYXJhbWV0ZXJzIHNwcjsKKwlzdHJ1Y3QgaW50
ZWxfcGxhbmVfd21fcGFyYW1ldGVycyBjdXI7CiB9OwogCiBzdHJ1Y3QgaHN3X3dtX21heGltdW1z
IHsKQEAgLTIyMDYsMTIgKzIyMDIsMTEgQEAgc3RhdGljIHVpbnQzMl90IGlsa19jb21wdXRlX3By
aV93bShzdHJ1Y3QgaHN3X3BpcGVfd21fcGFyYW1ldGVycyAqcGFyYW1zLAogewogCXVpbnQzMl90
IG1ldGhvZDEsIG1ldGhvZDI7CiAKLQkvKiBUT0RPOiBmb3Igbm93LCBhc3N1bWUgdGhlIHByaW1h
cnkgcGxhbmUgaXMgYWx3YXlzIGVuYWJsZWQuICovCi0JaWYgKCFwYXJhbXMtPmFjdGl2ZSkKKwlp
ZiAoIXBhcmFtcy0+YWN0aXZlIHx8ICFwYXJhbXMtPnByaS5lbmFibGVkKQogCQlyZXR1cm4gMDsK
IAogCW1ldGhvZDEgPSBpbGtfd21fbWV0aG9kMShwYXJhbXMtPnBpeGVsX3JhdGUsCi0JCQkJIHBh
cmFtcy0+cHJpX2J5dGVzX3Blcl9waXhlbCwKKwkJCQkgcGFyYW1zLT5wcmkuYnl0ZXNfcGVyX3Bp
eGVsLAogCQkJCSBtZW1fdmFsdWUpOwogCiAJaWYgKCFpc19scCkKQEAgLTIyMTksOCArMjIxNCw4
IEBAIHN0YXRpYyB1aW50MzJfdCBpbGtfY29tcHV0ZV9wcmlfd20oc3RydWN0IGhzd19waXBlX3dt
X3BhcmFtZXRlcnMgKnBhcmFtcywKIAogCW1ldGhvZDIgPSBpbGtfd21fbWV0aG9kMihwYXJhbXMt
PnBpeGVsX3JhdGUsCiAJCQkJIHBhcmFtcy0+cGlwZV9odG90YWwsCi0JCQkJIHBhcmFtcy0+cHJp
X2hvcml6X3BpeGVscywKLQkJCQkgcGFyYW1zLT5wcmlfYnl0ZXNfcGVyX3BpeGVsLAorCQkJCSBw
YXJhbXMtPnByaS5ob3Jpel9waXhlbHMsCisJCQkJIHBhcmFtcy0+cHJpLmJ5dGVzX3Blcl9waXhl
bCwKIAkJCQkgbWVtX3ZhbHVlKTsKIAogCXJldHVybiBtaW4obWV0aG9kMSwgbWV0aG9kMik7CkBA
IC0yMjM1LDE2ICsyMjMwLDE2IEBAIHN0YXRpYyB1aW50MzJfdCBpbGtfY29tcHV0ZV9zcHJfd20o
c3RydWN0IGhzd19waXBlX3dtX3BhcmFtZXRlcnMgKnBhcmFtcywKIHsKIAl1aW50MzJfdCBtZXRo
b2QxLCBtZXRob2QyOwogCi0JaWYgKCFwYXJhbXMtPmFjdGl2ZSB8fCAhcGFyYW1zLT5zcHJpdGVf
ZW5hYmxlZCkKKwlpZiAoIXBhcmFtcy0+YWN0aXZlIHx8ICFwYXJhbXMtPnNwci5lbmFibGVkKQog
CQlyZXR1cm4gMDsKIAogCW1ldGhvZDEgPSBpbGtfd21fbWV0aG9kMShwYXJhbXMtPnBpeGVsX3Jh
dGUsCi0JCQkJIHBhcmFtcy0+c3ByX2J5dGVzX3Blcl9waXhlbCwKKwkJCQkgcGFyYW1zLT5zcHIu
Ynl0ZXNfcGVyX3BpeGVsLAogCQkJCSBtZW1fdmFsdWUpOwogCW1ldGhvZDIgPSBpbGtfd21fbWV0
aG9kMihwYXJhbXMtPnBpeGVsX3JhdGUsCiAJCQkJIHBhcmFtcy0+cGlwZV9odG90YWwsCi0JCQkJ
IHBhcmFtcy0+c3ByX2hvcml6X3BpeGVscywKLQkJCQkgcGFyYW1zLT5zcHJfYnl0ZXNfcGVyX3Bp
eGVsLAorCQkJCSBwYXJhbXMtPnNwci5ob3Jpel9waXhlbHMsCisJCQkJIHBhcmFtcy0+c3ByLmJ5
dGVzX3Blcl9waXhlbCwKIAkJCQkgbWVtX3ZhbHVlKTsKIAlyZXR1cm4gbWluKG1ldGhvZDEsIG1l
dGhvZDIpOwogfQpAQCAtMjI1NiwxMyArMjI1MSwxMyBAQCBzdGF0aWMgdWludDMyX3QgaWxrX2Nv
bXB1dGVfc3ByX3dtKHN0cnVjdCBoc3dfcGlwZV93bV9wYXJhbWV0ZXJzICpwYXJhbXMsCiBzdGF0
aWMgdWludDMyX3QgaWxrX2NvbXB1dGVfY3VyX3dtKHN0cnVjdCBoc3dfcGlwZV93bV9wYXJhbWV0
ZXJzICpwYXJhbXMsCiAJCQkJICAgdWludDMyX3QgbWVtX3ZhbHVlKQogewotCWlmICghcGFyYW1z
LT5hY3RpdmUpCisJaWYgKCFwYXJhbXMtPmFjdGl2ZSB8fCAhcGFyYW1zLT5jdXIuZW5hYmxlZCkK
IAkJcmV0dXJuIDA7CiAKIAlyZXR1cm4gaWxrX3dtX21ldGhvZDIocGFyYW1zLT5waXhlbF9yYXRl
LAogCQkJICAgICAgcGFyYW1zLT5waXBlX2h0b3RhbCwKLQkJCSAgICAgIHBhcmFtcy0+Y3VyX2hv
cml6X3BpeGVscywKLQkJCSAgICAgIHBhcmFtcy0+Y3VyX2J5dGVzX3Blcl9waXhlbCwKKwkJCSAg
ICAgIHBhcmFtcy0+Y3VyLmhvcml6X3BpeGVscywKKwkJCSAgICAgIHBhcmFtcy0+Y3VyLmJ5dGVz
X3Blcl9waXhlbCwKIAkJCSAgICAgIG1lbV92YWx1ZSk7CiB9CiAKQEAgLTIyNzAsMTIgKzIyNjUs
MTIgQEAgc3RhdGljIHVpbnQzMl90IGlsa19jb21wdXRlX2N1cl93bShzdHJ1Y3QgaHN3X3BpcGVf
d21fcGFyYW1ldGVycyAqcGFyYW1zLAogc3RhdGljIHVpbnQzMl90IGlsa19jb21wdXRlX2ZiY193
bShzdHJ1Y3QgaHN3X3BpcGVfd21fcGFyYW1ldGVycyAqcGFyYW1zLAogCQkJCSAgIHVpbnQzMl90
IHByaV92YWwpCiB7Ci0JaWYgKCFwYXJhbXMtPmFjdGl2ZSkKKwlpZiAoIXBhcmFtcy0+YWN0aXZl
IHx8ICFwYXJhbXMtPnByaS5lbmFibGVkKQogCQlyZXR1cm4gMDsKIAogCXJldHVybiBpbGtfd21f
ZmJjKHByaV92YWwsCi0JCQkgIHBhcmFtcy0+cHJpX2hvcml6X3BpeGVscywKLQkJCSAgcGFyYW1z
LT5wcmlfYnl0ZXNfcGVyX3BpeGVsKTsKKwkJCSAgcGFyYW1zLT5wcmkuaG9yaXpfcGl4ZWxzLAor
CQkJICBwYXJhbXMtPnByaS5ieXRlc19wZXJfcGl4ZWwpOwogfQogCiBzdGF0aWMgdW5zaWduZWQg
aW50IGlsa19kaXNwbGF5X2ZpZm9fc2l6ZShjb25zdCBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQpA
QCAtMjYzNiwxMSArMjYzMSwxNCBAQCBzdGF0aWMgdm9pZCBoc3dfY29tcHV0ZV93bV9wYXJhbWV0
ZXJzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAkJcC0+cGlwZV9odG90YWwgPSBpbnRlbF9j
cnRjLT5jb25maWcuYWRqdXN0ZWRfbW9kZS5odG90YWw7CiAJCXAtPnBpeGVsX3JhdGUgPSBpbGtf
cGlwZV9waXhlbF9yYXRlKGRldiwgY3J0Yyk7Ci0JCXAtPnByaV9ieXRlc19wZXJfcGl4ZWwgPSBj
cnRjLT5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4OwotCQlwLT5jdXJfYnl0ZXNfcGVyX3BpeGVsID0g
NDsKLQkJcC0+cHJpX2hvcml6X3BpeGVscyA9CisJCXAtPnByaS5ieXRlc19wZXJfcGl4ZWwgPSBj
cnRjLT5mYi0+Yml0c19wZXJfcGl4ZWwgLyA4OworCQlwLT5jdXIuYnl0ZXNfcGVyX3BpeGVsID0g
NDsKKwkJcC0+cHJpLmhvcml6X3BpeGVscyA9CiAJCQlpbnRlbF9jcnRjLT5jb25maWcucmVxdWVz
dGVkX21vZGUuaGRpc3BsYXk7Ci0JCXAtPmN1cl9ob3Jpel9waXhlbHMgPSA2NDsKKwkJcC0+Y3Vy
Lmhvcml6X3BpeGVscyA9IDY0OworCQkvKiBUT0RPOiBmb3Igbm93LCBhc3N1bWUgcHJpbWFyeSBh
bmQgY3Vyc29yIHBsYW5lcyBhcmUgYWx3YXlzIGVuYWJsZWQuICovCisJCXAtPnByaS5lbmFibGVk
ID0gdHJ1ZTsKKwkJcC0+Y3VyLmVuYWJsZWQgPSB0cnVlOwogCX0KIAogCWxpc3RfZm9yX2VhY2hf
ZW50cnkocGxhbmUsICZkZXYtPm1vZGVfY29uZmlnLnBsYW5lX2xpc3QsIGhlYWQpIHsKQEAgLTI2
NTAsMTEgKzI2NDgsMTAgQEAgc3RhdGljIHZvaWQgaHN3X2NvbXB1dGVfd21fcGFyYW1ldGVycyhz
dHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQlwaXBlID0gaW50ZWxfcGxhbmUtPnBpcGU7CiAJCXAg
PSAmcGFyYW1zW3BpcGVdOwogCi0JCXAtPnNwcml0ZV9lbmFibGVkID0gaW50ZWxfcGxhbmUtPndt
LmVuYWJsZWQ7Ci0JCXAtPnNwcl9ieXRlc19wZXJfcGl4ZWwgPSBpbnRlbF9wbGFuZS0+d20uYnl0
ZXNfcGVyX3BpeGVsOwotCQlwLT5zcHJfaG9yaXpfcGl4ZWxzID0gaW50ZWxfcGxhbmUtPndtLmhv
cml6X3BpeGVsczsKKwkJcC0+c3ByID0gaW50ZWxfcGxhbmUtPndtOwogCi0JCWNvbmZpZy5zcHJp
dGVzX2VuYWJsZWQgfD0gcC0+c3ByaXRlX2VuYWJsZWQ7CisJCWNvbmZpZy5zcHJpdGVzX2VuYWJs
ZWQgfD0gcC0+c3ByLmVuYWJsZWQ7CisJCWNvbmZpZy5zcHJpdGVzX3NjYWxlZCB8PSBwLT5zcHIu
c2NhbGVkOwogCX0KIAogCWlsa193bV9tYXgoZGV2LCAxLCAmY29uZmlnLCBJTlRFTF9EREJfUEFS
VF8xXzIsIGxwX21heF8xXzIpOwotLSAKMS44LjEuNQoKX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA
bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h
bi9saXN0aW5mby9pbnRlbC1nZngK