| Message ID | 1355839963-28091-3-git-send-email-rahul.sharma@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Dec 18, 2012 at 9:12 AM, Rahul Sharma <rahul.sharma@samsung.com> wrote: > Extend the mixer configuration to include more resolutions that can be > generated by the mixer. This adds 640x480, 720x576 and 1680x1050. > I'd like to know why you changed this from https://gerrit.chromium.org/gerrit/#/c/32245, which pulled out common code from mixer and hdmi into drm_hdmi. That way we keep the supported resolution ranges nicely encapsulated in one place. Sean > Signed-off-by: Sean Paul <seanpaul@chromium.org> > Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com> > --- > drivers/gpu/drm/exynos/exynos_mixer.c | 8 ++++---- > 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 21db895..6aedc0f 100644 > --- a/drivers/gpu/drm/exynos/exynos_mixer.c > +++ b/drivers/gpu/drm/exynos/exynos_mixer.c > @@ -283,13 +283,13 @@ static void mixer_cfg_scan(struct mixer_context *ctx, unsigned int height) > MXR_CFG_SCAN_PROGRASSIVE); > > /* choosing between porper HD and SD mode */ > - if (height == 480) > + if (height <= 480) > val |= MXR_CFG_SCAN_NTSC | MXR_CFG_SCAN_SD; > - else if (height == 576) > + else if (height <= 576) > val |= MXR_CFG_SCAN_PAL | MXR_CFG_SCAN_SD; > - else if (height == 720) > + else if (height <= 720) > val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD; > - else if (height == 1080) > + else if (height <= 1080) > val |= MXR_CFG_SCAN_HD_1080 | MXR_CFG_SCAN_HD; > else > val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD; > -- > 1.7.0.4 >
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 21db895..6aedc0f 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -283,13 +283,13 @@ static void mixer_cfg_scan(struct mixer_context *ctx, unsigned int height) MXR_CFG_SCAN_PROGRASSIVE); /* choosing between porper HD and SD mode */ - if (height == 480) + if (height <= 480) val |= MXR_CFG_SCAN_NTSC | MXR_CFG_SCAN_SD; - else if (height == 576) + else if (height <= 576) val |= MXR_CFG_SCAN_PAL | MXR_CFG_SCAN_SD; - else if (height == 720) + else if (height <= 720) val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD; - else if (height == 1080) + else if (height <= 1080) val |= MXR_CFG_SCAN_HD_1080 | MXR_CFG_SCAN_HD; else val |= MXR_CFG_SCAN_HD_720 | MXR_CFG_SCAN_HD;