[PATCH 2/2] radeon: add support for forcing off lvds when mux switched away

[Alex Deucher]

On Mon, Jan 7, 2013 at 11:53 PM, Dave Airlie <airlied at gmail.com> wrote:
> From: Dave Airlie <airlied at redhat.com>
>
> otherwise userspace can get very confused


Thinking about this more, we probably want to check whether we have a
muxed to mux-less system otherwise we'll be disconnecting the display
when we switch.  Looks like the first patch is cognizant of that, but
this one is not unless I'm missing something.

Alex

> ---
>  drivers/gpu/drm/radeon/radeon_connectors.c |  4 ++++
>  drivers/gpu/drm/radeon/radeon_device.c     | 14 ++++++++++++++
>  drivers/gpu/drm/radeon/radeon_mode.h       |  2 ++
>  3 files changed, 20 insertions(+)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
> index 2399f25..e5a4a10 100644
> --- a/drivers/gpu/drm/radeon/radeon_connectors.c
> +++ b/drivers/gpu/drm/radeon/radeon_connectors.c
> @@ -611,6 +611,10 @@ radeon_lvds_detect(struct drm_connector *connector, bool force)
>         struct radeon_connector *radeon_connector = to_radeon_connector(connector);
>         struct drm_encoder *encoder = radeon_best_single_encoder(connector);
>         enum drm_connector_status ret = connector_status_disconnected;
> +       struct radeon_device *rdev = connector->dev->dev_private;
> +
> +       if (rdev->mode_info.mux_force_disconnected)
> +               return connector_status_disconnected;
>
>         if (encoder) {
>                 struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
> diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
> index cd75626..bf66f09 100644
> --- a/drivers/gpu/drm/radeon/radeon_device.c
> +++ b/drivers/gpu/drm/radeon/radeon_device.c
> @@ -945,10 +945,24 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
>         return can_switch;
>  }
>
> +static void radeon_switcheroo_mux_switched(struct pci_dev *pdev, enum vga_switcheroo_state state)
> +{
> +       struct drm_device *dev = pci_get_drvdata(pdev);
> +       struct radeon_device *rdev = dev->dev_private;
> +
> +       if (state == VGA_SWITCHEROO_OFF)
> +               rdev->mode_info.mux_force_disconnected = true;
> +       else
> +               rdev->mode_info.mux_force_disconnected = false;
> +
> +       drm_kms_helper_hotplug_event(dev);
> +}
> +
>  static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {
>         .set_gpu_state = radeon_switcheroo_set_state,
>         .reprobe = NULL,
>         .can_switch = radeon_switcheroo_can_switch,
> +       .mux_switched = radeon_switcheroo_mux_switched,
>  };
>
>  /**
> diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
> index 4003f5a..172eed8 100644
> --- a/drivers/gpu/drm/radeon/radeon_mode.h
> +++ b/drivers/gpu/drm/radeon/radeon_mode.h
> @@ -256,6 +256,8 @@ struct radeon_mode_info {
>         u16 firmware_flags;
>         /* pointer to backlight encoder */
>         struct radeon_encoder *bl_encoder;
> +
> +       bool mux_force_disconnected;
>  };
>
>  #define RADEON_MAX_BL_LEVEL 0xFF
> --
> 1.8.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel