Skip to contentSkip to conversation

drm/i915/fbdev: Enable late fbdev initial configuration

PATCH In review José Roberto de Souza 5 participants 9 messages Apr 18, 2018 – Apr 24, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 drm/i915/fbdev: Enable late fbdev initial configuration

If the initial fbdev configuration(intel_fbdev_initial_config()) runs and there still no sink connected it will cause drm_fb_helper_initial_config() to return 0 as no error happened(but internally the return is -EAGAIN).
Because no framebuffer was allocated, when a sink is connected intel_fbdev_output_poll_changed() will not execute drm_fb_helper_hotplug_event() that would trigger another try to do the initial fbdev configuration.

So here allowing drm_fb_helper_hotplug_event() to be executed when there is not frambebuffer allocated and fbdev was not setup yet.

This issue also happens when a MST DP sink is connected since boot, as the MST topology is discovered in parallel if intel_fbdev_initial_config() is executed before the first sink MST is discovered it will cause this same issue.

This is a follow up patch of
https://patchwork.freedesktop.org/patch/196089/

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104158
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104425

---

Changes from v1:
- not creating a dump framebuffer anymore, instead just allowing drm_fb_helper_hotplug_event() to execute when fbdev is not setup yet.

 drivers/gpu/drm/i915/intel_fbdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_fbdev.c +1 -1
index 7d41d139341b..e9e02b58b7be 100644
@@ -807,7 +807,7 @@ void intel_fbdev_output_poll_changed(struct drm_device *dev)
 		return;
 
 	intel_fbdev_sync(ifbdev);
-	if (ifbdev->vma)
+	if (ifbdev->vma || ifbdev->helper.deferred_setup)
 		drm_fb_helper_hotplug_event(&ifbdev->helper);
 }
 
Signature · 6 lines
2.17.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✓ Fi.CI.BAT: success for drm/i915/fbdev: Enable late fbdev initial configuration (rev4)

== Series Details ==

== Series Details ==

Series: drm/i915/fbdev: Enable late fbdev initial configuration (rev4)
URL : https://patchwork.freedesktop.org/series/41851/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4067 -> Patchwork_8744 =

== Summary - SUCCESS ==

No regressions found.

External URL: https://patchwork.freedesktop.org/api/1.0/series/41851/revisions/4/mbox/

== Known issues ==

Here are the changes found in Patchwork_8744 that come from known issues:

