From: Imre Deak Subject: [PATCH v2] drm/i915: Add missing NULL check before calling initial_watermarks Date: Mon, 29 Feb 2016 22:10:33 +0200 Message-ID: <1456776633-3401-1-git-send-email-imre.deak@intel.com> References: <1456773635-23362-1-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id E346C6E361 for ; Mon, 29 Feb 2016 20:10:35 +0000 (UTC) In-Reply-To: <1456773635-23362-1-git-send-email-imre.deak@intel.com> 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 Tm90IGFsbCBwbGF0Zm9ybXMgc2V0IHRoaXMgY2FsbGJhY2ssIHNvIE5VTEwgY2hlY2sgaXQgYmVm b3JlIGNhbGxpbmcgaXQuCgp2MjoKLSBDYWxsIGludGVsX3VwZGF0ZV93YXRlcm1hcmtzKCkgb24g SFNXKyB3aGVyZSB0aGUgY2FsbGJhY2sgaXMgbm90IHNldC4KICAoTWF0dCkKCkNDOiBNYXR0IFJv cGVyIDxtYXR0aGV3LmQucm9wZXJAaW50ZWwuY29tPgpGaXhlczogY29tbWl0IGVkNGE2YTdjICgi ZHJtL2k5MTU6IEFkZCB0d28tc3RhZ2UgSUxLLXN0eWxlIHdhdGVybWFyayBwcm9ncmFtbWluZyAo djExKSIpClNpZ25lZC1vZmYtYnk6IEltcmUgRGVhayA8aW1yZS5kZWFrQGludGVsLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCA4ICsrKysrKy0tCiAxIGZp bGUgY2hhbmdlZCwgNiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCA3OWJmNTI3Li5kNGIwYWQwIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC00OTU3LDcgKzQ5NTcsOCBAQCBzdGF0aWMgdm9pZCBp cm9ubGFrZV9jcnRjX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJICovCiAJaW50ZWxf Y3J0Y19sb2FkX2x1dChjcnRjKTsKIAotCWRldl9wcml2LT5kaXNwbGF5LmluaXRpYWxfd2F0ZXJt YXJrcyhpbnRlbF9jcnRjLT5jb25maWcpOworCWlmIChkZXZfcHJpdi0+ZGlzcGxheS5pbml0aWFs X3dhdGVybWFya3MgIT0gTlVMTCkKKwkJZGV2X3ByaXYtPmRpc3BsYXkuaW5pdGlhbF93YXRlcm1h cmtzKGludGVsX2NydGMtPmNvbmZpZyk7CiAJaW50ZWxfZW5hYmxlX3BpcGUoaW50ZWxfY3J0Yyk7 CiAKIAlpZiAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5oYXNfcGNoX2VuY29kZXIpCkBAIC01MDU2LDcg KzUwNTcsMTAgQEAgc3RhdGljIHZvaWQgaGFzd2VsbF9jcnRjX2VuYWJsZShzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMpCiAJaWYgKCFpbnRlbF9jcnRjLT5jb25maWctPmhhc19kc2lfZW5jb2RlcikKIAkJ aW50ZWxfZGRpX2VuYWJsZV90cmFuc2NvZGVyX2Z1bmMoY3J0Yyk7CiAKLQlkZXZfcHJpdi0+ZGlz cGxheS5pbml0aWFsX3dhdGVybWFya3MocGlwZV9jb25maWcpOworCWlmIChkZXZfcHJpdi0+ZGlz cGxheS5pbml0aWFsX3dhdGVybWFya3MgIT0gTlVMTCkKKwkJZGV2X3ByaXYtPmRpc3BsYXkuaW5p dGlhbF93YXRlcm1hcmtzKHBpcGVfY29uZmlnKTsKKwllbHNlCisJCWludGVsX3VwZGF0ZV93YXRl cm1hcmtzKGNydGMpOwogCWludGVsX2VuYWJsZV9waXBlKGludGVsX2NydGMpOwogCiAJaWYgKGlu dGVsX2NydGMtPmNvbmZpZy0+aGFzX3BjaF9lbmNvZGVyKQotLSAKMi41LjAKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=