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 E7BE3C433FE for ; Thu, 14 Oct 2021 09:18:31 +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 AACAC6101D for ; Thu, 14 Oct 2021 09:18:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org AACAC6101D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=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 666A36EC43; Thu, 14 Oct 2021 09:18:30 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id DE8756EC42; Thu, 14 Oct 2021 09:18:28 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10136"; a="251071934" X-IronPort-AV: E=Sophos;i="5.85,372,1624345200"; d="scan'208";a="251071934" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2021 02:18:28 -0700 X-IronPort-AV: E=Sophos;i="5.85,372,1624345200"; d="scan'208";a="491872012" Received: from rwambsga-mobl2.ger.corp.intel.com (HELO localhost) ([10.251.210.16]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2021 02:18:26 -0700 From: Jani Nikula To: Ville Syrjala , intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org, Dave Airlie Subject: Re: [PATCH 4/4] drm/i915: Fix oops on platforms w/o hpd support In-Reply-To: <20211014090941.12159-5-ville.syrjala@linux.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20211014090941.12159-1-ville.syrjala@linux.intel.com> <20211014090941.12159-5-ville.syrjala@linux.intel.com> Date: Thu, 14 Oct 2021 12:18:23 +0300 Message-ID: <87o87svuao.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Thu, 14 Oct 2021, Ville Syrjala wrote: > From: Ville Syrj=C3=A4l=C3=A4 > > We don't have hpd support on i8xx/i915 which means hotplug_funcs=3D=3DNUL= L. > 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? Reviewed-by: Jani Nikula > > Cc: Dave Airlie > Cc: Jani Nikula > Fixes: cd030c7c11a4 ("drm/i915: constify hotplug function vtable.") > Signed-off-by: Ville Syrj=C3=A4l=C3=A4 > --- > 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/d= rm/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) >=20=20 > 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); > } --=20 Jani Nikula, Intel Open Source Graphics Center 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 4EFA9C433F5 for ; Thu, 14 Oct 2021 09:18:30 +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 13D2D60E0C for ; Thu, 14 Oct 2021 09:18:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 13D2D60E0C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=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 659B56EC42; Thu, 14 Oct 2021 09:18:29 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id DE8756EC42; Thu, 14 Oct 2021 09:18:28 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10136"; a="251071934" X-IronPort-AV: E=Sophos;i="5.85,372,1624345200"; d="scan'208";a="251071934" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2021 02:18:28 -0700 X-IronPort-AV: E=Sophos;i="5.85,372,1624345200"; d="scan'208";a="491872012" Received: from rwambsga-mobl2.ger.corp.intel.com (HELO localhost) ([10.251.210.16]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2021 02:18:26 -0700 From: Jani Nikula To: Ville Syrjala , intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org, Dave Airlie In-Reply-To: <20211014090941.12159-5-ville.syrjala@linux.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20211014090941.12159-1-ville.syrjala@linux.intel.com> <20211014090941.12159-5-ville.syrjala@linux.intel.com> Date: Thu, 14 Oct 2021 12:18:23 +0300 Message-ID: <87o87svuao.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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, 14 Oct 2021, Ville Syrjala wrote: > From: Ville Syrj=C3=A4l=C3=A4 > > We don't have hpd support on i8xx/i915 which means hotplug_funcs=3D=3DNUL= L. > 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? Reviewed-by: Jani Nikula > > Cc: Dave Airlie > Cc: Jani Nikula > Fixes: cd030c7c11a4 ("drm/i915: constify hotplug function vtable.") > Signed-off-by: Ville Syrj=C3=A4l=C3=A4 > --- > 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/d= rm/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) >=20=20 > 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); > } --=20 Jani Nikula, Intel Open Source Graphics Center