On 28 May 2015 at 16:40, Pierre Moreau <pierre.morrow@xxxxxxx> wrote:
> Changes since v1:
> * Factorise testing of the 3 different _DSMs presence with a single function
Not overly important, but this part could be split out into an earlier
commit, keeping this commit just for adding the gmux support?
> * Check for gmux in nouveau_switcheroo_set_state
> * Change some comments and messages that were referring explicitly to Optimus
> whereas they were also testing the mux and gmux _DSMs
As could this part.
Thanks,
Ben.
>
> Signed-off-by: Pierre Moreau <pierre.morrow@xxxxxxx>
> ---
> drm/nouveau/nouveau_acpi.c | 57 ++++++++++++++++++++++++++++++++++++++++++++--
> drm/nouveau/nouveau_acpi.h | 4 ++++
> drm/nouveau/nouveau_drm.c | 12 +++++-----
> drm/nouveau/nouveau_vga.c | 10 ++++----
> 4 files changed, 70 insertions(+), 13 deletions(-)
>
> diff --git a/drm/nouveau/nouveau_acpi.c b/drm/nouveau/nouveau_acpi.c
> index edc4b94..ee5fcfa 100644
> --- a/drm/nouveau/nouveau_acpi.c
> +++ b/drm/nouveau/nouveau_acpi.c
> @@ -29,6 +29,10 @@
>
> #define NOUVEAU_DSM_OPTIMUS_SET_POWERDOWN (NOUVEAU_DSM_OPTIMUS_POWERDOWN_PS3 | NOUVEAU_DSM_OPTIMUS_FLAGS_CHANGED)
>
> +#define NOUVEAU_DSM_GMUX_V1_CAPS (3 << 6)
> +
> +#define NOUVEAU_DSM_GMUX_V2_CAPS (1 << 1)
> +
> /* result of the optimus caps function */
> #define OPTIMUS_ENABLED (1 << 0)
> #define OPTIMUS_STATUS_MASK (3 << 3)
> @@ -45,6 +49,7 @@
> static struct nouveau_dsm_priv {
> bool mux_detected;
> bool optimus_detected;
> + bool gmux_detected;
> acpi_handle dhandle;
> acpi_handle rom_handle;
> } nouveau_dsm_priv;
> @@ -57,8 +62,17 @@ bool nouveau_has_mux(void) {
> return nouveau_dsm_priv.mux_detected;
> }
>
> +bool nouveau_has_gmux(void) {
> + return nouveau_dsm_priv.gmux_detected;
> +}
> +
> +bool nouveau_has_dsm(void) {
> + return nouveau_is_optimus() || nouveau_has_mux() || nouveau_has_gmux();
> +}
> +
> #define NOUVEAU_DSM_HAS_MUX 0x1
> #define NOUVEAU_DSM_HAS_OPT 0x2
> +#define NOUVEAU_DSM_HAS_GMUX 0x4
>
> #ifdef CONFIG_VGA_SWITCHEROO
> static const uint32_t nouveau_mux_dsm_rid = 0x00000102;
> @@ -73,6 +87,18 @@ static const char nouveau_op_dsm_muid[] = {
> 0xA7, 0x2B, 0x60, 0x42, 0xA6, 0xB5, 0xBE, 0xE0,
> };
>
> +static const uint32_t nouveau_gmux_v1_dsm_rid = 0x0000101;
> +static const char nouveau_gmux_v1_dsm_muid[] = {
> + 0xA6, 0x69, 0x86, 0x99, 0xE9, 0x8B, 0xFB, 0x49,
> + 0xBD, 0xDB, 0x51, 0xA1, 0xEF, 0xE1, 0x9C, 0x3D,
> +};
> +
> +static const uint32_t nouveau_gmux_v2_dsm_rid = 0x0000001;
> +static const char nouveau_gmux_v2_dsm_muid[] = {
> + 0xC6, 0xB7, 0xB5, 0xA0, 0x18, 0x13, 0x1C, 0x44,
> + 0xB0, 0xC9, 0xFE, 0x69, 0x5E, 0xAF, 0x94, 0x9B,
> +};
> +
> static int nouveau_evaluate_optimus_dsm(acpi_handle handle, int func, int arg, uint32_t *result)
> {
> int i;
> @@ -161,6 +187,17 @@ static int nouveau_evaluate_mux_dsm(acpi_handle handle, int func, int arg)
> return ret;
> }
>
> +static int nouveau_check_gmux_dsm(acpi_handle handle)
> +{
> + bool has_v1 = acpi_check_dsm(handle, nouveau_gmux_v1_dsm_muid,
> + nouveau_gmux_v1_dsm_rid,
> + NOUVEAU_DSM_GMUX_V1_CAPS);
> + bool has_v2 = acpi_check_dsm(handle, nouveau_gmux_v2_dsm_muid,
> + nouveau_gmux_v2_dsm_rid,
> + NOUVEAU_DSM_GMUX_V2_CAPS);
> + return has_v1 || has_v2;
> +}
> +
> static int nouveau_dsm_switch_mux(acpi_handle handle, int mux_id)
> {
> mxm_wmi_call_mxmx(mux_id == NOUVEAU_DSM_MUX_LED_STAMINA ? MXM_MXDS_ADAPTER_IGD : MXM_MXDS_ADAPTER_0);
> @@ -238,6 +275,9 @@ static int nouveau_dsm_pci_probe(struct pci_dev *pdev)
> 1 << NOUVEAU_DSM_MUX_POWER))
> retval |= NOUVEAU_DSM_HAS_MUX;
>
> + if (nouveau_check_gmux_dsm(dhandle))
> + retval |= NOUVEAU_DSM_HAS_GMUX;
> +
> if (nouveau_check_optimus_dsm(dhandle))
> retval |= NOUVEAU_DSM_HAS_OPT;
>
> @@ -263,6 +303,7 @@ static bool nouveau_dsm_detect(void)
> struct pci_dev *pdev = NULL;
> int has_mux = 0;
> int has_optimus = 0;
> + bool has_gmux = false;
> int vga_count = 0;
> bool guid_valid;
> int retval;
> @@ -283,6 +324,8 @@ static bool nouveau_dsm_detect(void)
> has_mux |= 1;
> if (retval & NOUVEAU_DSM_HAS_OPT)
> has_optimus = 1;
> + if (retval & NOUVEAU_DSM_HAS_GMUX)
> + has_gmux = true;
> }
>
> while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_3D << 8, pdev)) != NULL) {
> @@ -293,9 +336,11 @@ static bool nouveau_dsm_detect(void)
> has_mux |= 1;
> if (retval & NOUVEAU_DSM_HAS_OPT)
> has_optimus = 1;
> + if (retval & NOUVEAU_DSM_HAS_GMUX)
> + has_gmux = true;
> }
>
> - /* find the optimus DSM or the mux DSM */
> + /* find the optimus DSM, the mux DSM or the gmux DSM */
> if (has_optimus == 1) {
> acpi_get_name(nouveau_dsm_priv.dhandle, ACPI_FULL_PATHNAME,
> &buffer);
> @@ -310,6 +355,13 @@ static bool nouveau_dsm_detect(void)
> acpi_method_name);
> nouveau_dsm_priv.mux_detected = true;
> ret = true;
> + } else if (has_gmux) {
> + acpi_get_name(nouveau_dsm_priv.dhandle, ACPI_FULL_PATHNAME,
> + &buffer);
> + printk(KERN_INFO "VGA switcheroo: detected gmux DSM switching method %s handle\n",
> + acpi_method_name);
> + nouveau_dsm_priv.gmux_detected = true;
> + ret = true;
> }
>
>
> @@ -321,7 +373,8 @@ void nouveau_register_dsm_handler(void)
> bool r;
>
> r = nouveau_dsm_detect();
> - if (!r)
> + /* Apple Gmux will register its own vga switcheroo handler */
> + if (!r || nouveau_has_gmux())
> return;
>
> vga_switcheroo_register_handler(&nouveau_dsm_handler);
> diff --git a/drm/nouveau/nouveau_acpi.h b/drm/nouveau/nouveau_acpi.h
> index 2bd88a8..e57ca3c 100644
> --- a/drm/nouveau/nouveau_acpi.h
> +++ b/drm/nouveau/nouveau_acpi.h
> @@ -6,6 +6,8 @@
> #if defined(CONFIG_ACPI) && defined(CONFIG_X86)
> bool nouveau_is_optimus(void);
> bool nouveau_has_mux(void);
> +bool nouveau_has_gmux(void);
> +bool nouveau_has_dsm(void);
> void nouveau_register_dsm_handler(void);
> void nouveau_unregister_dsm_handler(void);
> void nouveau_switcheroo_optimus_dsm(void);
> @@ -15,6 +17,8 @@ void *nouveau_acpi_edid(struct drm_device *, struct drm_connector *);
> #else
> static inline bool nouveau_is_optimus(void) { return false; };
> static inline bool nouveau_has_mux(void) { return false; };
> +static inline bool nouveau_has_gmux(void) { return false; };
> +static inline bool nouveau_has_dsm(void) { return false; };
> static inline void nouveau_register_dsm_handler(void) {}
> static inline void nouveau_unregister_dsm_handler(void) {}
> static inline void nouveau_switcheroo_optimus_dsm(void) {}
> diff --git a/drm/nouveau/nouveau_drm.c b/drm/nouveau/nouveau_drm.c
> index c06a7a1..5f85251 100644
> --- a/drm/nouveau/nouveau_drm.c
> +++ b/drm/nouveau/nouveau_drm.c
> @@ -718,9 +718,9 @@ nouveau_pmops_runtime_suspend(struct device *dev)
> return -EBUSY;
> }
>
> - /* are we optimus enabled? */
> - if (nouveau_runtime_pm == -1 && !nouveau_is_optimus() && !nouveau_has_mux()) {
> - DRM_DEBUG_DRIVER("failing to power off - not optimus\n");
> + /* do we have a _DSM for switching? */
> + if (nouveau_runtime_pm == -1 && !nouveau_has_dsm()) {
> + DRM_DEBUG_DRIVER("failing to power off - no valid _DSM found\n");
> pm_runtime_forbid(dev);
> return -EBUSY;
> }
> @@ -779,9 +779,9 @@ nouveau_pmops_runtime_idle(struct device *dev)
> return -EBUSY;
> }
>
> - /* are we optimus enabled? */
> - if (nouveau_runtime_pm == -1 && !nouveau_is_optimus() && !nouveau_has_mux()) {
> - DRM_DEBUG_DRIVER("failing to power off - not optimus\n");
> + /* do we have a _DSM for switching? */
> + if (nouveau_runtime_pm == -1 && !nouveau_has_dsm()) {
> + DRM_DEBUG_DRIVER("failing to power off - no valid _DSM found\n");
> pm_runtime_forbid(dev);
> return -EBUSY;
> }
> diff --git a/drm/nouveau/nouveau_vga.c b/drm/nouveau/nouveau_vga.c
> index 9a6328f..7b13804 100644
> --- a/drm/nouveau/nouveau_vga.c
> +++ b/drm/nouveau/nouveau_vga.c
> @@ -36,7 +36,7 @@ nouveau_switcheroo_set_state(struct pci_dev *pdev,
> {
> struct drm_device *dev = pci_get_drvdata(pdev);
>
> - if ((nouveau_is_optimus() || nouveau_has_mux()) && state == VGA_SWITCHEROO_OFF)
> + if (nouveau_has_dsm() && state == VGA_SWITCHEROO_OFF)
> return;
>
> if (state == VGA_SWITCHEROO_ON) {
> @@ -96,11 +96,11 @@ nouveau_vga_init(struct nouveau_drm *drm)
>
> if (nouveau_runtime_pm == 1)
> runtime = true;
> - if ((nouveau_runtime_pm == -1) && (nouveau_is_optimus() || nouveau_has_mux()))
> + if ((nouveau_runtime_pm == -1) && nouveau_has_dsm())
> runtime = true;
> vga_switcheroo_register_client(dev->pdev, &nouveau_switcheroo_ops, runtime);
>
> - if (runtime && nouveau_has_mux() && !nouveau_is_optimus())
> + if (runtime && (nouveau_has_mux() || nouveau_has_gmux()) && !nouveau_is_optimus())
> vga_switcheroo_init_domain_pm_ops(drm->dev->dev, &drm->vga_pm_domain);
> }
>
> @@ -112,11 +112,11 @@ nouveau_vga_fini(struct nouveau_drm *drm)
>
> if (nouveau_runtime_pm == 1)
> runtime = true;
> - if ((nouveau_runtime_pm == -1) && (nouveau_is_optimus() || nouveau_has_mux()))
> + if ((nouveau_runtime_pm == -1) && nouveau_has_dsm())
> runtime = true;
>
> vga_switcheroo_unregister_client(dev->pdev);
> - if (runtime && nouveau_has_mux() && !nouveau_is_optimus())
> + if (runtime && (nouveau_has_mux() || nouveau_has_gmux()) && !nouveau_is_optimus())
> vga_switcheroo_fini_domain_pm_ops(drm->dev->dev);
> vga_client_register(dev->pdev, NULL, NULL, NULL);
> }
> --
> 2.4.2
>
> _______________________________________________
> Nouveau mailing list
> Nouveau@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/nouveau
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
