diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-05-09 05:49:56 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-05-09 05:49:56 +0200 |
| commit | bafb86f5bc3173479002555dea7f31d943b12332 (patch) | |
| tree | 6ec94c96460faf782cdb8781339560e13e0918b0 /drivers/gpu/drm/exynos | |
| parent | drm/amdgpu: fix build on aarch64. (diff) | |
| parent | Linux 4.6-rc7 (diff) | |
| download | linux-bafb86f5bc3173479002555dea7f31d943b12332.tar.xz linux-bafb86f5bc3173479002555dea7f31d943b12332.zip | |
Merge tag 'v4.6-rc7' into drm-next
Merge this back as we've built up a fair few conflicts, and I have
some newer trees to pull in.
Diffstat (limited to 'drivers/gpu/drm/exynos')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_fimd.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 547d759a0a6f..cec508f9a335 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -924,7 +924,6 @@ static void fimd_dp_clock_enable(struct exynos_drm_clk *clk, bool enable) struct fimd_context *ctx = container_of(clk, struct fimd_context, dp_clk); u32 val = enable ? DP_MIE_CLK_DP_ENABLE : DP_MIE_CLK_DISABLE; - writel(val, ctx->regs + DP_MIE_CLKCON); } |