On 02/06/2016 08:54 AM, Xinliang Liu wrote: > Add crtc funcs and helper funcs for ADE. > > v4: None. > v3: > - Make ade as the master driver. > - Use port to connect with encoder. > - A few cleanup. > v2: > - Remove abtraction layer. > > Signed-off-by: Xinliang Liu <xinliang.liu at linaro.org> > --- > drivers/gpu/drm/hisilicon/kirin/Makefile | 3 +- > drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h | 280 +++++++++++++++ > drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 458 > ++++++++++++++++++++++++ > drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 15 + > drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 8 + > 5 files changed, 763 insertions(+), 1 deletion(-) > create mode 100644 drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h > create mode 100644 drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c > > diff --git a/drivers/gpu/drm/hisilicon/kirin/Makefile > b/drivers/gpu/drm/hisilicon/kirin/Makefile > index cb346de47d48..2a61ab006ddb 100644 > --- a/drivers/gpu/drm/hisilicon/kirin/Makefile > +++ b/drivers/gpu/drm/hisilicon/kirin/Makefile > @@ -1,3 +1,4 @@ > -kirin-drm-y := kirin_drm_drv.o > +kirin-drm-y := kirin_drm_drv.o \ > + kirin_drm_ade.o > > obj-$(CONFIG_DRM_HISI_KIRIN) += kirin-drm.o > diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h > b/drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h > new file mode 100644 > index 000000000000..78020747abfe > --- /dev/null > +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h > @@ -0,0 +1,280 @@ > +/* > + * Copyright (c) 2016 Linaro Limited. > + * Copyright (c) 2014-2016 Hisilicon Limited. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + * > + */ > + > +#ifndef __KIRIN_ADE_REG_H__ > +#define __KIRIN_ADE_REG_H__ > + > +/* > + * ADE Registers > + */ > +#define MASK(x) (BIT(x) - 1) > + > +#define ADE_CTRL 0x0004 > +#define FRM_END_START_OFST 0 > +#define FRM_END_START_MASK MASK(2) > +#define ADE_CTRL1 0x008C > +#define AUTO_CLK_GATE_EN_OFST 0 > +#define AUTO_CLK_GATE_EN BIT(0) > +#define ADE_ROT_SRC_CFG 0x0010 > +#define ADE_DISP_SRC_CFG 0x0018 > +#define ADE_WDMA2_SRC_CFG 0x001C > +#define ADE_SEC_OVLY_SRC_CFG 0x0020 > +#define ADE_WDMA3_SRC_CFG 0x0024 > +#define ADE_OVLY1_TRANS_CFG 0x002C > +#define ADE_EN 0x0100 > +#define ADE_DISABLE 0 > +#define ADE_ENABLE 1 > +#define INTR_MASK_CPU(x) (0x0C10 + (x) * 0x4) > +#define ADE_FRM_DISGARD_CTRL 0x00A4 > +/* reset and reload regs */ > +#define ADE_SOFT_RST_SEL(x) (0x0078 + (x) * 0x4) > +#define ADE_RELOAD_DIS(x) (0x00AC + (x) * 0x4) > +#define RDMA_OFST 0 > +#define CLIP_OFST 15 > +#define SCL_OFST 21 > +#define CTRAN_OFST 24 > +#define OVLY_OFST 37 /* 32+5 */ > +/* channel regs */ > +#define RD_CH_PE(x) (0x1000 + (x) * 0x80) > +#define RD_CH_CTRL(x) (0x1004 + (x) * 0x80) > +#define RD_CH_ADDR(x) (0x1008 + (x) * 0x80) > +#define RD_CH_SIZE(x) (0x100C + (x) * 0x80) > +#define RD_CH_STRIDE(x) (0x1010 + (x) * 0x80) > +#define RD_CH_SPACE(x) (0x1014 + (x) * 0x80) > +#define RD_CH_PARTIAL_SIZE(x) (0x1018 + (x) * 0x80) > +#define RD_CH_PARTIAL_SPACE(x) (0x101C + (x) * 0x80) > +#define RD_CH_EN(x) (0x1020 + (x) * 0x80) > +#define RD_CH_STATUS(x) (0x1024 + (x) * 0x80) > +#define RD_CH_DISP_CTRL 0x1404 > +#define RD_CH_DISP_ADDR 0x1408 > +#define RD_CH_DISP_SIZE 0x140C > +#define RD_CH_DISP_STRIDE 0x1410 > +#define RD_CH_DISP_SPACE 0x1414 > +#define RD_CH_DISP_EN 0x142C > +/* clip regs */ > +#define ADE_CLIP_DISABLE(x) (0x6800 + (x) * 0x100) > +#define ADE_CLIP_SIZE0(x) (0x6804 + (x) * 0x100) > +#define ADE_CLIP_SIZE1(x) (0x6808 + (x) * 0x100) > +#define ADE_CLIP_SIZE2(x) (0x680C + (x) * 0x100) > +#define ADE_CLIP_CFG_OK(x) (0x6810 + (x) * 0x100) > +/* scale regs */ > +#define ADE_SCL1_MUX_CFG 0x000C > +#define ADE_SCL2_SRC_CFG 0x0014 > +#define ADE_SCL3_MUX_CFG 0x0008 > +#define ADE_SCL_CTRL(x) (0x3000 + (x) * 0x800) > +#define ADE_SCL_HSP(x) (0x3004 + (x) * 0x800) > +#define ADE_SCL_UV_HSP(x) (0x3008 + (x) * 0x800) > +#define ADE_SCL_VSP(x) (0x300C + (x) * 0x800) > +#define ADE_SCL_UV_VSP(x) (0x3010 + (x) * 0x800) > +#define ADE_SCL_ORES(x) (0x3014 + (x) * 0x800) > +#define ADE_SCL_IRES(x) (0x3018 + (x) * 0x800) > +#define ADE_SCL_START(x) (0x301C + (x) * 0x800) > +#define ADE_SCL_ERR(x) (0x3020 + (x) * 0x800) > +#define ADE_SCL_PIX_OFST(x) (0x3024 + (x) * 0x800) > +#define ADE_SCL_UV_PIX_OFST(x) (0x3028 + (x) * 0x800) > +#define ADE_SCL_COEF_CLR(x) (0x3030 + (x) * 0x800) > +#define ADE_SCL_HCOEF(x, m, n) (0x3100 + (x) * 0x800 + \ > + 12 * (m) + 4 * (n)) > +#define ADE_SCL_VCOEF(x, i, j) (0x340C + (x) * 0x800 + \ > + 12 * (i) + 4 * (j)) > +/* ctran regs */ > +#define ADE_CTRAN5_TRANS_CFG 0x0040 > +#define ADE_CTRAN_DIS(x) (0x5004 + (x) * 0x100) > +#define CTRAN_BYPASS_ON 1 > +#define CTRAN_BYPASS_OFF 0 > +#define ADE_CTRAN_MODE_CHOOSE(x) (0x5008 + (x) * 0x100) > +#define ADE_CTRAN_STAT(x) (0x500C + (x) * 0x100) > +#define ADE_CTRAN_CHDC0(x) (0x5010 + (x) * 0x100) > +#define ADE_CTRAN_CHDC1(x) (0x5014 + (x) * 0x100) > +#define ADE_CTRAN_CHDC2(x) (0x5018 + (x) * 0x100) > +#define ADE_CTRAN_CHDC3(x) (0x501C + (x) * 0x100) > +#define ADE_CTRAN_CHDC4(x) (0x5020 + (x) * 0x100) > +#define ADE_CTRAN_CHDC5(x) (0x5024 + (x) * 0x100) > +#define ADE_CTRAN_CSC0(x) (0x5028 + (x) * 0x100) > +#define ADE_CTRAN_CSC1(x) (0x502C + (x) * 0x100) > +#define ADE_CTRAN_CSC2(x) (0x5030 + (x) * 0x100) > +#define ADE_CTRAN_CSC3(x) (0x5034 + (x) * 0x100) > +#define ADE_CTRAN_CSC4(x) (0x5038 + (x) * 0x100) > +#define ADE_CTRAN_IMAGE_SIZE(x) (0x503C + (x) * 0x100) > +#define ADE_CTRAN_CFG_OK(x) (0x5040 + (x) * 0x100) > +/* overlay regs */ > +#define ADE_OVLY_ALPHA_ST 0x2000 > +#define ADE_OVLY_CH_XY0(x) (0x2004 + (x) * 4) > +#define ADE_OVLY_CH_XY1(x) (0x2024 + (x) * 4) > +#define ADE_OVLY_CH_CTL(x) (0x204C + (x) * 4) > +#define ADE_OVLY_OUTPUT_SIZE(x) (0x2070 + (x) * 8) > +#define OUTPUT_XSIZE_OFST 16 > +#define ADE_OVLY_BASE_COLOR(x) (0x2074 + (x) * 8) > +#define ADE_OVLYX_CTL(x) (0x209C + (x) * 4) > +#define ADE_OVLY_CTL 0x0098 > +#define CH_OVLY_SEL_OFST(x) ((x) * 4) > +#define CH_OVLY_SEL_MASK MASK(2) > +#define CH_OVLY_SEL_VAL(x) ((x) + 1) > +#define CH_ALP_MODE_OFST 0 > +#define CH_ALP_SEL_OFST 2 > +#define CH_UNDER_ALP_SEL_OFST 4 > +#define CH_EN_OFST 6 > +#define CH_ALP_GBL_OFST 15 > +#define CH_SEL_OFST 28 > + > +/* > + * LDI Registers > + */ > +#define LDI_HRZ_CTRL0 0x7400 > +#define HBP_OFST 20 > +#define LDI_HRZ_CTRL1 0x7404 > +#define LDI_VRT_CTRL0 0x7408 > +#define VBP_OFST 20 > +#define LDI_VRT_CTRL1 0x740C > +#define LDI_PLR_CTRL 0x7410 > +#define FLAG_NVSYNC BIT(0) > +#define FLAG_NHSYNC BIT(1) > +#define FLAG_NPIXCLK BIT(2) > +#define FLAG_NDE BIT(3) > +#define LDI_DSP_SIZE 0x7414 > +#define VSIZE_OFST 20 > +#define LDI_INT_EN 0x741C > +#define FRAME_END_INT_EN_OFST 1 > +#define LDI_CTRL 0x7420 > +#define BPP_OFST 3 > +#define DATA_GATE_EN BIT(2) > +#define LDI_EN BIT(0) > +#define LDI_ORG_INT 0x7424 > +#define LDI_MSK_INT 0x7428 > +#define LDI_INT_CLR 0x742C > +#define LDI_WORK_MODE 0x7430 > +#define LDI_DE_SPACE_LOW 0x7438 > +#define LDI_MCU_INTS 0x7450 > +#define LDI_MCU_INTE 0x7454 > +#define LDI_MCU_INTC 0x7458 > +#define LDI_HDMI_DSI_GT 0x7434 > + > +/* > + * media regs > + */ > +#define SC_MEDIA_RSTDIS 0x0530 > +#define SC_MEDIA_RSTEN 0x052C > +#define NOC_ADE0_QOSGENERATOR_MODE 0x010C > +#define NOC_ADE0_QOSGENERATOR_EXTCONTROL 0x0118 > +#define NOC_ADE1_QOSGENERATOR_MODE 0x020C > +#define NOC_ADE1_QOSGENERATOR_EXTCONTROL 0x0218 > + > +/* > + * ADE regs relevant enums > + */ > +enum frame_end_start { > + /* regs take effective in every vsync */ > + REG_EFFECTIVE_IN_VSYNC = 0, > + /* regs take effective in fist ade en and every frame end */ > + REG_EFFECTIVE_IN_ADEEN_FRMEND, > + /* regs take effective in ade en immediately */ > + REG_EFFECTIVE_IN_ADEEN, > + /* regs take effective in first vsync and every frame end */ > + REG_EFFECTIVE_IN_VSYNC_FRMEND > +}; > + > +enum ade_fb_format { > + ADE_RGB_565 = 0, > + ADE_BGR_565, > + ADE_XRGB_8888, > + ADE_XBGR_8888, > + ADE_ARGB_8888, > + ADE_ABGR_8888, > + ADE_RGBA_8888, > + ADE_BGRA_8888, > + ADE_RGB_888, > + ADE_BGR_888 = 9, > + ADE_FORMAT_NOT_SUPPORT = 800 > +}; > + > +enum ade_channel { > + ADE_CH1 = 0, /* channel 1 for primary plane */ > + ADE_CH_NUM > +}; > + > +enum ade_scale { > + ADE_SCL1 = 0, > + ADE_SCL2, > + ADE_SCL3, > + ADE_SCL_NUM > +}; > + > +enum ade_ctran { > + ADE_CTRAN1 = 0, > + ADE_CTRAN2, > + ADE_CTRAN3, > + ADE_CTRAN4, > + ADE_CTRAN5, > + ADE_CTRAN6, > + ADE_CTRAN_NUM > +}; > + > +enum ade_overlay { > + ADE_OVLY1 = 0, > + ADE_OVLY2, > + ADE_OVLY3, > + ADE_OVLY_NUM > +}; > + > +enum ade_alpha_mode { > + ADE_ALP_GLOBAL = 0, > + ADE_ALP_PIXEL, > + ADE_ALP_PIXEL_AND_GLB > +}; > + > +enum ade_alpha_blending_mode { > + ADE_ALP_MUL_COEFF_0 = 0, /* alpha */ > + ADE_ALP_MUL_COEFF_1, /* 1-alpha */ > + ADE_ALP_MUL_COEFF_2, /* 0 */ > + ADE_ALP_MUL_COEFF_3 /* 1 */ > +}; > + > +/* > + * LDI regs relevant enums > + */ > +enum dsi_pclk_en { > + DSI_PCLK_ON = 0, > + DSI_PCLK_OFF > +}; > + > +enum ldi_output_format { > + LDI_OUT_RGB_565 = 0, > + LDI_OUT_RGB_666, > + LDI_OUT_RGB_888 > +}; > + > +enum ldi_work_mode { > + TEST_MODE = 0, > + NORMAL_MODE > +}; > + > +enum ldi_input_source { > + DISP_SRC_NONE = 0, > + DISP_SRC_OVLY2, > + DISP_SRC_DISP, > + DISP_SRC_ROT, > + DISP_SRC_SCL2 > +}; > + > +/* > + * Register Write/Read Helper functions > + */ > +static inline void ade_update_bits(void __iomem *addr, u32 bit_start, > + u32 mask, u32 val) > +{ > + u32 tmp, orig; > + > + orig = readl(addr); > + tmp = orig & ~(mask << bit_start); > + tmp |= (val & mask) << bit_start; > + writel(tmp, addr); > +} > + > +#endif > diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c > b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c > new file mode 100644 > index 000000000000..b45149616716 > --- /dev/null > +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c > @@ -0,0 +1,458 @@ > +/* > + * Hisilicon Hi6220 SoC ADE(Advanced Display Engine)'s crtc&plane driver > + * > + * Copyright (c) 2016 Linaro Limited. > + * Copyright (c) 2014-2016 Hisilicon Limited. > + * > + * Author: > + * Xinliang Liu <z.liuxinliang at hisilicon.com> > + * Xinliang Liu <xinliang.liu at linaro.org> > + * Xinwei Kong <kong.kongxinwei at hisilicon.com> > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + * > + */ > + > +#include <linux/bitops.h> > +#include <linux/clk.h> > +#include <video/display_timing.h> > + > +#include <drm/drmP.h> > +#include <drm/drm_crtc.h> > +#include <drm/drm_crtc_helper.h> > +#include <drm/drm_atomic.h> > +#include <drm/drm_atomic_helper.h> > + > +#include "kirin_drm_drv.h" > +#include "kirin_ade_reg.h" > + > +#define to_ade_crtc(crtc) \ > + container_of(crtc, struct ade_crtc, base) > + > +struct ade_hw_ctx { > + void __iomem *base; > + void __iomem *media_base; > + void __iomem *media_noc_base; > + int irq; > + struct clk *ade_core_clk; > + struct clk *media_noc_clk; > + struct clk *ade_pix_clk; > + bool power_on; > +}; > + > +struct ade_crtc { > + struct drm_crtc base; > + struct ade_hw_ctx *ctx; > + bool enable; > + u32 out_format; > +}; > + > +struct ade_data { > + struct ade_crtc acrtc; > + struct ade_hw_ctx ctx; > +}; > + > +static void ade_update_reload_bit(void __iomem *base, u32 bit_num, u32 val) > +{ > + u32 bit_ofst, reg_num; > + > + bit_ofst = bit_num % 32; > + reg_num = bit_num / 32; > + > + ade_update_bits(base + ADE_RELOAD_DIS(reg_num), bit_ofst, > + MASK(1), !!val); > +} > + > +static u32 ade_read_reload_bit(void __iomem *base, u32 bit_num) > +{ > + u32 tmp, bit_ofst, reg_num; > + > + bit_ofst = bit_num % 32; > + reg_num = bit_num / 32; > + > + tmp = readl(base + ADE_RELOAD_DIS(reg_num)); > + return !!(BIT(bit_ofst) & tmp); > +} > + > +static void ade_init(struct ade_hw_ctx *ctx) > +{ > + void __iomem *base = ctx->base; > + > + /* enable clk gate */ > + ade_update_bits(base + ADE_CTRL1, AUTO_CLK_GATE_EN_OFST, > + AUTO_CLK_GATE_EN, ADE_ENABLE); > + /* clear overlay */ > + writel(0, base + ADE_OVLY1_TRANS_CFG); > + writel(0, base + ADE_OVLY_CTL); > + writel(0, base + ADE_OVLYX_CTL(ADE_OVLY2)); > + /* clear reset and reload regs */ > + writel(MASK(32), base + ADE_SOFT_RST_SEL(0)); > + writel(MASK(32), base + ADE_SOFT_RST_SEL(1)); > + writel(MASK(32), base + ADE_RELOAD_DIS(0)); > + writel(MASK(32), base + ADE_RELOAD_DIS(1)); > + /* for video mode, that ade registers > + * became effective at frame end > + */ > + ade_update_bits(base + ADE_CTRL, FRM_END_START_OFST, > + FRM_END_START_MASK, REG_EFFECTIVE_IN_ADEEN_FRMEND); > +} > + > +static void ade_ldi_set_mode(struct ade_crtc *acrtc, > + struct drm_display_mode *mode, > + struct drm_display_mode *adj_mode) > +{ > + struct ade_hw_ctx *ctx = acrtc->ctx; > + void __iomem *base = ctx->base; > + u32 width = mode->hdisplay; > + u32 height = mode->vdisplay; > + u32 hfp, hbp, hsw, vfp, vbp, vsw; > + u32 plr_flags; > + int ret; > + > + plr_flags = (mode->flags & DRM_MODE_FLAG_NVSYNC) ? FLAG_NVSYNC : 0; > + plr_flags |= (mode->flags & DRM_MODE_FLAG_NHSYNC) ? FLAG_NHSYNC : 0; > + hfp = mode->hsync_start - mode->hdisplay; > + hbp = mode->htotal - mode->hsync_end; > + hsw = mode->hsync_end - mode->hsync_start; > + vfp = mode->vsync_start - mode->vdisplay; > + vbp = mode->vtotal - mode->vsync_end; > + vsw = mode->vsync_end - mode->vsync_start; > + if (vsw > 15) { > + DRM_DEBUG_DRIVER("vsw exceeded 15\n"); > + vsw = 15; > + } > + > + writel((hbp << HBP_OFST) | hfp, base + LDI_HRZ_CTRL0); > + /* the configured value is actual value - 1 */ > + writel(hsw - 1, base + LDI_HRZ_CTRL1); > + writel((vbp << VBP_OFST) | vfp, base + LDI_VRT_CTRL0); > + /* the configured value is actual value - 1 */ > + writel(vsw - 1, base + LDI_VRT_CTRL1); > + /* the configured value is actual value - 1 */ > + writel(((height - 1) << VSIZE_OFST) | (width - 1), > + base + LDI_DSP_SIZE); > + writel(plr_flags, base + LDI_PLR_CTRL); > + > + /* Success should be guaranteed in mode_valid call back, > + * so failer shouldn't happen here > + */ > + ret = clk_set_rate(ctx->ade_pix_clk, mode->clock * 1000); > + if (ret) > + DRM_ERROR("failed to set pixel clk %dHz (%d)\n", > + mode->clock * 1000, ret); > + adj_mode->clock = clk_get_rate(ctx->ade_pix_clk) / 1000; > + > + /* ctran6 setting */ > + writel(CTRAN_BYPASS_ON, base + ADE_CTRAN_DIS(ADE_CTRAN6)); > + /* the configured value is actual value - 1 */ > + writel(width * height - 1, base + ADE_CTRAN_IMAGE_SIZE(ADE_CTRAN6)); > + ade_update_reload_bit(base, CTRAN_OFST + ADE_CTRAN6, 0); > + > + DRM_DEBUG_DRIVER("set mode: %dx%d\n", width, height); > +} > + > +static int ade_power_up(struct ade_hw_ctx *ctx) > +{ > + void __iomem *media_base = ctx->media_base; > + int ret; > + > + ret = clk_prepare_enable(ctx->media_noc_clk); > + if (ret) { > + DRM_ERROR("failed to enable media_noc_clk (%d)\n", ret); > + return ret; > + } > + > + writel(0x20, media_base + SC_MEDIA_RSTDIS);
If this and the write in ade_power_down are to reset the ADE block, they should ideally belong to clock/reset subsystem and not touched by the driver. > + > + ret = clk_prepare_enable(ctx->ade_core_clk); > + if (ret) { > + DRM_ERROR("failed to enable ade_core_clk (%d)\n", ret); > + return ret; > + } > + > + ade_init(ctx); > + ctx->power_on = true; > + return 0; > +} > + > +static void ade_power_down(struct ade_hw_ctx *ctx) > +{ > + void __iomem *base = ctx->base; > + void __iomem *media_base = ctx->media_base; > + > + writel(ADE_DISABLE, base + LDI_CTRL); > + /* dsi pixel off */ > + writel(DSI_PCLK_OFF, base + LDI_HDMI_DSI_GT); > + > + clk_disable_unprepare(ctx->ade_core_clk); > + writel(0x20, media_base + SC_MEDIA_RSTEN); > + clk_disable_unprepare(ctx->media_noc_clk); > + ctx->power_on = false; > +} > + > +static void ade_set_medianoc_qos(struct ade_crtc *acrtc) > +{ > + struct ade_hw_ctx *ctx = acrtc->ctx; > + void __iomem *base = ctx->media_noc_base; > + void __iomem *reg; > + u32 val; > + > + reg = base + NOC_ADE0_QOSGENERATOR_MODE; > + val = (readl(reg) & 0xfffffffc) | 0x2; > + writel(val, reg); > + > + reg = base + NOC_ADE0_QOSGENERATOR_EXTCONTROL; > + val = readl(reg) | 0x1; > + writel(val, reg); > + > + reg = base + NOC_ADE1_QOSGENERATOR_MODE; > + val = (readl(reg) & 0xfffffffc) | 0x2; > + writel(val, reg); > + > + reg = base + NOC_ADE1_QOSGENERATOR_EXTCONTROL; > + val = readl(reg) | 0x1; > + writel(val, reg); We could at least try to pass these via syscon, since we don't have a framework to configure NoC QoS stuff. Thanks, Archit -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation