drm/i915: fix hdmi audio pixel clock config
Subsystems (2)
cover drm/i915: fix hdmi audio pixel clock config
This is a completely untested and possibly naïve attempt at fixing [1] and [2]. Based on top of drm-intel-nightly branch of [3].
David, Jasper, please give it a try.
Thanks,
Jani.
[1] http://mid.gmane.org/CAGpEb3Ep1LRZETPxHGRfBDqr5Ts2tAc8gCukWwugUf1U5NYv1g@mail.gmail.com
[2] http://mid.gmane.org/[email protected]
[3] git://people.freedesktop.org/~danvet/drm-intel
Jani Nikula (2):
drm/i915: pass mode to write eld
drm/i915: set hdmi audio clock
drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/i915_reg.h | 12 ++++++- drivers/gpu/drm/i915/intel_display.c | 58 +++++++++++++++++++++++++++++----- 3 files changed, 63 insertions(+), 10 deletions(-)
Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/2 drm/i915: pass mode to write eld
--- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/intel_display.c | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -379,7 +379,8 @@ struct drm_i915_display_funcs {void (*crtc_disable)(struct drm_crtc *crtc);void (*off)(struct drm_crtc *crtc);void (*write_eld)(struct drm_connector *connector, -struct drm_crtc *crtc); +struct drm_crtc *crtc, +struct drm_display_mode *mode);void (*fdi_link_train)(struct drm_crtc *crtc);void (*init_clock_gating)(struct drm_device *dev); int (*queue_flip)(struct drm_device *dev, struct drm_crtc *crtc,
drivers/gpu/drm/i915/intel_display.c +7 -4
@@ -6752,7 +6752,8 @@ static bool intel_eld_uptodate(struct drm_connector *connector, }static void g4x_write_eld (struct drm_connector *connector, -struct drm_crtc *crtc) +struct drm_crtc *crtc, +struct drm_display_mode *mode) {struct drm_i915_private *dev_priv = connector->dev->dev_private;uint8_t *eld = connector->eld;
@@ -6792,7 +6793,8 @@ static void g4x_write_eld(struct drm_connector *connector, }static void haswell_write_eld (struct drm_connector *connector, -struct drm_crtc *crtc) +struct drm_crtc *crtc, +struct drm_display_mode *mode) {struct drm_i915_private *dev_priv = connector->dev->dev_private;uint8_t *eld = connector->eld;
@@ -6879,7 +6881,8 @@ static void haswell_write_eld(struct drm_connector *connector, }static void ironlake_write_eld (struct drm_connector *connector, -struct drm_crtc *crtc) +struct drm_crtc *crtc, +struct drm_display_mode *mode) {struct drm_i915_private *dev_priv = connector->dev->dev_private;uint8_t *eld = connector->eld;
@@ -6974,7 +6977,7 @@ void intel_write_eld(struct drm_encoder *encoder, connector->eld[6 ] =drm_av_sync_delay (connector, mode) /2 ;if (dev_priv->display.write_eld) - dev_priv->display.write_eld (connector, crtc); + dev_priv->display.write_eld (connector, crtc, mode); }static void i845_update_cursor (struct drm_crtc *crtc,u32 base)
Signature · 1 line
1.7.9.5
PATCH 2/2 drm/i915: set hdmi audio clock
In reply to Jani Nikula--- drivers/gpu/drm/i915/i915_reg.h | 12 ++++++++- drivers/gpu/drm/i915/intel_display.c | 47 +++++++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +11 -1
@@ -4875,7 +4875,17 @@#define AUD_CONFIG_LOWER_N_SHIFT 4#define AUD_CONFIG_LOWER_N_VALUE (0xfff << 4)#define AUD_CONFIG_PIXEL_CLOCK_HDMI_SHIFT 16 -#define AUD_CONFIG_PIXEL_CLOCK_HDMI (0xf << 16) +#define AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK (0xf << 16) +#define AUD_CONFIG_PIXEL_CLOCK_HDMI_25175 (0 << 16) +#define AUD_CONFIG_PIXEL_CLOCK_HDMI_25200 (1 << 16) +#define AUD_CONFIG_PIXEL_CLOCK_HDMI_27000 (2 << 16) +#define AUD_CONFIG_PIXEL_CLOCK_HDMI_27027 (3 << 16) +#define AUD_CONFIG_PIXEL_CLOCK_HDMI_54000 (4 << 16) +#define AUD_CONFIG_PIXEL_CLOCK_HDMI_54054 (5 << 16) +#define AUD_CONFIG_PIXEL_CLOCK_HDMI_74176 (6 << 16) +#define AUD_CONFIG_PIXEL_CLOCK_HDMI_74250 (7 << 16) +#define AUD_CONFIG_PIXEL_CLOCK_HDMI_148352 (8 << 16) +#define AUD_CONFIG_PIXEL_CLOCK_HDMI_148500 (9 << 16)#define AUD_CONFIG_DISABLE_NCTS (1 << 3)/* HSW Audio */
drivers/gpu/drm/i915/intel_display.c +43 -4
65 lines not on this page · raw message
Signature · 1 line
1.7.9.5
Thanks for this,
Will apply the patches and test ASAP!
Quoted 25 lines · Jani Nikula
This is a completely untested and possibly naïve attempt at fixing [1] and [2]. Based on top of drm-intel-nightly branch of [3].
David, Jasper, please give it a try.
Thanks,
Jani.[1] http://mid.gmane.org/CAGpEb3Ep1LRZETPxHGRfBDqr5Ts2tAc8gCukWwugUf1U5NYv1g@mail.gmail.com
[2] http://mid.gmane.org/[email protected]
[3]git://people.freedesktop.org/~danvet/drm-intelJani Nikula (2):
drm/i915: pass mode to write eld
drm/i915: set hdmi audio clockdrivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/i915_reg.h | 12 ++++++- drivers/gpu/drm/i915/intel_display.c | 58 +++++++++++++++++++++++++++++----- 3 files changed, 63 insertions(+), 10 deletions(-)--
1.7.9.5
Signature · 8 lines
Met Vriendelijke Groeten Jasper Smet Developer Twitter: josbeir E-mail: [email protected] Mobile: 0486/41.75.45
Good news! Audio works now in 1080p@50/60 but only in 48000khz which fixes most of my problems :-)
What (still) does not work in 50/60hz is 41000khz audio (still works in lower modes) so the patch is not 100% :-)
I noticed this because menu sounds in XBMC are 41000 khz and they wouldn't play where all me test audio content worked well. I fixed this by adding a custom resample option where sound in menus started working too.
Anything i can do tho help ?
I would like to thank you for all your superbly great work so far :-) You rock dude! :-)
Quoted 25 lines · Jani Nikula
This is a completely untested and possibly naïve attempt at fixing [1] and [2]. Based on top of drm-intel-nightly branch of [3].
David, Jasper, please give it a try.
Thanks,
Jani.[1] http://mid.gmane.org/CAGpEb3Ep1LRZETPxHGRfBDqr5Ts2tAc8gCukWwugUf1U5NYv1g@mail.gmail.com
[2] http://mid.gmane.org/[email protected]
[3]git://people.freedesktop.org/~danvet/drm-intelJani Nikula (2):
drm/i915: pass mode to write eld
drm/i915: set hdmi audio clockdrivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/i915_reg.h | 12 ++++++- drivers/gpu/drm/i915/intel_display.c | 58 +++++++++++++++++++++++++++++----- 3 files changed, 63 insertions(+), 10 deletions(-)--
1.7.9.5
Signature · 8 lines
Met Vriendelijke Groeten Jasper Smet Developer Twitter: josbeir E-mail: [email protected] Mobile: 0486/41.75.45
Not a surprising outcome since it essentially means feature parity with the Windows driver (48kHz working, 44.1kHz not working).
I still suspect it's a bug with the Pioneer receiver.
Quoted 57 lines · Jasper Smet
Good news! Audio works now in 1080p@50/60 but only in 48000khz which fixes most of my problems :-)
What (still) does not work in 50/60hz is 41000khz audio (still works in lower modes) so the patch is not 100% :-)
I noticed this because menu sounds in XBMC are 41000 khz and they wouldn't play where all me test audio content worked well. I fixed this by adding a custom resample option where sound in menus started working too.
Anything i can do tho help ?
I would like to thank you for all your superbly great work so far :-) You rock dude! :-)
Quoted 25 lines · Jani Nikula
This is a completely untested and possibly naïve attempt at fixing [1] and [2]. Based on top of drm-intel-nightly branch of [3].
David, Jasper, please give it a try.
Thanks,
Jani.[1] http://mid.gmane.org/CAGpEb3Ep1LRZETPxHGRfBDqr5Ts2tAc8gCukWwugUf1U5NYv1g@mail.gmail.com
[2] http://mid.gmane.org/[email protected]
[3]git://people.freedesktop.org/~danvet/drm-intelJani Nikula (2):
drm/i915: pass mode to write eld
drm/i915: set hdmi audio clockdrivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/i915_reg.h | 12 ++++++- drivers/gpu/drm/i915/intel_display.c | 58 +++++++++++++++++++++++++++++----- 3 files changed, 63 insertions(+), 10 deletions(-)--
1.7.9.5Signature · 8 lines
Met Vriendelijke Groeten Jasper Smet Developer Twitter: josbeir E-mail: [email protected] Mobile: 0486/41.75.45
Signature · 1 line
David Härdeman