On Monday 08 Sep 2014 09:06:50 Chris Wilson wrote: > On Sat, Sep 06, 2014 at 02:01:31PM +0100, Tom Pitcher wrote: > > I've been attempting to solve a bug with i915 & switcheroo on many Macbook > > Pros (some with nvidia discrete cards, others radeon), report here: > > > > https://bugs.freedesktop.org/show_bug.cgi?id=61115 > > > > Basically, after switching to i915 using switcheroo the display isn't > > connected. It was mentioned that some kind of reprobing was needed, so I > > tried > > the following: > Right, I guess the output states do need to be repolled as well. But we > need to effectively re-initialised the LVDS (and possibly all the other > connectors, but it is likely to only be the panel connectors that are > muxed). > > This will require some rejigging of intel_lvds_init(), though it should > be safe enough to destroy and attempt to recreate it here: > > for_each_connector_safe() > if (connector->type == DRM_MODE_CONNECOR_LVDS) > drm_connector_destroy(connector); > > for_each_encoder_safe() > if (encoder->type == DRM_MODE_ENCODER_LVDS) > drm_encoder_destroy(encoder); > > intel_lvds_init(); > -Chris Thanks Chris, I turned what you provided into this: diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index d443441..edcecc9 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1281,6 +1281,26 @@ static void i915_switcheroo_set_state(struct pci_dev *pdev, enum vga_switcheroo_ } } +static void +i915_switcheroo_reprobe(struct pci_dev *pdev) +{ + struct drm_device *dev = pci_get_drvdata(pdev); + struct drm_encoder *encoder, *encoder_tmp; + struct drm_connector *connector, *connector_tmp; + + intel_fbdev_output_poll_changed(dev); + + list_for_each_entry_safe(connector, connector_tmp, &dev- >mode_config.connector_list, head) + if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS) + connector->funcs->destroy(connector); + + list_for_each_entry_safe(encoder, encoder_tmp, &dev- >mode_config.encoder_list, head) + if (encoder->encoder_type == DRM_MODE_ENCODER_LVDS) + intel_encoder_destroy(encoder); + + intel_lvds_init(dev); +} + static bool i915_switcheroo_can_switch(struct pci_dev *pdev) { struct drm_device *dev = pci_get_drvdata(pdev); @@ -1295,7 +1315,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev) static const struct vga_switcheroo_client_ops i915_switcheroo_ops = { .set_gpu_state = i915_switcheroo_set_state, - .reprobe = NULL, + .reprobe = i915_switcheroo_reprobe, .can_switch = i915_switcheroo_can_switch, }; This doesn't seem to have altered the behaviour - though my code is probably bad. Any ideas? (Apologies if this message comes through twice - my mail host is playing up). _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
