Hi Joonyoung,
On Thu, Apr 5, 2012 at 3:53 PM, Joonyoung Shim <jy0922.shim@xxxxxxxxxxx> wrote:
> Some defines and members in struct mixer_context aren't used, remove
> them.
>
> Signed-off-by: Joonyoung Shim <jy0922.shim@xxxxxxxxxxx>
> Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
> ---
> drivers/gpu/drm/exynos/exynos_hdmi.c | 1 -
> drivers/gpu/drm/exynos/exynos_mixer.c | 21 +++++++++------------
> 2 files changed, 9 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
> index 0a71317..340424f 100644
> --- a/drivers/gpu/drm/exynos/exynos_hdmi.c
> +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
> @@ -40,7 +40,6 @@
>
> #include "exynos_hdmi.h"
>
> -#define HDMI_OVERLAY_NUMBER 3
> #define MAX_WIDTH 1920
> #define MAX_HEIGHT 1080
> #define get_hdmi_context(dev) platform_get_drvdata(to_platform_device(dev))
> diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
> index 495a7af..563092e 100644
> --- a/drivers/gpu/drm/exynos/exynos_mixer.c
> +++ b/drivers/gpu/drm/exynos/exynos_mixer.c
> @@ -37,7 +37,8 @@
> #include "exynos_drm_drv.h"
> #include "exynos_drm_hdmi.h"
>
> -#define HDMI_OVERLAY_NUMBER 3
> +#define MIXER_WIN_NR 3
> +#define MIXER_DEFAULT_WIN 0
Patch description says 'remove unused codes...', but looks like you're
adding more codes here? I think you should do the addition / deletion
in separate patches.
>
> #define get_mixer_context(dev) platform_get_drvdata(to_platform_device(dev))
>
> @@ -75,16 +76,12 @@ struct mixer_resources {
> };
>
> struct mixer_context {
> - struct fb_videomode *default_timing;
> - unsigned int default_win;
> - unsigned int default_bpp;
> unsigned int irq;
> int pipe;
> bool interlace;
> - bool vp_enabled;
>
> struct mixer_resources mixer_res;
> - struct hdmi_win_data win_data[HDMI_OVERLAY_NUMBER];
> + struct hdmi_win_data win_data[MIXER_WIN_NR];
> };
>
> static const u8 filter_y_horiz_tap8[] = {
> @@ -643,9 +640,9 @@ static void mixer_win_mode_set(void *ctx,
>
> win = overlay->zpos;
> if (win == DEFAULT_ZPOS)
> - win = mixer_ctx->default_win;
> + win = MIXER_DEFAULT_WIN;
>
> - if (win < 0 || win > HDMI_OVERLAY_NUMBER) {
> + if (win < 0 || win > MIXER_WIN_NR) {
> DRM_ERROR("overlay plane[%d] is wrong\n", win);
> return;
> }
> @@ -683,9 +680,9 @@ static void mixer_win_commit(void *ctx, int zpos)
> DRM_DEBUG_KMS("[%d] %s, win: %d\n", __LINE__, __func__, win);
>
> if (win == DEFAULT_ZPOS)
> - win = mixer_ctx->default_win;
> + win = MIXER_DEFAULT_WIN;
>
> - if (win < 0 || win > HDMI_OVERLAY_NUMBER) {
> + if (win < 0 || win > MIXER_WIN_NR) {
> DRM_ERROR("overlay plane[%d] is wrong\n", win);
> return;
> }
> @@ -706,9 +703,9 @@ static void mixer_win_disable(void *ctx, int zpos)
> DRM_DEBUG_KMS("[%d] %s, win: %d\n", __LINE__, __func__, win);
>
> if (win == DEFAULT_ZPOS)
> - win = mixer_ctx->default_win;
> + win = MIXER_DEFAULT_WIN;
>
> - if (win < 0 || win > HDMI_OVERLAY_NUMBER) {
> + if (win < 0 || win > MIXER_WIN_NR) {
> DRM_ERROR("overlay plane[%d] is wrong\n", win);
> return;
> }
> --
> 1.7.5.4
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
Best regards,
~Sumit.
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
