dri-devel July 2018

dri-devel@lists.freedesktop.org

277 participants
1883 discussions

Re: Bug in virtio gpu connector destroy
by Dave Airlie 16 Jul '18

16 Jul '18

Cc'ing some others On Mon., 16 Jul. 2018, 23:33 Damir Shaikhutdinov, < Damir.Shaikhutdinov(a)opensynergy.com> wrote: > Hi Dave! > > I'm debugging virtio gpu unloading path in kernel 4.14, and found some bug > that presents even in 4.18. > > In file drivers/gpu/drm/virtio/virtgpu_display.c: > > static void virtio_gpu_conn_destroy <https://elixir.bootlin.com/linux/v4.18-rc5/ident/virtio_gpu_conn_destroy>(struct drm_connector <https://elixir.bootlin.com/linux/v4.18-rc5/ident/drm_connector> *connector){ > struct virtio_gpu_output <https://elixir.bootlin.com/linux/v4.18-rc5/ident/virtio_gpu_output> *virtio_gpu_output <https://elixir.bootlin.com/linux/v4.18-rc5/ident/virtio_gpu_output> = > drm_connector_to_virtio_gpu_output <https://elixir.bootlin.com/linux/v4.18-rc5/ident/drm_connector_to_virtio_gp…>(connector); > > drm_connector_unregister <https://elixir.bootlin.com/linux/v4.18-rc5/ident/drm_connector_unregister>(connector); > drm_connector_cleanup <https://elixir.bootlin.com/linux/v4.18-rc5/ident/drm_connector_cleanup>(connector); > kfree <https://elixir.bootlin.com/linux/v4.18-rc5/ident/kfree>(virtio_gpu_output <https://elixir.bootlin.com/linux/v4.18-rc5/ident/virtio_gpu_output>); // <--- here is the bug} > > > > https://elixir.bootlin.com/linux/v4.18-rc5/source/drivers/gpu/drm/virtio/vi… > > This virtio_gpu_output pointer in this function points to a memory NOT > allocated by k*alloc, but to an element of > outputs array in struct virtio device. > > You can find the actual code that initialize connector few lines lower: > > struct virtio_gpu_output <https://elixir.bootlin.com/linux/v4.18-rc5/ident/virtio_gpu_output> *output <https://elixir.bootlin.com/linux/v4.18-rc5/ident/output> = vgdev->outputs <https://elixir.bootlin.com/linux/v4.18-rc5/ident/outputs> + index; > struct drm_connector <https://elixir.bootlin.com/linux/v4.18-rc5/ident/drm_connector> *connector = &output <https://elixir.bootlin.com/linux/v4.18-rc5/ident/output>->conn <https://elixir.bootlin.com/linux/v4.18-rc5/ident/conn>; > > .... > drm_connector_init <https://elixir.bootlin.com/linux/v4.18-rc5/ident/drm_connector_init>(dev, connector, &virtio_gpu_connector_funcs <https://elixir.bootlin.com/linux/v4.18-rc5/ident/virtio_gpu_connector_funcs>, > DRM_MODE_CONNECTOR_VIRTUAL <https://elixir.bootlin.com/linux/v4.18-rc5/ident/DRM_MODE_CONNECTOR_VIRTUAL>); > > So, connector points to a field "conn" inside struct "virtio_gpu_output", which is an element of array > vgdev->outputs, and not something that was allocated separately. > > Kfree-ing it is an error. > > > Can you confirm that bug? > > > With best regards, > > Damir Shaikhutdinov > Senior Software Engineer > > OpenSynergy GmbH > Rotherstr. 20, 10245 Berlin > > Phone: +49 30 60 98 54 0. > Fax: +49 30 60 98 54 0 -99 > EMail: damir.shaikhutdinov(a)opensynergy.com > www.opensynergy.com > > Handelsregister/Commercial Registry: Amtsgericht Charlottenburg, HRB 108616B > Geschäftsführung: Stefaan Sonck Thiebaut, Rolf Morich > >

1 0

[PATCH 00/12] drm: add support for Cadence MHDP DPI/DP bridge.
by Damian Kos 16 Jul '18

16 Jul '18

