From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH v1.1 1/2] drm/i915: Allow preservation of
	watermarks, v2.
Date: Wed, 2 Mar 2016 12:38:06 +0100
Message-ID: <56D6D09E.5040007@linux.intel.com>
References: <1456826842-32553-1-git-send-email-maarten.lankhorst@linux.intel.com>
 <20160302111755.GQ15993@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 7D3046E82A
 for <intel-gfx@lists.freedesktop.org>; Wed,  2 Mar 2016 11:38:17 +0000 (UTC)
In-Reply-To: <20160302111755.GQ15993@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://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: <https://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: =?UTF-8?B?VmlsbGUgU3lyasOkbMOk?= <ville.syrjala@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

QXMgUGF1bG8gaGFzIG5vdGVkIHdlIGNhbiBoZWxwIGJpc2VjdGFiaWxpdHkgYnkgc2VwYXJhdGlu
ZyBjb21wdXRpbmcKd2F0ZXJtYXJrcyBvbiBhIG5vb3AgaW4gMiBzZXBhcmF0ZSBjb21taXRzLgoK
VGhpcyBwYXRjaCBubyBsb25nZXIgY2xlYXJzIHRoZSBjcnRjIHdhdGVybWFyayBzdGF0ZSwgYnV0
IHJlY2FsY3VsYXRlcwppdCBjb21wbGV0ZWx5LiBSZWdhcmRsZXNzIHdoZXRoZXIgYSBsZXZlbCBp
cyB1c2VkIHRoZSBmdWxsIHZhbHVlcyBmb3IKZWFjaCBsZXZlbCBhcmUgY2FsY3VsYXRlZC4gSWYg
YSBsZXZlbCBpcyBpbnZhbGlkIHdtW2xldmVsXS5lbmFibGUgaXMKdW5zZXQuCgpDaGFuZ2VzIHNp
bmNlIHYxOgotIE9ubHkgY2FsbCBpbGtfdmFsaWRhdGVfd21fbGV2ZWwgd2hlbiBsZXZlbCA8PSB1
c2FibGVfbGV2ZWwuCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5s
YW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X3BtLmMgfCAyMyArKysrKysrKysrKysrLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEzIGlu
c2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4
IDYxZGNhYzlkZWEzNy4uNGMyMWI5OGU1YTVjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAg
LTIzMDAsNyArMjMwMCw3IEBAIHN0YXRpYyBpbnQgaWxrX2NvbXB1dGVfcGlwZV93bShzdHJ1Y3Qg
aW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnByaXN0
YXRlID0gTlVMTDsKIAlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnNwcnN0YXRlID0gTlVMTDsK
IAlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKmN1cnN0YXRlID0gTlVMTDsKLQlpbnQgbGV2ZWws
IG1heF9sZXZlbCA9IGlsa193bV9tYXhfbGV2ZWwoZGV2KTsKKwlpbnQgbGV2ZWwsIG1heF9sZXZl
bCA9IGlsa193bV9tYXhfbGV2ZWwoZGV2KSwgdXNhYmxlX2xldmVsOwogCXN0cnVjdCBpbGtfd21f
bWF4aW11bXMgbWF4OwogCiAJY3N0YXRlID0gaW50ZWxfYXRvbWljX2dldF9jcnRjX3N0YXRlKHN0
YXRlLCBpbnRlbF9jcnRjKTsKQEAgLTIzMDgsNyArMjMwOCw2IEBAIHN0YXRpYyBpbnQgaWxrX2Nv
bXB1dGVfcGlwZV93bShzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAkJcmV0dXJuIFBU
Ul9FUlIoY3N0YXRlKTsKIAogCXBpcGVfd20gPSAmY3N0YXRlLT53bS5vcHRpbWFsLmlsazsKLQlt
ZW1zZXQocGlwZV93bSwgMCwgc2l6ZW9mKCpwaXBlX3dtKSk7CiAKIAlmb3JfZWFjaF9pbnRlbF9w
bGFuZV9vbl9jcnRjKGRldiwgaW50ZWxfY3J0YywgaW50ZWxfcGxhbmUpIHsKIAkJcHMgPSBkcm1f
YXRvbWljX2dldF9wbGFuZV9zdGF0ZShzdGF0ZSwKQEAgLTIzMzAsMTMgKzIzMjksMTUgQEAgc3Rh
dGljIGludCBpbGtfY29tcHV0ZV9waXBlX3dtKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRj
LAogCQkoZHJtX3JlY3Rfd2lkdGgoJnNwcnN0YXRlLT5kc3QpICE9IGRybV9yZWN0X3dpZHRoKCZz
cHJzdGF0ZS0+c3JjKSA+PiAxNiB8fAogCQlkcm1fcmVjdF9oZWlnaHQoJnNwcnN0YXRlLT5kc3Qp
ICE9IGRybV9yZWN0X2hlaWdodCgmc3Byc3RhdGUtPnNyYykgPj4gMTYpOwogCisJdXNhYmxlX2xl
dmVsID0gbWF4X2xldmVsOworCiAJLyogSUxLL1NOQjogTFAyKyB3YXRlcm1hcmtzIG9ubHkgdy9v
IHNwcml0ZXMgKi8KIAlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPD0gNiAmJiBzcHJzdGF0ZS0+
dmlzaWJsZSkKLQkJbWF4X2xldmVsID0gMTsKKwkJdXNhYmxlX2xldmVsID0gMTsKIAogCS8qIElM
Sy9TTkIvSVZCOiBMUDErIHdhdGVybWFya3Mgb25seSB3L28gc2NhbGluZyAqLwogCWlmIChwaXBl
X3dtLT5zcHJpdGVzX3NjYWxlZCkKLQkJbWF4X2xldmVsID0gMDsKKwkJdXNhYmxlX2xldmVsID0g
MDsKIAogCWlsa19jb21wdXRlX3dtX2xldmVsKGRldl9wcml2LCBpbnRlbF9jcnRjLCAwLCBjc3Rh
dGUsCiAJCQkgICAgIHByaXN0YXRlLCBzcHJzdGF0ZSwgY3Vyc3RhdGUsICZwaXBlX3dtLT53bVsw
XSk7CkBAIC0yMzUwLDIwICsyMzUxLDIyIEBAIHN0YXRpYyBpbnQgaWxrX2NvbXB1dGVfcGlwZV93
bShzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAlpbGtfY29tcHV0ZV93bV9yZWdfbWF4
aW11bXMoZGV2LCAxLCAmbWF4KTsKIAogCWZvciAobGV2ZWwgPSAxOyBsZXZlbCA8PSBtYXhfbGV2
ZWw7IGxldmVsKyspIHsKLQkJc3RydWN0IGludGVsX3dtX2xldmVsIHdtID0ge307CisJCXN0cnVj
dCBpbnRlbF93bV9sZXZlbCAqd20gPSAmcGlwZV93bS0+d21bbGV2ZWxdOwogCiAJCWlsa19jb21w
dXRlX3dtX2xldmVsKGRldl9wcml2LCBpbnRlbF9jcnRjLCBsZXZlbCwgY3N0YXRlLAotCQkJCSAg
ICAgcHJpc3RhdGUsIHNwcnN0YXRlLCBjdXJzdGF0ZSwgJndtKTsKKwkJCQkgICAgIHByaXN0YXRl
LCBzcHJzdGF0ZSwgY3Vyc3RhdGUsIHdtKTsKIAogCQkvKgogCQkgKiBEaXNhYmxlIGFueSB3YXRl
cm1hcmsgbGV2ZWwgdGhhdCBleGNlZWRzIHRoZQogCQkgKiByZWdpc3RlciBtYXhpbXVtcyBzaW5j
ZSBzdWNoIHdhdGVybWFya3MgYXJlCiAJCSAqIGFsd2F5cyBpbnZhbGlkLgogCQkgKi8KLQkJaWYg
KCFpbGtfdmFsaWRhdGVfd21fbGV2ZWwobGV2ZWwsICZtYXgsICZ3bSkpCi0JCQlicmVhazsKLQot
CQlwaXBlX3dtLT53bVtsZXZlbF0gPSB3bTsKKwkJaWYgKGxldmVsID4gdXNhYmxlX2xldmVsKSB7
CisJCQl3bS0+ZW5hYmxlID0gZmFsc2U7CisJCX0gZWxzZSBpZiAoIWlsa192YWxpZGF0ZV93bV9s
ZXZlbChsZXZlbCwgJm1heCwgd20pKSB7CisJCQl3bS0+ZW5hYmxlID0gZmFsc2U7CisJCQl1c2Fi
bGVfbGV2ZWwgPSBsZXZlbDsKKwkJfQogCX0KIAogCXJldHVybiAwOwotLSAKMi4xLjAKCgpfX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp
bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m
cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK