[Intel-gfx] [PATCH 1/5] drm/i915/fbdev: Always forward hotplug events

Jani Nikula jani.nikula at linux.intel.com
Mon Jul 10 12:15:19 UTC 2017


On Thu, 06 Jul 2017, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> With deferred fbdev setup we always need to forward hotplug events,
> even if fbdev isn't fully set up yet. Otherwise the deferred setup
> will neer happen.
>
> Originally this check was added in
>
> commit c45eb4fed12d278d3619f1904885bd0d7bcbf036 (tag: drm-intel-next-fixes-2016-08-05)
> Author: Chris Wilson <chris at chris-wilson.co.uk>
> Date:   Wed Jul 13 18:34:45 2016 +0100
>
>     drm/i915/fbdev: Check for the framebuffer before use

I just pushed

commit 7581d5ca2bb269cfc2ce2d0cb489aac513167f6b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Jun 22 17:02:11 2017 +0100

    drm/i915/fbdev: Check for existence of ifbdev->vma before operations

which is a backport of 15727ed0d944 ("drm/i915/fbdev: Check for
existence of ifbdev->vma before operations") to dinf.

Should this patch be backported too?

BR,
Jani.


>
> But the specific case of the hotplug function blowing up was fixed in
>
> commit 50c3dc970a09b3b60422a58934cc27a413288bab
> Author: Daniel Vetter <daniel.vetter at ffwll.ch>
> Date:   Fri Jun 27 17:19:22 2014 +0200
>
>     drm/fb-helper: Fix hpd vs. initial config races
>
> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Cc: Mika Kuoppala <mika.kuoppala at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_fbdev.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
> index f11ee039ff45..5536591d3da0 100644
> --- a/drivers/gpu/drm/i915/intel_fbdev.c
> +++ b/drivers/gpu/drm/i915/intel_fbdev.c
> @@ -821,7 +821,7 @@ void intel_fbdev_output_poll_changed(struct drm_device *dev)
>  {
>  	struct intel_fbdev *ifbdev = to_i915(dev)->fbdev;
>  
> -	if (ifbdev && ifbdev->vma)
> +	if (ifbdev)
>  		drm_fb_helper_hotplug_event(&ifbdev->helper);
>  }

-- 
Jani Nikula, Intel Open Source Technology Center


More information about the Intel-gfx mailing list