diff options
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_hdmi.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_mixer.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/exynos/regs-mixer.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 229b3613c60b..722cbf32192a 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c | |||
| @@ -2007,7 +2007,7 @@ static void hdmi_mode_set(struct exynos_drm_display *display, | |||
| 2007 | DRM_DEBUG_KMS("xres=%d, yres=%d, refresh=%d, intl=%s\n", | 2007 | DRM_DEBUG_KMS("xres=%d, yres=%d, refresh=%d, intl=%s\n", |
| 2008 | m->hdisplay, m->vdisplay, | 2008 | m->hdisplay, m->vdisplay, |
| 2009 | m->vrefresh, (m->flags & DRM_MODE_FLAG_INTERLACE) ? | 2009 | m->vrefresh, (m->flags & DRM_MODE_FLAG_INTERLACE) ? |
| 2010 | "INTERLACED" : "PROGERESSIVE"); | 2010 | "INTERLACED" : "PROGRESSIVE"); |
| 2011 | 2011 | ||
| 2012 | /* preserve mode information for later use. */ | 2012 | /* preserve mode information for later use. */ |
| 2013 | drm_mode_copy(&hdata->current_mode, mode); | 2013 | drm_mode_copy(&hdata->current_mode, mode); |
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index f79d70a3855d..82be65e90162 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c | |||
| @@ -267,7 +267,7 @@ static void mixer_cfg_scan(struct mixer_context *ctx, unsigned int height) | |||
| 267 | 267 | ||
| 268 | /* choosing between interlace and progressive mode */ | 268 | /* choosing between interlace and progressive mode */ |
| 269 | val = (ctx->interlace ? MXR_CFG_SCAN_INTERLACE : | 269 | val = (ctx->interlace ? MXR_CFG_SCAN_INTERLACE : |
| 270 | MXR_CFG_SCAN_PROGRASSIVE); | 270 | MXR_CFG_SCAN_PROGRESSIVE); |
| 271 | 271 | ||
| 272 | if (ctx->mxr_ver != MXR_VER_128_0_0_184) { | 272 | if (ctx->mxr_ver != MXR_VER_128_0_0_184) { |
| 273 | /* choosing between proper HD and SD mode */ | 273 | /* choosing between proper HD and SD mode */ |
diff --git a/drivers/gpu/drm/exynos/regs-mixer.h b/drivers/gpu/drm/exynos/regs-mixer.h index 5f32e1a29411..ac60260c2389 100644 --- a/drivers/gpu/drm/exynos/regs-mixer.h +++ b/drivers/gpu/drm/exynos/regs-mixer.h | |||
| @@ -101,7 +101,7 @@ | |||
| 101 | #define MXR_CFG_GRP0_ENABLE (1 << 4) | 101 | #define MXR_CFG_GRP0_ENABLE (1 << 4) |
| 102 | #define MXR_CFG_VP_ENABLE (1 << 3) | 102 | #define MXR_CFG_VP_ENABLE (1 << 3) |
| 103 | #define MXR_CFG_SCAN_INTERLACE (0 << 2) | 103 | #define MXR_CFG_SCAN_INTERLACE (0 << 2) |
| 104 | #define MXR_CFG_SCAN_PROGRASSIVE (1 << 2) | 104 | #define MXR_CFG_SCAN_PROGRESSIVE (1 << 2) |
| 105 | #define MXR_CFG_SCAN_NTSC (0 << 1) | 105 | #define MXR_CFG_SCAN_NTSC (0 << 1) |
| 106 | #define MXR_CFG_SCAN_PAL (1 << 1) | 106 | #define MXR_CFG_SCAN_PAL (1 << 1) |
| 107 | #define MXR_CFG_SCAN_SD (0 << 0) | 107 | #define MXR_CFG_SCAN_SD (0 << 0) |
