aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/exynos/exynos_hdmi.c11
-rw-r--r--drivers/gpu/drm/exynos/exynos_mixer.c4
2 files changed, 13 insertions, 2 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 218914339cac..1309b1c9e074 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -297,6 +297,15 @@ static const struct hdmiphy_config hdmiphy_v14_configs[] = {
297 }, 297 },
298 }, 298 },
299 { 299 {
300 .pixel_clock = 85500000,
301 .conf = {
302 0x01, 0xd1, 0x24, 0x11, 0x40, 0x40, 0xd0, 0x08,
303 0x84, 0xa0, 0xd6, 0xd8, 0x45, 0xa0, 0xac, 0x80,
304 0x08, 0x80, 0x11, 0x04, 0x02, 0x22, 0x44, 0x86,
305 0x54, 0x90, 0x24, 0x01, 0x00, 0x00, 0x01, 0x80,
306 },
307 },
308 {
300 .pixel_clock = 106500000, 309 .pixel_clock = 106500000,
301 .conf = { 310 .conf = {
302 0x01, 0xd1, 0x2c, 0x12, 0x40, 0x0c, 0x09, 0x08, 311 0x01, 0xd1, 0x2c, 0x12, 0x40, 0x0c, 0x09, 0x08,
@@ -1257,7 +1266,7 @@ static void hdmi_v14_mode_apply(struct hdmi_context *hdata)
1257 * first line is distorted. 1266 * first line is distorted.
1258 */ 1267 */
1259 if ((m->vdisplay != am->vdisplay) && 1268 if ((m->vdisplay != am->vdisplay) &&
1260 (m->hdisplay == 1280 || m->hdisplay == 1024)) 1269 (m->hdisplay == 1280 || m->hdisplay == 1024 || m->hdisplay == 1366))
1261 hquirk = 258; 1270 hquirk = 258;
1262 1271
1263 hdmi_reg_writev(hdata, HDMI_H_BLANK_0, 2, m->htotal - m->hdisplay); 1272 hdmi_reg_writev(hdata, HDMI_H_BLANK_0, 2, m->htotal - m->hdisplay);
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index 714d72fd3bc5..dc5d79465f9b 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -1015,7 +1015,9 @@ static int mixer_mode_valid(struct exynos_drm_crtc *crtc,
1015 (w >= 1664 && w <= 1920 && h >= 936 && h <= 1080)) 1015 (w >= 1664 && w <= 1920 && h >= 936 && h <= 1080))
1016 return MODE_OK; 1016 return MODE_OK;
1017 1017
1018 if ((w == 1024 && h == 768) || (w == 1280 && h == 1024)) 1018 if ((w == 1024 && h == 768) ||
1019 (w == 1366 && h == 768) ||
1020 (w == 1280 && h == 1024))
1019 return MODE_OK; 1021 return MODE_OK;
1020 1022
1021 return MODE_BAD; 1023 return MODE_BAD;