From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matt Roper Subject: [PATCH] drm/i915: Handle error paths during watermark sanitization properly Date: Mon, 11 Jan 2016 08:16:33 -0800 Message-ID: <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: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id A56F36E3A9 for ; Mon, 11 Jan 2016 08:16:38 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org c2FuaXRpemVfd2F0ZXJtYXJrcygpIGRvZXMgbm90IHByb3Blcmx5IGhhbmRsZSBlcnJvcnMgcmV0 dXJuZWQgYnkKZHJtX2F0b21pY19oZWxwZXJfZHVwbGljYXRlX3N0YXRlKCkuICBFREVBRExLIHNo b3VsZCB0cmlnZ2VyIGEgbW9kZXNldApiYWNrb2ZmIGFuZCByZXRyeTsgZm9yIG90aGVyIGVycm9y cyB3ZSBuZWVkIHRvIGRyb3AgbG9ja3MgYmVmb3JlCnJldHVybmluZy4KCkNjOiBEYW5pZWwgVmV0 dGVyIDxkYW5pZWxAZmZ3bGwuY2g+CkNjOiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5r aG9yc3RAbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBNYXR0IFJvcGVyIDxtYXR0aGV3 LmQucm9wZXJAaW50ZWwuY29tPgotLS0KSSB0aGluayB0aGlzIG1pZ2h0IGZpeCB0aGUgcHJvYmxl bXMgdGhhdCBibGV3IHVwIHRoZSBDSSBzeXN0ZW0gcmVjZW50bHkuCgogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgMTAgKysrKysrKystLQogMSBmaWxlIGNoYW5nZWQsIDgg aW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKaW5kZXggMzkxY2M3Zi4uZmRmZjQ2MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYwpAQCAtMTUzMTYsOCArMTUzMTYsMTMgQEAgcmV0cnk6CiAJfQogCiAJc3RhdGUgPSBk cm1fYXRvbWljX2hlbHBlcl9kdXBsaWNhdGVfc3RhdGUoZGV2LCAmY3R4KTsKLQlpZiAoV0FSTl9P TihJU19FUlIoc3RhdGUpKSkKLQkJcmV0dXJuOworCXJldCA9IFBUUl9FUlJfT1JfWkVSTyhzdGF0 ZSk7CisJaWYgKHJldCA9PSAtRURFQURMSykgeworCQlkcm1fbW9kZXNldF9iYWNrb2ZmKCZjdHgp OworCQlnb3RvIHJldHJ5OworCX0gZWxzZSBpZiAoV0FSTl9PTihyZXQpKSB7CisJCWdvdG8gZmFp bDsKKwl9CiAKIAlyZXQgPSBpbnRlbF9hdG9taWNfY2hlY2soZGV2LCBzdGF0ZSk7CiAJaWYgKHJl dCkgewpAQCAtMTUzNDUsNiArMTUzNTAsNyBAQCByZXRyeToKIAl9CiAKIAlkcm1fYXRvbWljX3N0 YXRlX2ZyZWUoc3RhdGUpOworZmFpbDoKIAlkcm1fbW9kZXNldF9kcm9wX2xvY2tzKCZjdHgpOwog CWRybV9tb2Rlc2V0X2FjcXVpcmVfZmluaSgmY3R4KTsKIH0KLS0gCjIuMS40CgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=