Damian Kos (3): dt-bindings: drm/bridge: Document Cadence MHDP bridge bindings drm/rockchip: added implementation for a few FW commands. drm/rockchip: add support for CDNS MHDP IP controller. Quentin Schulz (9): HACK: increase timeout for drm_atomic_helper_wait_for_vblanks drm/dp: make dp_link_status and dp_get_lane_status usable from outside of the core drm/dp: add helpers for drm_dp_set_adjust_request_pre_emphasis and drm_dp_set_adjust_request_voltage drm/dp: fix training interval formula for DP 1.3+ drm/dp: fix link probing for devices supporting DP 1.4+ drm/dp: fix drm_dp_link_power_* for DP 1.2+ drm/dp: fix drm_dp_link_train_clock_recovery_delay for DP 1.4 drm/dp: add max number of lanes supported drm/dp: add pixel encoding and colorimetry format indicator field in MISC1 .../bindings/display/bridge/cdns,mhdp.txt | 39 + drivers/gpu/drm/drm_atomic_helper.c | 2 +- drivers/gpu/drm/drm_dp_helper.c | 97 ++- drivers/gpu/drm/rockchip/cdn-dp-core.c | 953 +++++++++++++++++++- drivers/gpu/drm/rockchip/cdn-dp-core.h | 25 + drivers/gpu/drm/rockchip/cdn-dp-reg.c | 167 ++++- drivers/gpu/drm/rockchip/cdn-dp-reg.h | 147 +++- include/drm/drm_dp_helper.h | 14 +- 8 files changed, 1400 insertions(+), 44 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,mhdp.txt

4 16

[PATCH 0/3] Make the audio component binding more generic
by Takashi Iwai 16 Jul '18

16 Jul '18

Hi, this is a preliminiary patch set to convert the existing i915 / HD-audio component binding to be applicable to other drivers like radeon / amdgpu. This patchset itself doesn't change the functionality but only renames and split to a new drm_audio_component stuff from i915_audio_component. The actual usage of the new API will follow once after this one gets reviewed / accepted. The whole patches (including this patchset) are found in topic/hda-acomp branch of sound.git tree. BTW, since the whole stuff is about the audio binding, I suppose these will go through sound git tree. Let me know if anyone has concerns. Thanks! Takashi === Takashi Iwai (3): drm/i915: Split audio component to a generic type ALSA: hda/i915: Associate audio component with devres ALSA: hda: Make audio component support more generic drivers/gpu/drm/i915/Kconfig | 1 + drivers/gpu/drm/i915/intel_audio.c | 22 +- include/drm/drm_audio_component.h | 138 ++++++++++++ include/drm/i915_component.h | 85 +------- include/sound/hda_component.h | 61 ++++++ include/sound/hda_i915.h | 37 +--- include/sound/hdaudio.h | 6 +- sound/hda/Kconfig | 7 +- sound/hda/Makefile | 1 + sound/hda/hdac_component.c | 332 ++++++++++++++++++++++++++++ sound/hda/hdac_i915.c | 335 ++--------------------------- sound/pci/hda/patch_hdmi.c | 57 +++-- sound/soc/codecs/hdac_hdmi.c | 10 +- 13 files changed, 624 insertions(+), 468 deletions(-) create mode 100644 include/drm/drm_audio_component.h create mode 100644 include/sound/hda_component.h create mode 100644 sound/hda/hdac_component.c -- 2.18.0

2 7

[PATCH v2] drm/connector: Fix typo in drm_connector_list_iter_next()
by Lyude Paul 16 Jul '18

16 Jul '18

