From mboxrd@z Thu Jan  1 00:00:00 1970
From: ville.syrjala@linux.intel.com
Subject: [PATCH 03/16] drm/i915: Move LP1+ watermark merging out
	from hsw_compute_wm_results()
Date: Wed,  9 Oct 2013 19:17:57 +0300
Message-ID: <1381335490-4906-4-git-send-email-ville.syrjala@linux.intel.com>
References: <1381335490-4906-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 BD1CBE8136
	for <intel-gfx@lists.freedesktop.org>;
	Wed,  9 Oct 2013 09:18:37 -0700 (PDT)
In-Reply-To: <1381335490-4906-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

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkkg
d2FudCB0byBjb252ZXJ0IGhzd19maW5kX2Jlc3RfcmVzdWx0KCkgdG8gdXNlIGludGVsX3BpcGVf
d20sIHNvIHdlCm5lZWQgdG8gbW92ZSB0aGUgbWVyZ2luZyB0byBoYXBwZW4gb3V0c2lkZSBoc3df
Y29tcHV0ZV93bV9yZXN1bHRzKCkuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZp
bGxlLnN5cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX3BtLmMgfCAxOSArKysrKysrKysrLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTAgaW5z
ZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCA3
ZWVhNjlkLi5jMmQ0MzlmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w
bS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTI3MTYsMjYgKzI3
MTYsMjMgQEAgc3RhdGljIHZvaWQgaWxrX3dtX21lcmdlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs
CiB9CiAKIHN0YXRpYyB2b2lkIGhzd19jb21wdXRlX3dtX3Jlc3VsdHMoc3RydWN0IGRybV9kZXZp
Y2UgKmRldiwKLQkJCQkgICBjb25zdCBzdHJ1Y3QgaHN3X3dtX21heGltdW1zICpscF9tYXhpbXVt
cywKKwkJCQkgICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGlwZV93bSAqbWVyZ2VkLAogCQkJCSAgIHN0
cnVjdCBoc3dfd21fdmFsdWVzICpyZXN1bHRzKQogewogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRl
bF9jcnRjOwogCWludCBsZXZlbCwgd21fbHA7Ci0Jc3RydWN0IGludGVsX3BpcGVfd20gbWVyZ2Vk
ID0ge307Ci0KLQlpbGtfd21fbWVyZ2UoZGV2LCBscF9tYXhpbXVtcywgJm1lcmdlZCk7CiAKIAlt
ZW1zZXQocmVzdWx0cywgMCwgc2l6ZW9mKCpyZXN1bHRzKSk7CiAKLQlyZXN1bHRzLT5lbmFibGVf
ZmJjX3dtID0gbWVyZ2VkLmZiY193bV9lbmFibGVkOworCXJlc3VsdHMtPmVuYWJsZV9mYmNfd20g
PSBtZXJnZWQtPmZiY193bV9lbmFibGVkOwogCiAJLyogTFAxKyByZWdpc3RlciB2YWx1ZXMgKi8K
IAlmb3IgKHdtX2xwID0gMTsgd21fbHAgPD0gMzsgd21fbHArKykgewogCQljb25zdCBzdHJ1Y3Qg
aW50ZWxfd21fbGV2ZWwgKnI7CiAKLQkJbGV2ZWwgPSB3bV9scCArICh3bV9scCA+PSAyICYmIG1l
cmdlZC53bVs0XS5lbmFibGUpOworCQlsZXZlbCA9IHdtX2xwICsgKHdtX2xwID49IDIgJiYgbWVy
Z2VkLT53bVs0XS5lbmFibGUpOwogCi0JCXIgPSAmbWVyZ2VkLndtW2xldmVsXTsKKwkJciA9ICZt
ZXJnZWQtPndtW2xldmVsXTsKIAkJaWYgKCFyLT5lbmFibGUpCiAJCQlicmVhazsKIApAQCAtMjg5
Nyw2ICsyODk0LDcgQEAgc3RhdGljIHZvaWQgaGFzd2VsbF91cGRhdGVfd20oc3RydWN0IGRybV9j
cnRjICpjcnRjKQogCXN0cnVjdCBoc3dfd21fdmFsdWVzIHJlc3VsdHNfMV8yLCByZXN1bHRzXzVf
NiwgKmJlc3RfcmVzdWx0czsKIAllbnVtIGludGVsX2RkYl9wYXJ0aXRpb25pbmcgcGFydGl0aW9u
aW5nOwogCXN0cnVjdCBpbnRlbF9waXBlX3dtIHBpcGVfd20gPSB7fTsKKwlzdHJ1Y3QgaW50ZWxf
cGlwZV93bSBscF93bV8xXzIgPSB7fSwgbHBfd21fNV82ID0ge307CiAKIAloc3dfY29tcHV0ZV93
bV9wYXJhbWV0ZXJzKGNydGMsICZwYXJhbXMsICZscF9tYXhfMV8yLCAmbHBfbWF4XzVfNik7CiAK
QEAgLTI5MDcsOSArMjkwNSwxMiBAQCBzdGF0aWMgdm9pZCBoYXN3ZWxsX3VwZGF0ZV93bShzdHJ1
Y3QgZHJtX2NydGMgKmNydGMpCiAKIAlpbnRlbF9jcnRjLT53bS5hY3RpdmUgPSBwaXBlX3dtOwog
Ci0JaHN3X2NvbXB1dGVfd21fcmVzdWx0cyhkZXYsICZscF9tYXhfMV8yLCAmcmVzdWx0c18xXzIp
OworCWlsa193bV9tZXJnZShkZXYsICZscF9tYXhfMV8yLCAmbHBfd21fMV8yKTsKKwlpbGtfd21f
bWVyZ2UoZGV2LCAmbHBfbWF4XzVfNiwgJmxwX3dtXzVfNik7CisKKwloc3dfY29tcHV0ZV93bV9y
ZXN1bHRzKGRldiwgJmxwX3dtXzFfMiwgJnJlc3VsdHNfMV8yKTsKIAlpZiAobHBfbWF4XzFfMi5w
cmkgIT0gbHBfbWF4XzVfNi5wcmkpIHsKLQkJaHN3X2NvbXB1dGVfd21fcmVzdWx0cyhkZXYsICZs
cF9tYXhfNV82LCAmcmVzdWx0c181XzYpOworCQloc3dfY29tcHV0ZV93bV9yZXN1bHRzKGRldiwg
JmxwX3dtXzVfNiwgJnJlc3VsdHNfNV82KTsKIAkJYmVzdF9yZXN1bHRzID0gaHN3X2ZpbmRfYmVz
dF9yZXN1bHQoJnJlc3VsdHNfMV8yLCAmcmVzdWx0c181XzYpOwogCX0gZWxzZSB7CiAJCWJlc3Rf
cmVzdWx0cyA9ICZyZXN1bHRzXzFfMjsKLS0gCjEuOC4xLjUKCl9fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt
Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h
aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==