]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
drm/exynos: fimd: remove unused variable
authorAndrzej Hajda <a.hajda@samsung.com>
Thu, 20 Mar 2014 08:09:00 +0000 (17:09 +0900)
committerInki Dae <daeinki@gmail.com>
Sun, 23 Mar 2014 15:36:41 +0000 (00:36 +0900)
The patch removes unused vidcon0 field from fimd_context structure.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
drivers/gpu/drm/exynos/exynos_drm_fimd.c

index 15d6b37c687d88226793b9cb7760eae83376c8aa..40fd6ccfcd6f7595671d750b57ea44066ddf4b87 100644 (file)
@@ -114,7 +114,6 @@ struct fimd_context {
        struct fimd_win_data            win_data[WINDOWS_NR];
        unsigned int                    default_win;
        unsigned long                   irq_flags;
-       u32                             vidcon0;
        u32                             vidcon1;
        bool                            suspended;
        int                             pipe;
@@ -266,26 +265,19 @@ static void fimd_commit(struct exynos_drm_manager *mgr)
               VIDTCON2_HOZVAL_E(mode->hdisplay - 1);
        writel(val, ctx->regs + driver_data->timing_base + VIDTCON2);
 
-       /* setup clock source, clock divider, enable dma. */
-       val = ctx->vidcon0;
-       val &= ~(VIDCON0_CLKVAL_F_MASK | VIDCON0_CLKDIR);
+       /*
+        * fields of register with prefix '_F' would be updated
+        * at vsync(same as dma start)
+        */
+       val = VIDCON0_ENVID | VIDCON0_ENVID_F;
 
-       if (ctx->driver_data->has_clksel) {
-               val &= ~VIDCON0_CLKSEL_MASK;
+       if (ctx->driver_data->has_clksel)
                val |= VIDCON0_CLKSEL_LCD;
-       }
 
        clkdiv = fimd_calc_clkdiv(ctx, mode);
        if (clkdiv > 1)
                val |= VIDCON0_CLKVAL_F(clkdiv - 1) | VIDCON0_CLKDIR;
-       else
-               val &= ~VIDCON0_CLKDIR; /* 1:1 clock */
 
-       /*
-        * fields of register with prefix '_F' would be updated
-        * at vsync(same as dma start)
-        */
-       val |= VIDCON0_ENVID | VIDCON0_ENVID_F;
        writel(val, ctx->regs + VIDCON0);
 }