| Message ID | 1489152617-10425-1-git-send-email-tjakobi@math.uni-bielefeld.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Gentle ping. - Tobias Tobias Jakobi wrote: > Convert if-statements to switch statement. Removes > duplicated code. > > Reviewed-by: Andrzej Hajda <a.hajda@samsung.com> > Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> > --- > drivers/gpu/drm/exynos/exynos_mixer.c | 30 ++++++++---------------------- > 1 file changed, 8 insertions(+), 22 deletions(-) > > diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c > index 72143ac..41d0c36 100644 > --- a/drivers/gpu/drm/exynos/exynos_mixer.c > +++ b/drivers/gpu/drm/exynos/exynos_mixer.c > @@ -382,29 +382,14 @@ static void mixer_cfg_rgb_fmt(struct mixer_context *ctx, unsigned int height) > struct mixer_resources *res = &ctx->mixer_res; > u32 val; > > - if (height == 480) { > + switch (height) { > + case 480: > + case 576: > val = MXR_CFG_RGB601_0_255; > - } else if (height == 576) { > - val = MXR_CFG_RGB601_0_255; > - } else if (height == 720) { > - val = MXR_CFG_RGB709_16_235; > - mixer_reg_write(res, MXR_CM_COEFF_Y, > - (1 << 30) | (94 << 20) | (314 << 10) | > - (32 << 0)); > - mixer_reg_write(res, MXR_CM_COEFF_CB, > - (972 << 20) | (851 << 10) | (225 << 0)); > - mixer_reg_write(res, MXR_CM_COEFF_CR, > - (225 << 20) | (820 << 10) | (1004 << 0)); > - } else if (height == 1080) { > - val = MXR_CFG_RGB709_16_235; > - mixer_reg_write(res, MXR_CM_COEFF_Y, > - (1 << 30) | (94 << 20) | (314 << 10) | > - (32 << 0)); > - mixer_reg_write(res, MXR_CM_COEFF_CB, > - (972 << 20) | (851 << 10) | (225 << 0)); > - mixer_reg_write(res, MXR_CM_COEFF_CR, > - (225 << 20) | (820 << 10) | (1004 << 0)); > - } else { > + break; > + case 720: > + case 1080: > + default: > val = MXR_CFG_RGB709_16_235; > mixer_reg_write(res, MXR_CM_COEFF_Y, > (1 << 30) | (94 << 20) | (314 << 10) | > @@ -413,6 +398,7 @@ static void mixer_cfg_rgb_fmt(struct mixer_context *ctx, unsigned int height) > (972 << 20) | (851 << 10) | (225 << 0)); > mixer_reg_write(res, MXR_CM_COEFF_CR, > (225 << 20) | (820 << 10) | (1004 << 0)); > + break; > } > > mixer_reg_writemask(res, MXR_CFG, val, MXR_CFG_RGB_FMT_MASK); >
Hello Daniel, I'm not getting any response from the Exynos DRM maintainer concerning this patch. Since this is just a simple cleanup, and Andrzej has already review, could you perhaps merge it through drm-misc? With best wishes, Tobias Tobias Jakobi wrote: > Convert if-statements to switch statement. Removes > duplicated code. > > Reviewed-by: Andrzej Hajda <a.hajda@samsung.com> > Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> > --- > drivers/gpu/drm/exynos/exynos_mixer.c | 30 ++++++++---------------------- > 1 file changed, 8 insertions(+), 22 deletions(-) > > diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c > index 72143ac..41d0c36 100644 > --- a/drivers/gpu/drm/exynos/exynos_mixer.c > +++ b/drivers/gpu/drm/exynos/exynos_mixer.c > @@ -382,29 +382,14 @@ static void mixer_cfg_rgb_fmt(struct mixer_context *ctx, unsigned int height) > struct mixer_resources *res = &ctx->mixer_res; > u32 val; > > - if (height == 480) { > + switch (height) { > + case 480: > + case 576: > val = MXR_CFG_RGB601_0_255; > - } else if (height == 576) { > - val = MXR_CFG_RGB601_0_255; > - } else if (height == 720) { > - val = MXR_CFG_RGB709_16_235; > - mixer_reg_write(res, MXR_CM_COEFF_Y, > - (1 << 30) | (94 << 20) | (314 << 10) | > - (32 << 0)); > - mixer_reg_write(res, MXR_CM_COEFF_CB, > - (972 << 20) | (851 << 10) | (225 << 0)); > - mixer_reg_write(res, MXR_CM_COEFF_CR, > - (225 << 20) | (820 << 10) | (1004 << 0)); > - } else if (height == 1080) { > - val = MXR_CFG_RGB709_16_235; > - mixer_reg_write(res, MXR_CM_COEFF_Y, > - (1 << 30) | (94 << 20) | (314 << 10) | > - (32 << 0)); > - mixer_reg_write(res, MXR_CM_COEFF_CB, > - (972 << 20) | (851 << 10) | (225 << 0)); > - mixer_reg_write(res, MXR_CM_COEFF_CR, > - (225 << 20) | (820 << 10) | (1004 << 0)); > - } else { > + break; > + case 720: > + case 1080: > + default: > val = MXR_CFG_RGB709_16_235; > mixer_reg_write(res, MXR_CM_COEFF_Y, > (1 << 30) | (94 << 20) | (314 << 10) | > @@ -413,6 +398,7 @@ static void mixer_cfg_rgb_fmt(struct mixer_context *ctx, unsigned int height) > (972 << 20) | (851 << 10) | (225 << 0)); > mixer_reg_write(res, MXR_CM_COEFF_CR, > (225 << 20) | (820 << 10) | (1004 << 0)); > + break; > } > > mixer_reg_writemask(res, MXR_CFG, val, MXR_CFG_RGB_FMT_MASK); >
2017-03-29 20:55 GMT+09:00 Tobias Jakobi <tjakobi@math.uni-bielefeld.de>: > Hello Daniel, > > I'm not getting any response from the Exynos DRM maintainer concerning > this patch. Since this is just a simple cleanup, and Andrzej has already > review, could you perhaps merge it through drm-misc? > Sorry for late. Confirmed just now. This patch is a trivial thing so will be merged soon. Thanks, Inki Dae > With best wishes, > Tobias > > > > Tobias Jakobi wrote: >> Convert if-statements to switch statement. Removes >> duplicated code. >> >> Reviewed-by: Andrzej Hajda <a.hajda@samsung.com> >> Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> >> --- >> drivers/gpu/drm/exynos/exynos_mixer.c | 30 ++++++++---------------------- >> 1 file changed, 8 insertions(+), 22 deletions(-) >> >> diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c >> index 72143ac..41d0c36 100644 >> --- a/drivers/gpu/drm/exynos/exynos_mixer.c >> +++ b/drivers/gpu/drm/exynos/exynos_mixer.c >> @@ -382,29 +382,14 @@ static void mixer_cfg_rgb_fmt(struct mixer_context *ctx, unsigned int height) >> struct mixer_resources *res = &ctx->mixer_res; >> u32 val; >> >> - if (height == 480) { >> + switch (height) { >> + case 480: >> + case 576: >> val = MXR_CFG_RGB601_0_255; >> - } else if (height == 576) { >> - val = MXR_CFG_RGB601_0_255; >> - } else if (height == 720) { >> - val = MXR_CFG_RGB709_16_235; >> - mixer_reg_write(res, MXR_CM_COEFF_Y, >> - (1 << 30) | (94 << 20) | (314 << 10) | >> - (32 << 0)); >> - mixer_reg_write(res, MXR_CM_COEFF_CB, >> - (972 << 20) | (851 << 10) | (225 << 0)); >> - mixer_reg_write(res, MXR_CM_COEFF_CR, >> - (225 << 20) | (820 << 10) | (1004 << 0)); >> - } else if (height == 1080) { >> - val = MXR_CFG_RGB709_16_235; >> - mixer_reg_write(res, MXR_CM_COEFF_Y, >> - (1 << 30) | (94 << 20) | (314 << 10) | >> - (32 << 0)); >> - mixer_reg_write(res, MXR_CM_COEFF_CB, >> - (972 << 20) | (851 << 10) | (225 << 0)); >> - mixer_reg_write(res, MXR_CM_COEFF_CR, >> - (225 << 20) | (820 << 10) | (1004 << 0)); >> - } else { >> + break; >> + case 720: >> + case 1080: >> + default: >> val = MXR_CFG_RGB709_16_235; >> mixer_reg_write(res, MXR_CM_COEFF_Y, >> (1 << 30) | (94 << 20) | (314 << 10) | >> @@ -413,6 +398,7 @@ static void mixer_cfg_rgb_fmt(struct mixer_context *ctx, unsigned int height) >> (972 << 20) | (851 << 10) | (225 << 0)); >> mixer_reg_write(res, MXR_CM_COEFF_CR, >> (225 << 20) | (820 << 10) | (1004 << 0)); >> + break; >> } >> >> mixer_reg_writemask(res, MXR_CFG, val, MXR_CFG_RGB_FMT_MASK); >> > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 72143ac..41d0c36 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -382,29 +382,14 @@ static void mixer_cfg_rgb_fmt(struct mixer_context *ctx, unsigned int height) struct mixer_resources *res = &ctx->mixer_res; u32 val; - if (height == 480) { + switch (height) { + case 480: + case 576: val = MXR_CFG_RGB601_0_255; - } else if (height == 576) { - val = MXR_CFG_RGB601_0_255; - } else if (height == 720) { - val = MXR_CFG_RGB709_16_235; - mixer_reg_write(res, MXR_CM_COEFF_Y, - (1 << 30) | (94 << 20) | (314 << 10) | - (32 << 0)); - mixer_reg_write(res, MXR_CM_COEFF_CB, - (972 << 20) | (851 << 10) | (225 << 0)); - mixer_reg_write(res, MXR_CM_COEFF_CR, - (225 << 20) | (820 << 10) | (1004 << 0)); - } else if (height == 1080) { - val = MXR_CFG_RGB709_16_235; - mixer_reg_write(res, MXR_CM_COEFF_Y, - (1 << 30) | (94 << 20) | (314 << 10) | - (32 << 0)); - mixer_reg_write(res, MXR_CM_COEFF_CB, - (972 << 20) | (851 << 10) | (225 << 0)); - mixer_reg_write(res, MXR_CM_COEFF_CR, - (225 << 20) | (820 << 10) | (1004 << 0)); - } else { + break; + case 720: + case 1080: + default: val = MXR_CFG_RGB709_16_235; mixer_reg_write(res, MXR_CM_COEFF_Y, (1 << 30) | (94 << 20) | (314 << 10) | @@ -413,6 +398,7 @@ static void mixer_cfg_rgb_fmt(struct mixer_context *ctx, unsigned int height) (972 << 20) | (851 << 10) | (225 << 0)); mixer_reg_write(res, MXR_CM_COEFF_CR, (225 << 20) | (820 << 10) | (1004 << 0)); + break; } mixer_reg_writemask(res, MXR_CFG, val, MXR_CFG_RGB_FMT_MASK);