mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
Here is the big char/misc driver patch pull request for 5.1-rc1. The largest thing by far is the new habanalabs driver for their AI accelerator chip. For now it is in the drivers/misc directory but will probably move to a new directory soon along with other drivers of this type. Other than that, just the usual set of individual driver updates and fixes. There's an "odd" merge in here from the DRM tree that they asked me to do as the MEI driver is starting to interact with the i915 driver, and it needed some coordination. All of those patches have been properly acked by the relevant subsystem maintainers. All of these have been in linux-next with no reported issues, most for quite some time. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- iG0EABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCXH+dPQ8cZ3JlZ0Brcm9h aC5jb20ACgkQMUfUDdst+ym1fACgvpZAxjNzoRQJ6f06tc8ujtPk9rUAnR+tCtrZ 9e3l7H76oe33o96Qjhor =8A2k -----END PGP SIGNATURE----- Merge tag 'char-misc-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc Pull char/misc driver updates from Greg KH: "Here is the big char/misc driver patch pull request for 5.1-rc1. The largest thing by far is the new habanalabs driver for their AI accelerator chip. For now it is in the drivers/misc directory but will probably move to a new directory soon along with other drivers of this type. Other than that, just the usual set of individual driver updates and fixes. There's an "odd" merge in here from the DRM tree that they asked me to do as the MEI driver is starting to interact with the i915 driver, and it needed some coordination. All of those patches have been properly acked by the relevant subsystem maintainers. All of these have been in linux-next with no reported issues, most for quite some time" * tag 'char-misc-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (219 commits) habanalabs: adjust Kconfig to fix build errors habanalabs: use %px instead of %p in error print habanalabs: use do_div for 64-bit divisions intel_th: gth: Fix an off-by-one in output unassigning habanalabs: fix little-endian<->cpu conversion warnings habanalabs: use NULL to initialize array of pointers habanalabs: fix little-endian<->cpu conversion warnings habanalabs: soft-reset device if context-switch fails habanalabs: print pointer using %p habanalabs: fix memory leak with CBs with unaligned size habanalabs: return correct error code on MMU mapping failure habanalabs: add comments in uapi/misc/habanalabs.h habanalabs: extend QMAN0 job timeout habanalabs: set DMA0 completion to SOB 1007 habanalabs: fix validation of WREG32 to DMA completion habanalabs: fix mmu cache registers init habanalabs: disable CPU access on timeouts habanalabs: add MMU DRAM default page mapping habanalabs: Dissociate RAZWI info from event types misc/habanalabs: adjust Kconfig to fix build errors ...
160 lines
4.2 KiB
C
160 lines
4.2 KiB
C
/*
|
|
* hdac_i915.c - routines for sync between HD-A core and i915 display driver
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the Free
|
|
* Software Foundation; either version 2 of the License, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
* for more details.
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
#include <linux/pci.h>
|
|
#include <sound/core.h>
|
|
#include <sound/hdaudio.h>
|
|
#include <sound/hda_i915.h>
|
|
#include <sound/hda_register.h>
|
|
|
|
static struct completion bind_complete;
|
|
|
|
#define CONTROLLER_IN_GPU(pci) (((pci)->device == 0x0a0c) || \
|
|
((pci)->device == 0x0c0c) || \
|
|
((pci)->device == 0x0d0c) || \
|
|
((pci)->device == 0x160c))
|
|
|
|
/**
|
|
* snd_hdac_i915_set_bclk - Reprogram BCLK for HSW/BDW
|
|
* @bus: HDA core bus
|
|
*
|
|
* Intel HSW/BDW display HDA controller is in GPU. Both its power and link BCLK
|
|
* depends on GPU. Two Extended Mode registers EM4 (M value) and EM5 (N Value)
|
|
* are used to convert CDClk (Core Display Clock) to 24MHz BCLK:
|
|
* BCLK = CDCLK * M / N
|
|
* The values will be lost when the display power well is disabled and need to
|
|
* be restored to avoid abnormal playback speed.
|
|
*
|
|
* Call this function at initializing and changing power well, as well as
|
|
* at ELD notifier for the hotplug.
|
|
*/
|
|
void snd_hdac_i915_set_bclk(struct hdac_bus *bus)
|
|
{
|
|
struct drm_audio_component *acomp = bus->audio_component;
|
|
struct pci_dev *pci = to_pci_dev(bus->dev);
|
|
int cdclk_freq;
|
|
unsigned int bclk_m, bclk_n;
|
|
|
|
if (!acomp || !acomp->ops || !acomp->ops->get_cdclk_freq)
|
|
return; /* only for i915 binding */
|
|
if (!CONTROLLER_IN_GPU(pci))
|
|
return; /* only HSW/BDW */
|
|
|
|
cdclk_freq = acomp->ops->get_cdclk_freq(acomp->dev);
|
|
switch (cdclk_freq) {
|
|
case 337500:
|
|
bclk_m = 16;
|
|
bclk_n = 225;
|
|
break;
|
|
|
|
case 450000:
|
|
default: /* default CDCLK 450MHz */
|
|
bclk_m = 4;
|
|
bclk_n = 75;
|
|
break;
|
|
|
|
case 540000:
|
|
bclk_m = 4;
|
|
bclk_n = 90;
|
|
break;
|
|
|
|
case 675000:
|
|
bclk_m = 8;
|
|
bclk_n = 225;
|
|
break;
|
|
}
|
|
|
|
snd_hdac_chip_writew(bus, HSW_EM4, bclk_m);
|
|
snd_hdac_chip_writew(bus, HSW_EM5, bclk_n);
|
|
}
|
|
EXPORT_SYMBOL_GPL(snd_hdac_i915_set_bclk);
|
|
|
|
static int i915_component_master_match(struct device *dev, int subcomponent,
|
|
void *data)
|
|
{
|
|
return !strcmp(dev->driver->name, "i915") &&
|
|
subcomponent == I915_COMPONENT_AUDIO;
|
|
}
|
|
|
|
/* check whether intel graphics is present */
|
|
static bool i915_gfx_present(void)
|
|
{
|
|
static const struct pci_device_id ids[] = {
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_ANY_ID),
|
|
.class = PCI_BASE_CLASS_DISPLAY << 16,
|
|
.class_mask = 0xff << 16 },
|
|
{}
|
|
};
|
|
return pci_dev_present(ids);
|
|
}
|
|
|
|
static int i915_master_bind(struct device *dev,
|
|
struct drm_audio_component *acomp)
|
|
{
|
|
complete_all(&bind_complete);
|
|
/* clear audio_ops here as it was needed only for completion call */
|
|
acomp->audio_ops = NULL;
|
|
return 0;
|
|
}
|
|
|
|
static const struct drm_audio_component_audio_ops i915_init_ops = {
|
|
.master_bind = i915_master_bind
|
|
};
|
|
|
|
/**
|
|
* snd_hdac_i915_init - Initialize i915 audio component
|
|
* @bus: HDA core bus
|
|
*
|
|
* This function is supposed to be used only by a HD-audio controller
|
|
* driver that needs the interaction with i915 graphics.
|
|
*
|
|
* This function initializes and sets up the audio component to communicate
|
|
* with i915 graphics driver.
|
|
*
|
|
* Returns zero for success or a negative error code.
|
|
*/
|
|
int snd_hdac_i915_init(struct hdac_bus *bus)
|
|
{
|
|
struct drm_audio_component *acomp;
|
|
int err;
|
|
|
|
if (!i915_gfx_present())
|
|
return -ENODEV;
|
|
|
|
init_completion(&bind_complete);
|
|
|
|
err = snd_hdac_acomp_init(bus, &i915_init_ops,
|
|
i915_component_master_match,
|
|
sizeof(struct i915_audio_component) - sizeof(*acomp));
|
|
if (err < 0)
|
|
return err;
|
|
acomp = bus->audio_component;
|
|
if (!acomp)
|
|
return -ENODEV;
|
|
if (!acomp->ops) {
|
|
request_module("i915");
|
|
/* 60s timeout */
|
|
wait_for_completion_timeout(&bind_complete,
|
|
msecs_to_jiffies(60 * 1000));
|
|
}
|
|
if (!acomp->ops) {
|
|
dev_info(bus->dev, "couldn't bind with audio component\n");
|
|
snd_hdac_acomp_exit(bus);
|
|
return -ENODEV;
|
|
}
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(snd_hdac_i915_init);
|