From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH 2/2] drm/i915: Use the active wm config for
	merging on ILK-BDW
Date: Thu, 14 Jan 2016 14:53:35 +0200
Message-ID: <1452776015-22076-2-git-send-email-ville.syrjala@linux.intel.com>
References: <1452776015-22076-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 mga01.intel.com (mga01.intel.com [192.55.52.88])
 by gabe.freedesktop.org (Postfix) with ESMTP id EF2266E9C6
 for <intel-gfx@lists.freedesktop.org>; Thu, 14 Jan 2016 04:54:01 -0800 (PST)
In-Reply-To: <1452776015-22076-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>
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

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCmls
a19wcm9ncmFtX3dhdGVybWFya3MoKSBpcyBzdXBwb3NlZCB0byBtZXJnZSB0aGUgYWN0aXZlIHdh
dGVybWFya3MgZnJvbQphbGwgcGlwZXMuIFRodXMgd2UgbmVlZCB0byB1c2UgdGhlIGFjdGl2ZSBj
b25maWcgdG9vIGluc3RlYWQgb2Ygc29tZQpwcmVjb21wdXRlZCBzdHVmZi4KCkZpeGVzOiBhYTM2
MzEzNjg2NmMgKCJkcm0vaTkxNTogQ2FsY3VsYXRlIHdhdGVybWFyayBjb25maWd1cmF0aW9uIGR1
cmluZyBhdG9taWMgY2hlY2sgKHYyKSIpCkNjOiBNYXR0IFJvcGVyIDxtYXR0aGV3LmQucm9wZXJA
aW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFA
bGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgfCAz
MiArKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI2IGlu
c2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt
L2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXgg
ZTlmNGU2ZTdiNzM2Li5mNDRhOTYxMTgzZDcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAt
MzY4MCwyMyArMzY4MCw0MyBAQCBzdGF0aWMgdm9pZCBza2xfdXBkYXRlX3dtKHN0cnVjdCBkcm1f
Y3J0YyAqY3J0YykKIAlkZXZfcHJpdi0+d20uc2tsX2h3ID0gKnJlc3VsdHM7CiB9CiAKK3N0YXRp
YyB2b2lkIGlsa19jb21wdXRlX3dtX2NvbmZpZyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAorCQkJ
CSAgc3RydWN0IGludGVsX3dtX2NvbmZpZyAqY29uZmlnKQoreworCXN0cnVjdCBpbnRlbF9jcnRj
ICpjcnRjOworCisJLyogQ29tcHV0ZSB0aGUgY3VycmVudGx5IF9hY3RpdmVfIGNvbmZpZyAqLwor
CWZvcl9lYWNoX2ludGVsX2NydGMoZGV2LCBjcnRjKSB7CisJCWNvbnN0IHN0cnVjdCBpbnRlbF9w
aXBlX3dtICp3bSA9ICZjcnRjLT53bS5hY3RpdmUuaWxrOworCisJCWlmICghd20tPnBpcGVfZW5h
YmxlZCkKKwkJCWNvbnRpbnVlOworCisJCWNvbmZpZy0+c3ByaXRlc19lbmFibGVkIHw9IHdtLT5z
cHJpdGVzX2VuYWJsZWQ7CisJCWNvbmZpZy0+c3ByaXRlc19zY2FsZWQgfD0gd20tPnNwcml0ZXNf
c2NhbGVkOworCQljb25maWctPm51bV9waXBlc19hY3RpdmUrKzsKKwl9Cit9CisKIHN0YXRpYyB2
b2lkIGlsa19wcm9ncmFtX3dhdGVybWFya3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w
cml2KQogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBkZXZfcHJpdi0+ZGV2OwogCXN0cnVj
dCBpbnRlbF9waXBlX3dtIGxwX3dtXzFfMiA9IHt9LCBscF93bV81XzYgPSB7fSwgKmJlc3RfbHBf
d207CiAJc3RydWN0IGlsa193bV9tYXhpbXVtcyBtYXg7Ci0Jc3RydWN0IGludGVsX3dtX2NvbmZp
ZyAqY29uZmlnID0gJmRldl9wcml2LT53bS5jb25maWc7CisJc3RydWN0IGludGVsX3dtX2NvbmZp
ZyBjb25maWcgPSB7fTsKIAlzdHJ1Y3QgaWxrX3dtX3ZhbHVlcyByZXN1bHRzID0ge307CiAJZW51
bSBpbnRlbF9kZGJfcGFydGl0aW9uaW5nIHBhcnRpdGlvbmluZzsKIAotCWlsa19jb21wdXRlX3dt
X21heGltdW1zKGRldiwgMSwgY29uZmlnLCBJTlRFTF9EREJfUEFSVF8xXzIsICZtYXgpOwotCWls
a193bV9tZXJnZShkZXYsIGNvbmZpZywgJm1heCwgJmxwX3dtXzFfMik7CisJaWxrX2NvbXB1dGVf
d21fY29uZmlnKGRldiwgJmNvbmZpZyk7CisKKwlpbGtfY29tcHV0ZV93bV9tYXhpbXVtcyhkZXYs
IDEsICZjb25maWcsIElOVEVMX0REQl9QQVJUXzFfMiwgJm1heCk7CisJaWxrX3dtX21lcmdlKGRl
diwgJmNvbmZpZywgJm1heCwgJmxwX3dtXzFfMik7CiAKIAkvKiA1LzYgc3BsaXQgb25seSBpbiBz
aW5nbGUgcGlwZSBjb25maWcgb24gSVZCKyAqLwogCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+
PSA3ICYmCi0JICAgIGNvbmZpZy0+bnVtX3BpcGVzX2FjdGl2ZSA9PSAxICYmIGNvbmZpZy0+c3By
aXRlc19lbmFibGVkKSB7Ci0JCWlsa19jb21wdXRlX3dtX21heGltdW1zKGRldiwgMSwgY29uZmln
LCBJTlRFTF9EREJfUEFSVF81XzYsICZtYXgpOwotCQlpbGtfd21fbWVyZ2UoZGV2LCBjb25maWcs
ICZtYXgsICZscF93bV81XzYpOworCSAgICBjb25maWcubnVtX3BpcGVzX2FjdGl2ZSA9PSAxICYm
IGNvbmZpZy5zcHJpdGVzX2VuYWJsZWQpIHsKKwkJaWxrX2NvbXB1dGVfd21fbWF4aW11bXMoZGV2
LCAxLCAmY29uZmlnLCBJTlRFTF9EREJfUEFSVF81XzYsICZtYXgpOworCQlpbGtfd21fbWVyZ2Uo
ZGV2LCAmY29uZmlnLCAmbWF4LCAmbHBfd21fNV82KTsKIAogCQliZXN0X2xwX3dtID0gaWxrX2Zp
bmRfYmVzdF9yZXN1bHQoZGV2LCAmbHBfd21fMV8yLCAmbHBfd21fNV82KTsKIAl9IGVsc2Ugewot
LSAKMi40LjEwCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK
aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=