From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH 07/14] drm/i915: Don't merge LP1+ watermarks on
	ILK/SNB/IVB when multiple pipes are enabled
Date: Thu,  5 Dec 2013 15:51:34 +0200
Message-ID: <1386251501-10602-8-git-send-email-ville.syrjala@linux.intel.com>
References: <1386251501-10602-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@lists.freedesktop.org>
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
	by gabe.freedesktop.org (Postfix) with ESMTP id B3B69FB774
	for <intel-gfx@lists.freedesktop.org>;
	Thu,  5 Dec 2013 05:52:19 -0800 (PST)
In-Reply-To: <1386251501-10602-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@lists.freedesktop.org
Errors-To: intel-gfx-bounces@lists.freedesktop.org
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk11
bHRpLXBpcGUgTFAxKyB3YXRlcm1hcmtzIGFyZSBhIEhTVysgZmVhdHVyZSwgc28gbGV0J3Mgbm90
IGRvIGl0IG9uCmVhcmxpZXIgZ2VuZXJhdGlvbnMuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJq
w6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX3BtLmMgfCAxMCArKysrKysrKy0tCiAxIGZpbGUgY2hhbmdlZCwgOCBpbnNl
cnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDFh
YTZlYTkuLjI5YzMzM2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt
LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtMjY5MSwxMSArMjY5
MSwxNyBAQCBzdGF0aWMgdm9pZCBpbGtfbWVyZ2Vfd21fbGV2ZWwoc3RydWN0IGRybV9kZXZpY2Ug
KmRldiwKICAqIE1lcmdlIGFsbCBsb3cgcG93ZXIgd2F0ZXJtYXJrcyBmb3IgYWxsIGFjdGl2ZSBw
aXBlcy4KICAqLwogc3RhdGljIHZvaWQgaWxrX3dtX21lcmdlKHN0cnVjdCBkcm1fZGV2aWNlICpk
ZXYsCisJCQkgY29uc3Qgc3RydWN0IGludGVsX3dtX2NvbmZpZyAqY29uZmlnLAogCQkJIGNvbnN0
IHN0cnVjdCBoc3dfd21fbWF4aW11bXMgKm1heCwKIAkJCSBzdHJ1Y3QgaW50ZWxfcGlwZV93bSAq
bWVyZ2VkKQogewogCWludCBsZXZlbCwgbWF4X2xldmVsID0gaWxrX3dtX21heF9sZXZlbChkZXYp
OwogCisJLyogSUxLL1NOQi9JVkI6IExQMSsgd2F0ZXJtYXJrcyBvbmx5IHcvIHNpbmdsZSBwaXBl
ICovCisJaWYgKChJTlRFTF9JTkZPKGRldiktPmdlbiA8PSA2IHx8IElTX0lWWUJSSURHRShkZXYp
KSAmJgorCSAgICBjb25maWctPm51bV9waXBlc19hY3RpdmUgPiAxKQorCQlyZXR1cm47CisKIAlt
ZXJnZWQtPmZiY193bV9lbmFibGVkID0gdHJ1ZTsKIAogCS8qIG1lcmdlIGVhY2ggV00xKyBsZXZl
bCAqLwpAQCAtMzAwMSwxMyArMzAwNywxMyBAQCBzdGF0aWMgdm9pZCBoYXN3ZWxsX3VwZGF0ZV93
bShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJaW50ZWxfY3J0Yy0+d20uYWN0aXZlID0gcGlwZV93
bTsKIAogCWlsa19jb21wdXRlX3dtX21heGltdW1zKGRldiwgMSwgJmNvbmZpZywgSU5URUxfRERC
X1BBUlRfMV8yLCAmbWF4KTsKLQlpbGtfd21fbWVyZ2UoZGV2LCAmbWF4LCAmbHBfd21fMV8yKTsK
KwlpbGtfd21fbWVyZ2UoZGV2LCAmY29uZmlnLCAmbWF4LCAmbHBfd21fMV8yKTsKIAogCS8qIDUv
NiBzcGxpdCBvbmx5IGluIHNpbmdsZSBwaXBlIGNvbmZpZyBvbiBJVkIrICovCiAJaWYgKElOVEVM
X0lORk8oZGV2KS0+Z2VuID49IDcgJiYKIAkgICAgY29uZmlnLm51bV9waXBlc19hY3RpdmUgPT0g
MSAmJiBjb25maWcuc3ByaXRlc19lbmFibGVkKSB7CiAJCWlsa19jb21wdXRlX3dtX21heGltdW1z
KGRldiwgMSwgJmNvbmZpZywgSU5URUxfRERCX1BBUlRfNV82LCAmbWF4KTsKLQkJaWxrX3dtX21l
cmdlKGRldiwgJm1heCwgJmxwX3dtXzVfNik7CisJCWlsa193bV9tZXJnZShkZXYsICZjb25maWcs
ICZtYXgsICZscF93bV81XzYpOwogCiAJCWJlc3RfbHBfd20gPSBoc3dfZmluZF9iZXN0X3Jlc3Vs
dChkZXYsICZscF93bV8xXzIsICZscF93bV81XzYpOwogCX0gZWxzZSB7Ci0tIAoxLjguMy4yCgpf
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg
bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz
LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=