From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH 09/13] drm/i915: Split plane watermark
	parameters into a separate struct
Date: Tue,  6 Aug 2013 22:24:08 +0300
Message-ID: <1375817052-32310-10-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 mga09.intel.com (mga09.intel.com [134.134.136.24])
	by gabe.freedesktop.org (Postfix) with ESMTP id 4E4D8E5EAD
	for <intel-gfx@lists.freedesktop.org>;
	Tue,  6 Aug 2013 12:24:56 -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

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkdp
dmUgYSBuYW1lIHRvIHRoZSBwbGFuZSB3YXRlcm1hcmsgcmVsYXRlZCBkYXRhIHdlIGhhdmUgY3Vy
cmVudGx5CnN0b3JlZCB1bmRlciBpbnRlbF9wbGFuZS0+d20uCgpXZSBhbHNvIG9ic2VydmUgdGhh
dCB0aGlzIGRhdGEgaXMgbW9yZSBvciBsZXNzIHRoZSBzYW1lIHRoYXQgd2UgaGF2ZQppbiB0aGUg
aHN3X3BpcGVfd21fcGFyYW1ldGVycyBzdHJ1Y3R1cmUsIHNvIHVzZSBpdCB0aGVyZSBhcyB3ZWxs
LgoKU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4Lmlu
dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCB8IDE0ICsrKysr
LS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgIHwgNTcgKysrKysrKysrKysr
KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAzNSBpbnNlcnRp
b25zKCspLCAzNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IGVk
MzM5NzYuLjAzNjZiY2EgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Ry
di5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC0zMzAsNiArMzMw
LDEzIEBAIHN0cnVjdCBpbnRlbF9jcnRjIHsKIAlib29sIHBjaF9maWZvX3VuZGVycnVuX2Rpc2Fi
bGVkOwogfTsKIAorc3RydWN0IGludGVsX3BsYW5lX3dtX3BhcmFtZXRlcnMgeworCWJvb2wgZW5h
YmxlZDsKKwlib29sIHNjYWxlZDsKKwl1aW50OF90IGJ5dGVzX3Blcl9waXhlbDsKKwl1aW50MzJf
dCBob3Jpel9waXhlbHM7Cit9OworCiBzdHJ1Y3QgaW50ZWxfcGxhbmUgewogCXN0cnVjdCBkcm1f
cGxhbmUgYmFzZTsKIAlpbnQgcGxhbmU7CkBAIC0zNDgsMTIgKzM1NSw3IEBAIHN0cnVjdCBpbnRl
bF9wbGFuZSB7CiAJICogYXMgdGhlIG90aGVyIHBpZWNlcyBvZiB0aGUgc3RydWN0IG1heSBub3Qg
cmVmbGVjdCB0aGUgdmFsdWVzIHdlIHdhbnQKIAkgKiBmb3IgdGhlIHdhdGVybWFyayBjYWxjdWxh
dGlvbnMuIEN1cnJlbnRseSBvbmx5IEhhc3dlbGwgdXNlcyB0aGlzLgogCSAqLwotCXN0cnVjdCB7
Ci0JCWJvb2wgZW5hYmxlZDsKLQkJYm9vbCBzY2FsZWQ7Ci0JCXVpbnQ4X3QgYnl0ZXNfcGVyX3Bp
eGVsOwotCQl1aW50MzJfdCBob3Jpel9waXhlbHM7Ci0JfSB3bTsKKwlzdHJ1Y3QgaW50ZWxfcGxh
bmVfd21fcGFyYW1ldGVycyB3bTsKIAogCXZvaWQgKCp1cGRhdGVfcGxhbmUpKHN0cnVjdCBkcm1f
cGxhbmUgKnBsYW5lLAogCQkJICAgICBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwKZGlmZiAt
LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9wbS5jCmluZGV4IDAxNGE4YmEuLjlkNmY0YmYgMTAwNjQ0Ci0tLSBhL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfcG0uYwpAQCAtMjE2MiwxNSArMjE2MiwxMSBAQCBzdGF0aWMgdWludDMyX3QgaWxrX3dtX2Zi
Yyh1aW50MzJfdCBwcmlfdmFsLCB1aW50MzJfdCBob3Jpel9waXhlbHMsCiAKIHN0cnVjdCBoc3df
cGlwZV93bV9wYXJhbWV0ZXJzIHsKIAlib29sIGFjdGl2ZTsKLQlib29sIHNwcml0ZV9lbmFibGVk
OwotCXVpbnQ4X3QgcHJpX2J5dGVzX3Blcl9waXhlbDsKLQl1aW50OF90IHNwcl9ieXRlc19wZXJf
cGl4ZWw7Ci0JdWludDhfdCBjdXJfYnl0ZXNfcGVyX3BpeGVsOwotCXVpbnQzMl90IHByaV9ob3Jp
el9waXhlbHM7Ci0JdWludDMyX3Qgc3ByX2hvcml6X3BpeGVsczsKLQl1aW50MzJfdCBjdXJfaG9y
aXpfcGl4ZWxzOwogCXVpbnQzMl90IHBpcGVfaHRvdGFsOwogCXVpbnQzMl90IHBpeGVsX3JhdGU7
CisJc3RydWN0IGludGVsX3BsYW5lX3dtX3BhcmFtZXRlcnMgcHJpOworCXN0cnVjdCBpbnRlbF9w
bGFuZV93bV9wYXJhbWV0ZXJzIHNwcjsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmVfd21fcGFyYW1ldGVy
cyBjdXI7CiB9OwogCiBzdHJ1Y3QgaHN3X3dtX21heGltdW1zIHsKQEAgLTIyMDYsMTIgKzIyMDIs
MTEgQEAgc3RhdGljIHVpbnQzMl90IGlsa19jb21wdXRlX3ByaV93bShzdHJ1Y3QgaHN3X3BpcGVf
d21fcGFyYW1ldGVycyAqcGFyYW1zLAogewogCXVpbnQzMl90IG1ldGhvZDEsIG1ldGhvZDI7CiAK
LQkvKiBUT0RPOiBmb3Igbm93LCBhc3N1bWUgdGhlIHByaW1hcnkgcGxhbmUgaXMgYWx3YXlzIGVu
YWJsZWQuICovCi0JaWYgKCFwYXJhbXMtPmFjdGl2ZSkKKwlpZiAoIXBhcmFtcy0+YWN0aXZlIHx8
ICFwYXJhbXMtPnByaS5lbmFibGVkKQogCQlyZXR1cm4gMDsKIAogCW1ldGhvZDEgPSBpbGtfd21f
bWV0aG9kMShwYXJhbXMtPnBpeGVsX3JhdGUsCi0JCQkJIHBhcmFtcy0+cHJpX2J5dGVzX3Blcl9w
aXhlbCwKKwkJCQkgcGFyYW1zLT5wcmkuYnl0ZXNfcGVyX3BpeGVsLAogCQkJCSBtZW1fdmFsdWUp
OwogCiAJaWYgKCFpc19scCkKQEAgLTIyMTksOCArMjIxNCw4IEBAIHN0YXRpYyB1aW50MzJfdCBp
bGtfY29tcHV0ZV9wcmlfd20oc3RydWN0IGhzd19waXBlX3dtX3BhcmFtZXRlcnMgKnBhcmFtcywK
IAogCW1ldGhvZDIgPSBpbGtfd21fbWV0aG9kMihwYXJhbXMtPnBpeGVsX3JhdGUsCiAJCQkJIHBh
cmFtcy0+cGlwZV9odG90YWwsCi0JCQkJIHBhcmFtcy0+cHJpX2hvcml6X3BpeGVscywKLQkJCQkg
cGFyYW1zLT5wcmlfYnl0ZXNfcGVyX3BpeGVsLAorCQkJCSBwYXJhbXMtPnByaS5ob3Jpel9waXhl
bHMsCisJCQkJIHBhcmFtcy0+cHJpLmJ5dGVzX3Blcl9waXhlbCwKIAkJCQkgbWVtX3ZhbHVlKTsK
IAogCXJldHVybiBtaW4obWV0aG9kMSwgbWV0aG9kMik7CkBAIC0yMjM1LDE2ICsyMjMwLDE2IEBA
IHN0YXRpYyB1aW50MzJfdCBpbGtfY29tcHV0ZV9zcHJfd20oc3RydWN0IGhzd19waXBlX3dtX3Bh
cmFtZXRlcnMgKnBhcmFtcywKIHsKIAl1aW50MzJfdCBtZXRob2QxLCBtZXRob2QyOwogCi0JaWYg
KCFwYXJhbXMtPmFjdGl2ZSB8fCAhcGFyYW1zLT5zcHJpdGVfZW5hYmxlZCkKKwlpZiAoIXBhcmFt
cy0+YWN0aXZlIHx8ICFwYXJhbXMtPnNwci5lbmFibGVkKQogCQlyZXR1cm4gMDsKIAogCW1ldGhv
ZDEgPSBpbGtfd21fbWV0aG9kMShwYXJhbXMtPnBpeGVsX3JhdGUsCi0JCQkJIHBhcmFtcy0+c3By
X2J5dGVzX3Blcl9waXhlbCwKKwkJCQkgcGFyYW1zLT5zcHIuYnl0ZXNfcGVyX3BpeGVsLAogCQkJ
CSBtZW1fdmFsdWUpOwogCW1ldGhvZDIgPSBpbGtfd21fbWV0aG9kMihwYXJhbXMtPnBpeGVsX3Jh
dGUsCiAJCQkJIHBhcmFtcy0+cGlwZV9odG90YWwsCi0JCQkJIHBhcmFtcy0+c3ByX2hvcml6X3Bp
eGVscywKLQkJCQkgcGFyYW1zLT5zcHJfYnl0ZXNfcGVyX3BpeGVsLAorCQkJCSBwYXJhbXMtPnNw
ci5ob3Jpel9waXhlbHMsCisJCQkJIHBhcmFtcy0+c3ByLmJ5dGVzX3Blcl9waXhlbCwKIAkJCQkg
bWVtX3ZhbHVlKTsKIAlyZXR1cm4gbWluKG1ldGhvZDEsIG1ldGhvZDIpOwogfQpAQCAtMjI1Niwx
MyArMjI1MSwxMyBAQCBzdGF0aWMgdWludDMyX3QgaWxrX2NvbXB1dGVfc3ByX3dtKHN0cnVjdCBo
c3dfcGlwZV93bV9wYXJhbWV0ZXJzICpwYXJhbXMsCiBzdGF0aWMgdWludDMyX3QgaWxrX2NvbXB1
dGVfY3VyX3dtKHN0cnVjdCBoc3dfcGlwZV93bV9wYXJhbWV0ZXJzICpwYXJhbXMsCiAJCQkJICAg
dWludDMyX3QgbWVtX3ZhbHVlKQogewotCWlmICghcGFyYW1zLT5hY3RpdmUpCisJaWYgKCFwYXJh
bXMtPmFjdGl2ZSB8fCAhcGFyYW1zLT5jdXIuZW5hYmxlZCkKIAkJcmV0dXJuIDA7CiAKIAlyZXR1
cm4gaWxrX3dtX21ldGhvZDIocGFyYW1zLT5waXhlbF9yYXRlLAogCQkJICAgICAgcGFyYW1zLT5w
aXBlX2h0b3RhbCwKLQkJCSAgICAgIHBhcmFtcy0+Y3VyX2hvcml6X3BpeGVscywKLQkJCSAgICAg
IHBhcmFtcy0+Y3VyX2J5dGVzX3Blcl9waXhlbCwKKwkJCSAgICAgIHBhcmFtcy0+Y3VyLmhvcml6
X3BpeGVscywKKwkJCSAgICAgIHBhcmFtcy0+Y3VyLmJ5dGVzX3Blcl9waXhlbCwKIAkJCSAgICAg
IG1lbV92YWx1ZSk7CiB9CiAKQEAgLTIyNzAsMTIgKzIyNjUsMTIgQEAgc3RhdGljIHVpbnQzMl90
IGlsa19jb21wdXRlX2N1cl93bShzdHJ1Y3QgaHN3X3BpcGVfd21fcGFyYW1ldGVycyAqcGFyYW1z
LAogc3RhdGljIHVpbnQzMl90IGlsa19jb21wdXRlX2ZiY193bShzdHJ1Y3QgaHN3X3BpcGVfd21f
cGFyYW1ldGVycyAqcGFyYW1zLAogCQkJCSAgIHVpbnQzMl90IHByaV92YWwpCiB7Ci0JaWYgKCFw
YXJhbXMtPmFjdGl2ZSkKKwlpZiAoIXBhcmFtcy0+YWN0aXZlIHx8ICFwYXJhbXMtPnByaS5lbmFi
bGVkKQogCQlyZXR1cm4gMDsKIAogCXJldHVybiBpbGtfd21fZmJjKHByaV92YWwsCi0JCQkgIHBh
cmFtcy0+cHJpX2hvcml6X3BpeGVscywKLQkJCSAgcGFyYW1zLT5wcmlfYnl0ZXNfcGVyX3BpeGVs
KTsKKwkJCSAgcGFyYW1zLT5wcmkuaG9yaXpfcGl4ZWxzLAorCQkJICBwYXJhbXMtPnByaS5ieXRl
c19wZXJfcGl4ZWwpOwogfQogCiBzdGF0aWMgdW5zaWduZWQgaW50IGlsa19kaXNwbGF5X2ZpZm9f
c2l6ZShjb25zdCBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQpAQCAtMjYyNiwxMSArMjYyMSwxNCBA
QCBzdGF0aWMgdm9pZCBoc3dfY29tcHV0ZV93bV9wYXJhbWV0ZXJzKHN0cnVjdCBkcm1fZGV2aWNl
ICpkZXYsCiAKIAkJcC0+cGlwZV9odG90YWwgPSBpbnRlbF9jcnRjLT5jb25maWcuYWRqdXN0ZWRf
bW9kZS5odG90YWw7CiAJCXAtPnBpeGVsX3JhdGUgPSBpbGtfcGlwZV9waXhlbF9yYXRlKGRldiwg
Y3J0Yyk7Ci0JCXAtPnByaV9ieXRlc19wZXJfcGl4ZWwgPSBjcnRjLT5mYi0+Yml0c19wZXJfcGl4
ZWwgLyA4OwotCQlwLT5jdXJfYnl0ZXNfcGVyX3BpeGVsID0gNDsKLQkJcC0+cHJpX2hvcml6X3Bp
eGVscyA9CisJCXAtPnByaS5ieXRlc19wZXJfcGl4ZWwgPSBjcnRjLT5mYi0+Yml0c19wZXJfcGl4
ZWwgLyA4OworCQlwLT5jdXIuYnl0ZXNfcGVyX3BpeGVsID0gNDsKKwkJcC0+cHJpLmhvcml6X3Bp
eGVscyA9CiAJCQlpbnRlbF9jcnRjLT5jb25maWcucmVxdWVzdGVkX21vZGUuaGRpc3BsYXk7Ci0J
CXAtPmN1cl9ob3Jpel9waXhlbHMgPSA2NDsKKwkJcC0+Y3VyLmhvcml6X3BpeGVscyA9IDY0Owor
CQkvKiBUT0RPOiBmb3Igbm93LCBhc3N1bWUgcHJpbWFyeSBhbmQgY3Vyc29yIHBsYW5lcyBhcmUg
YWx3YXlzIGVuYWJsZWQuICovCisJCXAtPnByaS5lbmFibGVkID0gdHJ1ZTsKKwkJcC0+Y3VyLmVu
YWJsZWQgPSB0cnVlOwogCX0KIAogCWxpc3RfZm9yX2VhY2hfZW50cnkocGxhbmUsICZkZXYtPm1v
ZGVfY29uZmlnLnBsYW5lX2xpc3QsIGhlYWQpIHsKQEAgLTI2NDAsMTEgKzI2MzgsMTAgQEAgc3Rh
dGljIHZvaWQgaHN3X2NvbXB1dGVfd21fcGFyYW1ldGVycyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2
LAogCQlwaXBlID0gaW50ZWxfcGxhbmUtPnBpcGU7CiAJCXAgPSAmcGFyYW1zW3BpcGVdOwogCi0J
CXAtPnNwcml0ZV9lbmFibGVkID0gaW50ZWxfcGxhbmUtPndtLmVuYWJsZWQ7Ci0JCXAtPnNwcl9i
eXRlc19wZXJfcGl4ZWwgPSBpbnRlbF9wbGFuZS0+d20uYnl0ZXNfcGVyX3BpeGVsOwotCQlwLT5z
cHJfaG9yaXpfcGl4ZWxzID0gaW50ZWxfcGxhbmUtPndtLmhvcml6X3BpeGVsczsKKwkJcC0+c3By
ID0gaW50ZWxfcGxhbmUtPndtOwogCi0JCWNvbmZpZy5zcHJpdGVzX2VuYWJsZWQgfD0gcC0+c3By
aXRlX2VuYWJsZWQ7CisJCWNvbmZpZy5zcHJpdGVzX2VuYWJsZWQgfD0gcC0+c3ByLmVuYWJsZWQ7
CisJCWNvbmZpZy5zcHJpdGVzX3NjYWxlZCB8PSBwLT5zcHIuc2NhbGVkOwogCX0KIAogCWlsa193
bV9tYXgoZGV2LCAxLCAmY29uZmlnLCBJTlRFTF9EREJfUEFSVF8xXzIsIGxwX21heF8xXzIpOwot
LSAKMS44LjEuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn
Cmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK