diff options
author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2022-11-14 14:32:34 -0500 |
---|---|---|
committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2022-11-14 14:32:34 -0500 |
commit | 002c6ca75289a4ac4f6738213dd2d258704886e4 (patch) | |
tree | d99ec659974b2121cef3e06f54a97d719d0a94dd /drivers/gpu/drm/i915/display/intel_lpe_audio.c | |
parent | 801543b2593b04eef974a73d3ea03e7efbd5ffae (diff) | |
parent | c02f20d38fb90eba606277874581db124ace42c4 (diff) | |
download | linux-002c6ca75289a4ac4f6738213dd2d258704886e4.tar.gz linux-002c6ca75289a4ac4f6738213dd2d258704886e4.tar.bz2 linux-002c6ca75289a4ac4f6738213dd2d258704886e4.zip |
Merge drm/drm-next into drm-intel-next
Catch up on 6.1-rc cycle in order to solve the intel_backlight
conflict on linux-next.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_lpe_audio.c')
-rw-r--r-- | drivers/gpu/drm/i915/display/intel_lpe_audio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_lpe_audio.c b/drivers/gpu/drm/i915/display/intel_lpe_audio.c index a482e94ba078..8aaaef4d7856 100644 --- a/drivers/gpu/drm/i915/display/intel_lpe_audio.c +++ b/drivers/gpu/drm/i915/display/intel_lpe_audio.c @@ -102,9 +102,9 @@ lpe_audio_platdev_create(struct drm_i915_private *dev_priv) rsc[0].flags = IORESOURCE_IRQ; rsc[0].name = "hdmi-lpe-audio-irq"; - rsc[1].start = pci_resource_start(pdev, GTTMMADR_BAR) + + rsc[1].start = pci_resource_start(pdev, GEN4_GTTMMADR_BAR) + I915_HDMI_LPE_AUDIO_BASE; - rsc[1].end = pci_resource_start(pdev, GTTMMADR_BAR) + + rsc[1].end = pci_resource_start(pdev, GEN4_GTTMMADR_BAR) + I915_HDMI_LPE_AUDIO_BASE + I915_HDMI_LPE_AUDIO_SIZE - 1; rsc[1].flags = IORESOURCE_MEM; rsc[1].name = "hdmi-lpe-audio-mmio"; |