![Lukas Wunner](/assets/img/avatar_default.png)
The active attribute in struct vga_switcheroo_client denotes whether the outputs are currently switched to this client. The attribute is only meaningful for vga clients. It is never used for audio clients. The function vga_switcheroo_register_audio_client() misuses this attribute to store whether the audio device is fully initialized. Most likely there was a misunderstanding about the meaning of "active" when this was added. Comment from Takashi's review: "Not really. The full initialization of audio was meant that the audio is active indeed. Admittedly, though, the active flag for each audio client doesn't play any role because the audio always follows the gfx state changes, and the value passed there doesn't reflect the actual state due to the later change. So, I agree with the removal of the flag itself -- or let the audio active flag following the corresponding gfx flag. The latter will make the proc output more consistent while the former is certainly more reduction of code." Set the active attribute to false for audio clients. Remove the active parameter from vga_switcheroo_register_audio_client() and its sole caller, hda_intel.c:register_vga_switcheroo(). vga_switcheroo_register_audio_client() was introduced by3e9e63dbd3
("vga_switcheroo: Add the support for audio clients"). Its use in hda_intel.c was introduced bya82d51ed24
("ALSA: hda - Support VGA-switcheroo"). v1.1: The changes above imply that in find_active_client() the call to client_is_vga() is now superfluous. Drop it. Cc: Takashi Iwai <tiwai@suse.de> Signed-off-by: Lukas Wunner <lukas@wunner.de> [danvet: Add Takashi's clarification to the commit message.] Reviewed-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
170 lines
7 KiB
C
170 lines
7 KiB
C
/*
|
|
* vga_switcheroo.h - Support for laptop with dual GPU using one set of outputs
|
|
*
|
|
* Copyright (c) 2010 Red Hat Inc.
|
|
* Author : Dave Airlie <airlied@redhat.com>
|
|
*
|
|
* Copyright (c) 2015 Lukas Wunner <lukas@wunner.de>
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS
|
|
* IN THE SOFTWARE.
|
|
*
|
|
*/
|
|
|
|
#ifndef _LINUX_VGA_SWITCHEROO_H_
|
|
#define _LINUX_VGA_SWITCHEROO_H_
|
|
|
|
#include <linux/fb.h>
|
|
|
|
struct pci_dev;
|
|
|
|
/**
|
|
* enum vga_switcheroo_state - client power state
|
|
* @VGA_SWITCHEROO_OFF: off
|
|
* @VGA_SWITCHEROO_ON: on
|
|
* @VGA_SWITCHEROO_INIT: client has registered with vga_switcheroo but
|
|
* vga_switcheroo is not enabled, i.e. no second client or no handler
|
|
* has registered. Only used in vga_switcheroo_get_client_state() which
|
|
* in turn is only called from hda_intel.c
|
|
* @VGA_SWITCHEROO_NOT_FOUND: client has not registered with vga_switcheroo.
|
|
* Only used in vga_switcheroo_get_client_state() which in turn is only
|
|
* called from hda_intel.c
|
|
*
|
|
* Client power state.
|
|
*/
|
|
enum vga_switcheroo_state {
|
|
VGA_SWITCHEROO_OFF,
|
|
VGA_SWITCHEROO_ON,
|
|
/* below are referred only from vga_switcheroo_get_client_state() */
|
|
VGA_SWITCHEROO_INIT,
|
|
VGA_SWITCHEROO_NOT_FOUND,
|
|
};
|
|
|
|
/**
|
|
* enum vga_switcheroo_client_id - client identifier
|
|
* @VGA_SWITCHEROO_IGD: integrated graphics device
|
|
* @VGA_SWITCHEROO_DIS: discrete graphics device
|
|
* @VGA_SWITCHEROO_MAX_CLIENTS: currently no more than two GPUs are supported
|
|
*
|
|
* Client identifier. Audio clients use the same identifier & 0x100.
|
|
*/
|
|
enum vga_switcheroo_client_id {
|
|
VGA_SWITCHEROO_IGD,
|
|
VGA_SWITCHEROO_DIS,
|
|
VGA_SWITCHEROO_MAX_CLIENTS,
|
|
};
|
|
|
|
/**
|
|
* struct vga_switcheroo_handler - handler callbacks
|
|
* @init: initialize handler.
|
|
* Optional. This gets called when vga_switcheroo is enabled, i.e. when
|
|
* two vga clients have registered. It allows the handler to perform
|
|
* some delayed initialization that depends on the existence of the
|
|
* vga clients. Currently only the radeon and amdgpu drivers use this.
|
|
* The return value is ignored
|
|
* @switchto: switch outputs to given client.
|
|
* Mandatory. For muxless machines this should be a no-op. Returning 0
|
|
* denotes success, anything else failure (in which case the switch is
|
|
* aborted)
|
|
* @power_state: cut or reinstate power of given client.
|
|
* Optional. The return value is ignored
|
|
* @get_client_id: determine if given pci device is integrated or discrete GPU.
|
|
* Mandatory
|
|
*
|
|
* Handler callbacks. The multiplexer itself. The @switchto and @get_client_id
|
|
* methods are mandatory, all others may be set to NULL.
|
|
*/
|
|
struct vga_switcheroo_handler {
|
|
int (*init)(void);
|
|
int (*switchto)(enum vga_switcheroo_client_id id);
|
|
int (*power_state)(enum vga_switcheroo_client_id id,
|
|
enum vga_switcheroo_state state);
|
|
int (*get_client_id)(struct pci_dev *pdev);
|
|
};
|
|
|
|
/**
|
|
* struct vga_switcheroo_client_ops - client callbacks
|
|
* @set_gpu_state: do the equivalent of suspend/resume for the card.
|
|
* Mandatory. This should not cut power to the discrete GPU,
|
|
* which is the job of the handler
|
|
* @reprobe: poll outputs.
|
|
* Optional. This gets called after waking the GPU and switching
|
|
* the outputs to it
|
|
* @can_switch: check if the device is in a position to switch now.
|
|
* Mandatory. The client should return false if a user space process
|
|
* has one of its device files open
|
|
*
|
|
* Client callbacks. A client can be either a GPU or an audio device on a GPU.
|
|
* The @set_gpu_state and @can_switch methods are mandatory, @reprobe may be
|
|
* set to NULL. For audio clients, the @reprobe member is bogus.
|
|
*/
|
|
struct vga_switcheroo_client_ops {
|
|
void (*set_gpu_state)(struct pci_dev *dev, enum vga_switcheroo_state);
|
|
void (*reprobe)(struct pci_dev *dev);
|
|
bool (*can_switch)(struct pci_dev *dev);
|
|
};
|
|
|
|
#if defined(CONFIG_VGA_SWITCHEROO)
|
|
void vga_switcheroo_unregister_client(struct pci_dev *dev);
|
|
int vga_switcheroo_register_client(struct pci_dev *dev,
|
|
const struct vga_switcheroo_client_ops *ops,
|
|
bool driver_power_control);
|
|
int vga_switcheroo_register_audio_client(struct pci_dev *pdev,
|
|
const struct vga_switcheroo_client_ops *ops,
|
|
int id);
|
|
|
|
void vga_switcheroo_client_fb_set(struct pci_dev *dev,
|
|
struct fb_info *info);
|
|
|
|
int vga_switcheroo_register_handler(struct vga_switcheroo_handler *handler);
|
|
void vga_switcheroo_unregister_handler(void);
|
|
|
|
int vga_switcheroo_process_delayed_switch(void);
|
|
|
|
int vga_switcheroo_get_client_state(struct pci_dev *dev);
|
|
|
|
void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
|
|
|
|
int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
|
|
void vga_switcheroo_fini_domain_pm_ops(struct device *dev);
|
|
int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
|
|
#else
|
|
|
|
static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
|
|
static inline int vga_switcheroo_register_client(struct pci_dev *dev,
|
|
const struct vga_switcheroo_client_ops *ops, bool driver_power_control) { return 0; }
|
|
static inline void vga_switcheroo_client_fb_set(struct pci_dev *dev, struct fb_info *info) {}
|
|
static inline int vga_switcheroo_register_handler(struct vga_switcheroo_handler *handler) { return 0; }
|
|
static inline int vga_switcheroo_register_audio_client(struct pci_dev *pdev,
|
|
const struct vga_switcheroo_client_ops *ops,
|
|
int id) { return 0; }
|
|
static inline void vga_switcheroo_unregister_handler(void) {}
|
|
static inline int vga_switcheroo_process_delayed_switch(void) { return 0; }
|
|
static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return VGA_SWITCHEROO_ON; }
|
|
|
|
static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
|
|
|
|
static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
|
|
static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {}
|
|
static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
|
|
|
|
#endif
|
|
#endif /* _LINUX_VGA_SWITCHEROO_H_ */
|