From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9E9EC433F5 for ; Thu, 14 Oct 2021 09:30:08 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 82419610F9 for ; Thu, 14 Oct 2021 09:30:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 82419610F9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BBFB46EC4A; Thu, 14 Oct 2021 09:30:04 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2F5D66EC48; Thu, 14 Oct 2021 09:30:03 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10136"; a="227598122" X-IronPort-AV: E=Sophos;i="5.85,372,1624345200"; d="scan'208";a="227598122" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2021 02:30:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,372,1624345200"; d="scan'208";a="626744374" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.171]) by fmsmga001.fm.intel.com with SMTP; 14 Oct 2021 02:29:59 -0700 Received: by stinkbox (sSMTP sendmail emulation); Thu, 14 Oct 2021 12:29:58 +0300 Date: Thu, 14 Oct 2021 12:29:58 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Dave Airlie , Tomi Sarvela Message-ID: References: <20211014090941.12159-1-ville.syrjala@linux.intel.com> <20211014090941.12159-5-ville.syrjala@linux.intel.com> <87o87svuao.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87o87svuao.fsf@intel.com> X-Patchwork-Hint: comment Subject: Re: [Intel-gfx] [PATCH 4/4] drm/i915: Fix oops on platforms w/o hpd support X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, Oct 14, 2021 at 12:18:23PM +0300, Jani Nikula wrote: > On Thu, 14 Oct 2021, Ville Syrjala wrote: > > From: Ville Syrjälä > > > > We don't have hpd support on i8xx/i915 which means hotplug_funcs==NULL. > > Let's not oops when loading the driver on one those machines. > > D'oh! > > Lemme guess, CI just casually dropped the machines from the results > because they didn't boot? Dunno where the gdg has gone actually. Tomi? > > Reviewed-by: Jani Nikula > > > > > Cc: Dave Airlie > > Cc: Jani Nikula > > Fixes: cd030c7c11a4 ("drm/i915: constify hotplug function vtable.") > > Signed-off-by: Ville Syrjälä > > --- > > drivers/gpu/drm/i915/display/intel_hotplug.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/display/intel_hotplug.c b/drivers/gpu/drm/i915/display/intel_hotplug.c > > index 3c1cec953b42..0e949a258a22 100644 > > --- a/drivers/gpu/drm/i915/display/intel_hotplug.c > > +++ b/drivers/gpu/drm/i915/display/intel_hotplug.c > > @@ -215,7 +215,8 @@ intel_hpd_irq_storm_switch_to_polling(struct drm_i915_private *dev_priv) > > > > static void intel_hpd_irq_setup(struct drm_i915_private *i915) > > { > > - if (i915->display_irqs_enabled && i915->hotplug_funcs->hpd_irq_setup) > > + if (i915->display_irqs_enabled && > > + i915->hotplug_funcs && i915->hotplug_funcs->hpd_irq_setup) > > i915->hotplug_funcs->hpd_irq_setup(i915); > > } > > -- > Jani Nikula, Intel Open Source Graphics Center -- Ville Syrjälä Intel