Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfd13ef6 authored by Clint Taylor's avatar Clint Taylor Committed by Greg Kroah-Hartman
Browse files

drm/i915/hdmi: Add HDMI 2.0 audio clock recovery N values 



commit 6503493145cba4413ecd3d4d153faeef4a1e9b85 upstream.

HDMI 2.0 594Mhz modes were incorrectly selecting 25.200Mhz Automatic N value
mode instead of HDMI specification values.

V2: Fix 88.2 Hz N value

Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarClint Taylor <clinton.a.taylor@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1540493521-1746-2-git-send-email-clinton.a.taylor@intel.com


(cherry picked from commit 5a400aa3c562c4a726b4da286e63c96db905ade1)
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 943f7d5b

drivers/gpu/drm/i915/intel_audio.c

+17 −0
Original line number Diff line number Diff line
@@ -134,6 +134,9 @@ static const struct { 
/* HDMI N/CTS table */

#define TMDS_297M 297000

#define TMDS_296M 296703

#define TMDS_594M 594000

#define TMDS_593M 593407



static const struct {

	int sample_rate;

	int clock;
@@ -154,6 +157,20 @@ static const struct { 
	{ 176400, TMDS_297M, 18816, 247500 },

	{ 192000, TMDS_296M, 23296, 281250 },

	{ 192000, TMDS_297M, 20480, 247500 },

	{ 44100, TMDS_593M, 8918, 937500 },

	{ 44100, TMDS_594M, 9408, 990000 },

	{ 48000, TMDS_593M, 5824, 562500 },

	{ 48000, TMDS_594M, 6144, 594000 },

	{ 32000, TMDS_593M, 5824, 843750 },

	{ 32000, TMDS_594M, 3072, 445500 },

	{ 88200, TMDS_593M, 17836, 937500 },

	{ 88200, TMDS_594M, 18816, 990000 },

	{ 96000, TMDS_593M, 11648, 562500 },

	{ 96000, TMDS_594M, 12288, 594000 },

	{ 176400, TMDS_593M, 35672, 937500 },

	{ 176400, TMDS_594M, 37632, 990000 },

	{ 192000, TMDS_593M, 23296, 562500 },

	{ 192000, TMDS_594M, 24576, 594000 },

};



/* get AUD_CONFIG_PIXEL_CLOCK_HDMI_* value for mode */