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

Commit 606bb5e0 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Use round to closest when computing the CEA 1.001 pixel clocks 



drm_edid.c now computes the alternate CEA clocks using
DIV_ROUND_CLOSEST(), so follow suit in the N/CTS setup to make sure we
pick the right setting for the mode.

Unfortunately we can't actually use DIV_ROUND_CLOSEST() here due to the
({}) construct used, so just stick in raw numbers instead.

Cc: Clint Taylor <clinton.a.taylor@intel.com>
Cc: Libin Yang <libin.yang@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c562657a

drivers/gpu/drm/i915/intel_audio.c

+6 −6
Original line number Diff line number Diff line
@@ -61,21 +61,21 @@ static const struct { 
	int clock;

	u32 config;

} hdmi_audio_clock[] = {

	{ DIV_ROUND_UP(25200 * 1000, 1001), AUD_CONFIG_PIXEL_CLOCK_HDMI_25175 },

	{ 25175, AUD_CONFIG_PIXEL_CLOCK_HDMI_25175 },

	{ 25200, AUD_CONFIG_PIXEL_CLOCK_HDMI_25200 }, /* default per bspec */

	{ 27000, AUD_CONFIG_PIXEL_CLOCK_HDMI_27000 },

	{ 27000 * 1001 / 1000, AUD_CONFIG_PIXEL_CLOCK_HDMI_27027 },

	{ 27027, AUD_CONFIG_PIXEL_CLOCK_HDMI_27027 },

	{ 54000, AUD_CONFIG_PIXEL_CLOCK_HDMI_54000 },

	{ 54000 * 1001 / 1000, AUD_CONFIG_PIXEL_CLOCK_HDMI_54054 },

	{ DIV_ROUND_UP(74250 * 1000, 1001), AUD_CONFIG_PIXEL_CLOCK_HDMI_74176 },

	{ 54054, AUD_CONFIG_PIXEL_CLOCK_HDMI_54054 },

	{ 74176, AUD_CONFIG_PIXEL_CLOCK_HDMI_74176 },

	{ 74250, AUD_CONFIG_PIXEL_CLOCK_HDMI_74250 },

	{ DIV_ROUND_UP(148500 * 1000, 1001), AUD_CONFIG_PIXEL_CLOCK_HDMI_148352 },

	{ 148352, AUD_CONFIG_PIXEL_CLOCK_HDMI_148352 },

	{ 148500, AUD_CONFIG_PIXEL_CLOCK_HDMI_148500 },

};



/* HDMI N/CTS table */

#define TMDS_297M 297000

#define TMDS_296M DIV_ROUND_UP(297000 * 1000, 1001)

#define TMDS_296M 296703

static const struct {

	int sample_rate;

	int clock;