From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matt Roper <matthew.d.roper@intel.com>
Subject: [PATCH] drm/i915: Handle error paths during watermark
	sanitization properly (v2)
Date: Mon, 11 Jan 2016 10:27:03 -0800
Message-ID: <1452536823-26340-1-git-send-email-matthew.d.roper@intel.com>
References: <1452528993-13006-1-git-send-email-matthew.d.roper@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 mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id CD4536E329
 for <intel-gfx@lists.freedesktop.org>; Mon, 11 Jan 2016 10:27:05 -0800 (PST)
In-Reply-To: <1452528993-13006-1-git-send-email-matthew.d.roper@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

c2FuaXRpemVfd2F0ZXJtYXJrcygpIGRvZXMgbm90IHByb3Blcmx5IGhhbmRsZSBlcnJvcnMgcmV0
dXJuZWQgYnkKZHJtX2F0b21pY19oZWxwZXJfZHVwbGljYXRlX3N0YXRlKCkuICBNYWtlIGZhaWx1
cmVzIGRyb3AgbG9ja3MgYmVmb3JlCnJldHVybmluZy4gIFdlIGFsc28gY2hhbmdlIHRoZSBsb2Nr
IG9mIGNvbm5lY3Rpb25fbXV0ZXggdG8gYQpkcm1fbW9kZXNldF9sb2NrX2FsbF9jdHgoKSB0byBt
YWtlIHN1cmUgYW55IEVERUFETEsncyBhcmUgaGFuZGxlZAplYXJsaWVyLgoKdjI6IENoYW5nZSBj
YWxsIHRvIGxvY2sgY29ubmV0aW9uX211dGV4IHdpdGggYSBjYWxsIHRvCiAgICBkcm1fbW9kZXNl
dF9sb2NrX2FsbF9jdHgoKS4gIFRoaXMgZW5zdXJlcyB0aGF0IGFueSBsb2NrIGNvbnRlbnRpb24K
ICAgIGlzIGhhbmRsZWQgZWFybGllciBhbmQgZHJtX2F0b21pY19oZWxwZXJfZHVwbGljYXRlX3N0
YXRlKCkgd29uJ3QKICAgIHJldHVybiBFREVBRExLLgoKQ2M6IERhbmllbCBWZXR0ZXIgPGRhbmll
bEBmZndsbC5jaD4KQ2M6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51
eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBp
bnRlbC5jb20+Ci0tLQpIb3BlZnVsbHkgYSBmaXggZm9yIHRoZSBpc3N1ZSB0aGF0IHRoZSBDSSBz
eXN0ZW0gdHJpcHBlZCBvdmVyLgoKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku
YyB8IDUgKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25z
KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIv
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDM5MWNjN2YuLjVmYzk0
MmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTE1MzA3LDcgKzE1MzA3
LDcgQEAgc3RhdGljIHZvaWQgc2FuaXRpemVfd2F0ZXJtYXJrcyhzdHJ1Y3QgZHJtX2RldmljZSAq
ZGV2KQogCSAqLwogCWRybV9tb2Rlc2V0X2FjcXVpcmVfaW5pdCgmY3R4LCAwKTsKIHJldHJ5Ogot
CXJldCA9IGRybV9tb2Rlc2V0X2xvY2soJmRldi0+bW9kZV9jb25maWcuY29ubmVjdGlvbl9tdXRl
eCwgJmN0eCk7CisJcmV0ID0gZHJtX21vZGVzZXRfbG9ja19hbGxfY3R4KGRldiwgJmN0eCk7CiAJ
aWYgKHJldCA9PSAtRURFQURMSykgewogCQlkcm1fbW9kZXNldF9iYWNrb2ZmKCZjdHgpOwogCQln
b3RvIHJldHJ5OwpAQCAtMTUzMTcsNyArMTUzMTcsNyBAQCByZXRyeToKIAogCXN0YXRlID0gZHJt
X2F0b21pY19oZWxwZXJfZHVwbGljYXRlX3N0YXRlKGRldiwgJmN0eCk7CiAJaWYgKFdBUk5fT04o
SVNfRVJSKHN0YXRlKSkpCi0JCXJldHVybjsKKwkJZ290byBmYWlsOwogCiAJcmV0ID0gaW50ZWxf
YXRvbWljX2NoZWNrKGRldiwgc3RhdGUpOwogCWlmIChyZXQpIHsKQEAgLTE1MzQ1LDYgKzE1MzQ1
LDcgQEAgcmV0cnk6CiAJfQogCiAJZHJtX2F0b21pY19zdGF0ZV9mcmVlKHN0YXRlKTsKK2ZhaWw6
CiAJZHJtX21vZGVzZXRfZHJvcF9sb2NrcygmY3R4KTsKIAlkcm1fbW9kZXNldF9hY3F1aXJlX2Zp
bmkoJmN0eCk7CiB9Ci0tIAoyLjEuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl
ZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m
by9pbnRlbC1nZngK