From: Egbert Eich Subject: [PATCH] drm/i915: Resurrect warning from intel_encoder_crtc_ok() Date: Wed, 16 Apr 2014 11:46:06 +0200 Message-ID: <1397641566-12679-1-git-send-email-eich@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by gabe.freedesktop.org (Postfix) with ESMTP id 8F0B96EA50 for ; Wed, 16 Apr 2014 02:46:21 -0700 (PDT) Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id EC411AB49 for ; Wed, 16 Apr 2014 09:46:20 +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 Cc: Egbert Eich List-Id: intel-gfx@lists.freedesktop.org Bail out if crtc is NULL to keep the driver from crashing. Signed-off-by: Egbert Eich --- drivers/gpu/drm/i915/intel_display.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index c276733..dfebced 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10257,6 +10257,11 @@ intel_modeset_stage_output_state(struct drm_device *dev, new_crtc = set->crtc; } + if (!new_crtc) { + WARN(1, "crtc not set!"); + return -EINVAL; + } + /* Make sure the new CRTC will work with the encoder */ if (!drm_encoder_crtc_ok(&connector->new_encoder->base, new_crtc)) { -- 1.8.4.5