2014-10-27 21:26:43 +07:00
|
|
|
/*
|
|
|
|
* Copyright © 2014 Intel Corporation
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
2015-01-08 22:54:14 +07:00
|
|
|
#include <linux/component.h>
|
2019-04-05 18:00:03 +07:00
|
|
|
#include <linux/kernel.h>
|
|
|
|
|
|
|
|
#include <drm/drm_edid.h>
|
2015-01-08 22:54:14 +07:00
|
|
|
#include <drm/i915_component.h>
|
2014-10-27 21:26:43 +07:00
|
|
|
|
|
|
|
#include "i915_drv.h"
|
2019-04-05 18:00:03 +07:00
|
|
|
#include "intel_audio.h"
|
2019-08-06 18:39:33 +07:00
|
|
|
#include "intel_display_types.h"
|
2019-05-02 22:02:41 +07:00
|
|
|
#include "intel_lpe_audio.h"
|
2014-10-27 21:26:43 +07:00
|
|
|
|
2014-10-27 21:27:00 +07:00
|
|
|
/**
|
|
|
|
* DOC: High Definition Audio over HDMI and Display Port
|
|
|
|
*
|
|
|
|
* The graphics and audio drivers together support High Definition Audio over
|
|
|
|
* HDMI and Display Port. The audio programming sequences are divided into audio
|
|
|
|
* codec and controller enable and disable sequences. The graphics driver
|
|
|
|
* handles the audio codec sequences, while the audio driver handles the audio
|
|
|
|
* controller sequences.
|
|
|
|
*
|
|
|
|
* The disable sequences must be performed before disabling the transcoder or
|
|
|
|
* port. The enable sequences may only be performed after enabling the
|
2015-07-02 20:05:27 +07:00
|
|
|
* transcoder and port, and after completed link training. Therefore the audio
|
|
|
|
* enable/disable sequences are part of the modeset sequence.
|
2014-10-27 21:27:00 +07:00
|
|
|
*
|
|
|
|
* The codec and controller sequences could be done either parallel or serial,
|
|
|
|
* but generally the ELDV/PD change in the codec sequence indicates to the audio
|
|
|
|
* driver that the controller sequence should start. Indeed, most of the
|
|
|
|
* co-operation between the graphics and audio drivers is handled via audio
|
|
|
|
* related registers. (The notable exception is the power management, not
|
|
|
|
* covered here.)
|
2015-10-01 16:01:09 +07:00
|
|
|
*
|
2016-08-13 03:48:37 +07:00
|
|
|
* The struct &i915_audio_component is used to interact between the graphics
|
|
|
|
* and audio drivers. The struct &i915_audio_component_ops @ops in it is
|
2015-10-01 16:01:09 +07:00
|
|
|
* defined in graphics driver and called in audio driver. The
|
2016-08-13 03:48:37 +07:00
|
|
|
* struct &i915_audio_component_audio_ops @audio_ops is called from i915 driver.
|
2014-10-27 21:27:00 +07:00
|
|
|
*/
|
|
|
|
|
2016-10-25 21:54:18 +07:00
|
|
|
/* DP N/M table */
|
2018-06-08 02:20:13 +07:00
|
|
|
#define LC_810M 810000
|
2016-10-25 21:54:18 +07:00
|
|
|
#define LC_540M 540000
|
|
|
|
#define LC_270M 270000
|
|
|
|
#define LC_162M 162000
|
|
|
|
|
|
|
|
struct dp_aud_n_m {
|
|
|
|
int sample_rate;
|
|
|
|
int clock;
|
|
|
|
u16 m;
|
|
|
|
u16 n;
|
|
|
|
};
|
|
|
|
|
2019-06-28 05:07:08 +07:00
|
|
|
struct hdmi_aud_ncts {
|
|
|
|
int sample_rate;
|
|
|
|
int clock;
|
|
|
|
int n;
|
|
|
|
int cts;
|
|
|
|
};
|
|
|
|
|
2016-10-25 21:54:18 +07:00
|
|
|
/* Values according to DP 1.4 Table 2-104 */
|
|
|
|
static const struct dp_aud_n_m dp_aud_n_m[] = {
|
|
|
|
{ 32000, LC_162M, 1024, 10125 },
|
|
|
|
{ 44100, LC_162M, 784, 5625 },
|
|
|
|
{ 48000, LC_162M, 512, 3375 },
|
|
|
|
{ 64000, LC_162M, 2048, 10125 },
|
|
|
|
{ 88200, LC_162M, 1568, 5625 },
|
|
|
|
{ 96000, LC_162M, 1024, 3375 },
|
|
|
|
{ 128000, LC_162M, 4096, 10125 },
|
|
|
|
{ 176400, LC_162M, 3136, 5625 },
|
|
|
|
{ 192000, LC_162M, 2048, 3375 },
|
|
|
|
{ 32000, LC_270M, 1024, 16875 },
|
|
|
|
{ 44100, LC_270M, 784, 9375 },
|
|
|
|
{ 48000, LC_270M, 512, 5625 },
|
|
|
|
{ 64000, LC_270M, 2048, 16875 },
|
|
|
|
{ 88200, LC_270M, 1568, 9375 },
|
|
|
|
{ 96000, LC_270M, 1024, 5625 },
|
|
|
|
{ 128000, LC_270M, 4096, 16875 },
|
|
|
|
{ 176400, LC_270M, 3136, 9375 },
|
|
|
|
{ 192000, LC_270M, 2048, 5625 },
|
|
|
|
{ 32000, LC_540M, 1024, 33750 },
|
|
|
|
{ 44100, LC_540M, 784, 18750 },
|
|
|
|
{ 48000, LC_540M, 512, 11250 },
|
|
|
|
{ 64000, LC_540M, 2048, 33750 },
|
|
|
|
{ 88200, LC_540M, 1568, 18750 },
|
|
|
|
{ 96000, LC_540M, 1024, 11250 },
|
|
|
|
{ 128000, LC_540M, 4096, 33750 },
|
|
|
|
{ 176400, LC_540M, 3136, 18750 },
|
|
|
|
{ 192000, LC_540M, 2048, 11250 },
|
2018-06-08 02:20:13 +07:00
|
|
|
{ 32000, LC_810M, 1024, 50625 },
|
|
|
|
{ 44100, LC_810M, 784, 28125 },
|
|
|
|
{ 48000, LC_810M, 512, 16875 },
|
|
|
|
{ 64000, LC_810M, 2048, 50625 },
|
|
|
|
{ 88200, LC_810M, 1568, 28125 },
|
|
|
|
{ 96000, LC_810M, 1024, 16875 },
|
|
|
|
{ 128000, LC_810M, 4096, 50625 },
|
|
|
|
{ 176400, LC_810M, 3136, 28125 },
|
|
|
|
{ 192000, LC_810M, 2048, 16875 },
|
2016-10-25 21:54:18 +07:00
|
|
|
};
|
|
|
|
|
|
|
|
static const struct dp_aud_n_m *
|
2017-10-31 01:46:53 +07:00
|
|
|
audio_config_dp_get_n_m(const struct intel_crtc_state *crtc_state, int rate)
|
2016-10-25 21:54:18 +07:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(dp_aud_n_m); i++) {
|
|
|
|
if (rate == dp_aud_n_m[i].sample_rate &&
|
2017-10-31 01:46:53 +07:00
|
|
|
crtc_state->port_clock == dp_aud_n_m[i].clock)
|
2016-10-25 21:54:18 +07:00
|
|
|
return &dp_aud_n_m[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2014-10-27 21:26:44 +07:00
|
|
|
static const struct {
|
2014-10-27 21:26:43 +07:00
|
|
|
int clock;
|
|
|
|
u32 config;
|
|
|
|
} hdmi_audio_clock[] = {
|
2015-10-08 15:43:34 +07:00
|
|
|
{ 25175, AUD_CONFIG_PIXEL_CLOCK_HDMI_25175 },
|
2014-10-27 21:26:43 +07:00
|
|
|
{ 25200, AUD_CONFIG_PIXEL_CLOCK_HDMI_25200 }, /* default per bspec */
|
|
|
|
{ 27000, AUD_CONFIG_PIXEL_CLOCK_HDMI_27000 },
|
2015-10-08 15:43:34 +07:00
|
|
|
{ 27027, AUD_CONFIG_PIXEL_CLOCK_HDMI_27027 },
|
2014-10-27 21:26:43 +07:00
|
|
|
{ 54000, AUD_CONFIG_PIXEL_CLOCK_HDMI_54000 },
|
2015-10-08 15:43:34 +07:00
|
|
|
{ 54054, AUD_CONFIG_PIXEL_CLOCK_HDMI_54054 },
|
|
|
|
{ 74176, AUD_CONFIG_PIXEL_CLOCK_HDMI_74176 },
|
2014-10-27 21:26:43 +07:00
|
|
|
{ 74250, AUD_CONFIG_PIXEL_CLOCK_HDMI_74250 },
|
2015-10-08 15:43:34 +07:00
|
|
|
{ 148352, AUD_CONFIG_PIXEL_CLOCK_HDMI_148352 },
|
2014-10-27 21:26:43 +07:00
|
|
|
{ 148500, AUD_CONFIG_PIXEL_CLOCK_HDMI_148500 },
|
|
|
|
};
|
|
|
|
|
2015-09-02 13:11:39 +07:00
|
|
|
/* HDMI N/CTS table */
|
|
|
|
#define TMDS_297M 297000
|
2015-10-08 15:43:34 +07:00
|
|
|
#define TMDS_296M 296703
|
2018-10-26 01:52:00 +07:00
|
|
|
#define TMDS_594M 594000
|
|
|
|
#define TMDS_593M 593407
|
|
|
|
|
2019-06-28 05:07:08 +07:00
|
|
|
static const struct hdmi_aud_ncts hdmi_aud_ncts_24bpp[] = {
|
2015-09-02 13:11:39 +07:00
|
|
|
{ 32000, TMDS_296M, 5824, 421875 },
|
|
|
|
{ 32000, TMDS_297M, 3072, 222750 },
|
2018-11-01 03:54:55 +07:00
|
|
|
{ 32000, TMDS_593M, 5824, 843750 },
|
|
|
|
{ 32000, TMDS_594M, 3072, 445500 },
|
|
|
|
{ 44100, TMDS_296M, 4459, 234375 },
|
|
|
|
{ 44100, TMDS_297M, 4704, 247500 },
|
|
|
|
{ 44100, TMDS_593M, 8918, 937500 },
|
|
|
|
{ 44100, TMDS_594M, 9408, 990000 },
|
2015-09-02 13:11:39 +07:00
|
|
|
{ 88200, TMDS_296M, 8918, 234375 },
|
|
|
|
{ 88200, TMDS_297M, 9408, 247500 },
|
2018-11-01 03:54:55 +07:00
|
|
|
{ 88200, TMDS_593M, 17836, 937500 },
|
|
|
|
{ 88200, TMDS_594M, 18816, 990000 },
|
2015-09-02 13:11:39 +07:00
|
|
|
{ 176400, TMDS_296M, 17836, 234375 },
|
|
|
|
{ 176400, TMDS_297M, 18816, 247500 },
|
2018-11-01 03:54:55 +07:00
|
|
|
{ 176400, TMDS_593M, 35672, 937500 },
|
|
|
|
{ 176400, TMDS_594M, 37632, 990000 },
|
|
|
|
{ 48000, TMDS_296M, 5824, 281250 },
|
|
|
|
{ 48000, TMDS_297M, 5120, 247500 },
|
2018-10-26 01:52:00 +07:00
|
|
|
{ 48000, TMDS_593M, 5824, 562500 },
|
|
|
|
{ 48000, TMDS_594M, 6144, 594000 },
|
2018-11-01 03:54:55 +07:00
|
|
|
{ 96000, TMDS_296M, 11648, 281250 },
|
|
|
|
{ 96000, TMDS_297M, 10240, 247500 },
|
2018-10-26 01:52:00 +07:00
|
|
|
{ 96000, TMDS_593M, 11648, 562500 },
|
|
|
|
{ 96000, TMDS_594M, 12288, 594000 },
|
2018-11-01 03:54:55 +07:00
|
|
|
{ 192000, TMDS_296M, 23296, 281250 },
|
|
|
|
{ 192000, TMDS_297M, 20480, 247500 },
|
2018-10-26 01:52:00 +07:00
|
|
|
{ 192000, TMDS_593M, 23296, 562500 },
|
|
|
|
{ 192000, TMDS_594M, 24576, 594000 },
|
2015-09-02 13:11:39 +07:00
|
|
|
};
|
|
|
|
|
2019-06-28 05:07:08 +07:00
|
|
|
/* Appendix C - N & CTS values for deep color from HDMI 2.0 spec*/
|
|
|
|
/* HDMI N/CTS table for 10 bit deep color(30 bpp)*/
|
|
|
|
#define TMDS_371M 371250
|
|
|
|
#define TMDS_370M 370878
|
|
|
|
|
|
|
|
static const struct hdmi_aud_ncts hdmi_aud_ncts_30bpp[] = {
|
|
|
|
{ 32000, TMDS_370M, 5824, 527344 },
|
|
|
|
{ 32000, TMDS_371M, 6144, 556875 },
|
|
|
|
{ 44100, TMDS_370M, 8918, 585938 },
|
|
|
|
{ 44100, TMDS_371M, 4704, 309375 },
|
|
|
|
{ 88200, TMDS_370M, 17836, 585938 },
|
|
|
|
{ 88200, TMDS_371M, 9408, 309375 },
|
|
|
|
{ 176400, TMDS_370M, 35672, 585938 },
|
|
|
|
{ 176400, TMDS_371M, 18816, 309375 },
|
|
|
|
{ 48000, TMDS_370M, 11648, 703125 },
|
|
|
|
{ 48000, TMDS_371M, 5120, 309375 },
|
|
|
|
{ 96000, TMDS_370M, 23296, 703125 },
|
|
|
|
{ 96000, TMDS_371M, 10240, 309375 },
|
|
|
|
{ 192000, TMDS_370M, 46592, 703125 },
|
|
|
|
{ 192000, TMDS_371M, 20480, 309375 },
|
|
|
|
};
|
|
|
|
|
|
|
|
/* HDMI N/CTS table for 12 bit deep color(36 bpp)*/
|
|
|
|
#define TMDS_445_5M 445500
|
|
|
|
#define TMDS_445M 445054
|
|
|
|
|
|
|
|
static const struct hdmi_aud_ncts hdmi_aud_ncts_36bpp[] = {
|
|
|
|
{ 32000, TMDS_445M, 5824, 632813 },
|
|
|
|
{ 32000, TMDS_445_5M, 4096, 445500 },
|
|
|
|
{ 44100, TMDS_445M, 8918, 703125 },
|
|
|
|
{ 44100, TMDS_445_5M, 4704, 371250 },
|
|
|
|
{ 88200, TMDS_445M, 17836, 703125 },
|
|
|
|
{ 88200, TMDS_445_5M, 9408, 371250 },
|
|
|
|
{ 176400, TMDS_445M, 35672, 703125 },
|
|
|
|
{ 176400, TMDS_445_5M, 18816, 371250 },
|
|
|
|
{ 48000, TMDS_445M, 5824, 421875 },
|
|
|
|
{ 48000, TMDS_445_5M, 5120, 371250 },
|
|
|
|
{ 96000, TMDS_445M, 11648, 421875 },
|
|
|
|
{ 96000, TMDS_445_5M, 10240, 371250 },
|
|
|
|
{ 192000, TMDS_445M, 23296, 421875 },
|
|
|
|
{ 192000, TMDS_445_5M, 20480, 371250 },
|
|
|
|
};
|
|
|
|
|
2014-10-27 21:26:43 +07:00
|
|
|
/* get AUD_CONFIG_PIXEL_CLOCK_HDMI_* value for mode */
|
2017-10-31 01:46:53 +07:00
|
|
|
static u32 audio_config_hdmi_pixel_clock(const struct intel_crtc_state *crtc_state)
|
2014-10-27 21:26:43 +07:00
|
|
|
{
|
2017-10-31 01:46:53 +07:00
|
|
|
const struct drm_display_mode *adjusted_mode =
|
|
|
|
&crtc_state->base.adjusted_mode;
|
2014-10-27 21:26:43 +07:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(hdmi_audio_clock); i++) {
|
2015-09-25 20:38:56 +07:00
|
|
|
if (adjusted_mode->crtc_clock == hdmi_audio_clock[i].clock)
|
2014-10-27 21:26:43 +07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i == ARRAY_SIZE(hdmi_audio_clock)) {
|
2015-09-25 20:37:43 +07:00
|
|
|
DRM_DEBUG_KMS("HDMI audio pixel clock setting for %d not found, falling back to defaults\n",
|
2015-09-25 20:38:56 +07:00
|
|
|
adjusted_mode->crtc_clock);
|
2014-10-27 21:26:43 +07:00
|
|
|
i = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
DRM_DEBUG_KMS("Configuring HDMI audio for pixel clock %d (0x%08x)\n",
|
|
|
|
hdmi_audio_clock[i].clock,
|
|
|
|
hdmi_audio_clock[i].config);
|
|
|
|
|
|
|
|
return hdmi_audio_clock[i].config;
|
|
|
|
}
|
|
|
|
|
2017-10-31 01:46:53 +07:00
|
|
|
static int audio_config_hdmi_get_n(const struct intel_crtc_state *crtc_state,
|
2016-10-10 22:04:07 +07:00
|
|
|
int rate)
|
2015-09-02 13:11:39 +07:00
|
|
|
{
|
2019-06-28 05:07:08 +07:00
|
|
|
const struct hdmi_aud_ncts *hdmi_ncts_table;
|
|
|
|
int i, size;
|
|
|
|
|
|
|
|
if (crtc_state->pipe_bpp == 36) {
|
|
|
|
hdmi_ncts_table = hdmi_aud_ncts_36bpp;
|
|
|
|
size = ARRAY_SIZE(hdmi_aud_ncts_36bpp);
|
|
|
|
} else if (crtc_state->pipe_bpp == 30) {
|
|
|
|
hdmi_ncts_table = hdmi_aud_ncts_30bpp;
|
|
|
|
size = ARRAY_SIZE(hdmi_aud_ncts_30bpp);
|
|
|
|
} else {
|
|
|
|
hdmi_ncts_table = hdmi_aud_ncts_24bpp;
|
|
|
|
size = ARRAY_SIZE(hdmi_aud_ncts_24bpp);
|
|
|
|
}
|
2015-09-02 13:11:39 +07:00
|
|
|
|
2019-06-28 05:07:08 +07:00
|
|
|
for (i = 0; i < size; i++) {
|
|
|
|
if (rate == hdmi_ncts_table[i].sample_rate &&
|
|
|
|
crtc_state->port_clock == hdmi_ncts_table[i].clock) {
|
|
|
|
return hdmi_ncts_table[i].n;
|
2015-09-02 13:11:39 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-10-27 21:26:43 +07:00
|
|
|
static bool intel_eld_uptodate(struct drm_connector *connector,
|
2018-06-12 16:19:34 +07:00
|
|
|
i915_reg_t reg_eldv, u32 bits_eldv,
|
|
|
|
i915_reg_t reg_elda, u32 bits_elda,
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 20:33:26 +07:00
|
|
|
i915_reg_t reg_edid)
|
2014-10-27 21:26:43 +07:00
|
|
|
{
|
2016-07-04 17:34:36 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(connector->dev);
|
2018-06-19 19:44:37 +07:00
|
|
|
const u8 *eld = connector->eld;
|
2018-06-12 16:19:34 +07:00
|
|
|
u32 tmp;
|
2014-10-27 21:26:45 +07:00
|
|
|
int i;
|
2014-10-27 21:26:43 +07:00
|
|
|
|
2014-10-27 21:26:45 +07:00
|
|
|
tmp = I915_READ(reg_eldv);
|
|
|
|
tmp &= bits_eldv;
|
2014-10-27 21:26:43 +07:00
|
|
|
|
2014-10-27 21:26:45 +07:00
|
|
|
if (!tmp)
|
2014-10-27 21:26:43 +07:00
|
|
|
return false;
|
|
|
|
|
2014-10-27 21:26:45 +07:00
|
|
|
tmp = I915_READ(reg_elda);
|
|
|
|
tmp &= ~bits_elda;
|
|
|
|
I915_WRITE(reg_elda, tmp);
|
2014-10-27 21:26:43 +07:00
|
|
|
|
2014-10-28 21:20:48 +07:00
|
|
|
for (i = 0; i < drm_eld_size(eld) / 4; i++)
|
2018-06-19 19:44:37 +07:00
|
|
|
if (I915_READ(reg_edid) != *((const u32 *)eld + i))
|
2014-10-27 21:26:43 +07:00
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2017-10-31 01:46:53 +07:00
|
|
|
static void g4x_audio_codec_disable(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *old_crtc_state,
|
|
|
|
const struct drm_connector_state *old_conn_state)
|
2014-10-27 21:26:57 +07:00
|
|
|
{
|
2016-07-04 17:34:36 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2018-06-12 16:19:34 +07:00
|
|
|
u32 eldv, tmp;
|
2014-10-27 21:26:57 +07:00
|
|
|
|
|
|
|
DRM_DEBUG_KMS("Disable audio codec\n");
|
|
|
|
|
|
|
|
tmp = I915_READ(G4X_AUD_VID_DID);
|
|
|
|
if (tmp == INTEL_AUDIO_DEVBLC || tmp == INTEL_AUDIO_DEVCL)
|
|
|
|
eldv = G4X_ELDV_DEVCL_DEVBLC;
|
|
|
|
else
|
|
|
|
eldv = G4X_ELDV_DEVCTG;
|
|
|
|
|
|
|
|
/* Invalidate ELD */
|
|
|
|
tmp = I915_READ(G4X_AUD_CNTL_ST);
|
|
|
|
tmp &= ~eldv;
|
|
|
|
I915_WRITE(G4X_AUD_CNTL_ST, tmp);
|
|
|
|
}
|
|
|
|
|
2017-10-31 01:46:53 +07:00
|
|
|
static void g4x_audio_codec_enable(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2014-10-27 21:26:43 +07:00
|
|
|
{
|
2017-10-31 01:46:53 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
struct drm_connector *connector = conn_state->connector;
|
2018-06-19 19:44:37 +07:00
|
|
|
const u8 *eld = connector->eld;
|
2018-06-12 16:19:34 +07:00
|
|
|
u32 eldv;
|
|
|
|
u32 tmp;
|
2014-10-27 21:26:45 +07:00
|
|
|
int len, i;
|
2014-10-27 21:26:43 +07:00
|
|
|
|
2018-06-19 19:44:37 +07:00
|
|
|
DRM_DEBUG_KMS("Enable audio codec, %u bytes ELD\n", drm_eld_size(eld));
|
2014-10-27 21:26:58 +07:00
|
|
|
|
2014-10-27 21:26:45 +07:00
|
|
|
tmp = I915_READ(G4X_AUD_VID_DID);
|
|
|
|
if (tmp == INTEL_AUDIO_DEVBLC || tmp == INTEL_AUDIO_DEVCL)
|
2014-10-27 21:26:43 +07:00
|
|
|
eldv = G4X_ELDV_DEVCL_DEVBLC;
|
|
|
|
else
|
|
|
|
eldv = G4X_ELDV_DEVCTG;
|
|
|
|
|
|
|
|
if (intel_eld_uptodate(connector,
|
|
|
|
G4X_AUD_CNTL_ST, eldv,
|
2014-10-27 21:26:52 +07:00
|
|
|
G4X_AUD_CNTL_ST, G4X_ELD_ADDR_MASK,
|
2014-10-27 21:26:43 +07:00
|
|
|
G4X_HDMIW_HDMIEDID))
|
|
|
|
return;
|
|
|
|
|
2014-10-27 21:26:45 +07:00
|
|
|
tmp = I915_READ(G4X_AUD_CNTL_ST);
|
2014-10-27 21:26:52 +07:00
|
|
|
tmp &= ~(eldv | G4X_ELD_ADDR_MASK);
|
2014-10-27 21:26:45 +07:00
|
|
|
len = (tmp >> 9) & 0x1f; /* ELD buffer size */
|
|
|
|
I915_WRITE(G4X_AUD_CNTL_ST, tmp);
|
2014-10-27 21:26:43 +07:00
|
|
|
|
2014-10-28 21:20:48 +07:00
|
|
|
len = min(drm_eld_size(eld) / 4, len);
|
2014-10-27 21:26:43 +07:00
|
|
|
DRM_DEBUG_DRIVER("ELD size %d\n", len);
|
|
|
|
for (i = 0; i < len; i++)
|
2018-06-19 19:44:37 +07:00
|
|
|
I915_WRITE(G4X_HDMIW_HDMIEDID, *((const u32 *)eld + i));
|
2014-10-27 21:26:43 +07:00
|
|
|
|
2014-10-27 21:26:45 +07:00
|
|
|
tmp = I915_READ(G4X_AUD_CNTL_ST);
|
|
|
|
tmp |= eldv;
|
|
|
|
I915_WRITE(G4X_AUD_CNTL_ST, tmp);
|
2014-10-27 21:26:43 +07:00
|
|
|
}
|
|
|
|
|
2016-10-10 22:04:03 +07:00
|
|
|
static void
|
2017-10-31 01:46:53 +07:00
|
|
|
hsw_dp_audio_config_update(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state)
|
2016-10-10 22:04:03 +07:00
|
|
|
{
|
2017-10-31 01:46:53 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2016-10-25 21:54:18 +07:00
|
|
|
struct i915_audio_component *acomp = dev_priv->audio_component;
|
2019-04-30 21:29:01 +07:00
|
|
|
enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
|
2017-10-31 01:46:53 +07:00
|
|
|
enum port port = encoder->port;
|
|
|
|
const struct dp_aud_n_m *nm;
|
|
|
|
int rate;
|
2016-10-10 22:04:03 +07:00
|
|
|
u32 tmp;
|
|
|
|
|
2017-10-31 01:46:53 +07:00
|
|
|
rate = acomp ? acomp->aud_sample_rate[port] : 0;
|
|
|
|
nm = audio_config_dp_get_n_m(crtc_state, rate);
|
2016-10-25 21:54:18 +07:00
|
|
|
if (nm)
|
|
|
|
DRM_DEBUG_KMS("using Maud %u, Naud %u\n", nm->m, nm->n);
|
|
|
|
else
|
|
|
|
DRM_DEBUG_KMS("using automatic Maud, Naud\n");
|
|
|
|
|
2019-04-30 21:29:01 +07:00
|
|
|
tmp = I915_READ(HSW_AUD_CFG(cpu_transcoder));
|
2016-10-10 22:04:03 +07:00
|
|
|
tmp &= ~AUD_CONFIG_N_VALUE_INDEX;
|
|
|
|
tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK;
|
|
|
|
tmp &= ~AUD_CONFIG_N_PROG_ENABLE;
|
|
|
|
tmp |= AUD_CONFIG_N_VALUE_INDEX;
|
|
|
|
|
2016-10-25 21:54:18 +07:00
|
|
|
if (nm) {
|
|
|
|
tmp &= ~AUD_CONFIG_N_MASK;
|
|
|
|
tmp |= AUD_CONFIG_N(nm->n);
|
|
|
|
tmp |= AUD_CONFIG_N_PROG_ENABLE;
|
|
|
|
}
|
|
|
|
|
2019-04-30 21:29:01 +07:00
|
|
|
I915_WRITE(HSW_AUD_CFG(cpu_transcoder), tmp);
|
2016-10-25 21:54:18 +07:00
|
|
|
|
2019-04-30 21:29:01 +07:00
|
|
|
tmp = I915_READ(HSW_AUD_M_CTS_ENABLE(cpu_transcoder));
|
2016-10-25 21:54:18 +07:00
|
|
|
tmp &= ~AUD_CONFIG_M_MASK;
|
|
|
|
tmp &= ~AUD_M_CTS_M_VALUE_INDEX;
|
|
|
|
tmp &= ~AUD_M_CTS_M_PROG_ENABLE;
|
|
|
|
|
|
|
|
if (nm) {
|
|
|
|
tmp |= nm->m;
|
|
|
|
tmp |= AUD_M_CTS_M_VALUE_INDEX;
|
|
|
|
tmp |= AUD_M_CTS_M_PROG_ENABLE;
|
|
|
|
}
|
|
|
|
|
2019-04-30 21:29:01 +07:00
|
|
|
I915_WRITE(HSW_AUD_M_CTS_ENABLE(cpu_transcoder), tmp);
|
2016-10-10 22:04:03 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2017-10-31 01:46:53 +07:00
|
|
|
hsw_hdmi_audio_config_update(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state)
|
2016-10-10 22:04:00 +07:00
|
|
|
{
|
2017-10-31 01:46:53 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2016-10-10 22:04:00 +07:00
|
|
|
struct i915_audio_component *acomp = dev_priv->audio_component;
|
2019-04-30 21:29:01 +07:00
|
|
|
enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
|
2017-10-31 01:46:53 +07:00
|
|
|
enum port port = encoder->port;
|
|
|
|
int n, rate;
|
2016-10-10 22:04:00 +07:00
|
|
|
u32 tmp;
|
|
|
|
|
2017-10-31 01:46:53 +07:00
|
|
|
rate = acomp ? acomp->aud_sample_rate[port] : 0;
|
|
|
|
|
2019-04-30 21:29:01 +07:00
|
|
|
tmp = I915_READ(HSW_AUD_CFG(cpu_transcoder));
|
2016-10-10 22:04:00 +07:00
|
|
|
tmp &= ~AUD_CONFIG_N_VALUE_INDEX;
|
|
|
|
tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK;
|
|
|
|
tmp &= ~AUD_CONFIG_N_PROG_ENABLE;
|
2017-10-31 01:46:53 +07:00
|
|
|
tmp |= audio_config_hdmi_pixel_clock(crtc_state);
|
2016-10-10 22:04:03 +07:00
|
|
|
|
2017-10-31 01:46:53 +07:00
|
|
|
n = audio_config_hdmi_get_n(crtc_state, rate);
|
2016-10-25 21:54:17 +07:00
|
|
|
if (n != 0) {
|
|
|
|
DRM_DEBUG_KMS("using N %d\n", n);
|
|
|
|
|
|
|
|
tmp &= ~AUD_CONFIG_N_MASK;
|
|
|
|
tmp |= AUD_CONFIG_N(n);
|
|
|
|
tmp |= AUD_CONFIG_N_PROG_ENABLE;
|
|
|
|
} else {
|
|
|
|
DRM_DEBUG_KMS("using automatic N\n");
|
2016-10-10 22:04:00 +07:00
|
|
|
}
|
|
|
|
|
2019-04-30 21:29:01 +07:00
|
|
|
I915_WRITE(HSW_AUD_CFG(cpu_transcoder), tmp);
|
2016-10-25 21:54:18 +07:00
|
|
|
|
2016-11-11 15:46:28 +07:00
|
|
|
/*
|
|
|
|
* Let's disable "Enable CTS or M Prog bit"
|
|
|
|
* and let HW calculate the value
|
|
|
|
*/
|
2019-04-30 21:29:01 +07:00
|
|
|
tmp = I915_READ(HSW_AUD_M_CTS_ENABLE(cpu_transcoder));
|
2016-11-11 15:46:28 +07:00
|
|
|
tmp &= ~AUD_M_CTS_M_PROG_ENABLE;
|
2016-10-25 21:54:18 +07:00
|
|
|
tmp &= ~AUD_M_CTS_M_VALUE_INDEX;
|
2019-04-30 21:29:01 +07:00
|
|
|
I915_WRITE(HSW_AUD_M_CTS_ENABLE(cpu_transcoder), tmp);
|
2016-10-10 22:04:00 +07:00
|
|
|
}
|
|
|
|
|
2016-10-10 22:04:03 +07:00
|
|
|
static void
|
2017-10-31 01:46:53 +07:00
|
|
|
hsw_audio_config_update(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state)
|
2016-10-10 22:04:03 +07:00
|
|
|
{
|
2017-10-31 01:46:53 +07:00
|
|
|
if (intel_crtc_has_dp_encoder(crtc_state))
|
|
|
|
hsw_dp_audio_config_update(encoder, crtc_state);
|
2016-10-10 22:04:03 +07:00
|
|
|
else
|
2017-10-31 01:46:53 +07:00
|
|
|
hsw_hdmi_audio_config_update(encoder, crtc_state);
|
2016-10-10 22:04:03 +07:00
|
|
|
}
|
|
|
|
|
2017-10-31 01:46:53 +07:00
|
|
|
static void hsw_audio_codec_disable(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *old_crtc_state,
|
|
|
|
const struct drm_connector_state *old_conn_state)
|
2014-10-27 21:26:50 +07:00
|
|
|
{
|
2016-07-04 17:34:36 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-04-30 21:29:01 +07:00
|
|
|
enum transcoder cpu_transcoder = old_crtc_state->cpu_transcoder;
|
2018-06-12 16:19:34 +07:00
|
|
|
u32 tmp;
|
2014-10-27 21:26:50 +07:00
|
|
|
|
2019-04-30 21:29:01 +07:00
|
|
|
DRM_DEBUG_KMS("Disable audio codec on transcoder %s\n",
|
|
|
|
transcoder_name(cpu_transcoder));
|
2014-11-04 15:30:23 +07:00
|
|
|
|
2015-09-02 13:11:39 +07:00
|
|
|
mutex_lock(&dev_priv->av_mutex);
|
|
|
|
|
2014-11-04 15:30:23 +07:00
|
|
|
/* Disable timestamps */
|
2019-04-30 21:29:01 +07:00
|
|
|
tmp = I915_READ(HSW_AUD_CFG(cpu_transcoder));
|
2014-11-04 15:30:23 +07:00
|
|
|
tmp &= ~AUD_CONFIG_N_VALUE_INDEX;
|
|
|
|
tmp |= AUD_CONFIG_N_PROG_ENABLE;
|
|
|
|
tmp &= ~AUD_CONFIG_UPPER_N_MASK;
|
|
|
|
tmp &= ~AUD_CONFIG_LOWER_N_MASK;
|
2017-10-31 01:46:53 +07:00
|
|
|
if (intel_crtc_has_dp_encoder(old_crtc_state))
|
2014-11-04 15:30:23 +07:00
|
|
|
tmp |= AUD_CONFIG_N_VALUE_INDEX;
|
2019-04-30 21:29:01 +07:00
|
|
|
I915_WRITE(HSW_AUD_CFG(cpu_transcoder), tmp);
|
2014-11-04 15:30:23 +07:00
|
|
|
|
|
|
|
/* Invalidate ELD */
|
2014-10-27 21:26:50 +07:00
|
|
|
tmp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD);
|
2019-04-30 21:29:01 +07:00
|
|
|
tmp &= ~AUDIO_ELD_VALID(cpu_transcoder);
|
|
|
|
tmp &= ~AUDIO_OUTPUT_ENABLE(cpu_transcoder);
|
2014-10-27 21:26:50 +07:00
|
|
|
I915_WRITE(HSW_AUD_PIN_ELD_CP_VLD, tmp);
|
2015-09-02 13:11:39 +07:00
|
|
|
|
|
|
|
mutex_unlock(&dev_priv->av_mutex);
|
2014-10-27 21:26:50 +07:00
|
|
|
}
|
|
|
|
|
2017-10-31 01:46:53 +07:00
|
|
|
static void hsw_audio_codec_enable(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2014-10-27 21:26:43 +07:00
|
|
|
{
|
2017-10-31 01:46:53 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
struct drm_connector *connector = conn_state->connector;
|
2019-04-30 21:29:01 +07:00
|
|
|
enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
|
2018-06-12 16:19:34 +07:00
|
|
|
const u8 *eld = connector->eld;
|
|
|
|
u32 tmp;
|
2014-10-27 21:26:45 +07:00
|
|
|
int len, i;
|
2014-10-27 21:26:43 +07:00
|
|
|
|
2019-04-30 21:29:01 +07:00
|
|
|
DRM_DEBUG_KMS("Enable audio codec on transcoder %s, %u bytes ELD\n",
|
|
|
|
transcoder_name(cpu_transcoder), drm_eld_size(eld));
|
2014-10-27 21:26:43 +07:00
|
|
|
|
2015-09-02 13:11:39 +07:00
|
|
|
mutex_lock(&dev_priv->av_mutex);
|
|
|
|
|
2014-11-04 15:30:23 +07:00
|
|
|
/* Enable audio presence detect, invalidate ELD */
|
|
|
|
tmp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD);
|
2019-04-30 21:29:01 +07:00
|
|
|
tmp |= AUDIO_OUTPUT_ENABLE(cpu_transcoder);
|
|
|
|
tmp &= ~AUDIO_ELD_VALID(cpu_transcoder);
|
2014-11-04 15:30:23 +07:00
|
|
|
I915_WRITE(HSW_AUD_PIN_ELD_CP_VLD, tmp);
|
2014-10-27 21:26:43 +07:00
|
|
|
|
2014-11-04 15:30:23 +07:00
|
|
|
/*
|
|
|
|
* FIXME: We're supposed to wait for vblank here, but we have vblanks
|
|
|
|
* disabled during the mode set. The proper fix would be to push the
|
|
|
|
* rest of the setup into a vblank work item, queued here, but the
|
|
|
|
* infrastructure is not there yet.
|
|
|
|
*/
|
2014-10-27 21:26:43 +07:00
|
|
|
|
2014-11-04 15:30:23 +07:00
|
|
|
/* Reset ELD write address */
|
2019-04-30 21:29:01 +07:00
|
|
|
tmp = I915_READ(HSW_AUD_DIP_ELD_CTRL(cpu_transcoder));
|
2014-10-27 21:26:52 +07:00
|
|
|
tmp &= ~IBX_ELD_ADDRESS_MASK;
|
2019-04-30 21:29:01 +07:00
|
|
|
I915_WRITE(HSW_AUD_DIP_ELD_CTRL(cpu_transcoder), tmp);
|
2014-10-27 21:26:43 +07:00
|
|
|
|
2014-11-04 15:30:23 +07:00
|
|
|
/* Up to 84 bytes of hw ELD buffer */
|
2014-10-28 21:20:48 +07:00
|
|
|
len = min(drm_eld_size(eld), 84);
|
|
|
|
for (i = 0; i < len / 4; i++)
|
2019-04-30 21:29:01 +07:00
|
|
|
I915_WRITE(HSW_AUD_EDID_DATA(cpu_transcoder), *((const u32 *)eld + i));
|
2014-10-27 21:26:43 +07:00
|
|
|
|
2014-11-04 15:30:23 +07:00
|
|
|
/* ELD valid */
|
2014-10-27 21:26:50 +07:00
|
|
|
tmp = I915_READ(HSW_AUD_PIN_ELD_CP_VLD);
|
2019-04-30 21:29:01 +07:00
|
|
|
tmp |= AUDIO_ELD_VALID(cpu_transcoder);
|
2014-10-27 21:26:50 +07:00
|
|
|
I915_WRITE(HSW_AUD_PIN_ELD_CP_VLD, tmp);
|
2014-11-04 15:30:23 +07:00
|
|
|
|
|
|
|
/* Enable timestamps */
|
2017-10-31 01:46:53 +07:00
|
|
|
hsw_audio_config_update(encoder, crtc_state);
|
2015-09-02 13:11:39 +07:00
|
|
|
|
|
|
|
mutex_unlock(&dev_priv->av_mutex);
|
2014-10-27 21:26:43 +07:00
|
|
|
}
|
|
|
|
|
2017-10-31 01:46:53 +07:00
|
|
|
static void ilk_audio_codec_disable(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *old_crtc_state,
|
|
|
|
const struct drm_connector_state *old_conn_state)
|
2014-10-27 21:26:55 +07:00
|
|
|
{
|
2017-10-31 01:46:53 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->base.crtc);
|
|
|
|
enum pipe pipe = crtc->pipe;
|
|
|
|
enum port port = encoder->port;
|
2018-06-12 16:19:34 +07:00
|
|
|
u32 tmp, eldv;
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 20:33:26 +07:00
|
|
|
i915_reg_t aud_config, aud_cntrl_st2;
|
2014-10-27 21:26:55 +07:00
|
|
|
|
2019-08-31 01:27:19 +07:00
|
|
|
DRM_DEBUG_KMS("Disable audio codec on [ENCODER:%d:%s], pipe %c\n",
|
|
|
|
encoder->base.base.id, encoder->base.name,
|
|
|
|
pipe_name(pipe));
|
2014-10-27 21:26:55 +07:00
|
|
|
|
2015-05-04 21:20:49 +07:00
|
|
|
if (WARN_ON(port == PORT_A))
|
|
|
|
return;
|
|
|
|
|
2016-04-07 15:08:05 +07:00
|
|
|
if (HAS_PCH_IBX(dev_priv)) {
|
2014-10-27 21:26:55 +07:00
|
|
|
aud_config = IBX_AUD_CFG(pipe);
|
|
|
|
aud_cntrl_st2 = IBX_AUD_CNTL_ST2;
|
2015-12-10 03:29:35 +07:00
|
|
|
} else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
|
2014-10-27 21:26:55 +07:00
|
|
|
aud_config = VLV_AUD_CFG(pipe);
|
|
|
|
aud_cntrl_st2 = VLV_AUD_CNTL_ST2;
|
|
|
|
} else {
|
|
|
|
aud_config = CPT_AUD_CFG(pipe);
|
|
|
|
aud_cntrl_st2 = CPT_AUD_CNTRL_ST2;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Disable timestamps */
|
|
|
|
tmp = I915_READ(aud_config);
|
|
|
|
tmp &= ~AUD_CONFIG_N_VALUE_INDEX;
|
|
|
|
tmp |= AUD_CONFIG_N_PROG_ENABLE;
|
|
|
|
tmp &= ~AUD_CONFIG_UPPER_N_MASK;
|
|
|
|
tmp &= ~AUD_CONFIG_LOWER_N_MASK;
|
2017-10-31 01:46:53 +07:00
|
|
|
if (intel_crtc_has_dp_encoder(old_crtc_state))
|
2014-10-27 21:26:55 +07:00
|
|
|
tmp |= AUD_CONFIG_N_VALUE_INDEX;
|
|
|
|
I915_WRITE(aud_config, tmp);
|
|
|
|
|
2015-05-04 21:20:49 +07:00
|
|
|
eldv = IBX_ELD_VALID(port);
|
2014-10-27 21:26:55 +07:00
|
|
|
|
|
|
|
/* Invalidate ELD */
|
|
|
|
tmp = I915_READ(aud_cntrl_st2);
|
|
|
|
tmp &= ~eldv;
|
|
|
|
I915_WRITE(aud_cntrl_st2, tmp);
|
|
|
|
}
|
|
|
|
|
2017-10-31 01:46:53 +07:00
|
|
|
static void ilk_audio_codec_enable(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2014-10-27 21:26:43 +07:00
|
|
|
{
|
2017-10-31 01:46:53 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
|
|
|
|
struct drm_connector *connector = conn_state->connector;
|
|
|
|
enum pipe pipe = crtc->pipe;
|
|
|
|
enum port port = encoder->port;
|
2018-06-19 19:44:37 +07:00
|
|
|
const u8 *eld = connector->eld;
|
2018-06-12 16:19:34 +07:00
|
|
|
u32 tmp, eldv;
|
2014-10-27 21:26:45 +07:00
|
|
|
int len, i;
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 20:33:26 +07:00
|
|
|
i915_reg_t hdmiw_hdmiedid, aud_config, aud_cntl_st, aud_cntrl_st2;
|
2014-11-04 15:31:28 +07:00
|
|
|
|
2019-08-31 01:27:19 +07:00
|
|
|
DRM_DEBUG_KMS("Enable audio codec on [ENCODER:%d:%s], pipe %c, %u bytes ELD\n",
|
|
|
|
encoder->base.base.id, encoder->base.name,
|
|
|
|
pipe_name(pipe), drm_eld_size(eld));
|
2014-11-04 15:31:28 +07:00
|
|
|
|
2015-05-04 21:20:49 +07:00
|
|
|
if (WARN_ON(port == PORT_A))
|
|
|
|
return;
|
|
|
|
|
2014-11-04 15:31:28 +07:00
|
|
|
/*
|
|
|
|
* FIXME: We're supposed to wait for vblank here, but we have vblanks
|
|
|
|
* disabled during the mode set. The proper fix would be to push the
|
|
|
|
* rest of the setup into a vblank work item, queued here, but the
|
|
|
|
* infrastructure is not there yet.
|
|
|
|
*/
|
2014-10-27 21:26:43 +07:00
|
|
|
|
2016-10-13 17:02:53 +07:00
|
|
|
if (HAS_PCH_IBX(dev_priv)) {
|
2014-10-27 21:26:43 +07:00
|
|
|
hdmiw_hdmiedid = IBX_HDMIW_HDMIEDID(pipe);
|
|
|
|
aud_config = IBX_AUD_CFG(pipe);
|
|
|
|
aud_cntl_st = IBX_AUD_CNTL_ST(pipe);
|
|
|
|
aud_cntrl_st2 = IBX_AUD_CNTL_ST2;
|
2016-10-14 16:13:44 +07:00
|
|
|
} else if (IS_VALLEYVIEW(dev_priv) ||
|
|
|
|
IS_CHERRYVIEW(dev_priv)) {
|
2014-10-27 21:26:43 +07:00
|
|
|
hdmiw_hdmiedid = VLV_HDMIW_HDMIEDID(pipe);
|
|
|
|
aud_config = VLV_AUD_CFG(pipe);
|
|
|
|
aud_cntl_st = VLV_AUD_CNTL_ST(pipe);
|
|
|
|
aud_cntrl_st2 = VLV_AUD_CNTL_ST2;
|
|
|
|
} else {
|
|
|
|
hdmiw_hdmiedid = CPT_HDMIW_HDMIEDID(pipe);
|
|
|
|
aud_config = CPT_AUD_CFG(pipe);
|
|
|
|
aud_cntl_st = CPT_AUD_CNTL_ST(pipe);
|
|
|
|
aud_cntrl_st2 = CPT_AUD_CNTRL_ST2;
|
|
|
|
}
|
|
|
|
|
2015-05-04 21:20:49 +07:00
|
|
|
eldv = IBX_ELD_VALID(port);
|
2014-10-27 21:26:43 +07:00
|
|
|
|
2014-11-04 15:31:28 +07:00
|
|
|
/* Invalidate ELD */
|
2014-10-27 21:26:45 +07:00
|
|
|
tmp = I915_READ(aud_cntrl_st2);
|
|
|
|
tmp &= ~eldv;
|
|
|
|
I915_WRITE(aud_cntrl_st2, tmp);
|
2014-10-27 21:26:43 +07:00
|
|
|
|
2014-11-04 15:31:28 +07:00
|
|
|
/* Reset ELD write address */
|
2014-10-27 21:26:45 +07:00
|
|
|
tmp = I915_READ(aud_cntl_st);
|
2014-10-27 21:26:52 +07:00
|
|
|
tmp &= ~IBX_ELD_ADDRESS_MASK;
|
2014-10-27 21:26:45 +07:00
|
|
|
I915_WRITE(aud_cntl_st, tmp);
|
2014-10-27 21:26:43 +07:00
|
|
|
|
2014-11-04 15:31:28 +07:00
|
|
|
/* Up to 84 bytes of hw ELD buffer */
|
2014-10-28 21:20:48 +07:00
|
|
|
len = min(drm_eld_size(eld), 84);
|
|
|
|
for (i = 0; i < len / 4; i++)
|
2018-06-19 19:44:37 +07:00
|
|
|
I915_WRITE(hdmiw_hdmiedid, *((const u32 *)eld + i));
|
2014-10-27 21:26:43 +07:00
|
|
|
|
2014-11-04 15:31:28 +07:00
|
|
|
/* ELD valid */
|
2014-10-27 21:26:45 +07:00
|
|
|
tmp = I915_READ(aud_cntrl_st2);
|
|
|
|
tmp |= eldv;
|
|
|
|
I915_WRITE(aud_cntrl_st2, tmp);
|
2014-11-04 15:31:28 +07:00
|
|
|
|
|
|
|
/* Enable timestamps */
|
|
|
|
tmp = I915_READ(aud_config);
|
|
|
|
tmp &= ~AUD_CONFIG_N_VALUE_INDEX;
|
|
|
|
tmp &= ~AUD_CONFIG_N_PROG_ENABLE;
|
|
|
|
tmp &= ~AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK;
|
2017-10-31 01:46:53 +07:00
|
|
|
if (intel_crtc_has_dp_encoder(crtc_state))
|
2014-11-04 15:31:28 +07:00
|
|
|
tmp |= AUD_CONFIG_N_VALUE_INDEX;
|
|
|
|
else
|
2017-10-31 01:46:53 +07:00
|
|
|
tmp |= audio_config_hdmi_pixel_clock(crtc_state);
|
2014-11-04 15:31:28 +07:00
|
|
|
I915_WRITE(aud_config, tmp);
|
2014-10-27 21:26:43 +07:00
|
|
|
}
|
|
|
|
|
2014-10-27 21:26:50 +07:00
|
|
|
/**
|
|
|
|
* intel_audio_codec_enable - Enable the audio codec for HD audio
|
2017-10-31 01:46:53 +07:00
|
|
|
* @encoder: encoder on which to enable audio
|
2016-11-08 19:55:38 +07:00
|
|
|
* @crtc_state: pointer to the current crtc state.
|
|
|
|
* @conn_state: pointer to the current connector state.
|
2014-10-27 21:26:50 +07:00
|
|
|
*
|
|
|
|
* The enable sequences may only be performed after enabling the transcoder and
|
|
|
|
* port, and after completed link training.
|
|
|
|
*/
|
2017-10-31 01:46:53 +07:00
|
|
|
void intel_audio_codec_enable(struct intel_encoder *encoder,
|
2016-11-08 19:55:38 +07:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2014-10-27 21:26:43 +07:00
|
|
|
{
|
2017-10-31 01:46:53 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2015-08-19 15:48:56 +07:00
|
|
|
struct i915_audio_component *acomp = dev_priv->audio_component;
|
2017-10-31 01:46:53 +07:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
|
|
|
|
struct drm_connector *connector = conn_state->connector;
|
|
|
|
const struct drm_display_mode *adjusted_mode =
|
|
|
|
&crtc_state->base.adjusted_mode;
|
|
|
|
enum port port = encoder->port;
|
|
|
|
enum pipe pipe = crtc->pipe;
|
2014-10-27 21:26:43 +07:00
|
|
|
|
2019-04-30 21:29:00 +07:00
|
|
|
/* FIXME precompute the ELD in .compute_config() */
|
2017-10-31 01:46:53 +07:00
|
|
|
if (!connector->eld[0])
|
2019-04-30 21:29:00 +07:00
|
|
|
DRM_DEBUG_KMS("Bogus ELD on [CONNECTOR:%d:%s]\n",
|
|
|
|
connector->base.id, connector->name);
|
2014-10-27 21:26:43 +07:00
|
|
|
|
|
|
|
DRM_DEBUG_DRIVER("ELD on [CONNECTOR:%d:%s], [ENCODER:%d:%s]\n",
|
|
|
|
connector->base.id,
|
|
|
|
connector->name,
|
|
|
|
connector->encoder->base.id,
|
|
|
|
connector->encoder->name);
|
|
|
|
|
2015-09-08 17:40:45 +07:00
|
|
|
connector->eld[6] = drm_av_sync_delay(connector, adjusted_mode) / 2;
|
2014-10-27 21:26:43 +07:00
|
|
|
|
2014-10-27 21:26:50 +07:00
|
|
|
if (dev_priv->display.audio_codec_enable)
|
2017-10-31 01:46:53 +07:00
|
|
|
dev_priv->display.audio_codec_enable(encoder,
|
|
|
|
crtc_state,
|
|
|
|
conn_state);
|
2015-08-19 15:48:56 +07:00
|
|
|
|
2015-11-12 21:23:41 +07:00
|
|
|
mutex_lock(&dev_priv->av_mutex);
|
2017-10-31 01:46:53 +07:00
|
|
|
encoder->audio_connector = connector;
|
drm/i915/dp: DP audio API changes for MST
DP MST provides the capability to send multiple video and audio streams
through a single port. This requires the API's between i915 and audio
drivers to distinguish between multiple audio capable displays that can be
connected to a port. Currently only the port identity is shared in the
APIs. This patch adds support for MST with an additional parameter
'int pipe'. The existing parameter 'port' does not change it's meaning.
pipe =
MST : display pipe that the stream originates from
Non-MST : -1
Affected APIs:
struct i915_audio_component_ops
- int (*sync_audio_rate)(struct device *, int port, int rate);
+ int (*sync_audio_rate)(struct device *, int port, int pipe,
+ int rate);
- int (*get_eld)(struct device *, int port, bool *enabled,
- unsigned char *buf, int max_bytes);
+ int (*get_eld)(struct device *, int port, int pipe,
+ bool *enabled, unsigned char *buf, int max_bytes);
struct i915_audio_component_audio_ops
- void (*pin_eld_notify)(void *audio_ptr, int port);
+ void (*pin_eld_notify)(void *audio_ptr, int port, int pipe);
This patch makes dummy changes in the audio drivers (thanks Libin) for
build to succeed. The audio side drivers will send the right 'pipe' values
for MST in patches that will follow.
v2:
Renamed the new API parameter from 'dev_id' to 'pipe'. (Jim, Ville)
Included Asoc driver API compatibility changes from Jeeja.
Added WARN_ON() for invalid pipe in get_saved_encoder(). (Takashi)
Added comment for av_enc_map[] definition. (Takashi)
v3:
Fixed logic error introduced while renaming 'dev_id' as 'pipe' (Ville)
Renamed get_saved_encoder() to get_saved_enc() to reduce line length
v4:
Rebased.
Parameter check for pipe < -1 values in get_saved_enc() (Ville)
Switched to for_each_pipe() in get_saved_enc() (Ville)
Renamed 'pipe' to 'dev_id' in audio side code (Takashi)
v5:
Included a comment for the dev_id arg. (Libin)
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474488168-2343-1-git-send-email-dhinakaran.pandiyan@intel.com
2016-09-22 03:02:48 +07:00
|
|
|
|
2016-02-24 21:35:22 +07:00
|
|
|
/* referred in audio callbacks */
|
2017-10-31 01:46:53 +07:00
|
|
|
dev_priv->av_enc_map[pipe] = encoder;
|
2015-11-12 21:23:41 +07:00
|
|
|
mutex_unlock(&dev_priv->av_mutex);
|
|
|
|
|
2018-07-11 20:17:22 +07:00
|
|
|
if (acomp && acomp->base.audio_ops &&
|
|
|
|
acomp->base.audio_ops->pin_eld_notify) {
|
2017-02-01 03:16:50 +07:00
|
|
|
/* audio drivers expect pipe = -1 to indicate Non-MST cases */
|
2017-10-31 01:46:54 +07:00
|
|
|
if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST))
|
2017-02-01 03:16:50 +07:00
|
|
|
pipe = -1;
|
2018-07-11 20:17:22 +07:00
|
|
|
acomp->base.audio_ops->pin_eld_notify(acomp->base.audio_ops->audio_ptr,
|
drm/i915/dp: DP audio API changes for MST
DP MST provides the capability to send multiple video and audio streams
through a single port. This requires the API's between i915 and audio
drivers to distinguish between multiple audio capable displays that can be
connected to a port. Currently only the port identity is shared in the
APIs. This patch adds support for MST with an additional parameter
'int pipe'. The existing parameter 'port' does not change it's meaning.
pipe =
MST : display pipe that the stream originates from
Non-MST : -1
Affected APIs:
struct i915_audio_component_ops
- int (*sync_audio_rate)(struct device *, int port, int rate);
+ int (*sync_audio_rate)(struct device *, int port, int pipe,
+ int rate);
- int (*get_eld)(struct device *, int port, bool *enabled,
- unsigned char *buf, int max_bytes);
+ int (*get_eld)(struct device *, int port, int pipe,
+ bool *enabled, unsigned char *buf, int max_bytes);
struct i915_audio_component_audio_ops
- void (*pin_eld_notify)(void *audio_ptr, int port);
+ void (*pin_eld_notify)(void *audio_ptr, int port, int pipe);
This patch makes dummy changes in the audio drivers (thanks Libin) for
build to succeed. The audio side drivers will send the right 'pipe' values
for MST in patches that will follow.
v2:
Renamed the new API parameter from 'dev_id' to 'pipe'. (Jim, Ville)
Included Asoc driver API compatibility changes from Jeeja.
Added WARN_ON() for invalid pipe in get_saved_encoder(). (Takashi)
Added comment for av_enc_map[] definition. (Takashi)
v3:
Fixed logic error introduced while renaming 'dev_id' as 'pipe' (Ville)
Renamed get_saved_encoder() to get_saved_enc() to reduce line length
v4:
Rebased.
Parameter check for pipe < -1 values in get_saved_enc() (Ville)
Switched to for_each_pipe() in get_saved_enc() (Ville)
Renamed 'pipe' to 'dev_id' in audio side code (Takashi)
v5:
Included a comment for the dev_id arg. (Libin)
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474488168-2343-1-git-send-email-dhinakaran.pandiyan@intel.com
2016-09-22 03:02:48 +07:00
|
|
|
(int) port, (int) pipe);
|
2017-02-01 03:16:50 +07:00
|
|
|
}
|
|
|
|
|
2017-04-27 23:02:26 +07:00
|
|
|
intel_lpe_audio_notify(dev_priv, pipe, port, connector->eld,
|
2017-04-27 23:02:24 +07:00
|
|
|
crtc_state->port_clock,
|
2017-10-31 01:46:54 +07:00
|
|
|
intel_crtc_has_dp_encoder(crtc_state));
|
2014-10-27 21:26:50 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* intel_audio_codec_disable - Disable the audio codec for HD audio
|
2017-10-31 01:46:53 +07:00
|
|
|
* @encoder: encoder on which to disable audio
|
2017-11-15 02:11:27 +07:00
|
|
|
* @old_crtc_state: pointer to the old crtc state.
|
|
|
|
* @old_conn_state: pointer to the old connector state.
|
2014-10-27 21:26:50 +07:00
|
|
|
*
|
|
|
|
* The disable sequences must be performed before disabling the transcoder or
|
|
|
|
* port.
|
|
|
|
*/
|
2017-10-31 01:46:53 +07:00
|
|
|
void intel_audio_codec_disable(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *old_crtc_state,
|
|
|
|
const struct drm_connector_state *old_conn_state)
|
2014-10-27 21:26:50 +07:00
|
|
|
{
|
2017-10-31 01:46:53 +07:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2015-08-19 15:48:56 +07:00
|
|
|
struct i915_audio_component *acomp = dev_priv->audio_component;
|
2017-10-31 01:46:53 +07:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->base.crtc);
|
|
|
|
enum port port = encoder->port;
|
drm/i915/dp: DP audio API changes for MST
DP MST provides the capability to send multiple video and audio streams
through a single port. This requires the API's between i915 and audio
drivers to distinguish between multiple audio capable displays that can be
connected to a port. Currently only the port identity is shared in the
APIs. This patch adds support for MST with an additional parameter
'int pipe'. The existing parameter 'port' does not change it's meaning.
pipe =
MST : display pipe that the stream originates from
Non-MST : -1
Affected APIs:
struct i915_audio_component_ops
- int (*sync_audio_rate)(struct device *, int port, int rate);
+ int (*sync_audio_rate)(struct device *, int port, int pipe,
+ int rate);
- int (*get_eld)(struct device *, int port, bool *enabled,
- unsigned char *buf, int max_bytes);
+ int (*get_eld)(struct device *, int port, int pipe,
+ bool *enabled, unsigned char *buf, int max_bytes);
struct i915_audio_component_audio_ops
- void (*pin_eld_notify)(void *audio_ptr, int port);
+ void (*pin_eld_notify)(void *audio_ptr, int port, int pipe);
This patch makes dummy changes in the audio drivers (thanks Libin) for
build to succeed. The audio side drivers will send the right 'pipe' values
for MST in patches that will follow.
v2:
Renamed the new API parameter from 'dev_id' to 'pipe'. (Jim, Ville)
Included Asoc driver API compatibility changes from Jeeja.
Added WARN_ON() for invalid pipe in get_saved_encoder(). (Takashi)
Added comment for av_enc_map[] definition. (Takashi)
v3:
Fixed logic error introduced while renaming 'dev_id' as 'pipe' (Ville)
Renamed get_saved_encoder() to get_saved_enc() to reduce line length
v4:
Rebased.
Parameter check for pipe < -1 values in get_saved_enc() (Ville)
Switched to for_each_pipe() in get_saved_enc() (Ville)
Renamed 'pipe' to 'dev_id' in audio side code (Takashi)
v5:
Included a comment for the dev_id arg. (Libin)
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474488168-2343-1-git-send-email-dhinakaran.pandiyan@intel.com
2016-09-22 03:02:48 +07:00
|
|
|
enum pipe pipe = crtc->pipe;
|
2014-10-27 21:26:50 +07:00
|
|
|
|
|
|
|
if (dev_priv->display.audio_codec_disable)
|
2017-10-31 01:46:53 +07:00
|
|
|
dev_priv->display.audio_codec_disable(encoder,
|
|
|
|
old_crtc_state,
|
|
|
|
old_conn_state);
|
2015-08-19 15:48:56 +07:00
|
|
|
|
2015-11-12 21:23:41 +07:00
|
|
|
mutex_lock(&dev_priv->av_mutex);
|
2017-10-31 01:46:53 +07:00
|
|
|
encoder->audio_connector = NULL;
|
drm/i915/dp: DP audio API changes for MST
DP MST provides the capability to send multiple video and audio streams
through a single port. This requires the API's between i915 and audio
drivers to distinguish between multiple audio capable displays that can be
connected to a port. Currently only the port identity is shared in the
APIs. This patch adds support for MST with an additional parameter
'int pipe'. The existing parameter 'port' does not change it's meaning.
pipe =
MST : display pipe that the stream originates from
Non-MST : -1
Affected APIs:
struct i915_audio_component_ops
- int (*sync_audio_rate)(struct device *, int port, int rate);
+ int (*sync_audio_rate)(struct device *, int port, int pipe,
+ int rate);
- int (*get_eld)(struct device *, int port, bool *enabled,
- unsigned char *buf, int max_bytes);
+ int (*get_eld)(struct device *, int port, int pipe,
+ bool *enabled, unsigned char *buf, int max_bytes);
struct i915_audio_component_audio_ops
- void (*pin_eld_notify)(void *audio_ptr, int port);
+ void (*pin_eld_notify)(void *audio_ptr, int port, int pipe);
This patch makes dummy changes in the audio drivers (thanks Libin) for
build to succeed. The audio side drivers will send the right 'pipe' values
for MST in patches that will follow.
v2:
Renamed the new API parameter from 'dev_id' to 'pipe'. (Jim, Ville)
Included Asoc driver API compatibility changes from Jeeja.
Added WARN_ON() for invalid pipe in get_saved_encoder(). (Takashi)
Added comment for av_enc_map[] definition. (Takashi)
v3:
Fixed logic error introduced while renaming 'dev_id' as 'pipe' (Ville)
Renamed get_saved_encoder() to get_saved_enc() to reduce line length
v4:
Rebased.
Parameter check for pipe < -1 values in get_saved_enc() (Ville)
Switched to for_each_pipe() in get_saved_enc() (Ville)
Renamed 'pipe' to 'dev_id' in audio side code (Takashi)
v5:
Included a comment for the dev_id arg. (Libin)
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474488168-2343-1-git-send-email-dhinakaran.pandiyan@intel.com
2016-09-22 03:02:48 +07:00
|
|
|
dev_priv->av_enc_map[pipe] = NULL;
|
2015-11-12 21:23:41 +07:00
|
|
|
mutex_unlock(&dev_priv->av_mutex);
|
|
|
|
|
2018-07-11 20:17:22 +07:00
|
|
|
if (acomp && acomp->base.audio_ops &&
|
|
|
|
acomp->base.audio_ops->pin_eld_notify) {
|
2017-02-01 03:16:50 +07:00
|
|
|
/* audio drivers expect pipe = -1 to indicate Non-MST cases */
|
2017-10-31 01:46:54 +07:00
|
|
|
if (!intel_crtc_has_type(old_crtc_state, INTEL_OUTPUT_DP_MST))
|
2017-02-01 03:16:50 +07:00
|
|
|
pipe = -1;
|
2018-07-11 20:17:22 +07:00
|
|
|
acomp->base.audio_ops->pin_eld_notify(acomp->base.audio_ops->audio_ptr,
|
drm/i915/dp: DP audio API changes for MST
DP MST provides the capability to send multiple video and audio streams
through a single port. This requires the API's between i915 and audio
drivers to distinguish between multiple audio capable displays that can be
connected to a port. Currently only the port identity is shared in the
APIs. This patch adds support for MST with an additional parameter
'int pipe'. The existing parameter 'port' does not change it's meaning.
pipe =
MST : display pipe that the stream originates from
Non-MST : -1
Affected APIs:
struct i915_audio_component_ops
- int (*sync_audio_rate)(struct device *, int port, int rate);
+ int (*sync_audio_rate)(struct device *, int port, int pipe,
+ int rate);
- int (*get_eld)(struct device *, int port, bool *enabled,
- unsigned char *buf, int max_bytes);
+ int (*get_eld)(struct device *, int port, int pipe,
+ bool *enabled, unsigned char *buf, int max_bytes);
struct i915_audio_component_audio_ops
- void (*pin_eld_notify)(void *audio_ptr, int port);
+ void (*pin_eld_notify)(void *audio_ptr, int port, int pipe);
This patch makes dummy changes in the audio drivers (thanks Libin) for
build to succeed. The audio side drivers will send the right 'pipe' values
for MST in patches that will follow.
v2:
Renamed the new API parameter from 'dev_id' to 'pipe'. (Jim, Ville)
Included Asoc driver API compatibility changes from Jeeja.
Added WARN_ON() for invalid pipe in get_saved_encoder(). (Takashi)
Added comment for av_enc_map[] definition. (Takashi)
v3:
Fixed logic error introduced while renaming 'dev_id' as 'pipe' (Ville)
Renamed get_saved_encoder() to get_saved_enc() to reduce line length
v4:
Rebased.
Parameter check for pipe < -1 values in get_saved_enc() (Ville)
Switched to for_each_pipe() in get_saved_enc() (Ville)
Renamed 'pipe' to 'dev_id' in audio side code (Takashi)
v5:
Included a comment for the dev_id arg. (Libin)
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474488168-2343-1-git-send-email-dhinakaran.pandiyan@intel.com
2016-09-22 03:02:48 +07:00
|
|
|
(int) port, (int) pipe);
|
2017-02-01 03:16:50 +07:00
|
|
|
}
|
2017-01-25 05:57:50 +07:00
|
|
|
|
2017-04-27 23:02:26 +07:00
|
|
|
intel_lpe_audio_notify(dev_priv, pipe, port, NULL, 0, false);
|
2014-10-27 21:26:43 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2016-03-16 18:38:53 +07:00
|
|
|
* intel_init_audio_hooks - Set up chip specific audio hooks
|
|
|
|
* @dev_priv: device private
|
2014-10-27 21:26:43 +07:00
|
|
|
*/
|
2016-03-16 18:38:53 +07:00
|
|
|
void intel_init_audio_hooks(struct drm_i915_private *dev_priv)
|
2014-10-27 21:26:43 +07:00
|
|
|
{
|
2016-03-16 18:38:53 +07:00
|
|
|
if (IS_G4X(dev_priv)) {
|
2014-10-27 21:26:50 +07:00
|
|
|
dev_priv->display.audio_codec_enable = g4x_audio_codec_enable;
|
2014-10-27 21:26:57 +07:00
|
|
|
dev_priv->display.audio_codec_disable = g4x_audio_codec_disable;
|
2016-03-16 18:38:53 +07:00
|
|
|
} else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
|
2014-10-27 21:26:50 +07:00
|
|
|
dev_priv->display.audio_codec_enable = ilk_audio_codec_enable;
|
2014-10-27 21:26:55 +07:00
|
|
|
dev_priv->display.audio_codec_disable = ilk_audio_codec_disable;
|
2018-02-10 04:58:46 +07:00
|
|
|
} else if (IS_HASWELL(dev_priv) || INTEL_GEN(dev_priv) >= 8) {
|
2014-10-27 21:26:50 +07:00
|
|
|
dev_priv->display.audio_codec_enable = hsw_audio_codec_enable;
|
|
|
|
dev_priv->display.audio_codec_disable = hsw_audio_codec_disable;
|
2016-03-16 18:38:53 +07:00
|
|
|
} else if (HAS_PCH_SPLIT(dev_priv)) {
|
2014-10-27 21:26:50 +07:00
|
|
|
dev_priv->display.audio_codec_enable = ilk_audio_codec_enable;
|
2014-10-27 21:26:55 +07:00
|
|
|
dev_priv->display.audio_codec_disable = ilk_audio_codec_disable;
|
2014-10-27 21:26:50 +07:00
|
|
|
}
|
2014-10-27 21:26:43 +07:00
|
|
|
}
|
2015-01-08 22:54:14 +07:00
|
|
|
|
2019-03-20 20:54:36 +07:00
|
|
|
static void glk_force_audio_cdclk(struct drm_i915_private *dev_priv,
|
|
|
|
bool enable)
|
|
|
|
{
|
|
|
|
struct drm_modeset_acquire_ctx ctx;
|
|
|
|
struct drm_atomic_state *state;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
drm_modeset_acquire_init(&ctx, 0);
|
|
|
|
state = drm_atomic_state_alloc(&dev_priv->drm);
|
|
|
|
if (WARN_ON(!state))
|
|
|
|
return;
|
|
|
|
|
|
|
|
state->acquire_ctx = &ctx;
|
|
|
|
|
|
|
|
retry:
|
|
|
|
to_intel_atomic_state(state)->cdclk.force_min_cdclk_changed = true;
|
|
|
|
to_intel_atomic_state(state)->cdclk.force_min_cdclk =
|
|
|
|
enable ? 2 * 96000 : 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Protects dev_priv->cdclk.force_min_cdclk
|
|
|
|
* Need to lock this here in case we have no active pipes
|
|
|
|
* and thus wouldn't lock it during the commit otherwise.
|
|
|
|
*/
|
|
|
|
ret = drm_modeset_lock(&dev_priv->drm.mode_config.connection_mutex,
|
|
|
|
&ctx);
|
|
|
|
if (!ret)
|
|
|
|
ret = drm_atomic_commit(state);
|
|
|
|
|
|
|
|
if (ret == -EDEADLK) {
|
|
|
|
drm_atomic_state_clear(state);
|
|
|
|
drm_modeset_backoff(&ctx);
|
|
|
|
goto retry;
|
|
|
|
}
|
|
|
|
|
|
|
|
WARN_ON(ret);
|
|
|
|
|
|
|
|
drm_atomic_state_put(state);
|
|
|
|
|
|
|
|
drm_modeset_drop_locks(&ctx);
|
|
|
|
drm_modeset_acquire_fini(&ctx);
|
|
|
|
}
|
|
|
|
|
2019-02-13 22:21:09 +07:00
|
|
|
static unsigned long i915_audio_component_get_power(struct device *kdev)
|
2015-01-08 22:54:14 +07:00
|
|
|
{
|
2019-03-20 20:54:36 +07:00
|
|
|
struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
|
|
|
|
intel_wakeref_t ret;
|
|
|
|
|
2019-02-13 22:21:09 +07:00
|
|
|
/* Catch potential impedance mismatches before they occur! */
|
|
|
|
BUILD_BUG_ON(sizeof(intel_wakeref_t) > sizeof(unsigned long));
|
|
|
|
|
2019-03-20 20:54:36 +07:00
|
|
|
ret = intel_display_power_get(dev_priv, POWER_DOMAIN_AUDIO);
|
|
|
|
|
2019-09-20 15:39:18 +07:00
|
|
|
if (dev_priv->audio_power_refcount++ == 0) {
|
|
|
|
if (IS_TIGERLAKE(dev_priv) || IS_ICELAKE(dev_priv)) {
|
|
|
|
I915_WRITE(AUD_FREQ_CNTRL, dev_priv->audio_freq_cntrl);
|
|
|
|
DRM_DEBUG_KMS("restored AUD_FREQ_CNTRL to 0x%x\n",
|
|
|
|
dev_priv->audio_freq_cntrl);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Force CDCLK to 2*BCLK as long as we need audio powered. */
|
2019-10-03 15:55:31 +07:00
|
|
|
if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
|
2019-03-20 20:54:36 +07:00
|
|
|
glk_force_audio_cdclk(dev_priv, true);
|
2019-10-03 15:55:30 +07:00
|
|
|
|
|
|
|
if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
|
|
|
|
I915_WRITE(AUD_PIN_BUF_CTL,
|
|
|
|
(I915_READ(AUD_PIN_BUF_CTL) |
|
|
|
|
AUD_PIN_BUF_ENABLE));
|
2019-09-20 15:39:18 +07:00
|
|
|
}
|
2019-03-20 20:54:36 +07:00
|
|
|
|
|
|
|
return ret;
|
2015-01-08 22:54:14 +07:00
|
|
|
}
|
|
|
|
|
2019-02-13 22:21:09 +07:00
|
|
|
static void i915_audio_component_put_power(struct device *kdev,
|
|
|
|
unsigned long cookie)
|
2015-01-08 22:54:14 +07:00
|
|
|
{
|
2019-03-20 20:54:36 +07:00
|
|
|
struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
|
|
|
|
|
|
|
|
/* Stop forcing CDCLK to 2*BCLK if no need for audio to be powered. */
|
|
|
|
if (--dev_priv->audio_power_refcount == 0)
|
2019-10-03 15:55:31 +07:00
|
|
|
if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
|
2019-03-20 20:54:36 +07:00
|
|
|
glk_force_audio_cdclk(dev_priv, false);
|
|
|
|
|
|
|
|
intel_display_power_put(dev_priv, POWER_DOMAIN_AUDIO, cookie);
|
2015-01-08 22:54:14 +07:00
|
|
|
}
|
|
|
|
|
2016-08-22 17:32:42 +07:00
|
|
|
static void i915_audio_component_codec_wake_override(struct device *kdev,
|
2015-05-05 08:05:47 +07:00
|
|
|
bool enable)
|
|
|
|
{
|
2016-08-22 17:32:42 +07:00
|
|
|
struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
|
2019-02-13 22:21:09 +07:00
|
|
|
unsigned long cookie;
|
2015-05-05 08:05:47 +07:00
|
|
|
u32 tmp;
|
|
|
|
|
drm/i915: replace IS_GEN<N> with IS_GEN(..., N)
Define IS_GEN() similarly to our IS_GEN_RANGE(). but use gen instead of
gen_mask to do the comparison. Now callers can pass then gen as a parameter,
so we don't require one macro for each gen.
The following spatch was used to convert the users of these macros:
@@
expression e;
@@
(
- IS_GEN2(e)
+ IS_GEN(e, 2)
|
- IS_GEN3(e)
+ IS_GEN(e, 3)
|
- IS_GEN4(e)
+ IS_GEN(e, 4)
|
- IS_GEN5(e)
+ IS_GEN(e, 5)
|
- IS_GEN6(e)
+ IS_GEN(e, 6)
|
- IS_GEN7(e)
+ IS_GEN(e, 7)
|
- IS_GEN8(e)
+ IS_GEN(e, 8)
|
- IS_GEN9(e)
+ IS_GEN(e, 9)
|
- IS_GEN10(e)
+ IS_GEN(e, 10)
|
- IS_GEN11(e)
+ IS_GEN(e, 11)
)
v2: use IS_GEN rather than GT_GEN and compare to info.gen rather than
using the bitmask
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181212181044.15886-2-lucas.demarchi@intel.com
2018-12-13 01:10:43 +07:00
|
|
|
if (!IS_GEN(dev_priv, 9))
|
2015-05-05 08:05:47 +07:00
|
|
|
return;
|
|
|
|
|
2019-02-13 22:21:09 +07:00
|
|
|
cookie = i915_audio_component_get_power(kdev);
|
2016-08-03 23:09:00 +07:00
|
|
|
|
2015-05-05 08:05:47 +07:00
|
|
|
/*
|
|
|
|
* Enable/disable generating the codec wake signal, overriding the
|
|
|
|
* internal logic to generate the codec wake to controller.
|
|
|
|
*/
|
|
|
|
tmp = I915_READ(HSW_AUD_CHICKENBIT);
|
|
|
|
tmp &= ~SKL_AUD_CODEC_WAKE_SIGNAL;
|
|
|
|
I915_WRITE(HSW_AUD_CHICKENBIT, tmp);
|
|
|
|
usleep_range(1000, 1500);
|
|
|
|
|
|
|
|
if (enable) {
|
|
|
|
tmp = I915_READ(HSW_AUD_CHICKENBIT);
|
|
|
|
tmp |= SKL_AUD_CODEC_WAKE_SIGNAL;
|
|
|
|
I915_WRITE(HSW_AUD_CHICKENBIT, tmp);
|
|
|
|
usleep_range(1000, 1500);
|
|
|
|
}
|
2016-08-03 23:09:00 +07:00
|
|
|
|
2019-02-13 22:21:09 +07:00
|
|
|
i915_audio_component_put_power(kdev, cookie);
|
2015-05-05 08:05:47 +07:00
|
|
|
}
|
|
|
|
|
2015-01-08 22:54:14 +07:00
|
|
|
/* Get CDCLK in kHz */
|
2016-08-22 17:32:42 +07:00
|
|
|
static int i915_audio_component_get_cdclk_freq(struct device *kdev)
|
2015-01-08 22:54:14 +07:00
|
|
|
{
|
2016-08-22 17:32:42 +07:00
|
|
|
struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
|
2015-01-08 22:54:14 +07:00
|
|
|
|
|
|
|
if (WARN_ON_ONCE(!HAS_DDI(dev_priv)))
|
|
|
|
return -ENODEV;
|
|
|
|
|
2017-02-08 01:33:45 +07:00
|
|
|
return dev_priv->cdclk.hw.cdclk;
|
2015-01-08 22:54:14 +07:00
|
|
|
}
|
|
|
|
|
2016-12-01 12:17:18 +07:00
|
|
|
/*
|
|
|
|
* get the intel_encoder according to the parameter port and pipe
|
|
|
|
* intel_encoder is saved by the index of pipe
|
|
|
|
* MST & (pipe >= 0): return the av_enc_map[pipe],
|
|
|
|
* when port is matched
|
|
|
|
* MST & (pipe < 0): this is invalid
|
|
|
|
* Non-MST & (pipe >= 0): only pipe = 0 (the first device entry)
|
|
|
|
* will get the right intel_encoder with port matched
|
|
|
|
* Non-MST & (pipe < 0): get the right intel_encoder with port matched
|
|
|
|
*/
|
drm/i915/dp: DP audio API changes for MST
DP MST provides the capability to send multiple video and audio streams
through a single port. This requires the API's between i915 and audio
drivers to distinguish between multiple audio capable displays that can be
connected to a port. Currently only the port identity is shared in the
APIs. This patch adds support for MST with an additional parameter
'int pipe'. The existing parameter 'port' does not change it's meaning.
pipe =
MST : display pipe that the stream originates from
Non-MST : -1
Affected APIs:
struct i915_audio_component_ops
- int (*sync_audio_rate)(struct device *, int port, int rate);
+ int (*sync_audio_rate)(struct device *, int port, int pipe,
+ int rate);
- int (*get_eld)(struct device *, int port, bool *enabled,
- unsigned char *buf, int max_bytes);
+ int (*get_eld)(struct device *, int port, int pipe,
+ bool *enabled, unsigned char *buf, int max_bytes);
struct i915_audio_component_audio_ops
- void (*pin_eld_notify)(void *audio_ptr, int port);
+ void (*pin_eld_notify)(void *audio_ptr, int port, int pipe);
This patch makes dummy changes in the audio drivers (thanks Libin) for
build to succeed. The audio side drivers will send the right 'pipe' values
for MST in patches that will follow.
v2:
Renamed the new API parameter from 'dev_id' to 'pipe'. (Jim, Ville)
Included Asoc driver API compatibility changes from Jeeja.
Added WARN_ON() for invalid pipe in get_saved_encoder(). (Takashi)
Added comment for av_enc_map[] definition. (Takashi)
v3:
Fixed logic error introduced while renaming 'dev_id' as 'pipe' (Ville)
Renamed get_saved_encoder() to get_saved_enc() to reduce line length
v4:
Rebased.
Parameter check for pipe < -1 values in get_saved_enc() (Ville)
Switched to for_each_pipe() in get_saved_enc() (Ville)
Renamed 'pipe' to 'dev_id' in audio side code (Takashi)
v5:
Included a comment for the dev_id arg. (Libin)
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474488168-2343-1-git-send-email-dhinakaran.pandiyan@intel.com
2016-09-22 03:02:48 +07:00
|
|
|
static struct intel_encoder *get_saved_enc(struct drm_i915_private *dev_priv,
|
|
|
|
int port, int pipe)
|
|
|
|
{
|
2016-12-01 12:17:18 +07:00
|
|
|
struct intel_encoder *encoder;
|
drm/i915/dp: DP audio API changes for MST
DP MST provides the capability to send multiple video and audio streams
through a single port. This requires the API's between i915 and audio
drivers to distinguish between multiple audio capable displays that can be
connected to a port. Currently only the port identity is shared in the
APIs. This patch adds support for MST with an additional parameter
'int pipe'. The existing parameter 'port' does not change it's meaning.
pipe =
MST : display pipe that the stream originates from
Non-MST : -1
Affected APIs:
struct i915_audio_component_ops
- int (*sync_audio_rate)(struct device *, int port, int rate);
+ int (*sync_audio_rate)(struct device *, int port, int pipe,
+ int rate);
- int (*get_eld)(struct device *, int port, bool *enabled,
- unsigned char *buf, int max_bytes);
+ int (*get_eld)(struct device *, int port, int pipe,
+ bool *enabled, unsigned char *buf, int max_bytes);
struct i915_audio_component_audio_ops
- void (*pin_eld_notify)(void *audio_ptr, int port);
+ void (*pin_eld_notify)(void *audio_ptr, int port, int pipe);
This patch makes dummy changes in the audio drivers (thanks Libin) for
build to succeed. The audio side drivers will send the right 'pipe' values
for MST in patches that will follow.
v2:
Renamed the new API parameter from 'dev_id' to 'pipe'. (Jim, Ville)
Included Asoc driver API compatibility changes from Jeeja.
Added WARN_ON() for invalid pipe in get_saved_encoder(). (Takashi)
Added comment for av_enc_map[] definition. (Takashi)
v3:
Fixed logic error introduced while renaming 'dev_id' as 'pipe' (Ville)
Renamed get_saved_encoder() to get_saved_enc() to reduce line length
v4:
Rebased.
Parameter check for pipe < -1 values in get_saved_enc() (Ville)
Switched to for_each_pipe() in get_saved_enc() (Ville)
Renamed 'pipe' to 'dev_id' in audio side code (Takashi)
v5:
Included a comment for the dev_id arg. (Libin)
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474488168-2343-1-git-send-email-dhinakaran.pandiyan@intel.com
2016-09-22 03:02:48 +07:00
|
|
|
|
|
|
|
/* MST */
|
2016-12-01 12:17:18 +07:00
|
|
|
if (pipe >= 0) {
|
2018-02-15 00:38:40 +07:00
|
|
|
if (WARN_ON(pipe >= ARRAY_SIZE(dev_priv->av_enc_map)))
|
|
|
|
return NULL;
|
|
|
|
|
2016-12-01 12:17:18 +07:00
|
|
|
encoder = dev_priv->av_enc_map[pipe];
|
|
|
|
/*
|
|
|
|
* when bootup, audio driver may not know it is
|
|
|
|
* MST or not. So it will poll all the port & pipe
|
|
|
|
* combinations
|
|
|
|
*/
|
|
|
|
if (encoder != NULL && encoder->port == port &&
|
|
|
|
encoder->type == INTEL_OUTPUT_DP_MST)
|
|
|
|
return encoder;
|
|
|
|
}
|
drm/i915/dp: DP audio API changes for MST
DP MST provides the capability to send multiple video and audio streams
through a single port. This requires the API's between i915 and audio
drivers to distinguish between multiple audio capable displays that can be
connected to a port. Currently only the port identity is shared in the
APIs. This patch adds support for MST with an additional parameter
'int pipe'. The existing parameter 'port' does not change it's meaning.
pipe =
MST : display pipe that the stream originates from
Non-MST : -1
Affected APIs:
struct i915_audio_component_ops
- int (*sync_audio_rate)(struct device *, int port, int rate);
+ int (*sync_audio_rate)(struct device *, int port, int pipe,
+ int rate);
- int (*get_eld)(struct device *, int port, bool *enabled,
- unsigned char *buf, int max_bytes);
+ int (*get_eld)(struct device *, int port, int pipe,
+ bool *enabled, unsigned char *buf, int max_bytes);
struct i915_audio_component_audio_ops
- void (*pin_eld_notify)(void *audio_ptr, int port);
+ void (*pin_eld_notify)(void *audio_ptr, int port, int pipe);
This patch makes dummy changes in the audio drivers (thanks Libin) for
build to succeed. The audio side drivers will send the right 'pipe' values
for MST in patches that will follow.
v2:
Renamed the new API parameter from 'dev_id' to 'pipe'. (Jim, Ville)
Included Asoc driver API compatibility changes from Jeeja.
Added WARN_ON() for invalid pipe in get_saved_encoder(). (Takashi)
Added comment for av_enc_map[] definition. (Takashi)
v3:
Fixed logic error introduced while renaming 'dev_id' as 'pipe' (Ville)
Renamed get_saved_encoder() to get_saved_enc() to reduce line length
v4:
Rebased.
Parameter check for pipe < -1 values in get_saved_enc() (Ville)
Switched to for_each_pipe() in get_saved_enc() (Ville)
Renamed 'pipe' to 'dev_id' in audio side code (Takashi)
v5:
Included a comment for the dev_id arg. (Libin)
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474488168-2343-1-git-send-email-dhinakaran.pandiyan@intel.com
2016-09-22 03:02:48 +07:00
|
|
|
|
|
|
|
/* Non-MST */
|
2016-12-01 12:17:18 +07:00
|
|
|
if (pipe > 0)
|
|
|
|
return NULL;
|
drm/i915/dp: DP audio API changes for MST
DP MST provides the capability to send multiple video and audio streams
through a single port. This requires the API's between i915 and audio
drivers to distinguish between multiple audio capable displays that can be
connected to a port. Currently only the port identity is shared in the
APIs. This patch adds support for MST with an additional parameter
'int pipe'. The existing parameter 'port' does not change it's meaning.
pipe =
MST : display pipe that the stream originates from
Non-MST : -1
Affected APIs:
struct i915_audio_component_ops
- int (*sync_audio_rate)(struct device *, int port, int rate);
+ int (*sync_audio_rate)(struct device *, int port, int pipe,
+ int rate);
- int (*get_eld)(struct device *, int port, bool *enabled,
- unsigned char *buf, int max_bytes);
+ int (*get_eld)(struct device *, int port, int pipe,
+ bool *enabled, unsigned char *buf, int max_bytes);
struct i915_audio_component_audio_ops
- void (*pin_eld_notify)(void *audio_ptr, int port);
+ void (*pin_eld_notify)(void *audio_ptr, int port, int pipe);
This patch makes dummy changes in the audio drivers (thanks Libin) for
build to succeed. The audio side drivers will send the right 'pipe' values
for MST in patches that will follow.
v2:
Renamed the new API parameter from 'dev_id' to 'pipe'. (Jim, Ville)
Included Asoc driver API compatibility changes from Jeeja.
Added WARN_ON() for invalid pipe in get_saved_encoder(). (Takashi)
Added comment for av_enc_map[] definition. (Takashi)
v3:
Fixed logic error introduced while renaming 'dev_id' as 'pipe' (Ville)
Renamed get_saved_encoder() to get_saved_enc() to reduce line length
v4:
Rebased.
Parameter check for pipe < -1 values in get_saved_enc() (Ville)
Switched to for_each_pipe() in get_saved_enc() (Ville)
Renamed 'pipe' to 'dev_id' in audio side code (Takashi)
v5:
Included a comment for the dev_id arg. (Libin)
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474488168-2343-1-git-send-email-dhinakaran.pandiyan@intel.com
2016-09-22 03:02:48 +07:00
|
|
|
|
2016-12-01 12:17:18 +07:00
|
|
|
for_each_pipe(dev_priv, pipe) {
|
drm/i915/dp: DP audio API changes for MST
DP MST provides the capability to send multiple video and audio streams
through a single port. This requires the API's between i915 and audio
drivers to distinguish between multiple audio capable displays that can be
connected to a port. Currently only the port identity is shared in the
APIs. This patch adds support for MST with an additional parameter
'int pipe'. The existing parameter 'port' does not change it's meaning.
pipe =
MST : display pipe that the stream originates from
Non-MST : -1
Affected APIs:
struct i915_audio_component_ops
- int (*sync_audio_rate)(struct device *, int port, int rate);
+ int (*sync_audio_rate)(struct device *, int port, int pipe,
+ int rate);
- int (*get_eld)(struct device *, int port, bool *enabled,
- unsigned char *buf, int max_bytes);
+ int (*get_eld)(struct device *, int port, int pipe,
+ bool *enabled, unsigned char *buf, int max_bytes);
struct i915_audio_component_audio_ops
- void (*pin_eld_notify)(void *audio_ptr, int port);
+ void (*pin_eld_notify)(void *audio_ptr, int port, int pipe);
This patch makes dummy changes in the audio drivers (thanks Libin) for
build to succeed. The audio side drivers will send the right 'pipe' values
for MST in patches that will follow.
v2:
Renamed the new API parameter from 'dev_id' to 'pipe'. (Jim, Ville)
Included Asoc driver API compatibility changes from Jeeja.
Added WARN_ON() for invalid pipe in get_saved_encoder(). (Takashi)
Added comment for av_enc_map[] definition. (Takashi)
v3:
Fixed logic error introduced while renaming 'dev_id' as 'pipe' (Ville)
Renamed get_saved_encoder() to get_saved_enc() to reduce line length
v4:
Rebased.
Parameter check for pipe < -1 values in get_saved_enc() (Ville)
Switched to for_each_pipe() in get_saved_enc() (Ville)
Renamed 'pipe' to 'dev_id' in audio side code (Takashi)
v5:
Included a comment for the dev_id arg. (Libin)
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474488168-2343-1-git-send-email-dhinakaran.pandiyan@intel.com
2016-09-22 03:02:48 +07:00
|
|
|
encoder = dev_priv->av_enc_map[pipe];
|
|
|
|
if (encoder == NULL)
|
|
|
|
continue;
|
|
|
|
|
2016-12-01 12:17:18 +07:00
|
|
|
if (encoder->type == INTEL_OUTPUT_DP_MST)
|
|
|
|
continue;
|
|
|
|
|
drm/i915/dp: DP audio API changes for MST
DP MST provides the capability to send multiple video and audio streams
through a single port. This requires the API's between i915 and audio
drivers to distinguish between multiple audio capable displays that can be
connected to a port. Currently only the port identity is shared in the
APIs. This patch adds support for MST with an additional parameter
'int pipe'. The existing parameter 'port' does not change it's meaning.
pipe =
MST : display pipe that the stream originates from
Non-MST : -1
Affected APIs:
struct i915_audio_component_ops
- int (*sync_audio_rate)(struct device *, int port, int rate);
+ int (*sync_audio_rate)(struct device *, int port, int pipe,
+ int rate);
- int (*get_eld)(struct device *, int port, bool *enabled,
- unsigned char *buf, int max_bytes);
+ int (*get_eld)(struct device *, int port, int pipe,
+ bool *enabled, unsigned char *buf, int max_bytes);
struct i915_audio_component_audio_ops
- void (*pin_eld_notify)(void *audio_ptr, int port);
+ void (*pin_eld_notify)(void *audio_ptr, int port, int pipe);
This patch makes dummy changes in the audio drivers (thanks Libin) for
build to succeed. The audio side drivers will send the right 'pipe' values
for MST in patches that will follow.
v2:
Renamed the new API parameter from 'dev_id' to 'pipe'. (Jim, Ville)
Included Asoc driver API compatibility changes from Jeeja.
Added WARN_ON() for invalid pipe in get_saved_encoder(). (Takashi)
Added comment for av_enc_map[] definition. (Takashi)
v3:
Fixed logic error introduced while renaming 'dev_id' as 'pipe' (Ville)
Renamed get_saved_encoder() to get_saved_enc() to reduce line length
v4:
Rebased.
Parameter check for pipe < -1 values in get_saved_enc() (Ville)
Switched to for_each_pipe() in get_saved_enc() (Ville)
Renamed 'pipe' to 'dev_id' in audio side code (Takashi)
v5:
Included a comment for the dev_id arg. (Libin)
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474488168-2343-1-git-send-email-dhinakaran.pandiyan@intel.com
2016-09-22 03:02:48 +07:00
|
|
|
if (port == encoder->port)
|
|
|
|
return encoder;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int i915_audio_component_sync_audio_rate(struct device *kdev, int port,
|
|
|
|
int pipe, int rate)
|
2015-09-02 13:11:39 +07:00
|
|
|
{
|
2016-08-22 17:32:42 +07:00
|
|
|
struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
|
2015-09-25 08:36:12 +07:00
|
|
|
struct i915_audio_component *acomp = dev_priv->audio_component;
|
2017-10-31 01:46:53 +07:00
|
|
|
struct intel_encoder *encoder;
|
|
|
|
struct intel_crtc *crtc;
|
2019-02-13 22:21:09 +07:00
|
|
|
unsigned long cookie;
|
2015-12-01 00:19:39 +07:00
|
|
|
int err = 0;
|
2015-09-02 13:11:39 +07:00
|
|
|
|
2016-10-10 22:04:04 +07:00
|
|
|
if (!HAS_DDI(dev_priv))
|
2015-09-02 13:11:39 +07:00
|
|
|
return 0;
|
|
|
|
|
2019-02-13 22:21:09 +07:00
|
|
|
cookie = i915_audio_component_get_power(kdev);
|
2015-09-02 13:11:39 +07:00
|
|
|
mutex_lock(&dev_priv->av_mutex);
|
drm/i915/dp: DP audio API changes for MST
DP MST provides the capability to send multiple video and audio streams
through a single port. This requires the API's between i915 and audio
drivers to distinguish between multiple audio capable displays that can be
connected to a port. Currently only the port identity is shared in the
APIs. This patch adds support for MST with an additional parameter
'int pipe'. The existing parameter 'port' does not change it's meaning.
pipe =
MST : display pipe that the stream originates from
Non-MST : -1
Affected APIs:
struct i915_audio_component_ops
- int (*sync_audio_rate)(struct device *, int port, int rate);
+ int (*sync_audio_rate)(struct device *, int port, int pipe,
+ int rate);
- int (*get_eld)(struct device *, int port, bool *enabled,
- unsigned char *buf, int max_bytes);
+ int (*get_eld)(struct device *, int port, int pipe,
+ bool *enabled, unsigned char *buf, int max_bytes);
struct i915_audio_component_audio_ops
- void (*pin_eld_notify)(void *audio_ptr, int port);
+ void (*pin_eld_notify)(void *audio_ptr, int port, int pipe);
This patch makes dummy changes in the audio drivers (thanks Libin) for
build to succeed. The audio side drivers will send the right 'pipe' values
for MST in patches that will follow.
v2:
Renamed the new API parameter from 'dev_id' to 'pipe'. (Jim, Ville)
Included Asoc driver API compatibility changes from Jeeja.
Added WARN_ON() for invalid pipe in get_saved_encoder(). (Takashi)
Added comment for av_enc_map[] definition. (Takashi)
v3:
Fixed logic error introduced while renaming 'dev_id' as 'pipe' (Ville)
Renamed get_saved_encoder() to get_saved_enc() to reduce line length
v4:
Rebased.
Parameter check for pipe < -1 values in get_saved_enc() (Ville)
Switched to for_each_pipe() in get_saved_enc() (Ville)
Renamed 'pipe' to 'dev_id' in audio side code (Takashi)
v5:
Included a comment for the dev_id arg. (Libin)
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474488168-2343-1-git-send-email-dhinakaran.pandiyan@intel.com
2016-09-22 03:02:48 +07:00
|
|
|
|
2015-09-02 13:11:39 +07:00
|
|
|
/* 1. get the pipe */
|
2017-10-31 01:46:53 +07:00
|
|
|
encoder = get_saved_enc(dev_priv, port, pipe);
|
|
|
|
if (!encoder || !encoder->base.crtc) {
|
drm/i915/dp: DP audio API changes for MST
DP MST provides the capability to send multiple video and audio streams
through a single port. This requires the API's between i915 and audio
drivers to distinguish between multiple audio capable displays that can be
connected to a port. Currently only the port identity is shared in the
APIs. This patch adds support for MST with an additional parameter
'int pipe'. The existing parameter 'port' does not change it's meaning.
pipe =
MST : display pipe that the stream originates from
Non-MST : -1
Affected APIs:
struct i915_audio_component_ops
- int (*sync_audio_rate)(struct device *, int port, int rate);
+ int (*sync_audio_rate)(struct device *, int port, int pipe,
+ int rate);
- int (*get_eld)(struct device *, int port, bool *enabled,
- unsigned char *buf, int max_bytes);
+ int (*get_eld)(struct device *, int port, int pipe,
+ bool *enabled, unsigned char *buf, int max_bytes);
struct i915_audio_component_audio_ops
- void (*pin_eld_notify)(void *audio_ptr, int port);
+ void (*pin_eld_notify)(void *audio_ptr, int port, int pipe);
This patch makes dummy changes in the audio drivers (thanks Libin) for
build to succeed. The audio side drivers will send the right 'pipe' values
for MST in patches that will follow.
v2:
Renamed the new API parameter from 'dev_id' to 'pipe'. (Jim, Ville)
Included Asoc driver API compatibility changes from Jeeja.
Added WARN_ON() for invalid pipe in get_saved_encoder(). (Takashi)
Added comment for av_enc_map[] definition. (Takashi)
v3:
Fixed logic error introduced while renaming 'dev_id' as 'pipe' (Ville)
Renamed get_saved_encoder() to get_saved_enc() to reduce line length
v4:
Rebased.
Parameter check for pipe < -1 values in get_saved_enc() (Ville)
Switched to for_each_pipe() in get_saved_enc() (Ville)
Renamed 'pipe' to 'dev_id' in audio side code (Takashi)
v5:
Included a comment for the dev_id arg. (Libin)
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474488168-2343-1-git-send-email-dhinakaran.pandiyan@intel.com
2016-09-22 03:02:48 +07:00
|
|
|
DRM_DEBUG_KMS("Not valid for port %c\n", port_name(port));
|
2015-12-01 00:19:39 +07:00
|
|
|
err = -ENODEV;
|
|
|
|
goto unlock;
|
2015-09-02 13:11:39 +07:00
|
|
|
}
|
drm/i915/dp: DP audio API changes for MST
DP MST provides the capability to send multiple video and audio streams
through a single port. This requires the API's between i915 and audio
drivers to distinguish between multiple audio capable displays that can be
connected to a port. Currently only the port identity is shared in the
APIs. This patch adds support for MST with an additional parameter
'int pipe'. The existing parameter 'port' does not change it's meaning.
pipe =
MST : display pipe that the stream originates from
Non-MST : -1
Affected APIs:
struct i915_audio_component_ops
- int (*sync_audio_rate)(struct device *, int port, int rate);
+ int (*sync_audio_rate)(struct device *, int port, int pipe,
+ int rate);
- int (*get_eld)(struct device *, int port, bool *enabled,
- unsigned char *buf, int max_bytes);
+ int (*get_eld)(struct device *, int port, int pipe,
+ bool *enabled, unsigned char *buf, int max_bytes);
struct i915_audio_component_audio_ops
- void (*pin_eld_notify)(void *audio_ptr, int port);
+ void (*pin_eld_notify)(void *audio_ptr, int port, int pipe);
This patch makes dummy changes in the audio drivers (thanks Libin) for
build to succeed. The audio side drivers will send the right 'pipe' values
for MST in patches that will follow.
v2:
Renamed the new API parameter from 'dev_id' to 'pipe'. (Jim, Ville)
Included Asoc driver API compatibility changes from Jeeja.
Added WARN_ON() for invalid pipe in get_saved_encoder(). (Takashi)
Added comment for av_enc_map[] definition. (Takashi)
v3:
Fixed logic error introduced while renaming 'dev_id' as 'pipe' (Ville)
Renamed get_saved_encoder() to get_saved_enc() to reduce line length
v4:
Rebased.
Parameter check for pipe < -1 values in get_saved_enc() (Ville)
Switched to for_each_pipe() in get_saved_enc() (Ville)
Renamed 'pipe' to 'dev_id' in audio side code (Takashi)
v5:
Included a comment for the dev_id arg. (Libin)
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474488168-2343-1-git-send-email-dhinakaran.pandiyan@intel.com
2016-09-22 03:02:48 +07:00
|
|
|
|
2017-10-31 01:46:53 +07:00
|
|
|
crtc = to_intel_crtc(encoder->base.crtc);
|
2015-09-02 13:11:39 +07:00
|
|
|
|
2015-09-25 08:36:12 +07:00
|
|
|
/* port must be valid now, otherwise the pipe will be invalid */
|
|
|
|
acomp->aud_sample_rate[port] = rate;
|
|
|
|
|
2017-10-31 01:46:53 +07:00
|
|
|
hsw_audio_config_update(encoder, crtc->config);
|
2015-09-02 13:11:39 +07:00
|
|
|
|
2015-12-01 00:19:39 +07:00
|
|
|
unlock:
|
2015-09-02 13:11:39 +07:00
|
|
|
mutex_unlock(&dev_priv->av_mutex);
|
2019-02-13 22:21:09 +07:00
|
|
|
i915_audio_component_put_power(kdev, cookie);
|
2015-12-01 00:19:39 +07:00
|
|
|
return err;
|
2015-09-02 13:11:39 +07:00
|
|
|
}
|
|
|
|
|
2016-08-22 17:32:42 +07:00
|
|
|
static int i915_audio_component_get_eld(struct device *kdev, int port,
|
drm/i915/dp: DP audio API changes for MST
DP MST provides the capability to send multiple video and audio streams
through a single port. This requires the API's between i915 and audio
drivers to distinguish between multiple audio capable displays that can be
connected to a port. Currently only the port identity is shared in the
APIs. This patch adds support for MST with an additional parameter
'int pipe'. The existing parameter 'port' does not change it's meaning.
pipe =
MST : display pipe that the stream originates from
Non-MST : -1
Affected APIs:
struct i915_audio_component_ops
- int (*sync_audio_rate)(struct device *, int port, int rate);
+ int (*sync_audio_rate)(struct device *, int port, int pipe,
+ int rate);
- int (*get_eld)(struct device *, int port, bool *enabled,
- unsigned char *buf, int max_bytes);
+ int (*get_eld)(struct device *, int port, int pipe,
+ bool *enabled, unsigned char *buf, int max_bytes);
struct i915_audio_component_audio_ops
- void (*pin_eld_notify)(void *audio_ptr, int port);
+ void (*pin_eld_notify)(void *audio_ptr, int port, int pipe);
This patch makes dummy changes in the audio drivers (thanks Libin) for
build to succeed. The audio side drivers will send the right 'pipe' values
for MST in patches that will follow.
v2:
Renamed the new API parameter from 'dev_id' to 'pipe'. (Jim, Ville)
Included Asoc driver API compatibility changes from Jeeja.
Added WARN_ON() for invalid pipe in get_saved_encoder(). (Takashi)
Added comment for av_enc_map[] definition. (Takashi)
v3:
Fixed logic error introduced while renaming 'dev_id' as 'pipe' (Ville)
Renamed get_saved_encoder() to get_saved_enc() to reduce line length
v4:
Rebased.
Parameter check for pipe < -1 values in get_saved_enc() (Ville)
Switched to for_each_pipe() in get_saved_enc() (Ville)
Renamed 'pipe' to 'dev_id' in audio side code (Takashi)
v5:
Included a comment for the dev_id arg. (Libin)
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474488168-2343-1-git-send-email-dhinakaran.pandiyan@intel.com
2016-09-22 03:02:48 +07:00
|
|
|
int pipe, bool *enabled,
|
2015-11-12 21:23:41 +07:00
|
|
|
unsigned char *buf, int max_bytes)
|
|
|
|
{
|
2016-08-22 17:32:42 +07:00
|
|
|
struct drm_i915_private *dev_priv = kdev_to_i915(kdev);
|
2015-11-12 21:23:41 +07:00
|
|
|
struct intel_encoder *intel_encoder;
|
|
|
|
const u8 *eld;
|
|
|
|
int ret = -EINVAL;
|
|
|
|
|
|
|
|
mutex_lock(&dev_priv->av_mutex);
|
drm/i915/dp: DP audio API changes for MST
DP MST provides the capability to send multiple video and audio streams
through a single port. This requires the API's between i915 and audio
drivers to distinguish between multiple audio capable displays that can be
connected to a port. Currently only the port identity is shared in the
APIs. This patch adds support for MST with an additional parameter
'int pipe'. The existing parameter 'port' does not change it's meaning.
pipe =
MST : display pipe that the stream originates from
Non-MST : -1
Affected APIs:
struct i915_audio_component_ops
- int (*sync_audio_rate)(struct device *, int port, int rate);
+ int (*sync_audio_rate)(struct device *, int port, int pipe,
+ int rate);
- int (*get_eld)(struct device *, int port, bool *enabled,
- unsigned char *buf, int max_bytes);
+ int (*get_eld)(struct device *, int port, int pipe,
+ bool *enabled, unsigned char *buf, int max_bytes);
struct i915_audio_component_audio_ops
- void (*pin_eld_notify)(void *audio_ptr, int port);
+ void (*pin_eld_notify)(void *audio_ptr, int port, int pipe);
This patch makes dummy changes in the audio drivers (thanks Libin) for
build to succeed. The audio side drivers will send the right 'pipe' values
for MST in patches that will follow.
v2:
Renamed the new API parameter from 'dev_id' to 'pipe'. (Jim, Ville)
Included Asoc driver API compatibility changes from Jeeja.
Added WARN_ON() for invalid pipe in get_saved_encoder(). (Takashi)
Added comment for av_enc_map[] definition. (Takashi)
v3:
Fixed logic error introduced while renaming 'dev_id' as 'pipe' (Ville)
Renamed get_saved_encoder() to get_saved_enc() to reduce line length
v4:
Rebased.
Parameter check for pipe < -1 values in get_saved_enc() (Ville)
Switched to for_each_pipe() in get_saved_enc() (Ville)
Renamed 'pipe' to 'dev_id' in audio side code (Takashi)
v5:
Included a comment for the dev_id arg. (Libin)
Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1474488168-2343-1-git-send-email-dhinakaran.pandiyan@intel.com
2016-09-22 03:02:48 +07:00
|
|
|
|
|
|
|
intel_encoder = get_saved_enc(dev_priv, port, pipe);
|
|
|
|
if (!intel_encoder) {
|
|
|
|
DRM_DEBUG_KMS("Not valid for port %c\n", port_name(port));
|
|
|
|
mutex_unlock(&dev_priv->av_mutex);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
*enabled = intel_encoder->audio_connector != NULL;
|
|
|
|
if (*enabled) {
|
|
|
|
eld = intel_encoder->audio_connector->eld;
|
|
|
|
ret = drm_eld_size(eld);
|
|
|
|
memcpy(buf, eld, min(max_bytes, ret));
|
2015-11-12 21:23:41 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
mutex_unlock(&dev_priv->av_mutex);
|
|
|
|
return ret;
|
2015-09-02 13:11:39 +07:00
|
|
|
}
|
|
|
|
|
2018-07-11 20:17:22 +07:00
|
|
|
static const struct drm_audio_component_ops i915_audio_component_ops = {
|
2015-01-08 22:54:14 +07:00
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.get_power = i915_audio_component_get_power,
|
|
|
|
.put_power = i915_audio_component_put_power,
|
2015-05-05 08:05:47 +07:00
|
|
|
.codec_wake_override = i915_audio_component_codec_wake_override,
|
2015-01-08 22:54:14 +07:00
|
|
|
.get_cdclk_freq = i915_audio_component_get_cdclk_freq,
|
2015-09-02 13:11:39 +07:00
|
|
|
.sync_audio_rate = i915_audio_component_sync_audio_rate,
|
2015-11-12 21:23:41 +07:00
|
|
|
.get_eld = i915_audio_component_get_eld,
|
2015-01-08 22:54:14 +07:00
|
|
|
};
|
|
|
|
|
2016-08-22 17:32:42 +07:00
|
|
|
static int i915_audio_component_bind(struct device *i915_kdev,
|
|
|
|
struct device *hda_kdev, void *data)
|
2015-01-08 22:54:14 +07:00
|
|
|
{
|
|
|
|
struct i915_audio_component *acomp = data;
|
2016-08-22 17:32:42 +07:00
|
|
|
struct drm_i915_private *dev_priv = kdev_to_i915(i915_kdev);
|
2015-09-25 08:36:12 +07:00
|
|
|
int i;
|
2015-01-08 22:54:14 +07:00
|
|
|
|
2018-07-11 20:17:22 +07:00
|
|
|
if (WARN_ON(acomp->base.ops || acomp->base.dev))
|
2015-01-08 22:54:14 +07:00
|
|
|
return -EEXIST;
|
|
|
|
|
2018-10-23 21:43:10 +07:00
|
|
|
if (WARN_ON(!device_link_add(hda_kdev, i915_kdev, DL_FLAG_STATELESS)))
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2016-07-05 16:40:23 +07:00
|
|
|
drm_modeset_lock_all(&dev_priv->drm);
|
2018-07-11 20:17:22 +07:00
|
|
|
acomp->base.ops = &i915_audio_component_ops;
|
|
|
|
acomp->base.dev = i915_kdev;
|
2015-09-25 08:36:12 +07:00
|
|
|
BUILD_BUG_ON(MAX_PORTS != I915_MAX_PORTS);
|
|
|
|
for (i = 0; i < ARRAY_SIZE(acomp->aud_sample_rate); i++)
|
|
|
|
acomp->aud_sample_rate[i] = 0;
|
2015-08-19 15:48:56 +07:00
|
|
|
dev_priv->audio_component = acomp;
|
2016-07-05 16:40:23 +07:00
|
|
|
drm_modeset_unlock_all(&dev_priv->drm);
|
2015-01-08 22:54:14 +07:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-08-22 17:32:42 +07:00
|
|
|
static void i915_audio_component_unbind(struct device *i915_kdev,
|
|
|
|
struct device *hda_kdev, void *data)
|
2015-01-08 22:54:14 +07:00
|
|
|
{
|
|
|
|
struct i915_audio_component *acomp = data;
|
2016-08-22 17:32:42 +07:00
|
|
|
struct drm_i915_private *dev_priv = kdev_to_i915(i915_kdev);
|
2015-01-08 22:54:14 +07:00
|
|
|
|
2016-07-05 16:40:23 +07:00
|
|
|
drm_modeset_lock_all(&dev_priv->drm);
|
2018-07-11 20:17:22 +07:00
|
|
|
acomp->base.ops = NULL;
|
|
|
|
acomp->base.dev = NULL;
|
2015-08-19 15:48:56 +07:00
|
|
|
dev_priv->audio_component = NULL;
|
2016-07-05 16:40:23 +07:00
|
|
|
drm_modeset_unlock_all(&dev_priv->drm);
|
2018-10-23 21:43:10 +07:00
|
|
|
|
|
|
|
device_link_remove(hda_kdev, i915_kdev);
|
2015-01-08 22:54:14 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static const struct component_ops i915_audio_component_bind_ops = {
|
|
|
|
.bind = i915_audio_component_bind,
|
|
|
|
.unbind = i915_audio_component_unbind,
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* i915_audio_component_init - initialize and register the audio component
|
|
|
|
* @dev_priv: i915 device instance
|
|
|
|
*
|
|
|
|
* This will register with the component framework a child component which
|
|
|
|
* will bind dynamically to the snd_hda_intel driver's corresponding master
|
|
|
|
* component when the latter is registered. During binding the child
|
|
|
|
* initializes an instance of struct i915_audio_component which it receives
|
|
|
|
* from the master. The master can then start to use the interface defined by
|
|
|
|
* this struct. Each side can break the binding at any point by deregistering
|
|
|
|
* its own component after which each side's component unbind callback is
|
|
|
|
* called.
|
|
|
|
*
|
|
|
|
* We ignore any error during registration and continue with reduced
|
|
|
|
* functionality (i.e. without HDMI audio).
|
|
|
|
*/
|
2019-04-05 18:00:03 +07:00
|
|
|
static void i915_audio_component_init(struct drm_i915_private *dev_priv)
|
2015-01-08 22:54:14 +07:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
2019-02-08 06:27:59 +07:00
|
|
|
ret = component_add_typed(dev_priv->drm.dev,
|
|
|
|
&i915_audio_component_bind_ops,
|
|
|
|
I915_COMPONENT_AUDIO);
|
2015-01-08 22:54:14 +07:00
|
|
|
if (ret < 0) {
|
|
|
|
DRM_ERROR("failed to add audio component (%d)\n", ret);
|
|
|
|
/* continue with reduced functionality */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-09-20 15:39:18 +07:00
|
|
|
if (IS_TIGERLAKE(dev_priv) || IS_ICELAKE(dev_priv)) {
|
|
|
|
dev_priv->audio_freq_cntrl = I915_READ(AUD_FREQ_CNTRL);
|
|
|
|
DRM_DEBUG_KMS("init value of AUD_FREQ_CNTRL of 0x%x\n",
|
|
|
|
dev_priv->audio_freq_cntrl);
|
|
|
|
}
|
|
|
|
|
2015-01-08 22:54:14 +07:00
|
|
|
dev_priv->audio_component_registered = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* i915_audio_component_cleanup - deregister the audio component
|
|
|
|
* @dev_priv: i915 device instance
|
|
|
|
*
|
|
|
|
* Deregisters the audio component, breaking any existing binding to the
|
|
|
|
* corresponding snd_hda_intel driver's master component.
|
|
|
|
*/
|
2019-04-05 18:00:03 +07:00
|
|
|
static void i915_audio_component_cleanup(struct drm_i915_private *dev_priv)
|
2015-01-08 22:54:14 +07:00
|
|
|
{
|
|
|
|
if (!dev_priv->audio_component_registered)
|
|
|
|
return;
|
|
|
|
|
2016-07-05 16:40:23 +07:00
|
|
|
component_del(dev_priv->drm.dev, &i915_audio_component_bind_ops);
|
2015-01-08 22:54:14 +07:00
|
|
|
dev_priv->audio_component_registered = false;
|
|
|
|
}
|
2017-01-25 05:57:49 +07:00
|
|
|
|
|
|
|
/**
|
|
|
|
* intel_audio_init() - Initialize the audio driver either using
|
|
|
|
* component framework or using lpe audio bridge
|
|
|
|
* @dev_priv: the i915 drm device private data
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
void intel_audio_init(struct drm_i915_private *dev_priv)
|
|
|
|
{
|
|
|
|
if (intel_lpe_audio_init(dev_priv) < 0)
|
|
|
|
i915_audio_component_init(dev_priv);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* intel_audio_deinit() - deinitialize the audio driver
|
|
|
|
* @dev_priv: the i915 drm device private data
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
void intel_audio_deinit(struct drm_i915_private *dev_priv)
|
|
|
|
{
|
|
|
|
if ((dev_priv)->lpe_audio.platdev != NULL)
|
|
|
|
intel_lpe_audio_teardown(dev_priv);
|
|
|
|
else
|
|
|
|
i915_audio_component_cleanup(dev_priv);
|
|
|
|
}
|