Signed-off-by: Lyude Paul <lyude(a)redhat.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi(a)intel.com> --- Will push in just a moment, updating patchwork drivers/gpu/drm/drm_connector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 9b9ba5d5ec0c..2e0312e4645a 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -577,7 +577,7 @@ __drm_connector_put_safe(struct drm_connector *conn) /** * drm_connector_list_iter_next - return next connector - * @iter: connectr_list iterator + * @iter: connector_list iterator * * Returns the next connector for @iter, or NULL when the list walk has * completed. -- 2.17.1

1 0

[PATCH] drm/connector: Fix typo in drm_connector_list_iter_next()
by Lyude Paul 16 Jul '18

16 Jul '18

Signed-off-by: Lyude Paul <lyude(a)redhat.com> --- drivers/gpu/drm/drm_connector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 9b9ba5d5ec0c..2e0312e4645a 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -577,7 +577,7 @@ __drm_connector_put_safe(struct drm_connector *conn) /** * drm_connector_list_iter_next - return next connector - * @iter: connectr_list iterator + * @iter: connector_list iterator * * Returns the next connector for @iter, or NULL when the list walk has * completed. -- 2.17.1

2 1

Re: [PATCH] vgaswitchroo: set audio client id according to bound gpu client id
by Alex Deucher 16 Jul '18

16 Jul '18

On Thu, Jun 28, 2018 at 2:22 AM, Jim Qu <Jim.Qu(a)amd.com> wrote: > On modern laptop, there are more and more platforms > have two GPUs, and each of them maybe have audio codec > for HDMP/DP output. For some dGPU which is no output, > audio codec usually is disabled. > > In currect HDA audio driver, it will set all codec as > VGA_SWITCHEROO_DIS, so if system runtime pm is enabled, > the audio which is binded to UMA will be suspended. > > In HDA driver side, it is difficult to know which GPU > the audio has binded to. So set the bound gpu pci dev > to vgaswitchroo, let vgaswitchroo make decision. > > Newer dGPUs use PCI_CLASS_DISPLAY_OTHER rather than > PCI_CLASS_DISPLAY_VGA. Make sure we check for both when > checking for the dGPU in get_bound_vga() > > The patch also combine the HDA change to avoid break > building. > > Change-Id: I9906c1bd4dd5b36108d7133bb1cf724d13f1cd6d > Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> > Signed-off-by: Jim Qu <Jim.Qu(a)amd.com> > --- > drivers/gpu/vga/vga_switcheroo.c | 11 +++++++++-- > include/linux/vga_switcheroo.h | 4 ++-- > sound/pci/hda/hda_intel.c | 15 +++++++++------ > 3 files changed, 20 insertions(+), 10 deletions(-) > Please resend and send it to dri-devel and alsa-devel(a)alsa-project.org since this patch touches multiple subsystems. I would propose we merge this through the drm tree if possible. Alex > diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c > index fc4adf3..7b7b0fd 100644 > --- a/drivers/gpu/vga/vga_switcheroo.c > +++ b/drivers/gpu/vga/vga_switcheroo.c > @@ -329,7 +329,7 @@ EXPORT_SYMBOL(vga_switcheroo_register_client); > * vga_switcheroo_register_audio_client - register audio client > * @pdev: client pci device > * @ops: client callbacks > - * @id: client identifier > + * @bound_vga: client bound vga pci device > * > * Register audio client (audio device on a GPU). The client is assumed > * to use runtime PM. Beforehand, vga_switcheroo_client_probe_defer() > @@ -339,8 +339,15 @@ EXPORT_SYMBOL(vga_switcheroo_register_client); > */ > int vga_switcheroo_register_audio_client(struct pci_dev *pdev, > const struct vga_switcheroo_client_ops *ops, > - enum vga_switcheroo_client_id id) > + struct pci_dev *bound_vga) > { > + enum vga_switcheroo_client_id id = VGA_SWITCHEROO_DIS; > + > + if (bound_vga) { > + if (vgasr_priv.handler->get_client_id) > + id = vgasr_priv.handler->get_client_id(bound_vga); > + } > + > return register_client(pdev, ops, id | ID_BIT_AUDIO, false, true); > } > EXPORT_SYMBOL(vga_switcheroo_register_audio_client); > diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h > index 77f0f0a..a0c7b86 100644 > --- a/include/linux/vga_switcheroo.h > +++ b/include/linux/vga_switcheroo.h > @@ -151,7 +151,7 @@ int vga_switcheroo_register_client(struct pci_dev *dev, > bool driver_power_control); > int vga_switcheroo_register_audio_client(struct pci_dev *pdev, > const struct vga_switcheroo_client_ops *ops, > - enum vga_switcheroo_client_id id); > + struct pci_dev *bound_vga); > > void vga_switcheroo_client_fb_set(struct pci_dev *dev, > struct fb_info *info); > @@ -180,7 +180,7 @@ static inline int vga_switcheroo_register_handler(const struct vga_switcheroo_ha > enum vga_switcheroo_handler_flags_t handler_flags) { return 0; } > static inline int vga_switcheroo_register_audio_client(struct pci_dev *pdev, > const struct vga_switcheroo_client_ops *ops, > - enum vga_switcheroo_client_id id) { return 0; } > + struct pci_dev *bound_vga) { return 0; } > static inline void vga_switcheroo_unregister_handler(void) {} > static inline enum vga_switcheroo_handler_flags_t vga_switcheroo_handler_flags(void) { return 0; } > static inline int vga_switcheroo_lock_ddc(struct pci_dev *pdev) { return -ENODEV; } > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c > index 1ae1850..8f992e6 100644 > --- a/sound/pci/hda/hda_intel.c > +++ b/sound/pci/hda/hda_intel.c > @@ -1319,15 +1319,17 @@ static const struct vga_switcheroo_client_ops azx_vs_ops = { > static int register_vga_switcheroo(struct azx *chip) > { > struct hda_intel *hda = container_of(chip, struct hda_intel, chip); > + struct pci_dev *p; > int err; > > if (!hda->use_vga_switcheroo) > return 0; > - /* FIXME: currently only handling DIS controller > - * is there any machine with two switchable HDMI audio controllers? > - */ > - err = vga_switcheroo_register_audio_client(chip->pci, &azx_vs_ops, > - VGA_SWITCHEROO_DIS); > + > + p = get_bound_vga(chip->pci); > + err = vga_switcheroo_register_audio_client(chip->pci, &azx_vs_ops, p); > + > + if (p) > + pci_dev_put(p); > if (err < 0) > return err; > hda->vga_switcheroo_registered = 1; > @@ -1429,7 +1431,8 @@ static struct pci_dev *get_bound_vga(struct pci_dev *pci) > p = pci_get_domain_bus_and_slot(pci_domain_nr(pci->bus), > pci->bus->number, 0); > if (p) { > - if ((p->class >> 8) == PCI_CLASS_DISPLAY_VGA) > + if ((p->class >> 8) == PCI_CLASS_DISPLAY_VGA || > + (p->class >> 8) == PCI_CLASS_DISPLAY_OTHER) > return p; > pci_dev_put(p); > } > -- > 2.7.4 > > _______________________________________________ > amd-gfx mailing list > amd-gfx(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx

7 49

[PATCH v2] drm/dp_helper: Add DP aux channel tracing
by Lyude Paul 16 Jul '18

16 Jul '18

This is something we've needed for a very long time now, as it makes debugging issues with faulty MST hubs along with debugging issues regarding us interfacing with hubs correctly vastly easier to debug. Currently this can actually be done if you trace the i2c devices for DP using ftrace but that's significantly less useful for a couple of reasons: - Tracing the i2c devices through ftrace means all of the traces are going to contain a lot of "garbage" output that we're sending over the i2c line. Most of this garbage comes from retrying transactions, DRM's helper library adding extra transactions to work around bad hubs, etc. - Having a user set up ftrace so that they can provide debugging information is a lot more difficult then being able to say "just boot with drm.debug=0x100" - We can potentially expand upon this tracing in the future to print debugging information in regards to other DP transactions like MST sideband transactions This is inspired by a patch Rob Clark sent to do this a long time back. Neither of us could find the patch however, so we both assumed it would probably just be easier to rewrite it anyway. Cc: Rob Clark <robdclark(a)gmail.com> Signed-off-by: Lyude Paul <lyude(a)redhat.com> Reviewed-by: Daniel Vetter <daniel.vetter(a)ffwll.ch> --- Changes since v1: - Adjust limit in drm_dp_dump_access() and get rid of unneeded "..." suffix (danvet) - Remove extraneous whitespace I will be pushing this in just a moment, sending to list so it gets updated in patchwork first drivers/gpu/drm/drm_dp_helper.c | 32 +++++++++++++++++++++++++++----- drivers/gpu/drm/drm_drv.c | 15 ++++++++------- include/drm/drm_print.h | 6 ++++++ 3 files changed, 41 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c index a7ba602a43a8..03f8f93c61ac 100644 --- a/drivers/gpu/drm/drm_dp_helper.c +++ b/drivers/gpu/drm/drm_dp_helper.c @@ -185,6 +185,20 @@ EXPORT_SYMBOL(drm_dp_bw_code_to_link_rate); #define AUX_RETRY_INTERVAL 500 /* us */ +static inline void +drm_dp_dump_access(const struct drm_dp_aux *aux, + u8 request, uint offset, void *buffer, int ret) +{ + const char *arrow = request == DP_AUX_NATIVE_READ ? "->" : "<-"; + + if (ret > 0) + drm_dbg(DRM_UT_DP, "%s: 0x%05x AUX %s (ret=%3d) %*ph\n", + aux->name, offset, arrow, ret, min(ret, 20), buffer); + else + drm_dbg(DRM_UT_DP, "%s: 0x%05x AUX %s (ret=%3d)\n", + aux->name, offset, arrow, ret); +} + /** * DOC: dp helpers * @@ -288,10 +302,14 @@ ssize_t drm_dp_dpcd_read(struct drm_dp_aux *aux, unsigned int offset, ret = drm_dp_dpcd_access(aux, DP_AUX_NATIVE_READ, DP_DPCD_REV, buffer, 1); if (ret != 1) - return ret; + goto out; - return drm_dp_dpcd_access(aux, DP_AUX_NATIVE_READ, offset, buffer, - size); + ret = drm_dp_dpcd_access(aux, DP_AUX_NATIVE_READ, offset, buffer, + size); + +out: + drm_dp_dump_access(aux, DP_AUX_NATIVE_READ, offset, buffer, ret); + return ret; } EXPORT_SYMBOL(drm_dp_dpcd_read); @@ -312,8 +330,12 @@ EXPORT_SYMBOL(drm_dp_dpcd_read); ssize_t drm_dp_dpcd_write(struct drm_dp_aux *aux, unsigned int offset, void *buffer, size_t size) { - return drm_dp_dpcd_access(aux, DP_AUX_NATIVE_WRITE, offset, buffer, - size); + int ret; + + ret = drm_dp_dpcd_access(aux, DP_AUX_NATIVE_WRITE, offset, buffer, + size); + drm_dp_dump_access(aux, DP_AUX_NATIVE_WRITE, offset, buffer, ret); + return ret; } EXPORT_SYMBOL(drm_dp_dpcd_write); diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 7af748ed1c58..e555eb5de275 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -53,13 +53,14 @@ MODULE_AUTHOR("Gareth Hughes, Leif Delgass, José Fonseca, Jon Smirl"); MODULE_DESCRIPTION("DRM shared core routines"); MODULE_LICENSE("GPL and additional rights"); MODULE_PARM_DESC(debug, "Enable debug output, where each bit enables a debug category.\n" -"\t\tBit 0 (0x01) will enable CORE messages (drm core code)\n" -"\t\tBit 1 (0x02) will enable DRIVER messages (drm controller code)\n" -"\t\tBit 2 (0x04) will enable KMS messages (modesetting code)\n" -"\t\tBit 3 (0x08) will enable PRIME messages (prime code)\n" -"\t\tBit 4 (0x10) will enable ATOMIC messages (atomic code)\n" -"\t\tBit 5 (0x20) will enable VBL messages (vblank code)\n" -"\t\tBit 7 (0x80) will enable LEASE messages (leasing code)"); +"\t\tBit 0 (0x01) will enable CORE messages (drm core code)\n" +"\t\tBit 1 (0x02) will enable DRIVER messages (drm controller code)\n" +"\t\tBit 2 (0x04) will enable KMS messages (modesetting code)\n" +"\t\tBit 3 (0x08) will enable PRIME messages (prime code)\n" +"\t\tBit 4 (0x10) will enable ATOMIC messages (atomic code)\n" +"\t\tBit 5 (0x20) will enable VBL messages (vblank code)\n" +"\t\tBit 7 (0x80) will enable LEASE messages (leasing code)\n" +"\t\tBit 8 (0x100) will enable DP messages (displayport code)"); module_param_named(debug, drm_debug, int, 0600); static DEFINE_SPINLOCK(drm_minor_lock); diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index e1a46e9991cc..767c90b654c5 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -195,6 +195,7 @@ static inline struct drm_printer drm_debug_printer(const char *prefix) #define DRM_UT_VBL 0x20 #define DRM_UT_STATE 0x40 #define DRM_UT_LEASE 0x80 +#define DRM_UT_DP 0x100 __printf(3, 4) void drm_dev_printk(const struct device *dev, const char *level, @@ -307,6 +308,11 @@ void drm_err(const char *format, ...); #define DRM_DEBUG_LEASE(fmt, ...) \ drm_dbg(DRM_UT_LEASE, fmt, ##__VA_ARGS__) +#define DRM_DEV_DEBUG_DP(dev, fmt, ...) \ + drm_dev_dbg(dev, DRM_UT_DP, fmt, ## __VA_ARGS__) +#define DRM_DEBUG_DP(dev, fmt, ...) \ + drm_dbg(DRM_UT_DP, fmt, ## __VA_ARGS__) + #define _DRM_DEV_DEFINE_DEBUG_RATELIMITED(dev, category, fmt, ...) \ ({ \ static DEFINE_RATELIMIT_STATE(_rs, \ -- 2.17.1

1 0

Re: [alsa-devel] [V2 2/2] vgaswitchreoo: set audio client id in vgaswitchreoo enable function
by Lukas Wunner 16 Jul '18

16 Jul '18

On Mon, Jul 16, 2018 at 03:52:45PM +0800, Hui Wang wrote: > On 2018???07???16??? 14:06, Jim Qu wrote: > >On modern laptop, there are more and more platforms > >have two GPUs, and each of them maybe have audio codec > >for HDMP/DP output. For some dGPU which is no output, > >audio codec usually is disabled. > > > >In currect HDA audio driver, it will set all codec as > >VGA_SWITCHEROO_DIS, the audio which is binded to UMA > >will be suspended if user use debugfs to control power > > > >In HDA driver side, it is difficult to know which GPU > >the audio has bound to. So set the bound gpu pci dev > >to vgaswitchreoo, the correct audio id will be set in > >vgaswitchreoo enable function. > > > >Signed-off-by: Jim Qu <Jim.Qu(a)amd.com> > > Is it possible to send this patch to <stable(a)vger.kernel.org> as well, then > we will know that it is safe to backport this patch to the linux kernels > with different version. For which hardware do you want it in stable kernels? This patch pertains to manual power control, which is only used on the MacBook Pro by default. And there are no MacBook Pros with AMD APUs. On all other hardware, users have to specify "amdgpu.runpm=0" on the command line to see any benefit from this patch. Also, manual power control will likely be removed once we get runtime PM working with muxed systems (such as the MacBook Pro). Lukas

2 1

[V2 1/2] ALSA: HDA: use PCI_BASE_CLASS_DISPLAY to replace PCI_CLASS_DISPLAY_VGA
by Jim Qu 16 Jul '18

16 Jul '18

Except PCI_CLASS_DISPLAY_VGA, some PCI class is sometimes PCI_CLASS_DISPLAY_3D or PCI_CLASS_DISPLAY_OTHER. Signed-off-by: Jim Qu <Jim.Qu(a)amd.com> --- sound/pci/hda/hda_intel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 1ae1850..14733ff 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1429,7 +1429,7 @@ static struct pci_dev *get_bound_vga(struct pci_dev *pci) p = pci_get_domain_bus_and_slot(pci_domain_nr(pci->bus), pci->bus->number, 0); if (p) { - if ((p->class >> 8) == PCI_CLASS_DISPLAY_VGA) + if ((p->class >> 16) == PCI_BASE_CLASS_DISPLAY) return p; pci_dev_put(p); } -- 2.7.4

3 6

[PATCH 1/2] ALSA: HDA: use PCI_BASE_CLASS_DISPLAY to cover more display adapters
by Jim Qu 16 Jul '18

16 Jul '18

Signed-off-by: Jim Qu <Jim.Qu(a)amd.com> --- sound/pci/hda/hda_intel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 1ae1850..e0064567 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -31,7 +31,7 @@ * CHANGES: * * 2004.12.01 Major rewrite by tiwai, merged the work of pshou - * + * */ #include <linux/delay.h> @@ -390,8 +390,8 @@ static char *driver_short_names[] = { [AZX_DRIVER_SIS] = "HDA SIS966", [AZX_DRIVER_ULI] = "HDA ULI M5461", [AZX_DRIVER_NVIDIA] = "HDA NVidia", - [AZX_DRIVER_TERA] = "HDA Teradici", - [AZX_DRIVER_CTX] = "HDA Creative", + [AZX_DRIVER_TERA] = "HDA Teradici", + [AZX_DRIVER_CTX] = "HDA Creative", [AZX_DRIVER_CTHDA] = "HDA Creative", [AZX_DRIVER_CMEDIA] = "HDA C-Media", [AZX_DRIVER_GENERIC] = "HD-Audio Generic", @@ -1429,7 +1429,7 @@ static struct pci_dev *get_bound_vga(struct pci_dev *pci) p = pci_get_domain_bus_and_slot(pci_domain_nr(pci->bus), pci->bus->number, 0); if (p) { - if ((p->class >> 8) == PCI_CLASS_DISPLAY_VGA) + if ((p->class >> 16) == PCI_BASE_CLASS_DISPLAY) return p; pci_dev_put(p); } -- 2.7.4

5 13

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel July 2018