From: Imre Deak Subject: [PATCH] drm/i915: Add missing NULL check before calling initial_watermarks Date: Mon, 29 Feb 2016 21:20:35 +0200 Message-ID: <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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 03E736E347 for ; Mon, 29 Feb 2016 19:20:40 +0000 (UTC) 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 b3JlIGNhbGxpbmcgaXQuCgpDQzogTWF0dCBSb3BlciA8bWF0dGhldy5kLnJvcGVyQGludGVsLmNv bT4KRml4ZXM6IGNvbW1pdCBlZDRhNmE3YyAoImRybS9pOTE1OiBBZGQgdHdvLXN0YWdlIElMSy1z dHlsZSB3YXRlcm1hcmsgcHJvZ3JhbW1pbmcgKHYxMSkiKQpTaWduZWQtb2ZmLWJ5OiBJbXJlIERl YWsgPGltcmUuZGVha0BpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jIHwgNiArKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDIg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDc5YmY1 MjcuLmE2MDAxOGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTQ5NTcs NyArNDk1Nyw4IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX2NydGNfZW5hYmxlKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YykKIAkgKi8KIAlpbnRlbF9jcnRjX2xvYWRfbHV0KGNydGMpOwogCi0JZGV2X3By aXYtPmRpc3BsYXkuaW5pdGlhbF93YXRlcm1hcmtzKGludGVsX2NydGMtPmNvbmZpZyk7CisJaWYg KGRldl9wcml2LT5kaXNwbGF5LmluaXRpYWxfd2F0ZXJtYXJrcyAhPSBOVUxMKQorCQlkZXZfcHJp di0+ZGlzcGxheS5pbml0aWFsX3dhdGVybWFya3MoaW50ZWxfY3J0Yy0+Y29uZmlnKTsKIAlpbnRl bF9lbmFibGVfcGlwZShpbnRlbF9jcnRjKTsKIAogCWlmIChpbnRlbF9jcnRjLT5jb25maWctPmhh c19wY2hfZW5jb2RlcikKQEAgLTUwNTYsNyArNTA1Nyw4IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxf Y3J0Y19lbmFibGUoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCWlmICghaW50ZWxfY3J0Yy0+Y29u ZmlnLT5oYXNfZHNpX2VuY29kZXIpCiAJCWludGVsX2RkaV9lbmFibGVfdHJhbnNjb2Rlcl9mdW5j KGNydGMpOwogCi0JZGV2X3ByaXYtPmRpc3BsYXkuaW5pdGlhbF93YXRlcm1hcmtzKHBpcGVfY29u ZmlnKTsKKwlpZiAoZGV2X3ByaXYtPmRpc3BsYXkuaW5pdGlhbF93YXRlcm1hcmtzICE9IE5VTEwp CisJCWRldl9wcml2LT5kaXNwbGF5LmluaXRpYWxfd2F0ZXJtYXJrcyhwaXBlX2NvbmZpZyk7CiAJ aW50ZWxfZW5hYmxlX3BpcGUoaW50ZWxfY3J0Yyk7CiAKIAlpZiAoaW50ZWxfY3J0Yy0+Y29uZmln LT5oYXNfcGNoX2VuY29kZXIpCi0tIAoyLjUuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==