aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRahul Sharma <rahul.sharma@samsung.com>2013-01-15 08:11:07 -0500
committerInki Dae <inki.dae@samsung.com>2013-02-21 01:00:27 -0500
commit29630743c97cc4c395c308ea9d0c12bf55c55a92 (patch)
tree86f59d6a8ab84aeb84033084719573d97e3ac62b
parent0ea6822f5215b1771949e8b278f66ed787ba83f1 (diff)
drm/exynos: mixer: set correct mode for range of resolutions
With this patch, mixer driver find the correct resolution mode for the range of resolutions, upto 1080 vertical lines. Resolution will be categorized to NTSC SD, PAL SD or HD and the correct mode is set to the mixer configuration register. Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com> Signed-off-by: Sean Paul <seanpaul@chromium.org> Signed-off-by: Inki Dae <inki.dae@samsung.com>
-rw-r--r--drivers/gpu/drm/exynos/exynos_mixer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index cc809ca6b8ec..e919aba29b3d 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -284,13 +284,13 @@ static void mixer_cfg_scan(struct mixer_context *ctx, unsigned int height)
284 MXR_CFG_SCAN_PROGRASSIVE); 284 MXR_CFG_SCAN_PROGRASSIVE);
285 285
286 /* choosing between porper HD and SD mode */ 286 /* choosing between porper HD and SD mode */
287 if (height == 480) 287 if (height <= 480)
288 val |= MXR_CFG_SCAN_NTSC | MXR_CFG_SCAN_SD; 288 val |= MXR_CFG_SCAN_NTSC | MXR_CFG_SCAN_SD;
289 else if (height == 576) 289 else if (height <= 576)
290 val |= MXR_CFG_SCAN_PAL | MXR_CFG_SCAN_SD; 290 val |= MXR_CFG_SCAN_PAL | MXR_CFG_SCAN_SD;
291 else if (height == 720) 291 else if (height <= 720)
292 val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD; 292 val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD;
293 else if (height == 1080) 293 else if (height <= 1080)
294 val |= MXR_CFG_SCAN_HD_1080 | MXR_CFG_SCAN_HD; 294 val |= MXR_CFG_SCAN_HD_1080 | MXR_CFG_SCAN_HD;
295 else 295 else
296 val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD; 296 val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD;