All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
	Dave Airlie <airlied@redhat.com>
Subject: Re: [PATCH 4/4] drm/i915: Fix oops on platforms w/o hpd support
Date: Thu, 14 Oct 2021 12:27:28 +0300	[thread overview]
Message-ID: <YWf4AOWpvgT1deWm@intel.com> (raw)
In-Reply-To: <87lf2wvu7b.fsf@intel.com>

On Thu, Oct 14, 2021 at 12:20:24PM +0300, Jani Nikula wrote:
> On Thu, 14 Oct 2021, Jani Nikula <jani.nikula@intel.com> wrote:
> > On Thu, 14 Oct 2021, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> >> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >>
> >> 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?
> >
> > Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> >
> >>
> >> Cc: Dave Airlie <airlied@redhat.com>
> >> Cc: Jani Nikula <jani.nikula@intel.com>
> >> Fixes: cd030c7c11a4 ("drm/i915: constify hotplug function vtable.")
> >> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >> ---
> >>  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)
> 
> Btw i915->hotplug_funcs->hpd_irq_setup is always set if
> i915->hotplug_funcs is set, so that bit is a bit redundant.

Right. I'll drop the drop the belt, leaving just the suspenders.

> 
> Anyway, r-b stands either way you decide to go.
> 
> 
> >>  		i915->hotplug_funcs->hpd_irq_setup(i915);
> >>  }
> 
> -- 
> Jani Nikula, Intel Open Source Graphics Center

-- 
Ville Syrjälä
Intel

WARNING: multiple messages have this Message-ID (diff)
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
	Dave Airlie <airlied@redhat.com>
Subject: Re: [Intel-gfx] [PATCH 4/4] drm/i915: Fix oops on platforms w/o hpd support
Date: Thu, 14 Oct 2021 12:27:28 +0300	[thread overview]
Message-ID: <YWf4AOWpvgT1deWm@intel.com> (raw)
In-Reply-To: <87lf2wvu7b.fsf@intel.com>

On Thu, Oct 14, 2021 at 12:20:24PM +0300, Jani Nikula wrote:
> On Thu, 14 Oct 2021, Jani Nikula <jani.nikula@intel.com> wrote:
> > On Thu, 14 Oct 2021, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> >> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >>
> >> 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?
> >
> > Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> >
> >>
> >> Cc: Dave Airlie <airlied@redhat.com>
> >> Cc: Jani Nikula <jani.nikula@intel.com>
> >> Fixes: cd030c7c11a4 ("drm/i915: constify hotplug function vtable.")
> >> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >> ---
> >>  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)
> 
> Btw i915->hotplug_funcs->hpd_irq_setup is always set if
> i915->hotplug_funcs is set, so that bit is a bit redundant.

Right. I'll drop the drop the belt, leaving just the suspenders.

> 
> Anyway, r-b stands either way you decide to go.
> 
> 
> >>  		i915->hotplug_funcs->hpd_irq_setup(i915);
> >>  }
> 
> -- 
> Jani Nikula, Intel Open Source Graphics Center

-- 
Ville Syrjälä
Intel

  reply	other threads:[~2021-10-14  9:27 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-14  9:09 [PATCH 0/4] drm/i915: Make the driver not oops on load on old machines Ville Syrjala
2021-10-14  9:09 ` [Intel-gfx] " Ville Syrjala
2021-10-14  9:09 ` [PATCH 1/4] drm/i915: Replace the unconditional clflush with drm_clflush_virt_range() Ville Syrjala
2021-10-14  9:09   ` [Intel-gfx] " Ville Syrjala
2021-10-14  9:09 ` [PATCH 2/4] drm/i915: Convert unconditional clflush to drm_clflush_virt_range() Ville Syrjala
2021-10-14  9:09   ` [Intel-gfx] " Ville Syrjala
2021-10-14  9:09 ` [PATCH 3/4] drm/i915: Catch yet another unconditioal clflush Ville Syrjala
2021-10-14  9:09   ` [Intel-gfx] " Ville Syrjala
2021-10-14  9:09 ` [PATCH 4/4] drm/i915: Fix oops on platforms w/o hpd support Ville Syrjala
2021-10-14  9:09   ` [Intel-gfx] " Ville Syrjala
2021-10-14  9:18   ` Jani Nikula
2021-10-14  9:18     ` [Intel-gfx] " Jani Nikula
2021-10-14  9:20     ` Jani Nikula
2021-10-14  9:20       ` [Intel-gfx] " Jani Nikula
2021-10-14  9:27       ` Ville Syrjälä [this message]
2021-10-14  9:27         ` Ville Syrjälä
2021-10-14  9:29     ` Ville Syrjälä
2021-10-14  9:29       ` [Intel-gfx] " Ville Syrjälä
2021-10-14  9:31       ` Sarvela, Tomi P
2021-10-14  9:31         ` [Intel-gfx] " Sarvela, Tomi P
2021-10-14  9:36         ` Ville Syrjälä
2021-10-14  9:36           ` [Intel-gfx] " Ville Syrjälä
2021-10-14  9:42           ` Sarvela, Tomi P
2021-10-14  9:42             ` [Intel-gfx] " Sarvela, Tomi P
2021-10-14 10:07 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Make the driver not oops on load on old machines Patchwork
2021-10-14 11:24 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-10-17 23:54 ` [PATCH 0/4] " Dave Airlie
2021-10-17 23:54   ` [Intel-gfx] " Dave Airlie
2021-10-19  9:08   ` Ville Syrjälä
2021-10-19  9:08     ` [Intel-gfx] " Ville Syrjälä

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YWf4AOWpvgT1deWm@intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=airlied@redhat.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.