Skip to content

Commit 248da29

Browse files
committed
ODROID-COMMON: gpu/drm: add new display resolution 2560x1440
Signed-off-by: Joy Cho <joy.cho@hardkernel.com> Signed-off-by: Dongjin Kim <tobetter@gmail.com>
1 parent 5d1330a commit 248da29

2 files changed

Lines changed: 21 additions & 2 deletions

File tree

drivers/gpu/drm/meson/meson_vclk.c

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,8 @@ enum {
357357
MESON_VCLK_HDMI_594000,
358358
/* 2970 /1 /1 /1 /5 /1 => /1 /2 */
359359
MESON_VCLK_HDMI_594000_YUV420,
360+
/* 4830 /2 /1 /2 /5 /1 => /1 /1 */
361+
MESON_VCLK_HDMI_241500,
360362
};
361363

362364
struct meson_vclk_params {
@@ -467,6 +469,18 @@ struct meson_vclk_params {
467469
.vid_pll_div = VID_PLL_DIV_5,
468470
.vclk_div = 1,
469471
},
472+
[MESON_VCLK_HDMI_241500] = {
473+
.pll_freq = 4830000,
474+
.phy_freq = 2415000,
475+
.venc_freq = 241500,
476+
.vclk_freq = 241500,
477+
.pixel_freq = 241500,
478+
.pll_od1 = 2,
479+
.pll_od2 = 1,
480+
.pll_od3 = 2,
481+
.vid_pll_div = VID_PLL_DIV_5,
482+
.vclk_div = 1,
483+
},
470484
{ /* sentinel */ },
471485
};
472486

@@ -873,6 +887,10 @@ static void meson_vclk_set(struct meson_drm *priv, unsigned int pll_base_freq,
873887
m = 0xf7;
874888
frac = vic_alternate_clock ? 0x8148 : 0x10000;
875889
break;
890+
case 4830000:
891+
m = 0xc9;
892+
frac = 0xd560;
893+
break;
876894
}
877895

878896
meson_hdmi_pll_set_params(priv, m, frac, od1, od2, od3);

drivers/gpu/drm/meson/meson_venc.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -866,10 +866,11 @@ meson_venc_hdmi_supported_mode(const struct drm_display_mode *mode)
866866
DRM_MODE_FLAG_PVSYNC | DRM_MODE_FLAG_NVSYNC))
867867
return MODE_BAD;
868868

869-
if (mode->hdisplay < 640 || mode->hdisplay > 1920)
869+
/* support higher resolution than 1920x1080 */
870+
if (mode->hdisplay < 640 || mode->hdisplay > 2560)
870871
return MODE_BAD_HVALUE;
871872

872-
if (mode->vdisplay < 480 || mode->vdisplay > 1200)
873+
if (mode->vdisplay < 480 || mode->vdisplay > 1600)
873874
return MODE_BAD_VVALUE;
874875

875876
return MODE_OK;

0 commit comments

Comments
 (0)