=== IGT changes ===

    ==== Issues hit ====

    igt@kms_pipe_crc_basic@hang-read-crc-pipe-a:
      fi-skl-guc:         PASS -> FAIL (fdo#103191)

    igt@prime_vgem@basic-fence-flip:
      fi-ilk-650:         PASS -> FAIL (fdo#104008)

    
    ==== Possible fixes ====

    igt@gem_mmap_gtt@basic-small-bo-tiledx:
      fi-gdg-551:         FAIL (fdo#102575) -> PASS

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
      fi-ivb-3520m:       DMESG-WARN (fdo#106084) -> PASS
      fi-skl-guc:         FAIL (fdo#103191) -> PASS

fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fdo#106084 https://bugs.freedesktop.org/show_bug.cgi?id=106084

== Participating hosts (34 -> 30) ==

Missing (4): fi-ctg-p8600 fi-ilk-m540 fi-bxt-dsi fi-skl-6700hq

== Build changes ==

* Linux: CI_DRM_4067 -> Patchwork_8744

CI_DRM_4067: 1c7ccdf37b04bedb10e2191d34dfbba62beb79ea @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4441: 83ba5b7d3bde48b383df41792fc9c955a5a23bdb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8744: d356736d30be910191082e9535bee7f55303cd9e @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4441: e60d247eb359f044caf0c09904da14e39d7adca1 @ git://anongit.freedesktop.org/piglit

== Linux commits ==

d356736d30be drm/i915/fbdev: Enable late fbdev initial configuration

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8744/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

✓ Fi.CI.IGT: success for drm/i915/fbdev: Enable late fbdev initial configuration (rev4)

In reply to José Roberto de Souza
== Series Details ==

== Series Details ==

Series: drm/i915/fbdev: Enable late fbdev initial configuration (rev4)
URL : https://patchwork.freedesktop.org/series/41851/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4067_full -> Patchwork_8744_full =

== Summary - WARNING ==

Minor unknown changes coming with Patchwork_8744_full need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_8744_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://patchwork.freedesktop.org/api/1.0/series/41851/revisions/4/mbox/

== Possible new issues ==

Here are the unknown changes that may have been introduced in Patchwork_8744_full:

=== IGT changes ===

    ==== Warnings ====

    igt@gem_exec_schedule@deep-vebox:
      shard-kbl:          SKIP -> PASS +2

    igt@gem_mocs_settings@mocs-rc6-vebox:
      shard-kbl:          PASS -> SKIP +3

== Known issues ==

Here are the changes found in Patchwork_8744_full that come from known issues:

=== IGT changes ===

    ==== Issues hit ====

    igt@gem_ppgtt@blt-vs-render-ctx0:
      shard-kbl:          PASS -> INCOMPLETE (fdo#103665, fdo#106023)

    igt@kms_flip@2x-dpms-vs-vblank-race-interruptible:
      shard-hsw:          PASS -> FAIL (fdo#103060)

    igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
      shard-hsw:          PASS -> FAIL (fdo#102887)

    igt@kms_flip@2x-plain-flip-fb-recreate:
      shard-hsw:          PASS -> FAIL (fdo#100368)

    igt@kms_flip@2x-wf_vblank-ts-check:
      shard-hsw:          PASS -> FAIL (fdo#103928)

    igt@kms_flip@flip-vs-modeset-vs-hang-interruptible:
      shard-kbl:          PASS -> DMESG-WARN (fdo#103558, fdo#105602, fdo#103313) +1

    igt@kms_sysfs_edid_timing:
      shard-apl:          PASS -> WARN (fdo#100047)

    igt@pm_rpm@basic-pci-d3-state:
      shard-kbl:          PASS -> DMESG-WARN (fdo#103558, fdo#105602) +2

    
    ==== Possible fixes ====

    igt@kms_flip@wf_vblank-ts-check-interruptible:
      shard-apl:          FAIL (fdo#100368) -> PASS

fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#103313 https://bugs.freedesktop.org/show_bug.cgi?id=103313
fdo#103558 https://bugs.freedesktop.org/show_bug.cgi?id=103558
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103928 https://bugs.freedesktop.org/show_bug.cgi?id=103928
fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023

== Participating hosts (9 -> 4) ==

Missing (5): shard-glk8 shard-glk6 shard-glk7 shard-glk shard-glkb

== Build changes ==

* Linux: CI_DRM_4067 -> Patchwork_8744

CI_DRM_4067: 1c7ccdf37b04bedb10e2191d34dfbba62beb79ea @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4441: 83ba5b7d3bde48b383df41792fc9c955a5a23bdb @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8744: d356736d30be910191082e9535bee7f55303cd9e @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4441: e60d247eb359f044caf0c09904da14e39d7adca1 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8744/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

maintainer
#3 lore raw
In reply to José Roberto de Souza
Quoted 12 lines · José Roberto de Souza

If the initial fbdev configuration(intel_fbdev_initial_config()) runs and there still no sink connected it will cause drm_fb_helper_initial_config() to return 0 as no error happened(but internally the return is -EAGAIN).
Because no framebuffer was allocated, when a sink is connected intel_fbdev_output_poll_changed() will not execute drm_fb_helper_hotplug_event() that would trigger another try to do the initial fbdev configuration.

So here allowing drm_fb_helper_hotplug_event() to be executed when there is not frambebuffer allocated and fbdev was not setup yet.

Quoted 7 lines

This issue also happens when a MST DP sink is connected since boot, as the MST topology is discovered in parallel if intel_fbdev_initial_config() is executed before the first sink MST is discovered it will cause this same issue.

This is a follow up patch of
https://patchwork.freedesktop.org/patch/196089/

What does this mean? Is that patch a required dependency? What?

Quoted 2 lines

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104158
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104425

People responded to v1, please ask them to test v2.

Quoted 8 lines

---

Changes from v1:
- not creating a dump framebuffer anymore, instead just allowing drm_fb_helper_hotplug_event() to execute when fbdev is not setup yet.

Please look at git log in drm, and observe how we include the changelog in the commit message itself.

BR,
Jani.

Quoted 16 lines
 drivers/gpu/drm/i915/intel_fbdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_fbdev.c +1 -1
index 7d41d139341b..e9e02b58b7be 100644
@@ -807,7 +807,7 @@ void intel_fbdev_output_poll_changed(struct drm_device *dev)
 		return;
 
 	intel_fbdev_sync(ifbdev);
-	if (ifbdev->vma)
+	if (ifbdev->vma || ifbdev->helper.deferred_setup)
 		drm_fb_helper_hotplug_event(&ifbdev->helper);
 }
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw
Quoted 25 lines · Jani Nikula
Quoted 23 lines · José Roberto de Souza

If the initial fbdev configuration(intel_fbdev_initial_config()) runs and
there still no sink connected it will cause drm_fb_helper_initial_config() to return 0 as no error happened(but internally the return is -EAGAIN).
Because no framebuffer was allocated, when a sink is connected intel_fbdev_output_poll_changed() will not execute drm_fb_helper_hotplug_event() that would trigger another try to do the
initial fbdev configuration.

So here allowing drm_fb_helper_hotplug_event() to be executed when there
is not frambebuffer allocated and fbdev was not setup yet.

This issue also happens when a MST DP sink is connected since boot, as
the MST topology is discovered in parallel if intel_fbdev_initial_config()
is executed before the first sink MST is discovered it will cause this
same issue.

Quoted 4 lines
Quoted 2 lines

This is a follow up patch of
https://patchwork.freedesktop.org/patch/196089/

What does this mean? Is that patch a required dependency? What?

No requirement, this is just a follow up patch of that one, that patch was not accepted and Chris did a suggestion that was implemented in the first version.

Quoted 5 lines
Quoted 3 lines

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104158
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104425

People responded to v1, please ask them to test v2.

Okay, I just asked people to test the version 2 but I'm also able to reproduce the issue and it was already tested.

Quoted 6 lines
Quoted 6 lines

---

Quoted 8 lines
Quoted 4 lines

Changes from v1:
- not creating a dump framebuffer anymore, instead just allowing drm_fb_helper_hotplug_event() to execute when fbdev is not setup yet.

Please look at git log in drm, and observe how we include the changelog
in the commit message itself.

Okay, I will do that from now on.

Quoted 17 lines

BR,
Jani.

Quoted 13 lines
 drivers/gpu/drm/i915/intel_fbdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_fbdev.c +0 -0
index 7d41d139341b..e9e02b58b7be 100644
@@ -807,7 +807,7 @@ void intel_fbdev_output_poll_changed(struct
 drm_device *dev)
 		return;
 
Quoted 7 lines

drivers/gpu/drm/i915/intel_fbdev.c void intel_fbdev_output_poll_changed(struct drm_device *dev) · line 812

Quoted 5 lines
drivers/gpu/drm/i915/intel_fbdev.c +1 -1
 	intel_fbdev_sync(ifbdev);
-	if (ifbdev->vma)
+	if (ifbdev->vma || ifbdev->helper.deferred_setup)
 		drm_fb_helper_hotplug_event(&ifbdev->helper);
 }

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Tested-by on v2 1/1
#5 lore raw
In reply to José Roberto de Souza

Dear Jose,

Quoted 1 line · Jose

If the initial fbdev configuration(intel_fbdev_initial_config()) runs and

Nit: Space before (.

Quoted 3 lines

there still no sink connected it will cause drm_fb_helper_initial_config() to return 0 as no error happened(but internally the return is -EAGAIN).

Nit: Space before (.

Quoted 7 lines

Because no framebuffer was allocated, when a sink is connected intel_fbdev_output_poll_changed() will not execute drm_fb_helper_hotplug_event() that would trigger another try to do the initial fbdev configuration.

So here allowing drm_fb_helper_hotplug_event() to be executed when there is not frambebuffer allocated and fbdev was not setup yet.

s/not/no/
s/setup/set up/

Quoted 6 lines

This issue also happens when a MST DP sink is connected since boot, as the MST topology is discovered in parallel if intel_fbdev_initial_config() is executed before the first sink MST is discovered it will cause this same issue.

This is a follow up patch of

follow-up

Quoted 4 lines

https://patchwork.freedesktop.org/patch/196089/

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104158
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104425

Quoted 8 lines

---

Changes from v1:
- not creating a dump framebuffer anymore, instead just allowing drm_fb_helper_hotplug_event() to execute when fbdev is not setup yet.

s/setup/set up/

Quoted 8 lines
  drivers/gpu/drm/i915/intel_fbdev.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_fbdev.c +0 -0
index 7d41d139341b..e9e02b58b7be 100644

drivers/gpu/drm/i915/intel_fbdev.c void intel_fbdev_output_poll_changed(struct drm_device *dev) · line 813

Quoted 8 lines
drivers/gpu/drm/i915/intel_fbdev.c +1 -1
@@ -807,7 +807,7 @@ void intel_fbdev_output_poll_changed(struct drm_device *dev)
  		return;
 
  	intel_fbdev_sync(ifbdev);
-	if (ifbdev->vma)
+	if (ifbdev->vma || ifbdev->helper.deferred_setup)
  		drm_fb_helper_hotplug_event(&ifbdev->helper);
  }
 

Kind regards,

Paul

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

maintainer Tested-by frederik Tested-by Ian Pilcher
#6 lore raw
Quoted 59 lines · Paul Menzel

Dear Jose,

Quoted 1 line · Jose

If the initial fbdev configuration(intel_fbdev_initial_config()) runs and

Nit: Space before (.

Quoted 3 lines

there still no sink connected it will cause drm_fb_helper_initial_config() to return 0 as no error happened(but internally the return is -EAGAIN).

Nit: Space before (.

Quoted 7 lines

Because no framebuffer was allocated, when a sink is connected intel_fbdev_output_poll_changed() will not execute drm_fb_helper_hotplug_event() that would trigger another try to do the initial fbdev configuration.

So here allowing drm_fb_helper_hotplug_event() to be executed when there is not frambebuffer allocated and fbdev was not setup yet.

s/not/no/
s/setup/set up/

Quoted 6 lines

This issue also happens when a MST DP sink is connected since boot, as the MST topology is discovered in parallel if intel_fbdev_initial_config() is executed before the first sink MST is discovered it will cause this same issue.

This is a follow up patch of

follow-up

Quoted 4 lines

https://patchwork.freedesktop.org/patch/196089/

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104158
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104425

Quoted 8 lines

---

Changes from v1:
- not creating a dump framebuffer anymore, instead just allowing drm_fb_helper_hotplug_event() to execute when fbdev is not setup yet.

s/setup/set up/

Quoted 10 lines
  drivers/gpu/drm/i915/intel_fbdev.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_fbdev.c +0 -0
index 7d41d139341b..e9e02b58b7be 100644
@@ -807,7 +807,7 @@ void intel_fbdev_output_poll_changed(struct drm_device *dev)
  		return;
 
Quoted 8 lines

drivers/gpu/drm/i915/intel_fbdev.c void intel_fbdev_output_poll_changed(struct drm_device *dev) · line 813

Quoted 6 lines
drivers/gpu/drm/i915/intel_fbdev.c +1 -1
  	intel_fbdev_sync(ifbdev);
-	if (ifbdev->vma)
+	if (ifbdev->vma || ifbdev->helper.deferred_setup)
  		drm_fb_helper_hotplug_event(&ifbdev->helper);
  }
 

Also from the bug,

Quoted 10 lines

Kind regards,

Paul

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Acked-by on v2 1/1
#7 lore raw
In reply to José Roberto de Souza

Quoting José Roberto de Souza (2018-04-19 00:41:58)

Quoted 39 lines

If the initial fbdev configuration(intel_fbdev_initial_config()) runs and there still no sink connected it will cause drm_fb_helper_initial_config() to return 0 as no error happened(but internally the return is -EAGAIN).
Because no framebuffer was allocated, when a sink is connected intel_fbdev_output_poll_changed() will not execute drm_fb_helper_hotplug_event() that would trigger another try to do the initial fbdev configuration.

So here allowing drm_fb_helper_hotplug_event() to be executed when there is not frambebuffer allocated and fbdev was not setup yet.

This issue also happens when a MST DP sink is connected since boot, as the MST topology is discovered in parallel if intel_fbdev_initial_config() is executed before the first sink MST is discovered it will cause this same issue.

This is a follow up patch of
https://patchwork.freedesktop.org/patch/196089/

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104158
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104425

---

Changes from v1:
- not creating a dump framebuffer anymore, instead just allowing drm_fb_helper_hotplug_event() to execute when fbdev is not setup yet.

 drivers/gpu/drm/i915/intel_fbdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_fbdev.c +0 -0
index 7d41d139341b..e9e02b58b7be 100644

drivers/gpu/drm/i915/intel_fbdev.c void intel_fbdev_output_poll_changed(struct drm_device *dev) · line 810

Quoted 5 lines
drivers/gpu/drm/i915/intel_fbdev.c +1 -1
@@ -807,7 +807,7 @@ void intel_fbdev_output_poll_changed(struct drm_device *dev)
                return;
 
        intel_fbdev_sync(ifbdev);
-       if (ifbdev->vma)
+       if (ifbdev->vma || ifbdev->helper.deferred_setup)

Feels slightly dodgy, vma can only be set and deferred_setup only be cleared at runtime, so at worst we may miss sending a hpd event during a runtime configuration phase. Which is probably just as well.

What happens if we send two hpd events, and the first gets a deferred setup that fails. Do we hit the previous error condition? At least we are not hitting the condition of running the hotplug event while trying to do the initial configuration, but does the deferred setup have the same bugs?

drivers/gpu/drm/i915/intel_fbdev.c void intel_fbdev_output_poll_changed(struct drm_device *dev) · line 811

Quoted 1 line
drivers/gpu/drm/i915/intel_fbdev.c +0 -0
                drm_fb_helper_hotplug_event(&ifbdev->helper);

I fear this is just poking the bear,

-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

maintainer
#8 lore raw
Quoted 56 lines · Chris Wilson

Quoting José Roberto de Souza (2018-04-19 00:41:58)

Quoted 39 lines

If the initial fbdev configuration(intel_fbdev_initial_config()) runs and there still no sink connected it will cause drm_fb_helper_initial_config() to return 0 as no error happened(but internally the return is -EAGAIN).
Because no framebuffer was allocated, when a sink is connected intel_fbdev_output_poll_changed() will not execute drm_fb_helper_hotplug_event() that would trigger another try to do the initial fbdev configuration.

So here allowing drm_fb_helper_hotplug_event() to be executed when there is not frambebuffer allocated and fbdev was not setup yet.

This issue also happens when a MST DP sink is connected since boot, as the MST topology is discovered in parallel if intel_fbdev_initial_config() is executed before the first sink MST is discovered it will cause this same issue.

This is a follow up patch of
https://patchwork.freedesktop.org/patch/196089/

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104158
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104425

---

Changes from v1:
- not creating a dump framebuffer anymore, instead just allowing drm_fb_helper_hotplug_event() to execute when fbdev is not setup yet.

 drivers/gpu/drm/i915/intel_fbdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_fbdev.c +0 -0
index 7d41d139341b..e9e02b58b7be 100644

drivers/gpu/drm/i915/intel_fbdev.c void intel_fbdev_output_poll_changed(struct drm_device *dev) · line 810

Quoted 5 lines
drivers/gpu/drm/i915/intel_fbdev.c +1 -1
@@ -807,7 +807,7 @@ void intel_fbdev_output_poll_changed(struct drm_device *dev)
                return;
 
        intel_fbdev_sync(ifbdev);
-       if (ifbdev->vma)
+       if (ifbdev->vma || ifbdev->helper.deferred_setup)

Feels slightly dodgy, vma can only be set and deferred_setup only be cleared at runtime, so at worst we may miss sending a hpd event during a runtime configuration phase. Which is probably just as well.

What happens if we send two hpd events, and the first gets a deferred setup that fails. Do we hit the previous error condition? At least we are not hitting the condition of running the hotplug event while trying to do the initial configuration, but does the deferred setup have the same bugs?

Quoted 4 lines

drivers/gpu/drm/i915/intel_fbdev.c void intel_fbdev_output_poll_changed(struct drm_device *dev) · line 811

Quoted 1 line
drivers/gpu/drm/i915/intel_fbdev.c +0 -0
                drm_fb_helper_hotplug_event(&ifbdev->helper);

I fear this is just poking the bear,

Thanks for the patch and the ack. Pushed. If it's not a fix, at least it papers over the regression for now...

BR,
Jani.

Quoted 5 lines

-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx