DRM driver for Hikey 970
Subsystems (11)
PATCH 3/49 staging: hikey9xx/gpu: solve tearing issue of display
In reply to Mauro Carvalho ChehabFrom: Liwei Cai <[email protected]>
The use of synchronization mechanisms to deal with the display of buffer, to solve the problem of display tearing.
--- drivers/staging/hikey9xx/gpu/dw_drm_dsi.c | 3 +- drivers/staging/hikey9xx/gpu/kirin_drm_dss.c | 4 +- .../hikey9xx/gpu/kirin_drm_overlay_utils.c | 90 ++++++++----------- 3 files changed, 41 insertions(+), 56 deletions(-)
drivers/staging/hikey9xx/gpu/dw_drm_dsi.c +1 -2
@@ -35,7 +35,6 @@#define DTS_COMP_DSI_NAME "hisilicon,hi3660-dsi" -#define MAX_TX_ESC_CLK 10#define ROUND (x, y) ((x) / (y) + \ ((x) % (y) * 10 / (y) >= 5 ? 1 : 0))#define ROUND1 (x, y) ((x) / (y) + ((x) % (y) ? 1 : 0))
@@ -1237,7 +1236,7 @@ static int dsi_host_init(struct device *dev, struct dw_dsi *dsi) host->dev = dev; host->ops = &dsi_host_ops; - mipi->max_tx_esc_clk =10 ; + mipi->max_tx_esc_clk =10 *1000000UL ; mipi->vc =0 ; mipi->color_mode =DSI_24BITS_1 ; mipi->clk_post_adjust =120 ;
drivers/staging/hikey9xx/gpu/kirin_drm_dss.c +2 -2
@@ -167,8 +167,8 @@ static int dss_power_up(struct dss_crtc *acrtc)dss_inner_clk_common_enable (acrtc);dpe_interrupt_mask (acrtc);dpe_interrupt_clear (acrtc); -dpe_irq_enable (acrtc); -dpe_interrupt_unmask (acrtc); +//dpe_irq_enable(acrtc); +//dpe_interrupt_unmask(acrtc); ctx->power_on = true;return 0 ;
drivers/staging/hikey9xx/gpu/kirin_drm_overlay_utils.c +38 -52
144 lines not on this page · raw message
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/49 staging: hikey9xx/gpu: port it to work with Kernel v4.9
In reply to Mauro Carvalho ChehabFrom: John Stultz <[email protected]>
Update the driver to work with v4.9 kernels
--- drivers/staging/hikey9xx/gpu/dw_drm_dsi.c | 4 +- drivers/staging/hikey9xx/gpu/kirin_dpe_reg.h | 1 + drivers/staging/hikey9xx/gpu/kirin_drm_drv.c | 3 +- drivers/staging/hikey9xx/gpu/kirin_drm_drv.h | 1 + drivers/staging/hikey9xx/gpu/kirin_drm_dss.c | 46 ++++++++----------- .../hikey9xx/gpu/kirin_drm_overlay_utils.c | 7 ++- 6 files changed, 30 insertions(+), 32 deletions(-)
drivers/staging/hikey9xx/gpu/dw_drm_dsi.c +2 -2
@@ -1079,7 +1079,7 @@ static int dw_drm_encoder_init(struct device *dev, encoder->possible_crtcs = crtc_mask; ret =drm_encoder_init (drm_dev, encoder, &dw_encoder_funcs, -DRM_MODE_ENCODER_DSI ); +DRM_MODE_ENCODER_DSI ,NULL );if (ret) {DRM_ERROR ("failed to init dsi encoder\n" );return ret;
@@ -1104,7 +1104,7 @@ static int dsi_host_attach(struct mipi_dsi_host *host, dsi->client[id].lanes = mdsi->lanes; dsi->client[id].format = mdsi->format; dsi->client[id].mode_flags = mdsi->mode_flags; - dsi->client[id].phy_clock = mdsi->phy_clock; + dsi->client[id].phy_clock =0 ;DRM_INFO ("host attach, client name=[%s], id=%d\n" , mdsi->name, id);
drivers/staging/hikey9xx/gpu/kirin_dpe_reg.h +1 -0
@@ -18,6 +18,7 @@#include <linux/kernel.h> #include <linux/wait.h> #include <linux/bug.h> +#include <linux/iommu.h> #include <linux/ion.h> #include <linux/hisi/hisi_ion.h>
drivers/staging/hikey9xx/gpu/kirin_drm_drv.c +1 -2
@@ -200,9 +200,8 @@ static int kirin_drm_connectors_register(struct drm_device *dev)static struct drm_driver kirin_drm_driver = { .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_PRIME | -DRIVER_ATOMIC |DRIVER_HAVE_IRQ |DRIVER_RENDER , +DRIVER_ATOMIC |DRIVER_RENDER , .fops = &kirin_drm_fops, - .set_busid = drm_platform_set_busid, .gem_free_object = drm_gem_cma_free_object, .gem_vm_ops = &drm_gem_cma_vm_ops,
drivers/staging/hikey9xx/gpu/kirin_drm_drv.h +1 -0
@@ -12,6 +12,7 @@#define __KIRIN_DRM_DRV_H__#include <drm/drmP.h> +#include <linux/iommu.h> #include <linux/ion.h> #include <linux/hisi/hisi_ion.h> #include <linux/hisi/hisi-iommu.h>
drivers/staging/hikey9xx/gpu/kirin_drm_dss.c +20 -26
107 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_drm_overlay_utils.c +5 -2
@@ -1117,7 +1117,7 @@ void hisi_fb_pan_display(struct drm_plane *plane)dss_rect_ltrb_t rect;u32 bpp;u32 stride; -u32 display_addr; +u32 display_addr =0 ;u32 hal_fmt;int chn_idx =DSS_RCHN_D2 ;
@@ -1138,7 +1138,10 @@ void hisi_fb_pan_display(struct drm_plane *plane) bpp = fb->bits_per_pixel /8 ; stride = fb->pitches[0 ]; - display_addr = (u32 )fbdev->smem_start + src_y * stride; +if (fbdev) + display_addr = (u32 )fbdev->smem_start + src_y * stride; +else +printk ("JDB: fbdev is null?\n" ); rect.left =0 ; rect.right = src_w -1 ;
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 4/49 staging: hikey9xx/gpu: resolve the performance issue by interrupt mechanism
In reply to Mauro Carvalho ChehabFrom: Liwei Cai <[email protected]>
There is an error at wait for vactive end flags, waiting vactive flag in 1ms maybe too rough, but it's not good to control the waiting grain size, there is no way to get the waiting unit, so the interrupt mechanism is the best way to solve this problem.
Each frame would report hardware interrupt, implement the interrupt service to get vactive end interrupt, and fb_post return to tell gpu render next framebuffer.
--- drivers/staging/hikey9xx/gpu/kirin_dpe_reg.h | 4 +- .../hikey9xx/gpu/kirin_drm_dpe_utils.c | 3 +- drivers/staging/hikey9xx/gpu/kirin_drm_dss.c | 14 ++--- .../hikey9xx/gpu/kirin_drm_overlay_utils.c | 56 ++++--------------- 4 files changed, 20 insertions(+), 57 deletions(-)
drivers/staging/hikey9xx/gpu/kirin_dpe_reg.h +2 -2
@@ -2948,8 +2948,8 @@ struct dss_hw_ctx {bool power_on;int irq; -wait_queue_head_t vactive0_start_wq; -u32 vactive0_start_flag; +wait_queue_head_t vactive0_end_wq; +u32 vactive0_end_flag;ktime_t vsync_timestamp;ktime_t vsync_timestamp_prev;
drivers/staging/hikey9xx/gpu/kirin_drm_dpe_utils.c +1 -2
@@ -554,8 +554,7 @@ void dpe_interrupt_unmask(struct dss_crtc *acrtc)outp32 (dss_base +GLB_CPU_PDP_INT_MSK , unmask); unmask = ~0 ; - unmask &= ~(BIT_VSYNC |BIT_VACTIVE0_START - |BIT_VACTIVE0_END |BIT_FRM_END |BIT_LDI_UNFLOW ); + unmask &= ~(BIT_VSYNC |BIT_VACTIVE0_END |BIT_LDI_UNFLOW );outp32 (dss_base +DSS_LDI0_OFFSET +LDI_CPU_ITF_INT_MSK , unmask); }
drivers/staging/hikey9xx/gpu/kirin_drm_dss.c +7 -7
@@ -167,8 +167,8 @@ static int dss_power_up(struct dss_crtc *acrtc)dss_inner_clk_common_enable (acrtc);dpe_interrupt_mask (acrtc);dpe_interrupt_clear (acrtc); -//dpe_irq_enable(acrtc); -//dpe_interrupt_unmask(acrtc); +dpe_irq_enable (acrtc); +dpe_interrupt_unmask (acrtc); ctx->power_on = true;return 0 ;
@@ -237,9 +237,9 @@ static irqreturn_t dss_irq_handler(int irq, void *data) isr_s2 &= ~(inp32 (dss_base +DSS_LDI0_OFFSET +LDI_CPU_ITF_INT_MSK )); isr_s2_dpp &= ~(inp32 (dss_base +DSS_DPP_OFFSET +DPP_INT_MSK )); -if (isr_s2 &BIT_VACTIVE0_START ) { - ctx->vactive0_start_flag++; -wake_up_interruptible_all (&ctx->vactive0_start_wq); +if (isr_s2 &BIT_VACTIVE0_END ) { + ctx->vactive0_end_flag++; +wake_up_interruptible_all (&ctx->vactive0_end_wq); }if (isr_s2 &BIT_VSYNC ) {
@@ -637,8 +637,8 @@ static int dss_drm_init(struct drm_device *dev) ctx->screen_size =0 ; ctx->smem_start =0 ; - ctx->vactive0_start_flag =0 ; -init_waitqueue_head (&ctx->vactive0_start_wq); + ctx->vactive0_end_flag =0 ; +init_waitqueue_head (&ctx->vactive0_end_wq);/* * plane init
drivers/staging/hikey9xx/gpu/kirin_drm_overlay_utils.c +10 -46
112 lines not on this page · raw message
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 24/49 staging: hikey9xx/gpu: fix the DRM setting logic
In reply to Mauro Carvalho ChehabThe logich which sets the MIPI parameters is currently wrong:
it is using a value stored at cur_client, with actually points to the active location, and not to the one that it is about to be initialized.
The entire logic sounds buggy, but for now let's just keep following it, by adding an extra var that will tell what was the latest attached encoder.
--- .../hikey9xx/gpu/kirin9xx_dw_drm_dsi.c | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-)
drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c +19 -19
@@ -241,7 +241,7 @@ struct dw_dsi {unsigned long mode_flags;struct gpio_desc *gpio_mux;struct dw_dsi_client client[OUT_MAX ]; -enum dsi_output_client cur_client; +enum dsi_output_client cur_client, attached_client;bool enable; };
@@ -330,13 +330,12 @@ EXPORT_SYMBOL(dsi_set_output_client);#if defined (CONFIG_DRM_HISI_KIRIN970 )static void get_dsi_dphy_ctrl (struct dw_dsi *dsi, -struct mipi_phy_params *phy_ctrl) +struct mipi_phy_params *phy_ctrl,u32 id) {struct mipi_panel_info *mipi =NULL ;struct drm_display_mode *mode =NULL ;u32 dphy_req_kHz;int bpp; -u32 id =0 ;u32 ui =0 ;u32 m_pll =0 ;u32 n_pll =0 ;
@@ -364,7 +363,6 @@ static void get_dsi_dphy_ctrl(struct dw_dsi *dsi,WARN_ON (!phy_ctrl);WARN_ON (!dsi); - id = dsi->cur_client; mode = &dsi->cur_mode; mipi = &dsi->mipi;
@@ -562,13 +560,12 @@ static void get_dsi_dphy_ctrl(struct dw_dsi *dsi, }#else static void get_dsi_phy_ctrl (struct dw_dsi *dsi, -struct mipi_phy_params *phy_ctrl) +struct mipi_phy_params *phy_ctrl,u32 id) {struct mipi_panel_info *mipi =NULL ;struct drm_display_mode *mode =NULL ;u32 dphy_req_kHz;int bpp; -u32 id =0 ;u32 ui =0 ;u32 m_pll =0 ;u32 n_pll =0 ;
@@ -602,7 +599,6 @@ static void get_dsi_phy_ctrl(struct dw_dsi *dsi,WARN_ON (!phy_ctrl);WARN_ON (!dsi); - id = dsi->cur_client; mode = &dsi->cur_mode; mipi = &dsi->mipi;
@@ -949,13 +945,15 @@ static void dsi_phy_tst_set(void __iomem *base, u32 reg, u32 val)writel (0x00 , base +MIPIDSI_PHY_TST_CTRL0_OFFSET ); } -static void mipi_config_dphy_spec1v2_parameter (struct dw_dsi *dsi,char __iomem *mipi_dsi_base) +static void mipi_config_dphy_spec1v2_parameter (struct dw_dsi *dsi, +char __iomem *mipi_dsi_base, +u32 id) {uint32_t i;uint32_t addr =0 ;u32 lanes; - lanes = dsi->client[dsi->cur_client].lanes -1 ; + lanes = dsi->client[id].lanes -1 ;for (i =0 ; i <= (lanes +1 ); i++) {//Lane Transmission Property addr =MIPIDSI_PHY_TST_LANE_TRANSMISSION_PROPERTY + (i <<5 );
@@ -1027,13 +1025,13 @@ static void mipi_config_dphy_spec1v2_parameter(struct dw_dsi *dsi, char __iomem } } -static void dsi_mipi_init (struct dw_dsi *dsi,char __iomem *mipi_dsi_base) +static void dsi_mipi_init (struct dw_dsi *dsi,char __iomem *mipi_dsi_base, +u32 id) {u32 hline_time =0 ;u32 hsa_time =0 ;u32 hbp_time =0 ;u64 pixel_clk =0 ; -u32 id =0 ;unsigned long dw_jiffies =0 ;u32 tmp =0 ;bool is_ready = false;
@@ -1048,8 +1046,6 @@ static void dsi_mipi_init(struct dw_dsi *dsi, char __iomem *mipi_dsi_base)WARN_ON (!dsi);WARN_ON (!mipi_dsi_base); - id = dsi->cur_client; -DRM_INFO ("dsi_mipi_init, id=%d\n" , id);
@@ -1063,9 +1059,9 @@ static void dsi_mipi_init(struct dw_dsi *dsi, char __iomem *mipi_dsi_base)memset (&dsi->phy,0 ,sizeof (struct mipi_phy_params ));#if defined (CONFIG_DRM_HISI_KIRIN970 ) -get_dsi_dphy_ctrl (dsi, &dsi->phy); +get_dsi_dphy_ctrl (dsi, &dsi->phy, id);#else -get_dsi_phy_ctrl (dsi, &dsi->phy); +get_dsi_phy_ctrl (dsi, &dsi->phy, id);#endif rect.x =0 ;
@@ -1113,7 +1109,7 @@ static void dsi_mipi_init(struct dw_dsi *dsi, char __iomem *mipi_dsi_base)dsi_phy_tst_set (mipi_dsi_base,0x004B ,0x1 );//set dphy spec parameter -mipi_config_dphy_spec1v2_parameter (dsi, mipi_dsi_base); +mipi_config_dphy_spec1v2_parameter (dsi, mipi_dsi_base, id);#else /* physical configuration PLL I*/ dsi_phy_tst_set(mipi_dsi_base, 0x14,
@@ -1363,12 +1359,13 @@ static void dsi_encoder_disable(struct drm_encoder *encoder) dsi->enable = false; } -static int mipi_dsi_on_sub1 (struct dw_dsi *dsi,char __iomem *mipi_dsi_base) +static int mipi_dsi_on_sub1 (struct dw_dsi *dsi,char __iomem *mipi_dsi_base, +u32 id) {WARN_ON (!mipi_dsi_base);/* mipi init */ -dsi_mipi_init (dsi, mipi_dsi_base); +dsi_mipi_init (dsi, mipi_dsi_base, id);/* dsi memory init */ #if defined (CONFIG_DRM_HISI_KIRIN970 )
@@ -1443,7 +1440,7 @@ static void dsi_encoder_enable(struct drm_encoder *encoder)return ; } -mipi_dsi_on_sub1 (dsi, ctx->base); +mipi_dsi_on_sub1 (dsi, ctx->base, dsi->attached_client);mipi_dsi_on_sub2 (dsi, ctx->base);
@@ -1550,6 +1547,8 @@ static int dsi_host_attach(struct mipi_dsi_host *host, dsi->client[id].mode_flags = mdsi->mode_flags; dsi->client[id].phy_clock =0 ; + dsi->attached_client = id; +DRM_INFO ("host attach, client name=[%s], id=%d\n" , mdsi->name, id);return 0 ;
@@ -1959,6 +1958,7 @@ static int dsi_parse_dt(struct platform_device *pdev, struct dw_dsi *dsi)/* set dsi default output to panel */ dsi->cur_client =OUT_PANEL ; + dsi->attached_client = dsi->cur_client;DRM_INFO ("dsi cur_client is %d <0->hdmi;1->panel> \n" , dsi->cur_client);/*dis-reset*/
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 19/49 staging: hikey9xx/gpu: add a copy of set_reg() function there
In reply to Mauro Carvalho ChehabThis function has a too generic name to export it as a symbol. Also, we should likely use some other macro instead.
So, for now, just copy it into the Kirin9xx dsi module, in order for the driver to build.
--- .../staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c +16 -1
@@ -37,7 +37,6 @@#else #include "kirin960_dpe_reg.h" #endif -#include "kirin9xx_drm_dpe_utils.h" #include "kirin9xx_drm_drv.h" #if defined (CONFIG_DRM_HISI_KIRIN970 )
@@ -270,6 +269,22 @@ static const struct dsi_phy_range dphy_range_info[] = { { 1000000, 1500000, 0, 0 } }; +/* +* Except for debug, this is identical to the one defined at +* kirin9xx_drm_dpe_utils.h. +*/ +static void set_reg (char __iomem *addr,uint32_t val,uint8_t bw, +uint8_t bs) +{ +u32 mask = (1UL << bw) -1UL ; +u32 tmp =0 ; + + tmp =inp32 (addr); + tmp &= ~(mask << bs); + +outp32 (addr, tmp | ((val & mask) << bs)); +} +void dsi_set_output_client (struct drm_device *dev) {struct drm_connector_list_iter conn_iter;
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 9/49 staging: hikey9xx/gpu: Solve SR test reset problem for hikey970.
In reply to Mauro Carvalho ChehabFrom: Xiubin Zhang <[email protected]>
Add HDMI/DSS power on&off in the SR flow.
--- drivers/staging/hikey9xx/gpu/Makefile | 1 - drivers/staging/hikey9xx/gpu/dw_drm_dsi.c | 10 +-- .../staging/hikey9xx/gpu/kirin970_dpe_reg.h | 9 ++- drivers/staging/hikey9xx/gpu/kirin_dpe_reg.h | 4 +- .../hikey9xx/gpu/kirin_drm_dpe_utils.c | 80 ++++++++++++++----- .../hikey9xx/gpu/kirin_drm_dpe_utils.h | 4 + drivers/staging/hikey9xx/gpu/kirin_drm_dss.c | 34 +++----- .../hikey9xx/gpu/kirin_drm_overlay_utils.c | 3 - 8 files changed, 85 insertions(+), 60 deletions(-)
drivers/staging/hikey9xx/gpu/Makefile +0 -1
@@ -1,6 +1,5 @@ EXTRA_CFLAGS += \ -Iinclude/drm - kirin-drm-y := kirin_fbdev.o \ kirin_fb.o \ kirin_drm_drv.o \
drivers/staging/hikey9xx/gpu/dw_drm_dsi.c +2 -8
@@ -2046,11 +2046,8 @@ static int dsi_suspend(struct platform_device *pdev, pm_message_t state)struct dsi_data *ddata =dev_get_drvdata (dev);struct dw_dsi *dsi = &ddata->dsi; -DRM_INFO ("+. pdev->name is %s, pm_message is %d \n" , pdev->name, state.event); -dsi_encoder_disable (&dsi->encoder); - -DRM_INFO ("-. \n" ); +drm_bridge_post_disable (dsi->encoder.bridge);return 0 ; }
@@ -2061,12 +2058,9 @@ static int dsi_resume(struct platform_device *pdev)struct dsi_data *ddata =dev_get_drvdata (dev);struct dw_dsi *dsi = &ddata->dsi; -DRM_INFO ("+. pdev->name is %s \n" , pdev->name); - +drm_bridge_pre_enable (dsi->encoder.bridge);dsi_encoder_enable (&dsi->encoder); -DRM_INFO ("-. \n" ); -return 0 ; }
drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h +5 -4
@@ -43,6 +43,7 @@/* vcc name */ #define REGULATOR_PDP_NAME "regulator_dsssubsys"#define REGULATOR_MMBUF "regulator_mmbuf" +#define REGULATOR_MEDIA_NAME "regulator_media_subsys"/******************************************************************************* **
@@ -220,8 +221,8 @@ typedef struct drm_dss_layer {/*dss clk power off */ #define DEFAULT_DSS_CORE_CLK_RATE_POWER_OFF (277000000UL) -#define DEFAULT_DSS_PXL0_CLK_RATE_POWER_OFF (277000000UL) -#define DEFAULT_DSS_MMBUF_CLK_RATE_POWER_OFF (238000000UL) +#define DEFAULT_DSS_PXL0_CLK_RATE_POWER_OFF (238000000UL) +#define DEFAULT_DSS_MMBUF_CLK_RATE_POWER_OFF (208000000UL)#define DEFAULT_DSS_PXL1_CLK_RATE_POWER_OFF (238000000UL)#define DEFAULT_PCLK_DSS_RATE (114000000UL)
@@ -4085,8 +4086,8 @@ struct dss_hw_ctx {struct dss_clk_rate *dss_clk;struct regulator *dpe_regulator; -struct regulator_bulk_data *mmbuf_regulator; -struct regulator_bulk_data *media_subsys_regulator; +struct regulator *mmbuf_regulator; +struct regulator *mediacrg_regulator;bool power_on;int irq;
drivers/staging/hikey9xx/gpu/kirin_dpe_reg.h +2 -2
@@ -3073,8 +3073,8 @@ struct dss_hw_ctx {struct dss_clk_rate *dss_clk;struct regulator *dpe_regulator; -struct regulator_bulk_data *mmbuf_regulator; -struct regulator_bulk_data *media_subsys_regulator; +struct regulator *mmbuf_regulator; +struct regulator *mediacrg_regulator;bool power_on;int irq;
drivers/staging/hikey9xx/gpu/kirin_drm_dpe_utils.c +60 -20
118 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_drm_dpe_utils.h +4 -0
@@ -50,6 +50,8 @@ int dpe_inner_clk_enable(struct dss_hw_ctx *ctx);int dpe_inner_clk_disable (struct dss_hw_ctx *ctx);int dpe_regulator_enable (struct dss_hw_ctx *ctx);int dpe_regulator_disable (struct dss_hw_ctx *ctx); +int mediacrg_regulator_enable (struct dss_hw_ctx *ctx); +int mediacrg_regulator_disable (struct dss_hw_ctx *ctx);int dpe_set_clk_rate (struct dss_hw_ctx *ctx);int dpe_irq_enable (struct dss_crtc *acrtc);
@@ -59,6 +61,8 @@ int dpe_init(struct dss_crtc *acrtc);int dpe_deinit (struct dss_crtc *acrtc);void dpe_check_itf_status (struct dss_crtc *acrtc);int dpe_set_clk_rate_on_pll0 (struct dss_hw_ctx *ctx); +int dpe_set_common_clk_rate_on_pll0 (struct dss_hw_ctx *ctx); +int dpe_set_pixel_clk_rate_on_pll0 (struct dss_hw_ctx *ctx);void hisifb_dss_on (struct dss_hw_ctx *ctx);void hisi_dss_mctl_on (struct dss_hw_ctx *ctx);
drivers/staging/hikey9xx/gpu/kirin_drm_dss.c +12 -22
@@ -51,7 +51,6 @@#define DTS_COMP_DSS_NAME "hisilicon,hi3660-dpe"#endif -#define PPLL7_USED_IN_DRV #define DSS_DEBUG 0static const struct dss_format dss_formats[] = {
@@ -101,7 +100,6 @@ u32 dss_get_format(u32 pixel_format)return HISI_FB_PIXEL_FORMAT_UNSUPPORT ; } -#ifdef PPLL7_USED_IN_DRV /******************************************************************************* ** */
@@ -247,7 +245,6 @@ int hdmi_pxl_ppll7_init(struct dss_hw_ctx *ctx, uint64_t pixel_clock) }return ret; } -#endif /******************************************************************************* **
@@ -273,18 +270,8 @@ static void dss_ldi_set_mode(struct dss_crtc *acrtc)else clk_Hz = mode->clock *1000UL ; -#ifdef PPLL7_USED_IN_DRV +DRM_INFO ("HDMI real need clock = %llu \n" , clk_Hz);hdmi_pxl_ppll7_init (ctx, clk_Hz); -#else -/* -* Success should be guaranteed in mode_valid call back, -* so failure shouldn't happen here -*/ - ret =clk_set_rate (ctx->dss_pxl0_clk, clk_Hz); -if (ret) { -DRM_ERROR ("failed to set pixel clk %llu Hz (%d)\n" , clk_Hz, ret); - } -#endif adj_mode->clock = clk_Hz /1000 ; }else {if (mode->clock ==148500 )
@@ -320,6 +307,7 @@ static int dss_power_up(struct dss_crtc *acrtc)int ret =0 ;#if defined (CONFIG_HISI_FB_970 ) +mediacrg_regulator_enable (ctx);dpe_common_clk_enable (ctx);dpe_inner_clk_enable (ctx);#ifndef DSS_POWER_UP_ON_UEFI
@@ -384,14 +372,16 @@ static void dss_power_down(struct dss_crtc *acrtc)dss_inner_clk_pdp_disable (ctx);if (ctx->g_dss_version_tag &FB_ACCEL_KIRIN970 ) { +dpe_regulator_disable (ctx);dpe_inner_clk_disable (ctx);dpe_common_clk_disable (ctx); -dpe_regulator_disable (ctx); +mediacrg_regulator_disable (ctx); }else {dpe_regulator_disable (ctx);dpe_inner_clk_disable (ctx);dpe_common_clk_disable (ctx); } + ctx->power_on = false; }
@@ -789,7 +779,13 @@ static int dss_dts_parse(struct platform_device *pdev, struct dss_hw_ctx *ctx)#if defined (CONFIG_HISI_FB_970 ) ctx->dpe_regulator =devm_regulator_get (dev,REGULATOR_PDP_NAME );if (!ctx->dpe_regulator) { -DRM_ERROR ("failed to get regulator resource! ret=%d.\n" , ret); +DRM_ERROR ("failed to get dpe_regulator resource! ret=%d.\n" , ret); +return -ENXIO ; + } + + ctx->mediacrg_regulator =devm_regulator_get (dev,REGULATOR_MEDIA_NAME ); +if (!ctx->mediacrg_regulator) { +DRM_ERROR ("failed to get mediacrg_regulator resource! ret=%d.\n" , ret);return -ENXIO ; }#endif
@@ -946,11 +942,8 @@ static int dss_drm_suspend(struct platform_device *pdev, pm_message_t state)struct dss_data *dss =platform_get_drvdata (pdev);struct drm_crtc *crtc = &dss->acrtc.base; -DRM_INFO ("+. platform_device name is %s \n" , pdev->name);dss_crtc_disable (crtc); -DRM_INFO ("-. \n" ); -return 0 ; }
@@ -959,12 +952,9 @@ static int dss_drm_resume(struct platform_device *pdev)struct dss_data *dss =platform_get_drvdata (pdev);struct drm_crtc *crtc = &dss->acrtc.base; -DRM_INFO ("+. platform_device name is %s \n" , pdev->name); -dss_crtc_mode_set_nofb (crtc);dss_crtc_enable (crtc); -DRM_INFO ("-. \n" );return 0 ; }
drivers/staging/hikey9xx/gpu/kirin_drm_overlay_utils.c +0 -3
@@ -28,9 +28,6 @@#include "kirin_drm_dpe_utils.h" #include "kirin_drm_drv.h" - -#define DSS_CHN_MAX_DEFINE (DSS_COPYBIT_MAX) -static int mid_array[DSS_CHN_MAX_DEFINE ] = {0xb ,0xa ,0x9 ,0x8 ,0x7 ,0x6 ,0x5 ,0x4 ,0x2 ,0x1 ,0x3 ,0x0 };#if defined (CONFIG_HISI_FB_970 )
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 48/49 staging: hikey9xx/gpu: drop kirin9xx_pwm
In reply to Mauro Carvalho ChehabThis is part of support for a panel display. Those don't come with the Hikey 960 or 970 boards. As I don't have any of those for tests, and we didn't port another required driver for this to work, for now, let's drop it.
This patch can be reversed later, if one would be adding support for it.
--- .../boot/dts/hisilicon/hikey970-drm.dtsi | 37 -- drivers/staging/hikey9xx/gpu/Makefile | 2 +- drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c | 404 ------------------ 3 files changed, 1 insertion(+), 442 deletions(-) delete mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c
arch/arm64/boot/dts/hisilicon/hikey970-drm.dtsi +0 -37
@@ -87,44 +87,7 @@ dsi_out0: endpoint@0 { reg = <0>; remote-endpoint = <&adv7533_in>; }; - - dsi_out1: endpoint@1 { - reg = <1>; - remote-endpoint = <&panel0_in>; - }; }; }; - - panel@1 { - compatible = "hisilicon,mipi-hikey"; - #address-cells = <2>; - #size-cells = <2>; - reg = <1>; - panel-width-mm = <94>; - panel-height-mm = <151>; - vdd-supply = <&ldo3>; - pwr-en-gpio = <&gpio21 3 0>;//GPIO_171 - bl-en-gpio = <&gpio6 4 0>;//GPIO_052 - pwm-gpio = <&gpio23 1 0>;//GPIO_185 - - port { - panel0_in: endpoint { - remote-endpoint = <&dsi_out1>; - }; - }; - }; - }; - - panel_pwm { - #address-cells = <2>; - #size-cells = <2>; - compatible = "hisilicon,hisipwm"; - reg = <0 0xE8A04000 0 0x1000>, - <0 0xFFF35000 0 0x1000>; - clocks = <&crg_ctrl HI3670_CLK_GATE_PWM>; - clock-names = "clk_pwm"; - pinctrl-names = "default","idle"; - pinctrl-0 = <&gpio185_pmx_func &gpio185_cfg_func>; - pinctrl-1 = <&gpio185_pmx_idle &gpio185_cfg_idle>; }; };
drivers/staging/hikey9xx/gpu/Makefile +1 -1
@@ -5,5 +5,5 @@ kirin9xx-drm-y := kirin9xx_drm_drv.o \ kirin970_defs.o kirin960_defs.o \ kirin9xx_drm_overlay_utils.o -obj-$(CONFIG_DRM_HISI_KIRIN9XX) += kirin9xx-drm.o kirin9xx_pwm.o +obj-$(CONFIG_DRM_HISI_KIRIN9XX) += kirin9xx-drm.o obj-$(CONFIG_DRM_HISI_KIRIN9XX_DSI) += kirin9xx_dw_drm_dsi.o
drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c deleted +0 -404
404 lines not on this page · raw message
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 10/49 staging: hikey9xx/gpu: add debug prints for this driver
In reply to Mauro Carvalho ChehabFrom: Xiubin Zhang <[email protected]>
Add some debug prints on adv7535 and kirin_drm_drv.
--- drivers/staging/hikey9xx/gpu/hdmi/adv7535.c | 40 ++++++++++++++++++-- drivers/staging/hikey9xx/gpu/kirin_drm_drv.c | 2 +- 2 files changed, 37 insertions(+), 5 deletions(-)
drivers/staging/hikey9xx/gpu/hdmi/adv7535.c +36 -4
@@ -28,7 +28,8 @@#include "adv7535.h" -#define HPD_ENABLE 1 +//#define HPD_ENABLE 1 +#define HPD_ENABLE 0//#define TEST_COLORBAR_DISPLAY #ifdef CONFIG_HDMI_ADV7511_AUDIO extern int adv7511_audio_init (struct device *dev);
@@ -785,19 +786,25 @@ adv7511_detect(struct adv7511 *adv7511, {enum drm_connector_status status;unsigned int val; +unsigned int time =0 ;#if HPD_ENABLE bool hpd;#endif int ret; ret =regmap_read (adv7511->regmap,ADV7511_REG_STATUS , &val); -if (ret <0 ) +if (ret <0 ) { +DRM_ERROR ("regmap_read fail, ret = %d \n" , ret);return connector_status_disconnected; + } -if (val &ADV7511_STATUS_HPD ) +if (val &ADV7511_STATUS_HPD ) { +DRM_INFO ("connected : regmap_read val = 0x%x \n" , val); status = connector_status_connected; -else + }else { +DRM_INFO ("disconnected : regmap_read val = 0x%x \n" , val); status = connector_status_disconnected; + }#if HPD_ENABLE hpd =adv7511_hpd (adv7511);
@@ -820,7 +827,32 @@ adv7511_detect(struct adv7511 *adv7511, }#endif +if (status == connector_status_disconnected) { +do { + ret =regmap_read (adv7511->regmap,ADV7511_REG_STATUS , &val); +if (ret <0 ) { +DRM_ERROR ("regmap_read fail, ret = %d \n" , ret); +return connector_status_disconnected; + } + +if (val &ADV7511_STATUS_HPD ) { +DRM_INFO ("connected : regmap_read val = 0x%x \n" , val); + status = connector_status_connected; + }else { +DRM_INFO ("disconnected : regmap_read val = 0x%x \n" , val); + status = connector_status_disconnected; + } + time ++; +mdelay (20 ); + }while (status == connector_status_disconnected && time <10 ); + } + +if (time >=10 ) +DRM_ERROR ("Read connector status timout, time = %d \n" , time); + adv7511->status = status; + +DRM_INFO ("hdmi connector status = %d \n" , status);return status; }
drivers/staging/hikey9xx/gpu/kirin_drm_drv.c +1 -1
@@ -144,7 +144,7 @@ static int kirin_drm_kms_init(struct drm_device *dev)/* init kms poll for handling hpd */ drm_kms_helper_poll_init (dev); -#if 0 +#if 1 /* force detection after connectors init */ (void )drm_helper_hpd_irq_event (dev);#endif
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 6/49 staging: hikey9xx/gpu: Solve SR Cannot Display Problems.
In reply to Mauro Carvalho ChehabFrom: Xiubin Zhang <[email protected]>
Add suspend and resume interface to solve SR Cannot Display Problems.
--- drivers/staging/hikey9xx/gpu/dw_drm_dsi.c | 32 +++ drivers/staging/hikey9xx/gpu/hdmi/adv7535.c | 14 +- .../staging/hikey9xx/gpu/kirin970_dpe_reg.h | 46 ++-- drivers/staging/hikey9xx/gpu/kirin_dpe_reg.h | 6 + .../hikey9xx/gpu/kirin_drm_dpe_utils.c | 204 +++++++++++++++++- .../hikey9xx/gpu/kirin_drm_dpe_utils.h | 8 + drivers/staging/hikey9xx/gpu/kirin_drm_drv.c | 32 +++ drivers/staging/hikey9xx/gpu/kirin_drm_drv.h | 2 + drivers/staging/hikey9xx/gpu/kirin_drm_dss.c | 53 ++++- .../hikey9xx/gpu/kirin_drm_overlay_utils.c | 61 ++++-- drivers/staging/hikey9xx/gpu/kirin_fbdev.c | 3 +- 11 files changed, 401 insertions(+), 60 deletions(-)
drivers/staging/hikey9xx/gpu/dw_drm_dsi.c +32 -0
@@ -2063,6 +2063,36 @@ static int dsi_remove(struct platform_device *pdev)return 0 ; } +static int dsi_suspend (struct platform_device *pdev,pm_message_t state) +{ +struct device *dev = &pdev->dev; +struct dsi_data *ddata =dev_get_drvdata (dev); +struct dw_dsi *dsi = &ddata->dsi; + +DRM_INFO ("+. pdev->name is %s, pm_message is %d \n" , pdev->name, state.event); + +dsi_encoder_disable (&dsi->encoder); + +DRM_INFO ("-. \n" ); + +return 0 ; +} + +static int dsi_resume (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct dsi_data *ddata =dev_get_drvdata (dev); +struct dw_dsi *dsi = &ddata->dsi; + +DRM_INFO ("+. pdev->name is %s \n" , pdev->name); + +dsi_encoder_enable (&dsi->encoder); + +DRM_INFO ("-. \n" ); + +return 0 ; +} +static const struct of_device_id dsi_of_match[] = { {.compatible ="hisilicon,hi3660-dsi" }, {.compatible ="hisilicon,kirin970-dsi" },
@@ -2073,6 +2103,8 @@ MODULE_DEVICE_TABLE(of, dsi_of_match);static struct platform_driver dsi_driver = { .probe = dsi_probe, .remove = dsi_remove, + .suspend = dsi_suspend, + .resume = dsi_resume, .driver = { .name ="dw-dsi" , .of_match_table = dsi_of_match,
drivers/staging/hikey9xx/gpu/hdmi/adv7535.c +6 -8
@@ -1231,12 +1231,10 @@ static int adv7533_init_regulators(struct adv7511 *adv75xx, struct device *dev)if (IS_ERR (adv75xx->v1p2)) { ret =PTR_ERR (adv75xx->v1p2);dev_err (dev,"failed to get v1p2 regulator %d\n" , ret); -//return ret; +return ret; } ret =regulator_set_voltage (adv75xx->vdd,1800000 ,1800000 ); -//ret = regulator_set_voltage(adv75xx->vdd, 1500000, 1500000); -//ret = regulator_set_voltage(adv75xx->vdd, 2000000, 2000000); if (ret) {dev_err (dev,"failed to set avdd voltage %d\n" , ret);return ret;
@@ -1244,11 +1242,11 @@ static int adv7533_init_regulators(struct adv7511 *adv75xx, struct device *dev)DRM_INFO (" adv75xx->vdd = %d \n" ,regulator_get_voltage (adv75xx->vdd)); -//ret = regulator_set_voltage(adv75xx->v1p2, 1200000, 1200000); +/*ret = regulator_set_voltage(adv75xx->v1p2, 1200000, 1200000); if (ret) { dev_err(dev, "failed to set v1p2 voltage %d\n", ret); -//return ret; - } +return ret; +}*/ /* keep the regulators always on */ ret =regulator_enable (adv75xx->vdd);
@@ -1257,11 +1255,11 @@ static int adv7533_init_regulators(struct adv7511 *adv75xx, struct device *dev)return ret; } -//ret = regulator_enable(adv75xx->v1p2); +/*ret = regulator_enable(adv75xx->v1p2); if (ret) { dev_err(dev, "failed to enable v1p2 %d\n", ret); //return ret; - } +}*/ return 0 ; }
drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h +23 -23
68 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_dpe_reg.h +6 -0
@@ -193,6 +193,12 @@ typedef struct drm_dss_layer {#define DEFAULT_PCLK_PCTRL_RATE (80000000UL)#define DSS_MAX_PXL0_CLK_288M (288000000UL) +/*dss clk power off */ +#define DEFAULT_DSS_CORE_CLK_RATE_POWER_OFF (277000000UL) +#define DEFAULT_DSS_PXL0_CLK_RATE_POWER_OFF (277000000UL) +#define DEFAULT_DSS_MMBUF_CLK_RATE_POWER_OFF (238000000UL) +#define DEFAULT_DSS_PXL1_CLK_RATE_POWER_OFF (238000000UL) +#define MMBUF_SIZE_MAX (288 * 1024)#define HISI_DSS_CMDLIST_MAX (16)#define HISI_DSS_CMDLIST_IDXS_MAX (0xFFFF)
drivers/staging/hikey9xx/gpu/kirin_drm_dpe_utils.c +195 -9
271 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_drm_dpe_utils.h +8 -0
@@ -38,19 +38,27 @@ void enable_ldi(struct dss_crtc *acrtc);void disable_ldi (struct dss_crtc *acrtc);void dss_inner_clk_pdp_enable (struct dss_hw_ctx *ctx); +void dss_inner_clk_pdp_disable (struct dss_hw_ctx *ctx);void dss_inner_clk_common_enable (struct dss_hw_ctx *ctx); +void dss_inner_clk_common_disable (struct dss_hw_ctx *ctx);void dpe_interrupt_clear (struct dss_crtc *acrtc);void dpe_interrupt_unmask (struct dss_crtc *acrtc);void dpe_interrupt_mask (struct dss_crtc *acrtc);int dpe_common_clk_enable (struct dss_hw_ctx *ctx); +int dpe_common_clk_disable (struct dss_hw_ctx *ctx);int dpe_inner_clk_enable (struct dss_hw_ctx *ctx); +int dpe_inner_clk_disable (struct dss_hw_ctx *ctx);int dpe_regulator_enable (struct dss_hw_ctx *ctx); +int dpe_regulator_disable (struct dss_hw_ctx *ctx);int dpe_set_clk_rate (struct dss_hw_ctx *ctx);int dpe_irq_enable (struct dss_crtc *acrtc);int dpe_irq_disable (struct dss_crtc *acrtc);int dpe_init (struct dss_crtc *acrtc); +int dpe_deinit (struct dss_crtc *acrtc); +void dpe_check_itf_status (acrtc ); +int dpe_set_clk_rate_on_pll0 (struct dss_hw_ctx *ctx);void hisifb_dss_on (struct dss_hw_ctx *ctx);void hisi_dss_mctl_on (struct dss_hw_ctx *ctx);
drivers/staging/hikey9xx/gpu/kirin_drm_drv.c +32 -0
@@ -372,6 +372,36 @@ static int kirin_drm_platform_remove(struct platform_device *pdev)return 0 ; } +static int kirin_drm_platform_suspend (struct platform_device *pdev,pm_message_t state) +{ +struct device *dev = &pdev->dev; + +DRM_INFO ("+. pdev->name is %s, m_message is %d \n" , pdev->name, state.event); +if (!dc_ops) { +DRM_ERROR ("dc_ops is NULL\n" ); +return -EINVAL ; + } + dc_ops->suspend (pdev, state); + +DRM_INFO ("-. \n" ); +return 0 ; +} + +static int kirin_drm_platform_resume (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; + +DRM_INFO ("+. pdev->name is %s \n" , pdev->name); +if (!dc_ops) { +DRM_ERROR ("dc_ops is NULL\n" ); +return -EINVAL ; + } + dc_ops->resume (pdev); + +DRM_INFO ("-. \n" ); +return 0 ; +} +static const struct of_device_id kirin_drm_dt_ids[] = { { .compatible ="hisilicon,hi3660-dpe" , .data = &dss_dc_ops,
@@ -386,6 +416,8 @@ MODULE_DEVICE_TABLE(of, kirin_drm_dt_ids);static struct platform_driver kirin_drm_platform_driver = { .probe = kirin_drm_platform_probe, .remove = kirin_drm_platform_remove, + .suspend = kirin_drm_platform_suspend, + .resume = kirin_drm_platform_resume, .driver = { .name ="kirin-drm" , .of_match_table = kirin_drm_dt_ids,
drivers/staging/hikey9xx/gpu/kirin_drm_drv.h +2 -0
@@ -29,6 +29,8 @@struct kirin_dc_ops {int (*init)(struct drm_device *dev);void (*cleanup)(struct drm_device *dev); +int (*suspend)(struct platform_device *pdev,pm_message_t state); +int (*resume)(struct platform_device *pdev); };struct kirin_drm_private {
drivers/staging/hikey9xx/gpu/kirin_drm_dss.c +47 -6
98 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_drm_overlay_utils.c +49 -12
123 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_fbdev.c +1 -2
@@ -194,8 +194,7 @@ static int kirin_fbdev_mmap(struct fb_info *info, struct vm_area_struct * vma) addr += len;if (addr >= vma->vm_end) { -DRM_ERROR ("addr = 0x%x!, vma->vm_end = 0x%x\n" , addr, vma->vm_end); - +DRM_INFO ("addr = 0x%x!, vma->vm_end = 0x%x\n" , addr, vma->vm_end);return 0 ; } }
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 29/49 staging: hikey9xx/gpu: add a possible implementation for atomic_disable
In reply to Mauro Carvalho ChehabCurrently, the method is empty. However, looking at the driver, it sounds it shouldn't be hard to implement it.
--- drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c +8 -1
@@ -638,7 +638,14 @@ static void dss_plane_atomic_update(struct drm_plane *plane,static void dss_plane_atomic_disable (struct drm_plane *plane,struct drm_plane_state *old_state) { -//struct dss_plane *aplane = to_dss_plane(plane); +// FIXME: Maybe this? +#if 0 +struct dss_plane *aplane =to_dss_plane (plane); +struct dss_crtc *acrtc = aplane->acrtc; + +disable_ldi (acrtc); +hisifb_mctl_sw_clr (acrtc); +#endif }static const struct drm_plane_helper_funcs dss_plane_helper_funcs = {
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 14/49 staging: hikey9xx/gpu: get rid of kirin9xx_fbdev.c
In reply to Mauro Carvalho ChehabWe don't need to implement legacy fbdev support. Just use the FB emulation instead.
--- .../staging/hikey9xx/gpu/kirin9xx_drm_drv.c | 9 +- .../staging/hikey9xx/gpu/kirin9xx_drm_drv.h | 2 - drivers/staging/hikey9xx/gpu/kirin9xx_fb.c | 94 ---- drivers/staging/hikey9xx/gpu/kirin9xx_fbdev.c | 487 ------------------ 4 files changed, 1 insertion(+), 591 deletions(-) delete mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_fb.c delete mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_fbdev.c
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c +1 -8
@@ -39,10 +39,8 @@ static int kirin_drm_kms_cleanup(struct drm_device *dev) {struct kirin_drm_private *priv = dev->dev_private; -if (priv->fbdev) { -kirin_drm_fbdev_fini (dev); +if (priv->fbdev) priv->fbdev =NULL ; - }drm_kms_helper_poll_fini (dev);drm_vblank_cleanup (dev);
@@ -75,8 +73,6 @@ static void kirin_fbdev_output_poll_changed(struct drm_device *dev)#else if (priv->fbdev)drm_fb_helper_hotplug_event (priv->fbdev); -else - priv->fbdev =kirin_drm_fbdev_init (dev);#endif }
@@ -138,9 +134,6 @@ static int kirin_drm_kms_init(struct drm_device *dev)/* reset all the states of crtc/plane/encoder/connector */ drm_mode_config_reset (dev); -if (fbdev) - priv->fbdev =kirin_drm_fbdev_init (dev); -/* init kms poll for handling hpd */ drm_kms_helper_poll_init (dev);
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h +0 -2
@@ -57,7 +57,5 @@ extern void dsi_set_output_client(struct drm_device *dev);struct drm_framebuffer *kirin_framebuffer_init (struct drm_device *dev,struct drm_mode_fb_cmd2 *mode_cmd); -struct drm_fb_helper *kirin_drm_fbdev_init (struct drm_device *dev); -void kirin_drm_fbdev_fini (struct drm_device *dev);#endif /* __KIRIN_DRM_DRV_H__ */
drivers/staging/hikey9xx/gpu/kirin9xx_fb.c deleted +0 -94
94 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_fbdev.c deleted +0 -487
487 lines not on this page · raw message
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 16/49 staging: hikey9xx/gpu: rename the config option for Kirin970
In reply to Mauro Carvalho ChehabUse the same standard as used on other Hisilicon DRM config vars for kirin9xx.
--- .../staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c | 2 +- .../staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.h | 2 +- drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c | 12 ++++++------ .../hikey9xx/gpu/kirin9xx_drm_overlay_utils.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-)
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c +1 -1
@@ -993,7 +993,7 @@ int dpe_regulator_disable(struct dss_hw_ctx *ctx)return -EINVAL ; } -#if defined (CONFIG_HISI_FB_970 ) +#if defined (CONFIG_DRM_HISI_KIRIN970 )dpe_set_pixel_clk_rate_on_pll0 (ctx);dpe_set_common_clk_rate_on_pll0 (ctx);#endif
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.h +1 -1
@@ -14,7 +14,7 @@#ifndef KIRIN_DRM_DPE_UTILS_H #define KIRIN_DRM_DPE_UTILS_H -#if defined (CONFIG_HISI_FB_970 ) +#if defined (CONFIG_DRM_HISI_KIRIN970 )#include "kirin970_dpe_reg.h" #else #include "kirin_dpe_reg.h"
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c +6 -6
@@ -37,7 +37,7 @@#include "kirin_drm_drv.h" #include "kirin_drm_dpe_utils.h" -#if defined (CONFIG_HISI_FB_970 ) +#if defined (CONFIG_DRM_HISI_KIRIN970 )#include "kirin970_dpe_reg.h" #else #include "kirin_dpe_reg.h"
@@ -45,7 +45,7 @@//#define DSS_POWER_UP_ON_UEFI -#if defined (CONFIG_HISI_FB_970 ) +#if defined (CONFIG_DRM_HISI_KIRIN970 )#define DTS_COMP_DSS_NAME "hisilicon,kirin970-dpe"#else #define DTS_COMP_DSS_NAME "hisilicon,hi3660-dpe"
@@ -310,7 +310,7 @@ static int dss_power_up(struct dss_crtc *acrtc)struct dss_hw_ctx *ctx = acrtc->ctx;int ret =0 ; -#if defined (CONFIG_HISI_FB_970 ) +#if defined (CONFIG_DRM_HISI_KIRIN970 )mediacrg_regulator_enable (ctx);dpe_common_clk_enable (ctx);dpe_inner_clk_enable (ctx);
@@ -706,7 +706,7 @@ static int dss_dts_parse(struct platform_device *pdev, struct dss_hw_ctx *ctx)return -ENXIO ; } -#if defined (CONFIG_HISI_FB_970 ) +#if defined (CONFIG_DRM_HISI_KIRIN970 ) ret =of_property_read_u32 (np,"dss_version_tag" , &dss_version_tag);if (ret) {DRM_ERROR ("failed to get dss_version_tag.\n" );
@@ -756,7 +756,7 @@ static int dss_dts_parse(struct platform_device *pdev, struct dss_hw_ctx *ctx)return -ENXIO ; } -#if defined (CONFIG_HISI_FB_970 ) +#if defined (CONFIG_DRM_HISI_KIRIN970 ) ctx->pmctrl_base =of_iomap (np,5 );if (!(ctx->pmctrl_base)) {DRM_ERROR ("failed to get dss pmctrl_base resource.\n" );
@@ -780,7 +780,7 @@ static int dss_dts_parse(struct platform_device *pdev, struct dss_hw_ctx *ctx)DRM_INFO ("dss irq = %d. \n" , ctx->irq); #ifndef DSS_POWER_UP_ON_UEFI -#if defined (CONFIG_HISI_FB_970) +#if defined (CONFIG_DRM_HISI_KIRIN970) ctx->dpe_regulator = devm_regulator_get(dev, REGULATOR_PDP_NAME); if (!ctx->dpe_regulator) { DRM_ERROR("failed to get dpe_regulator resource! ret=%d.\n", ret);
drivers/staging/hikey9xx/gpu/kirin9xx_drm_overlay_utils.c +1 -1
@@ -30,7 +30,7 @@static int mid_array[DSS_CHN_MAX_DEFINE ] = {0xb ,0xa ,0x9 ,0x8 ,0x7 ,0x6 ,0x5 ,0x4 ,0x2 ,0x1 ,0x3 ,0x0 }; -#if defined (CONFIG_HISI_FB_970) +#if defined (CONFIG_DRM_HISI_KIRIN970) uint32_t g_dss_module_base[DSS_CHN_MAX_DEFINE][MODULE_CHN_MAX] = { // D0 {
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 30/49 staging: hikey9xx/gpu: register connector
In reply to Mauro Carvalho Chehabcall drm_connector_register() when initializing the connector.
--- drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c +2 -0
@@ -1786,6 +1786,8 @@ static int dsi_connector_init(struct drm_device *dev, struct dw_dsi *dsi)if (ret)return ret; +drm_connector_register (&dsi->connector); +DRM_INFO ("connector init\n" );return 0 ; }
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 23/49 staging: hikey9xx/gpu: Change the logic which sets the burst mode
In reply to Mauro Carvalho ChehabThe logic there is more complex than it needs. It also places the device with a wrong setting if the flags are missed.
This currently happens on Kirin970 for HDMI, as there's a bug at the part of the driver which selects between PANEL or OUTPUT at encoder init code.
--- .../hikey9xx/gpu/kirin9xx_dw_drm_dsi.c | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-)
drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c +20 -14
@@ -902,26 +902,28 @@ static void dw_dsi_set_mode(struct dw_dsi *dsi, enum dsi_work_mode mode)writel (POWERUP , base +PWR_UP ); } -static void dsi_set_burst_mode (void __iomem *base,unsigned long flags) +static void dsi_set_burst_mode (void __iomem *base,unsigned long burst_flags) { +unsigned long flags;u32 val; -u32 mode_mask =MIPI_DSI_MODE_VIDEO |MIPI_DSI_MODE_VIDEO_BURST | -MIPI_DSI_MODE_VIDEO_SYNC_PULSE ; -u32 non_burst_sync_pulse =MIPI_DSI_MODE_VIDEO | -MIPI_DSI_MODE_VIDEO_SYNC_PULSE ; -u32 non_burst_sync_event =MIPI_DSI_MODE_VIDEO ; -/* -* choose video mode type -*/ -if ((flags & mode_mask) == non_burst_sync_pulse) + flags = burst_flags; + flags &=MIPI_DSI_MODE_VIDEO | +MIPI_DSI_MODE_VIDEO_BURST | +MIPI_DSI_MODE_VIDEO_SYNC_PULSE ; + +if (!(flags &MIPI_DSI_MODE_VIDEO )) { +DRM_WARN ("MIPI_DSI_MODE_VIDEO was not set! Using DSI_NON_BURST_SYNC_PULSES" ); val =DSI_NON_BURST_SYNC_PULSES ; -else if ((flags & mode_mask) == non_burst_sync_event) - val =DSI_NON_BURST_SYNC_EVENTS ; -else + }else if (flags &MIPI_DSI_MODE_VIDEO_BURST ) { val =DSI_BURST_SYNC_PULSES_1 ; + }else if (flags &MIPI_DSI_MODE_VIDEO_SYNC_PULSE ) { + val =DSI_NON_BURST_SYNC_PULSES ; + }else { + val =DSI_NON_BURST_SYNC_EVENTS ; + } -DRM_INFO ("burst_mode = 0x%x (DSI_NON_BURST_SYNC_PULSES => 0)" , val); +DRM_INFO ("burst_mode = 0x%x (flags: 0x%04lx)" , val, burst_flags);set_reg (base +MIPIDSI_VID_MODE_CFG_OFFSET , val,2 ,0 ); }
@@ -1047,6 +1049,10 @@ static void dsi_mipi_init(struct dw_dsi *dsi, char __iomem *mipi_dsi_base)WARN_ON (!mipi_dsi_base); id = dsi->cur_client; + +DRM_INFO ("dsi_mipi_init, id=%d\n" , id); + + mipi = &dsi->mipi;if (mipi->max_tx_esc_clk ==0 ) {
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 15/49 staging: hikey9xx/gpu: get rid of some ifdefs
In reply to Mauro Carvalho ChehabThere are some #ifdefs there for non-existing CONFIG_ options (nor even at the downstream code).
Let's get rid of those. It can be re-added later if ever needed.
--- .../hikey9xx/gpu/kirin9xx_drm_dpe_utils.c | 36 ------------------- .../hikey9xx/gpu/kirin9xx_drm_dpe_utils.h | 4 --- .../hikey9xx/gpu/kirin9xx_drm_overlay_utils.c | 14 -------- 3 files changed, 54 deletions(-)
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c +0 -36
@@ -275,17 +275,8 @@ void init_ldi(struct dss_crtc *acrtc)/*ldi_data_gate(ctx, true);*/ -#ifdef CONFIG_HISI_FB_LDI_COLORBAR_USED -/* colorbar width*/ -set_reg (ldi_base +LDI_CTRL ,DSS_WIDTH (0x3c ),7 ,6 ); -/* colorbar ort*/ -set_reg (ldi_base +LDI_WORK_MODE ,0x0 ,1 ,1 ); -/* colorbar enable*/ -set_reg (ldi_base +LDI_WORK_MODE ,0x0 ,1 ,0 ); -#else /* normal*/ set_reg (ldi_base +LDI_WORK_MODE ,0x1 ,1 ,0 ); -#endif /* ldi disable*/ set_reg (ldi_base +LDI_CTRL ,0x0 ,1 ,0 );
@@ -493,33 +484,6 @@ void init_dpp(struct dss_crtc *acrtc) (DSS_HEIGHT(mode->vdisplay) << 16) | DSS_WIDTH(mode->hdisplay));outp32 (dpp_base +DPP_IMG_SIZE_AFT_SR , (DSS_HEIGHT (mode->vdisplay) <<16 ) |DSS_WIDTH (mode->hdisplay)); - -#ifdef CONFIG_HISI_FB_DPP_COLORBAR_USED -#if defined (CONFIG_HISI_FB_970 ) -outp32 (dpp_base +DPP_CLRBAR_CTRL , (0x30 <<24 ) | (0 <<1 ) |0x1 ); -set_reg (dpp_base +DPP_CLRBAR_1ST_CLR ,0x3FF00000 ,30 ,0 );//Red -set_reg (dpp_base +DPP_CLRBAR_2ND_CLR ,0x000FFC00 ,30 ,0 );//Green -set_reg (dpp_base +DPP_CLRBAR_3RD_CLR ,0x000003FF ,30 ,0 );//Blue -#else -void __iomem *mctl_base; -outp32 (dpp_base +DPP_CLRBAR_CTRL , (0x30 <<24 ) | (0 <<1 ) |0x1 ); -set_reg (dpp_base +DPP_CLRBAR_1ST_CLR ,0xFF ,8 ,16 ); -set_reg (dpp_base +DPP_CLRBAR_2ND_CLR ,0xFF ,8 ,8 ); -set_reg (dpp_base +DPP_CLRBAR_3RD_CLR ,0xFF ,8 ,0 ); - - mctl_base = ctx->base + - g_dss_module_ovl_base[DSS_OVL0 ][MODULE_MCTL_BASE ]; - -set_reg (mctl_base +MCTL_CTL_MUTEX ,0x1 ,1 ,0 ); -set_reg (mctl_base +MCTL_CTL_EN ,0x1 ,32 ,0 ); -set_reg (mctl_base +MCTL_CTL_TOP ,0x2 ,32 ,0 );/*auto mode*/ -set_reg (mctl_base +MCTL_CTL_DBG ,0xB13A00 ,32 ,0 ); - -set_reg (mctl_base +MCTL_CTL_MUTEX_ITF ,0x1 ,2 ,0 ); -set_reg (mctl_sys_base +MCTL_OV0_FLUSH_EN ,0x8 ,4 ,0 ); -set_reg (mctl_base +MCTL_CTL_MUTEX ,0x0 ,1 ,0 ); -#endif -#endif }void enable_ldi (struct dss_crtc *acrtc)
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.h +0 -4
@@ -21,10 +21,6 @@#endif #include "kirin_drm_drv.h" -/*#define CONFIG_HISI_FB_OV_BASE_USED*/ -/*#define CONFIG_HISI_FB_DPP_COLORBAR_USED*/ -/*#define CONFIG_HISI_FB_LDI_COLORBAR_USED*/ -void set_reg (char __iomem *addr,uint32_t val,uint8_t bw,uint8_t bs);uint32_t set_bits32 (uint32_t old_val,uint32_t val,uint8_t bw,uint8_t bs);
drivers/staging/hikey9xx/gpu/kirin9xx_drm_overlay_utils.c +0 -14
@@ -1211,14 +1211,8 @@ int hisi_dss_ovl_base_config(struct dss_hw_ctx *ctx, u32 xres, u32 yres)set_reg (ovl0_base +OVL_SIZE , (xres -1 ) | ((yres -1 ) <<16 ),32 ,0 ); -#ifdef CONFIG_HISI_FB_OV_BASE_USED -DRM_INFO ("CONFIG_HISI_FB_OV_BASE_USED !!. \n" ); -set_reg (ovl0_base +OV_BG_COLOR_RGB ,0x3FF00000 ,32 ,0 ); -set_reg (ovl0_base +OV_BG_COLOR_A ,0x3FF ,32 ,0 ); -#else set_reg (ovl0_base +OV_BG_COLOR_RGB ,0x00000000 ,32 ,0 );set_reg (ovl0_base +OV_BG_COLOR_A ,0x00000000 ,32 ,0 ); -#endif set_reg (ovl0_base +OV_DST_STARTPOS ,0x0 ,32 ,0 );set_reg (ovl0_base +OV_DST_ENDPOS , (xres -1 ) | ((yres -1 ) <<16 ),32 ,0 );
@@ -1228,11 +1222,7 @@ int hisi_dss_ovl_base_config(struct dss_hw_ctx *ctx, u32 xres, u32 yres)set_reg (ovl0_base +OVL6_REG_DEFAULT ,0x1 ,32 ,0 );set_reg (ovl0_base +OVL6_REG_DEFAULT ,0x0 ,32 ,0 );set_reg (ovl0_base +OVL_SIZE , (xres -1 ) | ((yres -1 ) <<16 ),32 ,0 ); -#ifdef CONFIG_HISI_FB_OV_BASE_USED -set_reg (ovl0_base +OVL_BG_COLOR ,0xFFFF0000 ,32 ,0 ); -#else set_reg (ovl0_base +OVL_BG_COLOR ,0xFF000000 ,32 ,0 ); -#endif set_reg (ovl0_base +OVL_DST_STARTPOS ,0x0 ,32 ,0 );set_reg (ovl0_base +OVL_DST_ENDPOS , (xres -1 ) | ((yres -1 ) <<16 ),32 ,0 );set_reg (ovl0_base +OVL_GCFG ,0x10001 ,32 ,0 );
@@ -1559,10 +1549,6 @@ void hisi_fb_pan_display(struct drm_plane *plane) bpp = fb->bits_per_pixel /8 ; stride = fb->pitches[0 ]; -#if defined(CONFIG_HISI_FB_LDI_COLORBAR_USED ) || defined(CONFIG_HISI_FB_DPP_COLORBAR_USED ) || defined(CONFIG_HISI_FB_OV_BASE_USED ) -return ; -#endif -#ifndef CMA_BUFFER_USED if (fbdev) display_addr = (u32 )fbdev->smem_start + src_y * stride;
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
cover DRM driver for Hikey 970
This patch series port the out-of-tree driver for Hikey 970 (which should also support Hikey 960) from the official 96boards tree:
https://github.com/96boards-hikey/linux/tree/hikey970-v4.9
Based on his history, this driver seems to be originally written for Kernel 4.4, and was later ported to Kernel 4.9. The original driver used to depend on ION (from Kernel 4.4) and had its own implementation for FB dev API.
As I need to preserve the original history (with has patches from both HiSilicon and from Linaro), I'm starting from the original patch applied there. The remaining patches are incremental, and port this driver to work with upstream Kernel.
This driver doesn't depend on any firmware or on any special userspace code. It works as-is with both X11 and Wayland.
Yet, I'm submitting it via staging due to the following reasons:
- It depends on the LDO3 power supply, which is provided by a regulator driver that it is currently on staging;
- Due to legal reasons, I need to preserve the authorship of each one responsbile for each patch. So, I need to start from the original patch from Kernel 4.4;
- There are still some problems I need to figure out how to solve:
- The adv7535 can't get EDID data. Maybe it is a timing issue,
but it requires more research to be sure about how to solve it;
- The driver only accept resolutions on a defined list, as there's a known bug that this driver may have troubles with random resolutions. Probably due to a bug at the pixel clock settings;
- Sometimes (at least with 1080p), it generates LDI underflow errors, which in turn causes the DRM to stop working. That happens for example when using gdm on Wayland and gnome on X11;
- Probably related to the previous issue, when the monitor suspends due to DPMS, it doesn't return back to life.
So, IMO, the best is to keep it on staging for a while, until those remaining bugs gets solved.
I added this series, together with the regulator driver and a few other patches (including a hack to fix a Kernel 5.8 regression at WiFi ) at:
https://gitlab.freedesktop.org/mchehab_kernel/hikey-970/-/commits/master
Chen Feng (1):
staging: hikey9xx: Add hisilicon DRM driver for hikey960/970
John Stultz (1):
staging: hikey9xx/gpu: port it to work with Kernel v4.9
Liwei Cai (2):
staging: hikey9xx/gpu: solve tearing issue of display
staging: hikey9xx/gpu: resolve the performance issue by interrupt
mechanism
Mauro Carvalho Chehab (38):
staging: hikey9xx/gpu: get rid of adv7535 fork
staging: hikey9xx/gpu: rename the Kirin9xx namespace
staging: hikey9xx/gpu: get rid of kirin9xx_fbdev.c
staging: hikey9xx/gpu: get rid of some ifdefs
staging: hikey9xx/gpu: rename the config option for Kirin970
staging: hikey9xx/gpu: change the includes to reflect upstream
staging: hikey9xx/gpu: port driver to upstream kAPIs
staging: hikey9xx/gpu: add a copy of set_reg() function there
staging: hikey9xx/gpu: get rid of ION headers
staging: hikey9xx/gpu: add support for using a reserved CMA memory
staging: hikey9xx/gpu: cleanup encoder attach logic
staging: hikey9xx/gpu: Change the logic which sets the burst mode
staging: hikey9xx/gpu: fix the DRM setting logic
staging: hikey9xx/gpu: do some code cleanups
staging: hikey9xx/gpu: use default GEM_CMA fops
staging: hikey9xx/gpu: place vblank enable/disable at the right place
staging: hikey9xx/gpu: remove an uneeded hack
staging: hikey9xx/gpu: add a possible implementation for
atomic_disable
staging: hikey9xx/gpu: register connector
staging: hikey9xx/gpu: fix driver name
staging: hikey9xx/gpu: get rid of iommu_format
staging: hikey9xx/gpu: re-work the mode validation code
staging: hikey9xx/gpu: add support for enable/disable ldo3 regulator
staging: hikey9xx/gpu: add SPMI headers
staging: hikey9xx/gpu: solve most coding style issues
staging: hikey9xx/gpu: don't use iommu code
staging: hikey9xx/gpu: add kirin9xx driver to the building system
staging: hikey9xx/gpu: get rid of typedefs
staging: hikey9xx/gpu: get rid of input/output macros
staging: hikey9xx/gpu: get rid of some unused data
staging: hikey9xx/gpu: place common definitions at kirin9xx_dpe.h
staging: hikey9xx/gpu: get rid of DRM_HISI_KIRIN970
dts: hisilicon: hi3670.dtsi: add I2C settings
dts: hikey970-pinctrl.dtsi: add missing pinctrl settings
dt: hisilicon: add support for the PMIC found on Hikey 970
dts: add support for Hikey 970 DRM
staging: hikey9xx/gpu: drop kirin9xx_pwm
dt: display: Add binds for the DPE and DSI controller for Kirin
960/970
Xiubin Zhang (7):
staging: hikey9xx/gpu: add support to hikey970 HDMI and panel
staging: hikey9xx/gpu: Solve SR Cannot Display Problems.
staging: hikey9xx/gpu: Solve HDMI compatibility Problem.
staging: hikey9xx/gpu: Support MIPI DSI 3 lanes for hikey970.
staging: hikey9xx/gpu: Solve SR test reset problem for hikey970.
staging: hikey9xx/gpu: add debug prints for this driver
staging: hikey9xx/gpu: Add support 10.1 inch special HDMI displays.
.../display/hisilicon,hi3660-dpe.yaml | 99 + .../display/hisilicon,hi3660-dsi.yaml | 102 + .../boot/dts/hisilicon/hi3670-hikey970.dts | 56 +- arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 77 + .../boot/dts/hisilicon/hikey970-drm.dtsi | 93 + .../boot/dts/hisilicon/hikey970-pinctrl.dtsi | 548 +++- .../boot/dts/hisilicon/hikey970-pmic.dtsi | 197 ++ drivers/staging/hikey9xx/Kconfig | 3 + drivers/staging/hikey9xx/Makefile | 1 + drivers/staging/hikey9xx/gpu/Kconfig | 22 + drivers/staging/hikey9xx/gpu/Makefile | 9 + drivers/staging/hikey9xx/gpu/kirin960_defs.c | 378 +++ .../staging/hikey9xx/gpu/kirin960_dpe_reg.h | 233 ++ drivers/staging/hikey9xx/gpu/kirin970_defs.c | 381 +++ .../staging/hikey9xx/gpu/kirin970_dpe_reg.h | 1188 ++++++++ drivers/staging/hikey9xx/gpu/kirin9xx_dpe.h | 2437 +++++++++++++++++ .../hikey9xx/gpu/kirin9xx_drm_dpe_utils.c | 1178 ++++++++ .../hikey9xx/gpu/kirin9xx_drm_dpe_utils.h | 286 ++ .../staging/hikey9xx/gpu/kirin9xx_drm_drv.c | 368 +++ .../staging/hikey9xx/gpu/kirin9xx_drm_drv.h | 57 + .../staging/hikey9xx/gpu/kirin9xx_drm_dss.c | 1063 +++++++ .../hikey9xx/gpu/kirin9xx_drm_overlay_utils.c | 1005 +++++++ .../hikey9xx/gpu/kirin9xx_dw_drm_dsi.c | 2132 ++++++++++++++ .../hikey9xx/gpu/kirin9xx_dw_dsi_reg.h | 146 + .../staging/hikey9xx/gpu/kirin9xx_fb_panel.h | 191 ++ 25 files changed, 12229 insertions(+), 21 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/hisilicon,hi3660-dpe.yaml create mode 100644 Documentation/devicetree/bindings/display/hisilicon,hi3660-dsi.yaml create mode 100644 arch/arm64/boot/dts/hisilicon/hikey970-drm.dtsi create mode 100644 arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi create mode 100644 drivers/staging/hikey9xx/gpu/Kconfig create mode 100644 drivers/staging/hikey9xx/gpu/Makefile create mode 100644 drivers/staging/hikey9xx/gpu/kirin960_defs.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin970_defs.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_dpe.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_drm_overlay_utils.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_dw_dsi_reg.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_fb_panel.h
Signature · 7 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 20/49 staging: hikey9xx/gpu: get rid of ION headers
This is not used anymore on this version, so let's get rid of them.
--- drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h | 3 --- drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h | 3 --- drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h | 2 -- 3 files changed, 8 deletions(-)
drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h +0 -3
@@ -27,9 +27,6 @@#include <drm/drm_plane.h> #include <drm/drm_crtc.h> -#include <linux/ion.h> -#include <linux/hisi/hisi_ion.h> -#define FB_ACCEL_HI62xx 0x1#define FB_ACCEL_HI363x 0x2#define FB_ACCEL_HI365x 0x4
drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h +0 -3
@@ -27,9 +27,6 @@#include <drm/drm_plane.h> #include <drm/drm_crtc.h> -#include <linux/ion.h> -#include <linux/hisi/hisi_ion.h> -#define FB_ACCEL_HI62xx 0x1#define FB_ACCEL_HI363x 0x2#define FB_ACCEL_HI365x 0x4
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h +0 -2
@@ -17,8 +17,6 @@#include <drm/drm_print.h> #include <linux/iommu.h> -#include <linux/ion.h> -#include <linux/hisi/hisi_ion.h> #include <linux/hisi/hisi-iommu.h> #define MAX_CRTC 2
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 46/49 dt: hisilicon: add support for the PMIC found on Hikey 970
In reply to Mauro Carvalho ChehabAdd a device tree for the HiSilicon 6421v600 SPMI PMIC, used on HiKey970 board.
As we now have support for it, change the fixed regulators used by the SD I/O to use the proper LDO supplies.
--- .../boot/dts/hisilicon/hi3670-hikey970.dts | 22 +- .../boot/dts/hisilicon/hikey970-pmic.dtsi | 197 ++++++++++++++++++ 2 files changed, 200 insertions(+), 19 deletions(-) create mode 100644 arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi
arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts +3 -19
@@ -12,6 +12,7 @@ #include "hi3670.dtsi" #include "hikey970-pinctrl.dtsi" +#include "hikey970-pmic.dtsi" / { model = "HiKey970";
@@ -39,23 +40,6 @@ memory@0 { reg = <0x0 0x0 0x0 0x0>; }; - sd_1v8: regulator-1v8 { - compatible = "regulator-fixed"; - regulator-name = "fixed-1.8V"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - }; - - sd_3v3: regulator-3v3 { - compatible = "regulator-fixed"; - regulator-name = "fixed-3.3V"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; - regulator-always-on; - }; - wlan_en: wlan-en-1-8v { compatible = "regulator-fixed"; regulator-name = "wlan-en-regulator";
@@ -402,8 +386,8 @@ &dwmmc1 { pinctrl-0 = <&sd_pmx_func &sd_clk_cfg_func &sd_cfg_func>; - vmmc-supply = <&sd_3v3>; - vqmmc-supply = <&sd_1v8>; + vmmc-supply = <&ldo16>; + vqmmc-supply = <&ldo9>; status = "okay"; };
arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi new file +197 -0
197 lines not on this page · raw message
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 39/49 staging: hikey9xx/gpu: get rid of typedefs
In reply to Mauro Carvalho ChehabThere are a few typedefs inside this driver. Get rid of them.
--- .../staging/hikey9xx/gpu/kirin960_dpe_reg.h | 126 +++++++++--------- .../staging/hikey9xx/gpu/kirin970_dpe_reg.h | 117 ++++++++-------- .../hikey9xx/gpu/kirin9xx_drm_dpe_utils.c | 4 +- .../hikey9xx/gpu/kirin9xx_drm_dpe_utils.h | 2 +- .../hikey9xx/gpu/kirin9xx_drm_overlay_utils.c | 8 +- .../hikey9xx/gpu/kirin9xx_dw_drm_dsi.c | 2 +- 6 files changed, 130 insertions(+), 129 deletions(-)
drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h +63 -63
@@ -72,19 +72,19 @@ enum dss_channel {#define PRIMARY_CH DSS_CH1/* primary plane */ -typedef struct dss_rect { +struct dss_rect {s32 x;s32 y;s32 w;s32 h; -}dss_rect_t ; +}; -typedef struct dss_rect_ltrb { +struct dss_rect_ltrb {s32 left;s32 top;s32 right;s32 bottom; -}dss_rect_ltrb_t ; +};enum {DSI_1_LANES =0 ,
@@ -103,7 +103,7 @@ enum dss_ovl_idx {#define DSS_WCH_MAX (2) -typedef struct dss_img { +struct dss_img {u32 format;u32 width;u32 height;
@@ -130,13 +130,13 @@ typedef struct dss_img {u32 secure_mode;s32 shared_fd;u32 reserved0; -} dss_img_t; +}; -typedef struct drm_dss_layer { - dss_img_t img; - dss_rect_t src_rect; - dss_rect_t src_rect_mask; - dss_rect_t dst_rect; +struct drm_dss_layer { +struct dss_img img; +struct dss_rect src_rect; +struct dss_rect src_rect_mask; +struct dss_rect dst_rect;u32 transform;s32 blending;u32 glb_alpha;
@@ -145,7 +145,7 @@ typedef struct drm_dss_layer {s32 chn_idx;u32 need_cap;s32 acquire_fence; -} drm_dss_layer_t; +};/******************************************************************************/
@@ -1160,17 +1160,17 @@ enum dss_rdma_idx {#define AIF_MODULE_CLK_SEL (0x0A04)#define AIF_MODULE_CLK_EN (0x0A08) -typedef struct dss_aif { +struct dss_aif {u32 aif_ch_ctl;u32 aif_ch_ctl_add; -}dss_aif_t ; +}; -typedef struct dss_aif_bw { +struct dss_aif_bw {u64 bw;u8 chn_idx;s8 axi_sel;u8 is_used; -}dss_aif_bw_t ; +};/* * MIF
@@ -1212,13 +1212,13 @@ typedef struct dss_aif_bw {#define LITTLE_LAYER_BUF_SIZE (256 * 1024)#define MIF_STRIDE_UNIT (4 * 1024) -typedef struct dss_mif { +struct dss_mif {u32 mif_ctrl1;u32 mif_ctrl2;u32 mif_ctrl3;u32 mif_ctrl4;u32 mif_ctrl5; -}dss_mif_t ; +};/* * stretch blt, linear/tile, rotation, pixel format
@@ -1317,7 +1317,7 @@ enum dss_mmu_tlb_tag_org {#define SMMU_SID_NUM (64) -typedef struct dss_smmu { +struct dss_smmu {u32 smmu_scr;u32 smmu_memctrl;u32 smmu_lp_ctrl;
@@ -1375,7 +1375,7 @@ typedef struct dss_smmu {u32 smmu_offset_addr_s;u8 smmu_smrx_ns_used[DSS_CHN_MAX_DEFINE ]; -} dss_smmu_t; +};/* * RDMA
@@ -1455,7 +1455,7 @@ typedef struct dss_smmu {#define DFC_DITHER_ENABLE (0x0020)#define DFC_PADDING_CTL (0x0024) -typedef struct dss_dfc { +struct dss_dfc {u32 disp_size;u32 pix_in_num;u32 disp_fmt;
@@ -1465,7 +1465,7 @@ typedef struct dss_dfc {u32 icg_module;u32 dither_enable;u32 padding_ctl; -} dss_dfc_t; +};/* * SCF
@@ -1514,7 +1514,7 @@ typedef struct dss_dfc {#define SCF_EDGE_FACTOR (3)#define ARSR2P_INC_FACTOR (65536) -typedef struct dss_scl { +struct dss_scl {u32 en_hscl_str;u32 en_vscl_str;u32 h_v_order;
@@ -1528,7 +1528,7 @@ typedef struct dss_scl {u32 en_mmp;u32 scf_ch_core_gt;u32 fmt; -} dss_scl_t; +};enum scl_coef_lut_idx {SCL_COEF_NONE_IDX =-1 ,
@@ -1585,7 +1585,7 @@ enum scl_coef_lut_idx {#define ARSR2P_LUT_COEFUV_V_OFFSET (0x0600)#define ARSR2P_LUT_COEFUV_H_OFFSET (0x0700) -typedef struct dss_arsr2p_effect { +struct dss_arsr2p_effect {u32 skin_thres_y;u32 skin_thres_u;u32 skin_thres_v;
@@ -1605,9 +1605,9 @@ typedef struct dss_arsr2p_effect {u32 sharp_cfg9;u32 texturw_analysts;u32 intplshootctrl; -} dss_arsr2p_effect_t; +}; -typedef struct dss_arsr2p { +struct dss_arsr2p {u32 arsr_input_width_height;u32 arsr_output_width_height;u32 ihleft;
@@ -1618,11 +1618,11 @@ typedef struct dss_arsr2p {u32 ivinc;u32 offset;u32 mode; -dss_arsr2p_effect_t arsr2p_effect; +struct dss_arsr2p_effect arsr2p_effect;u32 ihleft1;u32 ihright1;u32 ivbottom1; -} dss_arsr2p_t; +};/* * POST_CLIP v g
@@ -1632,12 +1632,12 @@ typedef struct dss_arsr2p {#define POST_CLIP_CTL_VRZ (0x0014)#define POST_CLIP_EN (0x0018) -typedef struct dss_post_clip { +struct dss_post_clip {u32 disp_size;u32 clip_ctl_hrz;u32 clip_ctl_vrz;u32 ctl_clip_en; -}dss_post_clip_t ; +};/* * PCSC v
@@ -1654,9 +1654,9 @@ typedef struct dss_post_clip {#define PCSC_ICG_MODULE (0x0024)#define PCSC_MPREC (0x0028) -typedef struct dss_pcsc { +struct dss_pcsc {u32 pcsc_idc0; -}dss_pcsc_t ; +};/* * CSC
@@ -1674,7 +1674,7 @@ typedef struct dss_pcsc {#define CSC_ICG_MODULE (0x0024)#define CSC_MPREC (0x0028) -typedef struct dss_csc { +struct dss_csc {u32 idc0;u32 idc2;u32 odc0;
@@ -1686,7 +1686,7 @@ typedef struct dss_csc {u32 p4;u32 icg_module;u32 mprec; -} dss_csc_t; +};/* * channel DEBUG
@@ -1838,7 +1838,7 @@ enum DSS_AFBC_HALF_BLOCK_MODE { AFBC_HALF_BLOCK_LOWER_ONLY, }; -typedef struct dss_rdma { +struct dss_rdma {u32 oft_x0;u32 oft_y0;u32 oft_x1;
@@ -1892,9 +1892,9 @@ typedef struct dss_rdma {u8 vpp_used;u8 afbc_used; -} dss_rdma_t; +}; -typedef struct dss_wdma { +struct dss_wdma {u32 oft_x0;u32 oft_y0;u32 oft_x1;
@@ -1947,7 +1947,7 @@ typedef struct dss_wdma {u8 afbc_used;u8 rot_used; -} dss_wdma_t; +};/* * MCTL MUTEX0 1 2 3 4 5
@@ -2120,37 +2120,37 @@ enum dss_mctl_idx { DSS_MCTL_IDX_MAX, }; -typedef struct dss_mctl { +struct dss_mctl {u32 ctl_mutex_itf;u32 ctl_mutex_dbuf;u32 ctl_mutex_scf;u32 ctl_mutex_ov; -}dss_mctl_t ; +}; -typedef struct dss_mctl_ch_base { +struct dss_mctl_ch_base {char __iomem *chn_mutex_base;char __iomem *chn_flush_en_base;char __iomem *chn_ov_en_base;char __iomem *chn_starty_base;char __iomem *chn_mod_dbg_base; -}dss_mctl_ch_base_t ; +}; -typedef struct dss_mctl_ch { +struct dss_mctl_ch {u32 chn_mutex;u32 chn_flush_en;u32 chn_ov_oen;u32 chn_starty;u32 chn_mod_dbg; -}dss_mctl_ch_t ; +}; -typedef struct dss_mctl_sys { +struct dss_mctl_sys {u32 ov_flush_en[DSS_OVL_IDX_MAX ];u32 chn_ov_sel[DSS_OVL_IDX_MAX ];u32 wchn_ov_sel[DSS_WCH_MAX ];u8 ov_flush_en_used[DSS_OVL_IDX_MAX ];u8 chn_ov_sel_used[DSS_OVL_IDX_MAX ];u8 wch_ov_sel_used[DSS_WCH_MAX ]; -}dss_mctl_sys_t ; +};/* * OVL
@@ -2356,34 +2356,34 @@ typedef struct dss_mctl_sys {#define OV2_REG_DEFAULT (0x218)#define OV_8LAYER_NUM (8) -typedef struct dss_ovl_layer { +struct dss_ovl_layer {u32 layer_pos;u32 layer_size;u32 layer_pattern;u32 layer_alpha;u32 layer_cfg; -}dss_ovl_layer_t ; +}; -typedef struct dss_ovl_layer_pos { +struct dss_ovl_layer_pos {u32 layer_pspos;u32 layer_pepos; -}dss_ovl_layer_pos_t ; +}; -typedef struct dss_ovl { +struct dss_ovl {u32 ovl_size;u32 ovl_bg_color;u32 ovl_dst_startpos;u32 ovl_dst_endpos;u32 ovl_gcfg;u32 ovl_block_size; -dss_ovl_layer_t ovl_layer[OVL_6LAYER_NUM ]; -dss_ovl_layer_pos_t ovl_layer_pos[OVL_6LAYER_NUM ]; +struct dss_ovl_layer ovl_layer[OVL_6LAYER_NUM ]; +struct dss_ovl_layer_pos ovl_layer_pos[OVL_6LAYER_NUM ];u8 ovl_layer_used[OVL_6LAYER_NUM ]; -}dss_ovl_t ; +}; -typedef struct dss_ovl_alpha { +struct dss_ovl_alpha {u32 src_amode;u32 src_gmode;u32 alpha_offsrc;
@@ -2398,7 +2398,7 @@ typedef struct dss_ovl_alpha {u32 dst_pmode;u32 fix_mode; -} dss_ovl_alpha_t; +};/* * DBUF
@@ -2598,7 +2598,7 @@ typedef struct dss_ovl_alpha {#define LCP_DEGAMA_MEM_CTRL (0x03C)#define LCP_GMP_MEM_CTRL (0x040) -typedef struct dss_arsr1p { +struct dss_arsr1p {u32 ihleft;u32 ihright;u32 ihleft1;
@@ -2639,7 +2639,7 @@ typedef struct dss_arsr1p {u32 dpp_img_vrt_bef_sr;u32 dpp_img_hrz_aft_sr;u32 dpp_img_vrt_aft_sr; -} dss_arsr1p_t; +};#define ARSR1P_INC_FACTOR (65536)
@@ -3088,14 +3088,14 @@ struct dss_hw_ctx {unsigned long screen_size; }; -typedef struct dss_clk_rate { +struct dss_clk_rate {u64 dss_pri_clk_rate;u64 dss_pclk_dss_rate;u64 dss_pclk_pctrl_rate;u64 dss_mmbuf_rate;u32 dss_voltage_value;//0:0.7v, 2:0.8v u32 reserved; -}dss_clk_rate_t ; +};struct dss_crtc {struct drm_crtc base;
@@ -3206,7 +3206,7 @@ enum PXL0_DSI_GT_EN { PXL0_DSI_GT_EN_3, }; -typedef struct mipi_ifbc_division { +struct mipi_ifbc_division {u32 xres_div;u32 yres_div;u32 comp_mode;
@@ -3214,7 +3214,7 @@ typedef struct mipi_ifbc_division {u32 pxl0_div4_gt_en;u32 pxl0_divxcfg;u32 pxl0_dsi_gt_en; -} mipi_ifbc_division_t; +};/*****************************************************************************/
drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h +58 -59
362 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c +3 -1
@@ -21,6 +21,8 @@ static int g_debug_set_reg_val;DEFINE_SEMAPHORE (hisi_fb_dss_regulator_sem); +extern u32 g_dss_module_ovl_base[DSS_MCTL_IDX_MAX ][MODULE_OVL_MAX ]; +struct mipi_ifbc_division g_mipi_ifbc_division[MIPI_DPHY_NUM ][IFBC_TYPE_MAX ] = {/*single mipi*/ {
@@ -240,7 +242,7 @@ void init_ldi(struct dss_crtc *acrtc)struct drm_display_mode *mode;struct drm_display_mode *adj_mode; -dss_rect_t rect = {0 ,0 ,0 ,0 }; +struct dss_rect rect = {0 ,0 ,0 ,0 };u32 hfp, hbp, hsw, vfp, vbp, vsw;u32 vsync_plr =0 ;u32 hsync_plr =0 ;
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.h +1 -1
@@ -71,7 +71,7 @@ int hisi_dss_mctl_mutex_unlock(struct dss_hw_ctx *ctx);int hisi_dss_ovl_base_config (struct dss_hw_ctx *ctx,u32 xres,u32 yres);void hisi_fb_pan_display (struct drm_plane *plane); -void hisi_dss_online_play (struct kirin_fbdev *fbdev,struct drm_plane *plane,drm_dss_layer_t *layer); +void hisi_dss_online_play (struct kirin_fbdev *fbdev,struct drm_plane *plane,struct drm_dss_layer *layer);u32 dss_get_format (u32 pixel_format);
drivers/staging/hikey9xx/gpu/kirin9xx_drm_overlay_utils.c +4 -4
@@ -1008,7 +1008,7 @@ static int hisi_dss_mctl_sys_config(struct dss_hw_ctx *ctx, int chn_idx) }static int hisi_dss_rdma_config (struct dss_hw_ctx *ctx, -const dss_rect_ltrb_t *rect,u32 display_addr,u32 hal_format, +const struct dss_rect_ltrb *rect,u32 display_addr,u32 hal_format,u32 bpp,int chn_idx,bool afbcd,bool mmu_enable) {void __iomem *rdma_base;
@@ -1234,7 +1234,7 @@ int hisi_dss_ovl_base_config(struct dss_hw_ctx *ctx, u32 xres, u32 yres) }static int hisi_dss_ovl_config (struct dss_hw_ctx *ctx, -const dss_rect_ltrb_t *rect,u32 xres,u32 yres) +const struct dss_rect_ltrb *rect,u32 xres,u32 yres) {void __iomem *ovl0_base;
@@ -1524,7 +1524,7 @@ void hisi_fb_pan_display(struct drm_plane *plane)bool afbcd = false;bool mmu_enable = false; -dss_rect_ltrb_t rect; +struct dss_rect_ltrb rect;u32 bpp;u32 stride;u32 display_addr =0 ;
@@ -1601,7 +1601,7 @@ void hisi_dss_online_play(struct kirin_fbdev *fbdev, struct drm_plane *plane,bool afbcd = false;bool mmu_enable = false; -dss_rect_ltrb_t rect; +struct dss_rect_ltrb rect;u32 bpp;u32 stride;u32 display_addr;
drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c +1 -1
@@ -1040,7 +1040,7 @@ static void dsi_mipi_init(struct dw_dsi *dsi, char __iomem *mipi_dsi_base,u32 tmp =0 ;bool is_ready = false;struct mipi_panel_info *mipi =NULL ; -dss_rect_t rect; +struct dss_rect rect;u32 cmp_stopstate_val =0 ;u32 lanes;#if !defined(CONFIG_DRM_HISI_KIRIN970 )
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 41/49 staging: hikey9xx/gpu: get rid of some unused data
In reply to Mauro Carvalho ChehabThere are some things inside struct dss_hw_ctx that are unused. Get rid of them.
--- drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h | 2 -- drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h | 3 --- drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c | 2 -- 3 files changed, 7 deletions(-)
drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h +0 -2
@@ -3081,8 +3081,6 @@ struct dss_hw_ctx {ktime_t vsync_timestamp_prev;struct iommu_domain *mmu_domain; -struct ion_client *ion_client; -struct ion_handle *ion_handle;char __iomem *screen_base;unsigned long smem_start;unsigned long screen_size;
drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h +0 -3
@@ -4068,12 +4068,9 @@ struct dss_hw_ctx {ktime_t vsync_timestamp_prev;struct iommu_domain *mmu_domain; -struct ion_client *ion_client; -struct ion_handle *ion_handle;char __iomem *screen_base;unsigned long smem_start;unsigned long screen_size; -struct dss_smmu smmu; };struct dss_clk_rate {
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c +0 -2
@@ -976,8 +976,6 @@ static int dss_drm_init(struct drm_device *dev)if (ret)return ret; - ctx->ion_client =NULL ; - ctx->ion_handle =NULL ; ctx->screen_base =0 ; ctx->screen_size =0 ; ctx->smem_start =0 ;
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 27/49 staging: hikey9xx/gpu: place vblank enable/disable at the right place
In reply to Mauro Carvalho ChehabThose methods belong to crtc fops
--- .../staging/hikey9xx/gpu/kirin9xx_drm_dss.c | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c +11 -10
@@ -391,24 +391,26 @@ static void dss_power_down(struct dss_crtc *acrtc) ctx->power_on = false; } -static int dss_enable_vblank (struct drm_device *dev,unsigned int pipe) +static int dss_enable_vblank (struct drm_crtc *crtc) { -struct kirin_drm_private *priv = dev->dev_private; -struct dss_crtc *acrtc =to_dss_crtc (priv->crtc[pipe]); +struct dss_crtc *acrtc =to_dss_crtc (crtc);struct dss_hw_ctx *ctx = acrtc->ctx; -if (!ctx->power_on) +DRM_INFO ("%s\n" , __func__); +if (!ctx->power_on) { +DRM_INFO ("Enabling vblank\n" ); (void )dss_power_up (acrtc); + }return 0 ; } -static void dss_disable_vblank (struct drm_device *dev,unsigned int pipe) +static void dss_disable_vblank (struct drm_crtc *crtc) { -struct kirin_drm_private *priv = dev->dev_private; -struct dss_crtc *acrtc =to_dss_crtc (priv->crtc[pipe]); +struct dss_crtc *acrtc =to_dss_crtc (crtc);struct dss_hw_ctx *ctx = acrtc->ctx; +DRM_INFO ("%s\n" , __func__);if (!ctx->power_on) {DRM_ERROR ("power is down! vblank disable fail\n" );return ;
@@ -545,6 +547,8 @@ static const struct drm_crtc_funcs dss_crtc_funcs = { .reset = drm_atomic_helper_crtc_reset, .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, + .enable_vblank = dss_enable_vblank, + .disable_vblank = dss_disable_vblank, }; static int dss_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
@@ -928,9 +932,6 @@ static int dss_drm_init(struct drm_device *dev)disable_irq (ctx->irq); - dev->driver->enable_vblank = dss_enable_vblank; - dev->driver->disable_vblank = dss_disable_vblank; -return 0 ; }
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 35/49 staging: hikey9xx/gpu: add SPMI headers
In reply to Mauro Carvalho ChehabUse SPMI headers to identify the license of each file.
--- .../staging/hikey9xx/gpu/kirin960_dpe_reg.h | 1 + .../staging/hikey9xx/gpu/kirin970_dpe_reg.h | 1 + .../hikey9xx/gpu/kirin9xx_drm_dpe_utils.c | 4 ++- .../hikey9xx/gpu/kirin9xx_drm_dpe_utils.h | 4 ++- .../staging/hikey9xx/gpu/kirin9xx_drm_drv.c | 1 + .../staging/hikey9xx/gpu/kirin9xx_drm_drv.h | 1 + .../staging/hikey9xx/gpu/kirin9xx_drm_dss.c | 1 + .../hikey9xx/gpu/kirin9xx_drm_overlay_utils.c | 10 +++---- .../hikey9xx/gpu/kirin9xx_dw_drm_dsi.c | 2 +- .../hikey9xx/gpu/kirin9xx_dw_dsi_reg.h | 1 + .../staging/hikey9xx/gpu/kirin9xx_fb_panel.h | 25 +++++++++--------- drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c | 26 ++++++++++--------- 12 files changed, 43 insertions(+), 34 deletions(-)
drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2016 Linaro Limited. * Copyright (c) 2014-2016 Hisilicon Limited.
drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2016 Linaro Limited. * Copyright (c) 2014-2016 Hisilicon Limited.
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c +3 -1
@@ -1,4 +1,6 @@ -/* Copyright (c) 2013-2014, Hisilicon Tech. Co., Ltd. All rights reserved. +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2013-2014, Hisilicon Tech. Co., Ltd. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.h +3 -1
@@ -1,4 +1,6 @@ -/* Copyright (c) 2013-2014, Hisilicon Tech. Co., Ltd. All rights reserved. +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2013-2014, Hisilicon Tech. Co., Ltd. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Hisilicon Kirin SoCs drm master driver *
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2016 Linaro Limited. * Copyright (c) 2014-2016 Hisilicon Limited.
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Hisilicon Hi6220 SoC ADE(Advanced Display Engine)'s crtc&plane driver *
drivers/staging/hikey9xx/gpu/kirin9xx_drm_overlay_utils.c +3 -7
@@ -1,4 +1,6 @@ -/* Copyright (c) 2008-2011, Hisilicon Tech. Co., Ltd. All rights reserved. +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2008-2011, Hisilicon Tech. Co., Ltd. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and
@@ -8,12 +10,6 @@* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA. -* */ #include <drm/drm_atomic.h>
drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c +1 -1
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * DesignWare MIPI DSI Host Controller v1.02 driver *
@@ -11,7 +12,6 @@* 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/clk.h>
drivers/staging/hikey9xx/gpu/kirin9xx_dw_dsi_reg.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2016 Linaro Limited. * Copyright (c) 2014-2016 Hisilicon Limited.
drivers/staging/hikey9xx/gpu/kirin9xx_fb_panel.h +13 -12
@@ -1,15 +1,16 @@ -/* Copyright (c) 2013-2014, Hisilicon Tech. Co., Ltd. All rights reserved. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 and -* only version 2 as published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -*/ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2013-2014, Hisilicon Tech. Co., Ltd. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ #ifndef KIRIN_FB_PANEL_H #define KIRIN_FB_PANEL_H
drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c +14 -12
@@ -1,15 +1,17 @@ -/* Copyright (c) 2013-2014, Hisilicon Tech. Co., Ltd. All rights reserved. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 and -* only version 2 as published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -*/ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2013-2014, Hisilicon Tech. Co., Ltd. All rights reserved. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 and +* only version 2 as published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +*/ #include <drm/drm_drv.h> #include <drm/drm_mipi_dsi.h>
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 7/49 staging: hikey9xx/gpu: Solve HDMI compatibility Problem.
In reply to Mauro Carvalho ChehabFrom: Xiubin Zhang <[email protected]>
Modfiy pix_clk and dsi lanes to improve HDMI compatibility for hikey970.
--- drivers/staging/hikey9xx/gpu/dw_drm_dsi.c | 53 ++----- drivers/staging/hikey9xx/gpu/hdmi/adv7535.c | 9 +- .../hikey9xx/gpu/kirin_drm_dpe_utils.c | 133 ++---------------- .../hikey9xx/gpu/kirin_drm_dpe_utils.h | 2 +- drivers/staging/hikey9xx/gpu/kirin_drm_drv.c | 7 - drivers/staging/hikey9xx/gpu/kirin_drm_dss.c | 17 +-- .../hikey9xx/gpu/kirin_drm_overlay_utils.c | 3 - drivers/staging/hikey9xx/gpu/kirin_fb_panel.h | 5 - drivers/staging/hikey9xx/gpu/kirin_fbdev.c | 10 +- 9 files changed, 41 insertions(+), 198 deletions(-)
drivers/staging/hikey9xx/gpu/dw_drm_dsi.c +12 -41
@@ -312,6 +312,7 @@ void dsi_set_output_client(struct drm_device *dev) }EXPORT_SYMBOL (dsi_set_output_client); +#if defined (CONFIG_HISI_FB_970 )static void get_dsi_dphy_ctrl (struct dw_dsi *dsi,struct mipi_phy_params *phy_ctrl) {
@@ -357,10 +358,8 @@ static void get_dsi_dphy_ctrl(struct dw_dsi *dsi, bpp =mipi_dsi_pixel_format_to_bpp (dsi->client[id].format);if (bpp <0 )return ; -if (mode->clock >80000 ) - dsi->client[id].lanes =4 ; -else - dsi->client[id].lanes =3 ; + + dsi->client[id].lanes =4 ;if (dsi->client[id].phy_clock) dphy_req_kHz = dsi->client[id].phy_clock;
@@ -387,33 +386,7 @@ static void get_dsi_dphy_ctrl(struct dw_dsi *dsi, m_n_int = lane_clock * vco_div *1000000UL /DEFAULT_MIPI_CLK_RATE ; m_n_fract = ((lane_clock * vco_div *1000000UL *1000UL /DEFAULT_MIPI_CLK_RATE ) %1000 ) *10 /1000 ; -if (m_n_int %2 ==0 ) { -if (m_n_fract *6 >=50 ) { - n_pll =2 ; - m_pll = (m_n_int +1 ) * n_pll; - }else if (m_n_fract *6 >=30 ) { - n_pll =3 ; - m_pll = m_n_int * n_pll +2 ; - }else { - n_pll =1 ; - m_pll = m_n_int * n_pll; - } - }else { -if (m_n_fract *6 >=50 ) { - n_pll =1 ; - m_pll = (m_n_int +1 ) * n_pll; - }else if (m_n_fract *6 >=30 ) { - n_pll =1 ; - m_pll = (m_n_int +1 ) * n_pll; - }else if (m_n_fract *6 >=10 ) { - n_pll =3 ; - m_pll = m_n_int * n_pll +1 ; - }else { - n_pll =2 ; - m_pll = m_n_int * n_pll; - } - } -//n_pll = 2; + n_pll =2 ; m_pll = (u32)(lane_clock * vco_div * n_pll *1000000UL /DEFAULT_MIPI_CLK_RATE );
@@ -568,7 +541,7 @@ static void get_dsi_dphy_ctrl(struct dw_dsi *dsi, phy_ctrl->data_lane_hs2lp_time, phy_ctrl->phy_stop_wait_time); } - +#else static void get_dsi_phy_ctrl (struct dw_dsi *dsi,struct mipi_phy_params *phy_ctrl) {
@@ -887,7 +860,7 @@ static void get_dsi_phy_ctrl(struct dw_dsi *dsi, phy_ctrl->data_t_hs_trial, phy_ctrl->data_t_ta_go, phy_ctrl->data_t_ta_get); -DRM_INFO ("clk_lane_lp2hs_time=%u\n" +DRM_DEBUG ("clk_lane_lp2hs_time=%u\n" "clk_lane_hs2lp_time=%u\n" "data_lane_lp2hs_time=%u\n" "data_lane_hs2lp_time=%u\n"
@@ -898,6 +871,7 @@ static void get_dsi_phy_ctrl(struct dw_dsi *dsi, phy_ctrl->data_lane_hs2lp_time, phy_ctrl->phy_stop_wait_time); } +#endif static void dw_dsi_set_mode (struct dw_dsi *dsi,enum dsi_work_mode mode) {
@@ -962,13 +936,11 @@ static void mipi_config_dphy_spec1v2_parameter(struct dw_dsi *dsi, char __iomem lanes = dsi->client[dsi->cur_client].lanes -1 ; -#if defined (CONFIG_HISI_FB_970 ) -for (i =0 ; i <= lanes; i++) { +for (i =0 ; i <= (lanes+1 ); i++) {//Lane Transmission Property addr =MIPIDSI_PHY_TST_LANE_TRANSMISSION_PROPERTY + (i <<5 );dsi_phy_tst_set (mipi_dsi_base, addr,0x43 ); } -#endif //pre_delay of clock lane request setting dsi_phy_tst_set (mipi_dsi_base,MIPIDSI_PHY_TST_CLK_PRE_DELAY ,DSS_REDUCE (dsi->phy.clk_pre_delay));
@@ -988,7 +960,7 @@ static void mipi_config_dphy_spec1v2_parameter(struct dw_dsi *dsi, char __iomem//clock lane timing ctrl - t_hs_trial dsi_phy_tst_set (mipi_dsi_base,MIPIDSI_PHY_TST_CLK_TRAIL ,DSS_REDUCE (dsi->phy.clk_t_hs_trial)); -for (i =0 ; i <= (lanes +1 ); i++) {//lint !e850 +for (i =0 ; i <= (lanes +1 ); i++) {if (i ==2 ) { i++;//addr: lane0:0x60; lane1:0x80; lane2:0xC0; lane3:0xE0 }
@@ -1039,7 +1011,6 @@ static void dsi_mipi_init(struct dw_dsi *dsi, char __iomem *mipi_dsi_base)u32 hsa_time =0 ;u32 hbp_time =0 ;u64 pixel_clk =0 ; -u32 i =0 ;u32 id =0 ;unsigned long dw_jiffies =0 ;u32 tmp =0 ;
@@ -1161,7 +1132,7 @@ static void dsi_mipi_init(struct dw_dsi *dsi, char __iomem *mipi_dsi_base)/* clock lane timing ctrl - t_hs_trial*/ dsi_phy_tst_set (mipi_dsi_base,0x25 , dsi->phy.clk_t_hs_trial); -for (i =0 ; i <= lanes; i++) { +for (int i =0 ; i <= lanes; i++) {/* data lane pre_delay*/ tmp =0x30 + (i <<4 );dsi_phy_tst_set (mipi_dsi_base, tmp,DSS_REDUCE (dsi->phy.data_pre_delay));
@@ -1391,8 +1362,9 @@ static int mipi_dsi_on_sub1(struct dw_dsi *dsi, char __iomem *mipi_dsi_base)static int mipi_dsi_on_sub2 (struct dw_dsi *dsi,char __iomem *mipi_dsi_base) {WARN_ON (!mipi_dsi_base); -u64 pctrl_dphytx_stopcnt =0 ; +u64 pctrl_dphytx_stopcnt; + pctrl_dphytx_stopcnt =0 ;/* switch to video mode */ set_reg (mipi_dsi_base +MIPIDSI_MODE_CFG_OFFSET ,0x0 ,1 ,0 );
@@ -1938,7 +1910,6 @@ static int dsi_parse_dt(struct platform_device *pdev, struct dw_dsi *dsi)DRM_ERROR ("failed to get dsi base resource.\n" );return -ENXIO ; } -DRM_INFO ("dsi base =0x%x.\n" , ctx->base); ctx->peri_crg_base =of_iomap (np,1 );if (!(ctx->peri_crg_base)) {
drivers/staging/hikey9xx/gpu/hdmi/adv7535.c +4 -5
@@ -380,7 +380,6 @@ static void adv7511_set_link_config(struct adv7511 *adv7511,static void adv7511_dsi_config_tgen (struct adv7511 *adv7511) { -struct mipi_dsi_device *dsi = adv7511->dsi;struct drm_display_mode *mode = &adv7511->curr_mode;u8 clock_div_by_lanes[] = {6 ,4 ,3 };/* 2, 3, 4 lanes */ unsigned int hsw, hfp, hbp, vsw, vfp, vbp;
@@ -402,10 +401,6 @@ static void adv7511_dsi_config_tgen(struct adv7511 *adv7511) clock_div_by_lanes[adv7511->num_dsi_lanes - 2] << 3);#endif -/* set pixel clock divider mode */ -/*regmap_write(adv7511->regmap_cec, 0x16, -clock_div_by_lanes[dsi->lanes - 2] << 3);*/ -/* horizontal porch params */ regmap_write (adv7511->regmap_cec,0x28 , mode->htotal >>4 );regmap_write (adv7511->regmap_cec,0x29 , (mode->htotal <<4 ) &0xff );
@@ -944,10 +939,14 @@ static void adv7511_mode_set(struct adv7511 *adv7511,struct mipi_dsi_device *dsi = adv7511->dsi;int lanes, ret; +#if defined(CONFIG_HISI_FB_970 ) + lanes =4 ; +#else if (adj_mode->clock >80000 ) lanes =4 ;else lanes =3 ; +#endif if (lanes != dsi->lanes) {mipi_dsi_detach (dsi);
drivers/staging/hikey9xx/gpu/kirin_drm_dpe_utils.c +12 -121
222 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_drm_dpe_utils.h +1 -1
@@ -57,7 +57,7 @@ int dpe_irq_disable(struct dss_crtc *acrtc);int dpe_init (struct dss_crtc *acrtc);int dpe_deinit (struct dss_crtc *acrtc); -void dpe_check_itf_status (acrtc ); +void dpe_check_itf_status (struct dss_crtc *acrtc);int dpe_set_clk_rate_on_pll0 (struct dss_hw_ctx *ctx);void hisifb_dss_on (struct dss_hw_ctx *ctx);
drivers/staging/hikey9xx/gpu/kirin_drm_drv.c +0 -7
@@ -374,8 +374,6 @@ static int kirin_drm_platform_remove(struct platform_device *pdev)static int kirin_drm_platform_suspend (struct platform_device *pdev,pm_message_t state) { -struct device *dev = &pdev->dev; -DRM_INFO ("+. pdev->name is %s, m_message is %d \n" , pdev->name, state.event);if (!dc_ops) {DRM_ERROR ("dc_ops is NULL\n" );
@@ -383,22 +381,17 @@ static int kirin_drm_platform_suspend(struct platform_device *pdev, pm_message_t } dc_ops->suspend (pdev, state); -DRM_INFO ("-. \n" );return 0 ; }static int kirin_drm_platform_resume (struct platform_device *pdev) { -struct device *dev = &pdev->dev; - -DRM_INFO ("+. pdev->name is %s \n" , pdev->name);if (!dc_ops) {DRM_ERROR ("dc_ops is NULL\n" );return -EINVAL ; } dc_ops->resume (pdev); -DRM_INFO ("-. \n" );return 0 ; }
drivers/staging/hikey9xx/gpu/kirin_drm_dss.c +7 -10
@@ -265,7 +265,7 @@ static void dss_ldi_set_mode(struct dss_crtc *acrtc)if (mode->clock ==148500 ) clk_Hz =144000 *1000UL ;else if (mode->clock ==83496 ) - clk_Hz =80000 *1000UL ; + clk_Hz =84000 *1000UL ;else if (mode->clock ==74440 ) clk_Hz =72000 *1000UL ;else if (mode->clock ==74250 )
@@ -282,7 +282,7 @@ static void dss_ldi_set_mode(struct dss_crtc *acrtc)*/ ret =clk_set_rate (ctx->dss_pxl0_clk, clk_Hz);if (ret) { -DRM_ERROR ("failed to set pixel clk %dHz (%d)\n" , clk_Hz, ret); +DRM_ERROR ("failed to set pixel clk %llu Hz (%d)\n" , clk_Hz, ret); }#endif adj_mode->clock = clk_Hz /1000 ;
@@ -304,20 +304,20 @@ static void dss_ldi_set_mode(struct dss_crtc *acrtc)*/ ret =clk_set_rate (ctx->dss_pxl0_clk, clk_Hz);if (ret) { -DRM_ERROR ("failed to set pixel clk %dHz (%d)\n" , clk_Hz, ret); +DRM_ERROR ("failed to set pixel clk %llu Hz (%d)\n" , clk_Hz, ret); } adj_mode->clock =clk_get_rate (ctx->dss_pxl0_clk) /1000 ; } -DRM_INFO ("dss_pxl0_clk [%llu]->[%llu] \n" , clk_Hz,clk_get_rate (ctx->dss_pxl0_clk)); +DRM_INFO ("dss_pxl0_clk [%llu]->[%lu] \n" , clk_Hz,clk_get_rate (ctx->dss_pxl0_clk));dpe_init (acrtc); }static int dss_power_up (struct dss_crtc *acrtc) { -int ret;struct dss_hw_ctx *ctx = acrtc->ctx; +int ret =0 ;#if defined (CONFIG_HISI_FB_970 )dpe_common_clk_enable (ctx);
@@ -367,7 +367,8 @@ static int dss_power_up(struct dss_crtc *acrtc)dpe_interrupt_unmask (acrtc); ctx->power_on = true; -return 0 ; + +return ret; }static void dss_power_down (struct dss_crtc *acrtc)
@@ -427,8 +428,6 @@ static irqreturn_t dss_irq_handler(int irq, void *data)u32 isr_s1 =0 ;u32 isr_s2 =0 ; -u32 isr_s2_dpp =0 ; -u32 isr_s2_smmu =0 ;u32 mask =0 ; isr_s1 =inp32 (dss_base +GLB_CPU_PDP_INTS );
@@ -632,7 +631,6 @@ static int dss_plane_atomic_check(struct drm_plane *plane,static void dss_plane_atomic_update (struct drm_plane *plane,struct drm_plane_state *old_state) { -struct drm_atomic_state *atomic_state;hisi_fb_pan_display (plane); }
@@ -731,7 +729,6 @@ static int dss_dts_parse(struct platform_device *pdev, struct dss_hw_ctx *ctx)DRM_ERROR ("failed to get dss base resource.\n" );return -ENXIO ; } -DRM_INFO ("dss base =0x%x.\n" , ctx->base); ctx->peri_crg_base =of_iomap (np,1 );if (!(ctx->peri_crg_base)) {
drivers/staging/hikey9xx/gpu/kirin_drm_overlay_utils.c +0 -3
@@ -1356,7 +1356,6 @@ void hisi_dss_smmu_on(struct dss_hw_ctx *ctx)struct iommu_domain_data *domain_data =NULL ;uint32_t phy_pgd_base =0 ;uint64_t fama_phy_pgd_base; -uint32_t fama_ptw_msb;if (!ctx) {DRM_ERROR ("ctx is NULL!\n" );
@@ -1448,7 +1447,6 @@ void hisifb_mctl_sw_clr(struct dss_crtc *acrtc) {char __iomem *mctl_base =NULL ;struct dss_hw_ctx *ctx = acrtc->ctx; -int mctl_idx;int mctl_status;int delay_count =0 ;bool is_timeout;
@@ -1546,7 +1544,6 @@ void hisi_fb_pan_display(struct drm_plane *plane)u32 display_addr =0 ;u32 hal_fmt;int chn_idx =DSS_RCHN_D2 ; -char filename[256 ] = {0 };int crtc_x = state->crtc_x;int crtc_y = state->crtc_y;
drivers/staging/hikey9xx/gpu/kirin_fb_panel.h +0 -5
@@ -184,14 +184,9 @@ int vcc_cmds_tx(struct platform_device *pdev, struct vcc_desc *cmds, int cnt);int pinctrl_cmds_tx (struct platform_device *pdev,struct pinctrl_cmd_desc *cmds,int cnt);int gpio_cmds_tx (struct gpio_desc *cmds,int cnt);extern struct spi_device *g_spi_dev; -int spi_cmds_tx (struct spi_device *spi,struct spi_cmd_desc *cmds,int cnt);int hisi_pwm_set_backlight (struct backlight_device *bl,uint32_t bl_level);int hisi_pwm_off (void );int hisi_pwm_on (void ); -int hisi_lcd_backlight_on (struct drm_panel *p); -int hisi_lcd_backlight_off (struct drm_panel *p); - -#endif /* KIRIN_FB_PANEL_H */
drivers/staging/hikey9xx/gpu/kirin_fbdev.c +5 -5
@@ -114,7 +114,7 @@ unsigned long kirin_alloc_fb_buffer(struct kirin_fbdev *fbdev, int size) fbdev->ion_client = client; fbdev->ion_handle = handle; -DRM_INFO ("fbdev->smem_start = 0x%x, fbdev->screen_base = 0x%x\n" , +DRM_INFO ("fbdev->smem_start = 0x%lu, fbdev->screen_base = 0x%p\n" , fbdev->smem_start, fbdev->screen_base);return buf_addr;
@@ -164,12 +164,12 @@ static int kirin_fbdev_mmap(struct fb_info *info, struct vm_area_struct * vma) addr = vma->vm_start; offset = vma->vm_pgoff *PAGE_SIZE ; size = vma->vm_end - vma->vm_start; -DRM_INFO ("addr = 0x%x, offset = %d, size = %d!\n" , addr, offset, size); +DRM_INFO ("addr = 0x%lu, offset = 0x%lu, size = %lu!\n" , addr, offset, size);if (size > info->fix.smem_len) {DRM_ERROR ("size=%lu is out of range(%u)!\n" , size, info->fix.smem_len);return -EFAULT ; } -DRM_INFO ("fbdev->smem_start = 0x%x, fbdev->screen_base = 0x%x\n" , +DRM_INFO ("fbdev->smem_start = 0x%lu, fbdev->screen_base = 0x%p\n" , fbdev->smem_start, fbdev->screen_base);for_each_sg (table->sgl, sg, table->nents, i) {
@@ -194,12 +194,12 @@ static int kirin_fbdev_mmap(struct fb_info *info, struct vm_area_struct * vma) addr += len;if (addr >= vma->vm_end) { -DRM_INFO ("addr = 0x%x!, vma->vm_end = 0x%x\n" , addr, vma->vm_end); +DRM_INFO ("addr = 0x%lu!, vma->vm_end = 0x%lu \n" , addr, vma->vm_end);return 0 ; } } -DRM_INFO ("kirin_fbdev_mmap addr = 0x%x!\n" , addr); +DRM_INFO ("kirin_fbdev_mmap addr = 0x%lu!\n" , addr);return 0 ; }
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 21/49 staging: hikey9xx/gpu: add support for using a reserved CMA memory
In reply to Mauro Carvalho ChehabAllocate the framebuffer memory via CMA, as otherwise the drm driver may not work properly with X11.
Part of the changes here were based on a patch originally authored by:
alik <[email protected]>
The original version can be found at:
https://github.com/Bigcountry907/linux/commit/046e29834ef1c523c73614747377d3660eec3964
--- .../staging/hikey9xx/gpu/kirin9xx_drm_drv.c | 36 ++++++------------- .../staging/hikey9xx/gpu/kirin9xx_drm_drv.h | 4 +-- .../hikey9xx/gpu/kirin9xx_drm_overlay_utils.c | 16 ++------- 3 files changed, 13 insertions(+), 43 deletions(-)
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c +10 -26
@@ -21,6 +21,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_drv.h> +#include <drm/drm_fb_helper.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_gem_framebuffer_helper.h>
@@ -29,13 +30,6 @@#include "kirin9xx_drm_drv.h" -#ifdef CONFIG_DRM_FBDEV_EMULATION -static bool fbdev = true; -MODULE_PARM_DESC (fbdev,"Enable fbdev compat layer" ); -module_param (fbdev, bool,0600 ); -#endif - -static struct kirin_dc_ops *dc_ops;static int kirin_drm_kms_cleanup (struct drm_device *dev)
@@ -60,22 +54,7 @@ static void kirin_fbdev_output_poll_changed(struct drm_device *dev)dsi_set_output_client (dev); -#ifdef CMA_BUFFER_USED -if (priv->fbdev) { -DRM_INFO ("hotplug_event!!!!!!\n" ); -drm_fbdev_cma_hotplug_event (priv->fbdev); - }else { -DRM_INFO ("cma_init!!!!!!\n" ); - priv->fbdev =drm_fbdev_cma_init (dev,32 , - dev->mode_config.num_crtc, - dev->mode_config.num_connector); -if (IS_ERR (priv->fbdev)) - priv->fbdev =NULL ; - } -#else -if (priv->fbdev) -drm_fb_helper_hotplug_event (priv->fbdev); -#endif +drm_fb_helper_hotplug_event (priv->fbdev); }static const struct drm_mode_config_funcs kirin_drm_mode_config_funcs = {
@@ -98,7 +77,7 @@ static void kirin_drm_mode_config_init(struct drm_device *dev)static int kirin_drm_kms_init (struct drm_device *dev) { -struct kirin_drm_private *priv; +struct kirin_drm_private *priv = dev->dev_private;int ret; priv =devm_kzalloc (dev->dev,sizeof (*priv),GFP_KERNEL );
@@ -256,6 +235,7 @@ static int kirin_drm_bind(struct device *dev) {struct drm_driver *driver = &kirin_drm_driver;struct drm_device *drm_dev; +struct kirin_drm_private *priv;int ret; drm_dev =drm_dev_alloc (driver, dev);
@@ -270,6 +250,9 @@ static int kirin_drm_bind(struct device *dev)if (ret) goto err_kms_cleanup; +drm_fbdev_generic_setup (drm_dev,32 ); + priv = drm_dev->dev_private; +/* connectors should be registered after drm device register */ ret =kirin_drm_connectors_register (drm_dev);if (ret)
@@ -340,6 +323,7 @@ static int kirin_drm_platform_probe(struct platform_device *pdev)struct device_node *np = dev->of_node;struct component_match *match =NULL ;struct device_node *remote; +int ret; dc_ops = (struct kirin_dc_ops *)of_device_get_match_data (dev);if (!dc_ops) {
@@ -356,9 +340,9 @@ static int kirin_drm_platform_probe(struct platform_device *pdev)component_match_add (dev, &match, compare_of, remote); +if (ret) +DRM_ERROR ("cma device init failed!" );return component_master_add_with_match (dev, &kirin_drm_ops, match); - -return 0 ; }static int kirin_drm_platform_remove (struct platform_device *pdev)
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h +1 -3
@@ -13,6 +13,7 @@#include <drm/drm_crtc.h> #include <drm/drm_drv.h> +#include <drm/drm_fb_cma_helper.h> #include <drm/drm_fb_helper.h> #include <drm/drm_print.h>
@@ -21,8 +22,6 @@#define MAX_CRTC 2 -#define to_kirin_fbdev (x) container_of(x, struct kirin_fbdev, fb_helper) -/* display controller init/cleanup ops */ struct kirin_dc_ops {int (*init)(struct drm_device *dev);
@@ -32,7 +31,6 @@ struct kirin_dc_ops { };struct kirin_drm_private { -struct drm_fb_helper *fb_helper;struct drm_fb_helper *fbdev;struct drm_crtc *crtc[MAX_CRTC ]; };
drivers/staging/hikey9xx/gpu/kirin9xx_drm_overlay_utils.c +2 -14
@@ -1517,15 +1517,10 @@ void hisi_fb_pan_display(struct drm_plane *plane)struct dss_crtc *acrtc = aplane->acrtc;struct dss_hw_ctx *ctx = acrtc->ctx; -#ifndef CMA_BUFFER_USED -struct kirin_drm_private *priv = plane->dev->dev_private; -struct kirin_fbdev *fbdev =to_kirin_fbdev (priv->fbdev); -#else struct drm_gem_cma_object *obj =drm_fb_cma_get_gem_obj (state->fb,0 ); -#endif bool afbcd = false; -bool mmu_enable = true; +bool mmu_enable = false;dss_rect_ltrb_t rect;u32 bpp;u32 stride;
@@ -1550,14 +1545,7 @@ void hisi_fb_pan_display(struct drm_plane *plane) bpp = fb->format->cpp[0 ]; stride = fb->pitches[0 ]; -#ifndef CMA_BUFFER_USED -if (fbdev) - display_addr = (u32 )fbdev->smem_start + src_y * stride; -else -DRM_ERROR ("fbdev is null? \n" ); -#else display_addr = (u32 )obj->paddr + src_y * stride; -#endif rect.left =0 ; rect.right = src_w -1 ;
@@ -1609,7 +1597,7 @@ void hisi_dss_online_play(struct kirin_fbdev *fbdev, struct drm_plane *plane, drstruct dss_hw_ctx *ctx = acrtc->ctx;bool afbcd = false; -bool mmu_enable = true; +bool mmu_enable = false;dss_rect_ltrb_t rect;u32 bpp;u32 stride;
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 8/49 staging: hikey9xx/gpu: Support MIPI DSI 3 lanes for hikey970.
In reply to Mauro Carvalho ChehabFrom: Xiubin Zhang <[email protected]>
Modfiy mipi dsi lanes to improve HDMI compatibility.
--- drivers/staging/hikey9xx/gpu/dw_drm_dsi.c | 24 ++++++++++++------- drivers/staging/hikey9xx/gpu/hdmi/adv7535.c | 4 ---- .../staging/hikey9xx/gpu/kirin970_dpe_reg.h | 1 + 3 files changed, 16 insertions(+), 13 deletions(-)
drivers/staging/hikey9xx/gpu/dw_drm_dsi.c +15 -9
@@ -359,7 +359,10 @@ static void get_dsi_dphy_ctrl(struct dw_dsi *dsi,if (bpp <0 )return ; - dsi->client[id].lanes =4 ; +if (mode->clock >80000 ) + dsi->client[id].lanes =4 ; +else + dsi->client[id].lanes =3 ;if (dsi->client[id].phy_clock) dphy_req_kHz = dsi->client[id].phy_clock;
@@ -935,8 +938,7 @@ static void mipi_config_dphy_spec1v2_parameter(struct dw_dsi *dsi, char __iomemu32 lanes; lanes = dsi->client[dsi->cur_client].lanes -1 ; - -for (i =0 ; i <= (lanes+1 ); i++) { +for (i =0 ; i <= (lanes +1 ); i++) {//Lane Transmission Property addr =MIPIDSI_PHY_TST_LANE_TRANSMISSION_PROPERTY + (i <<5 );dsi_phy_tst_set (mipi_dsi_base, addr,0x43 );
@@ -960,10 +962,12 @@ static void mipi_config_dphy_spec1v2_parameter(struct dw_dsi *dsi, char __iomem//clock lane timing ctrl - t_hs_trial dsi_phy_tst_set (mipi_dsi_base,MIPIDSI_PHY_TST_CLK_TRAIL ,DSS_REDUCE (dsi->phy.clk_t_hs_trial)); -for (i =0 ; i <= (lanes +1 ); i++) { -if (i ==2 ) { +for (i =0 ; i <=4 ; i++) { +if (lanes ==2 && i ==1 )/*init mipi dsi 3 lanes shoud skip lane3*/ + i++; + +if (i ==2 )/* skip clock lane*/ i++;//addr: lane0:0x60; lane1:0x80; lane2:0xC0; lane3:0xE0 - }//data lane pre_delay addr =MIPIDSI_PHY_TST_DATA_PRE_DELAY + (i <<5 );
@@ -1019,6 +1023,9 @@ static void dsi_mipi_init(struct dw_dsi *dsi, char __iomem *mipi_dsi_base)dss_rect_t rect;u32 cmp_stopstate_val =0 ;u32 lanes; +#if !defined (CONFIG_HISI_FB_970 ) +int i =0 ; +#endif WARN_ON (!dsi);WARN_ON (!mipi_dsi_base);
@@ -1132,7 +1139,7 @@ static void dsi_mipi_init(struct dw_dsi *dsi, char __iomem *mipi_dsi_base)/* clock lane timing ctrl - t_hs_trial*/ dsi_phy_tst_set (mipi_dsi_base,0x25 , dsi->phy.clk_t_hs_trial); -for (int i =0 ; i <= lanes; i++) { +for (i =0 ; i <= lanes; i++) {/* data lane pre_delay*/ tmp =0x30 + (i <<4 );dsi_phy_tst_set (mipi_dsi_base, tmp,DSS_REDUCE (dsi->phy.data_pre_delay));
@@ -1361,10 +1368,9 @@ static int mipi_dsi_on_sub1(struct dw_dsi *dsi, char __iomem *mipi_dsi_base)static int mipi_dsi_on_sub2 (struct dw_dsi *dsi,char __iomem *mipi_dsi_base) { +u64 pctrl_dphytx_stopcnt =0 ;WARN_ON (!mipi_dsi_base); -u64 pctrl_dphytx_stopcnt; - pctrl_dphytx_stopcnt =0 ;/* switch to video mode */ set_reg (mipi_dsi_base +MIPIDSI_MODE_CFG_OFFSET ,0x0 ,1 ,0 );
drivers/staging/hikey9xx/gpu/hdmi/adv7535.c +0 -4
@@ -939,14 +939,10 @@ static void adv7511_mode_set(struct adv7511 *adv7511,struct mipi_dsi_device *dsi = adv7511->dsi;int lanes, ret; -#if defined(CONFIG_HISI_FB_970 ) - lanes =4 ; -#else if (adj_mode->clock >80000 ) lanes =4 ;else lanes =3 ; -#endif if (lanes != dsi->lanes) {mipi_dsi_detach (dsi);
drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h +1 -0
@@ -449,6 +449,7 @@ enum dss_chn_module {MODULE_SCL_LUT ,MODULE_ARSR2P ,MODULE_ARSR2P_LUT , +MODULE_POST_CLIP_ES ,MODULE_POST_CLIP ,MODULE_PCSC , MODULE_CSC,
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 43/49 staging: hikey9xx/gpu: get rid of DRM_HISI_KIRIN970
In reply to Mauro Carvalho ChehabThere are lots of ifdefs checking if the SoC version is 960 or 970. Replace them all by runtime definitions.
With that, the same DRM driver should work with both versions.
The behavior will dynamically change depending on the OF compatible strings.
---
drivers/staging/hikey9xx/gpu/Makefile | 1 +
drivers/staging/hikey9xx/gpu/kirin960_defs.c | 378 ++++++++++
.../staging/hikey9xx/gpu/kirin960_dpe_reg.h | 21 -
drivers/staging/hikey9xx/gpu/kirin970_defs.c | 381 ++++++++++
.../staging/hikey9xx/gpu/kirin970_dpe_reg.h | 23 -
.../hikey9xx/gpu}/kirin9xx_dpe.h | 30 +-
.../hikey9xx/gpu/kirin9xx_drm_dpe_utils.c | 29 +-
.../hikey9xx/gpu/kirin9xx_drm_dpe_utils.h | 21 +
.../staging/hikey9xx/gpu/kirin9xx_drm_drv.c | 4 +-
.../staging/hikey9xx/gpu/kirin9xx_drm_drv.h | 3 +-
.../staging/hikey9xx/gpu/kirin9xx_drm_dss.c | 174 ++---
.../hikey9xx/gpu/kirin9xx_drm_overlay_utils.c | 697 +-----------------
.../hikey9xx/gpu/kirin9xx_dw_drm_dsi.c | 275 +++----
drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c | 6 +-
14 files changed, 1074 insertions(+), 969 deletions(-)
create mode 100644 drivers/staging/hikey9xx/gpu/kirin960_defs.c
create mode 100644 drivers/staging/hikey9xx/gpu/kirin970_defs.c
rename drivers/{gpu/drm/hisilicon/kirin => staging/hikey9xx/gpu}/kirin9xx_dpe.h (99%)drivers/staging/hikey9xx/gpu/Makefile +1 -0
@@ -2,6 +2,7 @@ kirin9xx-drm-y := kirin9xx_drm_drv.o \ kirin9xx_drm_dss.o \ kirin9xx_drm_dpe_utils.o \ + kirin970_defs.o kirin960_defs.o \ kirin9xx_drm_overlay_utils.o obj-$(CONFIG_DRM_HISI_KIRIN9XX) += kirin9xx-drm.o kirin9xx_pwm.o
drivers/staging/hikey9xx/gpu/kirin960_defs.c new file +378 -0
378 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h +0 -21
@@ -22,27 +22,6 @@#define DEFAULT_DSS_PXL0_CLK_RATE_POWER_OFF (277000000UL)#define DEFAULT_DSS_MMBUF_CLK_RATE_POWER_OFF (238000000UL) -enum dss_chn_module { -MODULE_MIF_CHN , -MODULE_AIF0_CHN , -MODULE_AIF1_CHN , -MODULE_MCTL_CHN_MUTEX , -MODULE_MCTL_CHN_FLUSH_EN , -MODULE_MCTL_CHN_OV_OEN , -MODULE_MCTL_CHN_STARTY , -MODULE_MCTL_CHN_MOD_DBG , -MODULE_DMA , -MODULE_DFC , -MODULE_SCL , -MODULE_SCL_LUT , -MODULE_ARSR2P , -MODULE_ARSR2P_LUT , -MODULE_POST_CLIP , -MODULE_PCSC , -MODULE_CSC , -MODULE_CHN_MAX , -}; -/*****************************************************************************/ #define SCPWREN (0x0D0)
drivers/staging/hikey9xx/gpu/kirin970_defs.c new file +381 -0
381 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h +0 -23
@@ -48,28 +48,6 @@#define DEFAULT_DSS_PXL0_CLK_RATE_POWER_OFF (238000000UL)#define DEFAULT_DSS_MMBUF_CLK_RATE_POWER_OFF (208000000UL) -enum dss_chn_module { -MODULE_MIF_CHN , -MODULE_AIF0_CHN , -MODULE_AIF1_CHN , -MODULE_MCTL_CHN_MUTEX , -MODULE_MCTL_CHN_FLUSH_EN , -MODULE_MCTL_CHN_OV_OEN , -MODULE_MCTL_CHN_STARTY , -MODULE_MCTL_CHN_MOD_DBG , -MODULE_DMA , -MODULE_DFC , -MODULE_SCL , -MODULE_SCL_LUT , -MODULE_ARSR2P , -MODULE_ARSR2P_LUT , -MODULE_POST_CLIP_ES , -MODULE_POST_CLIP , -MODULE_PCSC , -MODULE_CSC , -MODULE_CHN_MAX , -}; -/*****************************************************************************/ #define PEREN4 (0x040)
@@ -1186,7 +1164,6 @@ enum dss_chn_module {#define AUTO_ULPS_ENTER_DELAY (0x00E4)#define AUTO_ULPS_WAKEUP_TIME (0x00E8)#define AUTO_ULPS_MIN_TIME (0xF8) -#define PHY_MODE (0xFC)#define DSI_MEM_CTRL (0x0194)#define DSI_PM_CTRL (0x0198)#define DSI_DEBUG (0x019C)
drivers/staging/hikey9xx/gpu/kirin9xx_dpe.h renamed from drivers/gpu/drm/hisilicon/kirin/kirin9xx_dpe.h +28 -2
@@ -217,8 +217,6 @@ enum dss_axi_idx { AXI_CHN_MAX, }; - -enum dss_rdma_idx {DSS_RDMA0 =0 ,DSS_RDMA1 ,
@@ -228,6 +226,29 @@ enum dss_rdma_idx { DSS_RDMA_MAX, }; +enum dss_chn_module { +MODULE_MIF_CHN , +MODULE_AIF0_CHN , +MODULE_AIF1_CHN , +MODULE_MCTL_CHN_MUTEX , +MODULE_MCTL_CHN_FLUSH_EN , +MODULE_MCTL_CHN_OV_OEN , +MODULE_MCTL_CHN_STARTY , +MODULE_MCTL_CHN_MOD_DBG , +MODULE_DMA , +MODULE_DFC , +MODULE_SCL , +MODULE_SCL_LUT , +MODULE_ARSR2P , +MODULE_ARSR2P_LUT , +MODULE_POST_CLIP , +MODULE_PCSC , +MODULE_CSC , +MODULE_POST_CLIP_ES ,/* Only for Kirin 970 */ +MODULE_CHN_MAX , +}; + +/*****************************************************************************/ #define FB_ACCEL_HI62xx 0x1
@@ -243,6 +264,11 @@ enum dss_rdma_idx {#define FB_ACCEL_PLATFORM_TYPE_FPGA 0x10000000 //FPGA#define FB_ACCEL_PLATFORM_TYPE_ASIC 0x20000000 //ASIC +/* Kirin 970 specific data from MPI DSI */ + +#define KIRIN970_DSI_MEM_CTRL (0x0194) +#define KIRIN970_PHY_MODE (0xFC) +/******************************************************************************/ #define DSS_WCH_MAX (2)
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c +10 -19
@@ -16,19 +16,10 @@#include <drm/drm_mipi_dsi.h> #include "kirin9xx_drm_dpe_utils.h" - -#if defined(CONFIG_DRM_HISI_KIRIN970 ) -#include "kirin970_dpe_reg.h" -#else -#include "kirin960_dpe_reg.h" -#endif - -static int g_debug_set_reg_val; +#include "kirin9xx_dpe.h" DEFINE_SEMAPHORE (hisi_fb_dss_regulator_sem); -extern u32 g_dss_module_ovl_base[DSS_MCTL_IDX_MAX ][MODULE_OVL_MAX ]; -struct mipi_ifbc_division g_mipi_ifbc_division[MIPI_DPHY_NUM ][IFBC_TYPE_MAX ] = {/*single mipi*/ {
@@ -715,7 +706,7 @@ void dss_inner_clk_pdp_enable(struct dss_hw_ctx *ctx)writel (0x00000888 , dss_base +DSS_DSC_OFFSET +DSC_MEM_CTRL );writel (0x00000008 , dss_base +DSS_LDI0_OFFSET +LDI_MEM_CTRL );writel (0x00000008 , dss_base +DSS_DBUF0_OFFSET +DBUF_MEM_CTRL ); -writel (0x00000008 , dss_base +DSS_DPP_DITHER_OFFSET +DITHER_MEM_CTRL ); +writel (0x00000008 , dss_base +DSS_DPP_DITHER_OFFSET + ctx->dither_mem_ctrl); }void dss_inner_clk_common_enable (struct dss_hw_ctx *ctx)
@@ -737,7 +728,7 @@ void dss_inner_clk_common_enable(struct dss_hw_ctx *ctx)writel (0x00000008 , dss_base +DSS_RCH_VG0_SCL_OFFSET +SCF_LB_MEM_CTRL );/*rch_v0 ,scf mem*/ writel (0x00000008 , - dss_base +DSS_RCH_VG0_ARSR_OFFSET +ARSR2P_LB_MEM_CTRL );/*rch_v0 ,arsr2p mem*/ + dss_base +DSS_RCH_VG0_ARSR_OFFSET + ctx->arsr2p_lb_mem_ctrl);/*rch_v0 ,arsr2p mem*/ writel (0x00000008 , dss_base +DSS_RCH_VG0_DMA_OFFSET +VPP_MEM_CTRL );/*rch_v0 ,vpp mem*/ writel (0x00000008 , dss_base +DSS_RCH_VG0_DMA_OFFSET +DMA_BUF_MEM_CTRL );/*rch_v0 ,dma_buf mem*/
@@ -796,10 +787,10 @@ void dss_inner_clk_common_enable(struct dss_hw_ctx *ctx)writel (0x00000008 , dss_base +DSS_WCH0_DMA_OFFSET +DMA_BUF_MEM_CTRL );/*wch0 DMA/AFBCE mem*/ writel (0x00000888 , dss_base +DSS_WCH0_DMA_OFFSET +AFBCE_MEM_CTRL );/*wch0 DMA/AFBCE mem*/ -writel (0x00000008 , dss_base +DSS_WCH0_DMA_OFFSET +ROT_MEM_CTRL );/*wch0 rot mem*/ +writel (0x00000008 , dss_base +DSS_WCH0_DMA_OFFSET + ctx->rot_mem_ctrl);/*wch0 rot mem*/ writel (0x00000008 , dss_base +DSS_WCH1_DMA_OFFSET +DMA_BUF_MEM_CTRL );/*wch1 DMA/AFBCE mem*/ writel (0x00000888 , dss_base +DSS_WCH1_DMA_OFFSET +AFBCE_MEM_CTRL );/*wch1 DMA/AFBCE mem*/ -writel (0x00000008 , dss_base +DSS_WCH1_DMA_OFFSET +ROT_MEM_CTRL );/*wch1 rot mem*/ +writel (0x00000008 , dss_base +DSS_WCH1_DMA_OFFSET + ctx->rot_mem_ctrl);/*wch1 rot mem*/ if (ctx->g_dss_version_tag ==FB_ACCEL_KIRIN970 ) {writel (0x00000088 , dss_base +DSS_WCH1_DMA_OFFSET +WCH_SCF_COEF_MEM_CTRL );
@@ -810,7 +801,7 @@ void dss_inner_clk_common_enable(struct dss_hw_ctx *ctx)writel (0x00000008 , dss_base +DSS_WCH2_DMA_OFFSET +DMA_BUF_MEM_CTRL );/*wch2 DMA/AFBCE mem*/ writel (0x00000008 , - dss_base +DSS_WCH2_DMA_OFFSET +ROT_MEM_CTRL );/*wch2 rot mem*/ + dss_base +DSS_WCH2_DMA_OFFSET + ctx->rot_mem_ctrl);/*wch2 rot mem*/ //outp32(dss_base + DSS_WCH2_DMA_OFFSET + DMA_BUF_MEM_CTRL, 0x00000008); //outp32(dss_base + DSS_WCH2_DMA_OFFSET + DMA_BUF_MEM_CTRL, 0x00000008); }
@@ -1035,10 +1026,10 @@ int dpe_regulator_disable(struct dss_hw_ctx *ctx)return -EINVAL ; } -#if defined(CONFIG_DRM_HISI_KIRIN970 ) +if (ctx->g_dss_version_tag ==FB_ACCEL_KIRIN970 ) {dpe_set_pixel_clk_rate_on_pll0 (ctx);dpe_set_common_clk_rate_on_pll0 (ctx); -#endif + } ret =regulator_disable (ctx->dpe_regulator);if (ret !=0 ) {
@@ -1139,7 +1130,7 @@ int dpe_set_pixel_clk_rate_on_pll0(struct dss_hw_ctx *ctx)return -EINVAL ; } - clk_rate =DEFAULT_DSS_PXL0_CLK_RATE_POWER_OFF ; + clk_rate = ctx->pxl0_clk_rate_power_off; ret =clk_set_rate (ctx->dss_pxl0_clk, clk_rate);if (ret <0 ) { DRM_ERROR("dss_pxl0_clk clk_set_rate(%llu) failed, error=%d!\n",
@@ -1163,7 +1154,7 @@ int dpe_set_common_clk_rate_on_pll0(struct dss_hw_ctx *ctx)return -EINVAL ; } - clk_rate =DEFAULT_DSS_MMBUF_CLK_RATE_POWER_OFF ; + clk_rate = ctx->dss_mmbuf_clk_rate_power_off; ret =clk_set_rate (ctx->dss_mmbuf_clk, clk_rate);if (ret <0 ) { DRM_ERROR("dss_mmbuf clk_set_rate(%llu) failed, error=%d!\n",
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.h +21 -0
@@ -16,10 +16,13 @@#ifndef KIRIN_DRM_DPE_UTILS_H #define KIRIN_DRM_DPE_UTILS_H +#include <linux/kernel.h> +#include <drm/drm_plane.h> #include <drm/drm_crtc.h> #include "kirin9xx_drm_drv.h" +#include "kirin9xx_dpe.h" enum dss_channel { DSS_CH1 = 0, /* channel 1 for primary plane */
@@ -110,8 +113,26 @@ struct dss_hw_ctx {char __iomem *screen_base;unsigned long smem_start;unsigned long screen_size; + +/* Version-specific data */ +u32 g_dss_module_base[DSS_CHN_MAX_DEFINE ][MODULE_CHN_MAX ]; +u32 g_dss_module_ovl_base[DSS_MCTL_IDX_MAX ][MODULE_OVL_MAX ]; +int g_scf_lut_chn_coef_idx[DSS_CHN_MAX_DEFINE ]; +u32 g_dss_module_cap[DSS_CHN_MAX_DEFINE ][MODULE_CAP_MAX ]; +u32 g_dss_chn_sid_num[DSS_CHN_MAX_DEFINE ]; +u32 g_dss_smmu_smrx_idx[DSS_CHN_MAX_DEFINE ]; +u32 smmu_offset; +u32 afbc_header_addr_align; +u32 dss_mmbuf_clk_rate_power_off; +u32 rot_mem_ctrl; +u32 dither_mem_ctrl; +u32 arsr2p_lb_mem_ctrl; +u32 pxl0_clk_rate_power_off; }; +void kirin960_dpe_defs (struct dss_hw_ctx *ctx); +void kirin970_dpe_defs (struct dss_hw_ctx *ctx); +struct dss_clk_rate {u64 dss_pri_clk_rate;u64 dss_pclk_dss_rate;
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c +2 -2
@@ -340,10 +340,10 @@ static int kirin_drm_platform_resume(struct platform_device *pdev)static const struct of_device_id kirin_drm_dt_ids[] = { { .compatible ="hisilicon,kirin960-dpe" , - .data = &dss_dc_ops, + .data = &kirin960_dss_dc_ops, }, { .compatible ="hisilicon,kirin970-dpe" , - .data = &dss_dc_ops, + .data = &kirin970_dss_dc_ops, }, {/* end node */ }, };
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h +2 -1
@@ -47,7 +47,8 @@ struct kirin_fbdev {int shared_fd; }; -extern const struct kirin_dc_ops dss_dc_ops; +extern const struct kirin_dc_ops kirin960_dss_dc_ops; +extern const struct kirin_dc_ops kirin970_dss_dc_ops;void dsi_set_output_client (struct drm_device *dev); struct drm_framebuffer *kirin_framebuffer_init(struct drm_device *dev,
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c +90 -84
235 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_drm_overlay_utils.c +19 -678
796 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c +141 -134
427 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c +1 -5
@@ -27,11 +27,7 @@#include "kirin9xx_fb_panel.h" #include "kirin9xx_dw_dsi_reg.h" -#if defined(CONFIG_DRM_HISI_KIRIN970 ) -#include "kirin970_dpe_reg.h" -#else -#include "kirin960_dpe_reg.h" -#endif +#include "kirin9xx_dpe.h" /* default pwm clk */ #define DEFAULT_PWM_CLK_RATE (80 * 1000000L)
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 28/49 staging: hikey9xx/gpu: remove an uneeded hack
In reply to Mauro Carvalho ChehabAt least on current upstream Kernels, forcing an event parse during init time isn't needed anymore.
--- drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c +0 -5
@@ -122,11 +122,6 @@ static int kirin_drm_kms_init(struct drm_device *dev)/* init kms poll for handling hpd */ drm_kms_helper_poll_init (dev); -#if 1 -/* force detection after connectors init */ - (void )drm_helper_hpd_irq_event (dev); -#endif -return 0 ; err_unbind_all:
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 17/49 staging: hikey9xx/gpu: change the includes to reflect upstream
In reply to Mauro Carvalho ChehabThe includes there reflect a downstream version back on v4.4 times. change them to reflect the current upstream and to avoid the need of using a -I flag at the Makefile.
---
...{kirin9xx_dpe_reg.h => kirin960_dpe_reg.h} | 3 +++
.../staging/hikey9xx/gpu/kirin970_dpe_reg.h | 3 +++
.../hikey9xx/gpu/kirin9xx_drm_dpe_utils.c | 6 +++---
.../hikey9xx/gpu/kirin9xx_drm_dpe_utils.h | 4 ++--
.../staging/hikey9xx/gpu/kirin9xx_drm_drv.c | 11 ++++++----
.../staging/hikey9xx/gpu/kirin9xx_drm_drv.h | 10 +++++-----
.../staging/hikey9xx/gpu/kirin9xx_drm_dss.c | 20 ++++++++++---------
.../hikey9xx/gpu/kirin9xx_drm_overlay_utils.c | 15 +++++++-------
.../hikey9xx/gpu/kirin9xx_dw_drm_dsi.c | 2 ++
drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c | 12 ++++++-----
10 files changed, 51 insertions(+), 35 deletions(-)
rename drivers/staging/hikey9xx/gpu/{kirin9xx_dpe_reg.h => kirin960_dpe_reg.h} (99%)drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h renamed from drivers/staging/hikey9xx/gpu/kirin9xx_dpe_reg.h +3 -0
@@ -24,6 +24,9 @@#include <linux/regulator/driver.h> #include <linux/regulator/machine.h> +#include <drm/drm_plane.h> +#include <drm/drm_crtc.h> +#include <linux/ion.h> #include <linux/hisi/hisi_ion.h>
drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h +3 -0
@@ -24,6 +24,9 @@#include <linux/regulator/driver.h> #include <linux/regulator/machine.h> +#include <drm/drm_plane.h> +#include <drm/drm_crtc.h> +#include <linux/ion.h> #include <linux/hisi/hisi_ion.h>
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c +3 -3
@@ -10,10 +10,10 @@* GNU General Public License for more details. * */ -#include <drm/drmP.h> +#include <drm/drm_drv.h> +#include <drm/drm_mipi_dsi.h> -#include "drm_mipi_dsi.h" -#include "kirin_drm_dpe_utils.h" +#include "kirin9xx_drm_dpe_utils.h" int g_debug_set_reg_val =0 ;
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.h +2 -2
@@ -17,9 +17,9 @@#if defined (CONFIG_DRM_HISI_KIRIN970 )#include "kirin970_dpe_reg.h" #else -#include "kirin_dpe_reg.h" +#include "kirin960_dpe_reg.h" #endif -#include "kirin_drm_drv.h" +#include "kirin9xx_drm_drv.h" void set_reg (char __iomem *addr,uint32_t val,uint8_t bw,uint8_t bs);uint32_t set_bits32 (uint32_t old_val,uint32_t val,uint8_t bw,uint8_t bs);
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c +7 -4
@@ -18,13 +18,16 @@#include <linux/component.h> #include <linux/of_graph.h> -#include <drm/drmP.h> -#include <drm/drm_gem_cma_helper.h> -#include <drm/drm_fb_cma_helper.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_drv.h> +#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> -#include "kirin_drm_drv.h" +#include "kirin9xx_drm_drv.h" #ifdef CONFIG_DRM_FBDEV_EMULATION static bool fbdev = true;
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h +5 -5
@@ -11,18 +11,18 @@#ifndef __KIRIN_DRM_DRV_H__#define __KIRIN_DRM_DRV_H__ -#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_drv.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_print.h> +#include <linux/iommu.h> #include <linux/ion.h> #include <linux/hisi/hisi_ion.h> #include <linux/hisi/hisi-iommu.h> -#include "drm_crtc.h" -#include "drm_fb_helper.h" -#define MAX_CRTC 2 -//#define CMA_BUFFER_USED #define to_kirin_fbdev (x) container_of(x, struct kirin_fbdev, fb_helper)/* display controller init/cleanup ops */
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c +11 -9
@@ -25,22 +25,24 @@#include <linux/of.h> #include <linux/of_irq.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 <drm/drm_plane_helper.h> -#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_drv.h> #include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_plane_helper.h> +#include <drm/drm_vblank.h> +#include <drm/drm_modeset_helper_vtables.h> -#include "kirin_drm_drv.h" - -#include "kirin_drm_dpe_utils.h" +#include "kirin9xx_drm_drv.h" +#include "kirin9xx_drm_dpe_utils.h" #if defined (CONFIG_DRM_HISI_KIRIN970 )#include "kirin970_dpe_reg.h" #else -#include "kirin_dpe_reg.h" +#include "kirin960_dpe_reg.h" #endif //#define DSS_POWER_UP_ON_UEFI
drivers/staging/hikey9xx/gpu/kirin9xx_drm_overlay_utils.c +8 -7
@@ -16,17 +16,18 @@* */ -#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 <drm/drm_plane_helper.h> -#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_drv.h> #include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_plane_helper.h> -#include "kirin_drm_dpe_utils.h" -#include "kirin_drm_drv.h" +#include "kirin9xx_drm_dpe_utils.h" +#include "kirin9xx_drm_drv.h" static int mid_array[DSS_CHN_MAX_DEFINE ] = {0xb ,0xa ,0x9 ,0x8 ,0x7 ,0x6 ,0x5 ,0x4 ,0x2 ,0x1 ,0x3 ,0x0 };
drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c +2 -0
@@ -28,6 +28,8 @@#include <drm/drm_encoder_slave.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_panel.h> +#include <drm/drm_probe_helper.h> +#include "dw_dsi_reg.h" #if defined (CONFIG_HISI_FB_970 )
drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c +7 -5
@@ -10,18 +10,20 @@* GNU General Public License for more details. * */ -#include <drm/drmP.h> +#include <drm/drm_drv.h> +#include <drm/drm_mipi_dsi.h> +#include <linux/clk.h> #include <linux/regmap.h> #include <linux/reset.h> #include <linux/of_address.h> #include <linux/of.h> #include <linux/of_irq.h> +#include <linux/pinctrl/consumer.h> -#include "drm_mipi_dsi.h" -#include "kirin_drm_dpe_utils.h" -#include "kirin_fb_panel.h" -#include "dw_dsi_reg.h" +#include "kirin9xx_drm_dpe_utils.h" +#include "kirin9xx_fb_panel.h" +#include "kirin9xx_dw_dsi_reg.h" /* default pwm clk */ #define DEFAULT_PWM_CLK_RATE (80 * 1000000L)
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 37/49 staging: hikey9xx/gpu: don't use iommu code
In reply to Mauro Carvalho ChehabWhile this driver apparently supports both IOMMU and no-IOMMU access, it always enable the IOMMU via some code, at the downstream version.
Apparently, the downstream iommu is there just to get the physical address of the logical IOMMU address. Based on the downstream code, it sounds that the IOMMU would be an specific one for the GPU.
Anyway, right now, the driver is set to not use the IOMMU at all. So, let's comment out the code which allocates IOMMU pages, and the code that would try to use it to setup a register, as, without the IOMMU, this would cause an OOPS.
--- drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c | 12 ++++++++++-- .../hikey9xx/gpu/kirin9xx_drm_overlay_utils.c | 10 ++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-)
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c +10 -2
@@ -769,6 +769,14 @@ static int dss_plane_init(struct drm_device *dev, struct dss_plane *aplane,static int dss_enable_iommu (struct platform_device *pdev,struct dss_hw_ctx *ctx) { +#if 0 +/* +* FIXME: +* +* Right now, the IOMMU support is actually disabled. See the caller of +* hisi_dss_smmu_config(). Yet, if we end enabling it, this should be +* ported to use io-pgtable directly. +*/ struct device *dev =NULL ; dev = &pdev->dev;
@@ -781,7 +789,7 @@ static int dss_enable_iommu(struct platform_device *pdev, struct dss_hw_ctx *ctx }iommu_attach_device (ctx->mmu_domain, dev); - +#endif return 0 ; }
@@ -934,7 +942,7 @@ static int dss_dts_parse(struct platform_device *pdev, struct dss_hw_ctx *ctx) DSS_MAX_PXL0_CLK_144M, (uint64_t)clk_get_rate(ctx->dss_pxl0_clk)); } -/* regulator enable */ +/* enable IOMMU */ dss_enable_iommu (pdev, ctx);return 0 ;
drivers/staging/hikey9xx/gpu/kirin9xx_drm_overlay_utils.c +10 -0
@@ -1333,8 +1333,17 @@ static void hisi_dss_mif_on(struct dss_hw_ctx *ctx)set_reg (dss_base +MIF_CH11_OFFSET +MIF_CTRL0 ,0x1 ,1 ,0 ); } +void hisi_dss_smmu_on (struct dss_hw_ctx *ctx) { +#if 0 +/* +* FIXME: +* +* Right now, the IOMMU support is actually disabled. See the caller of +* hisi_dss_smmu_config(). Yet, if we end enabling it, this should be +* ported to use io-pgtable directly. +*/ void __iomem *smmu_base;struct iommu_domain_data *domain_data =NULL ;u32 phy_pgd_base =0 ;
@@ -1374,6 +1383,7 @@ void hisi_dss_smmu_on(struct dss_hw_ctx *ctx) phy_pgd_base = (uint32_t )(domain_data->phy_pgd_base);DRM_DEBUG ("fama_phy_pgd_base = %llu, phy_pgd_base =0x%x \n" , fama_phy_pgd_base, phy_pgd_base);set_reg (smmu_base +SMMU_CB_TTBR0 , phy_pgd_base,32 ,0 ); +#endif }void hisifb_dss_on (struct dss_hw_ctx *ctx)
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 45/49 dts: hikey970-pinctrl.dtsi: add missing pinctrl settings
In reply to Mauro Carvalho ChehabThere are several pinctrl settings that are missing at this DT file.
Also, the entries are out of order.
Add the missing bits, as they'll be required by the DRM driver - and probably by other drivers not upstreamed yet.
Reorder the entres, adding the missing bits.
--- .../boot/dts/hisilicon/hikey970-pinctrl.dtsi | 548 +++++++++++++++++- 1 file changed, 537 insertions(+), 11 deletions(-)
arch/arm64/boot/dts/hisilicon/hikey970-pinctrl.dtsi +537 -11
@@ -61,6 +61,153 @@ uart6_pmx_func: uart6_pmx_func { 0x060 MUX_M1 /* UART6_TXD */ >; }; + + i2c3_pmx_func: i2c3_pmx_func { + pinctrl-single,pins = < + 0x010 MUX_M1 /* I2C3_SCL */ + 0x014 MUX_M1 /* I2C3_SDA */ + >; + }; + + i2c4_pmx_func: i2c4_pmx_func { + pinctrl-single,pins = < + 0x03c MUX_M1 /* I2C4_SCL */ + 0x040 MUX_M1 /* I2C4_SDA */ + >; + }; + + cam0_rst_pmx_func: cam0_rst_pmx_func { + pinctrl-single,pins = < + 0x714 MUX_M0 /* CAM0_RST */ + >; + }; + + cam1_rst_pmx_func: cam1_rst_pmx_func { + pinctrl-single,pins = < + 0x048 MUX_M0 /* CAM1_RST */ + >; + }; + + cam0_pwd_n_pmx_func: cam0_pwd_n_pmx_func { + pinctrl-single,pins = < + 0x098 MUX_M0 /* CAM0_PWD_N */ + >; + }; + + cam1_pwd_n_pmx_func: cam1_pwd_n_pmx_func { + pinctrl-single,pins = < + 0x044 MUX_M0 /* CAM1_PWD_N */ + >; + }; + + isp0_pmx_func: isp0_pmx_func { + pinctrl-single,pins = < + 0x018 MUX_M1 /* ISP_CLK0 */ + 0x024 MUX_M1 /* ISP_SCL0 */ + 0x028 MUX_M1 /* ISP_SDA0 */ + >; + }; + + isp1_pmx_func: isp1_pmx_func { + pinctrl-single,pins = < + 0x01c MUX_M1 /* ISP_CLK1 */ + 0x02c MUX_M1 /* ISP_SCL1 */ + 0x030 MUX_M1 /* ISP_SDA1 */ + >; + }; + }; + + pmx1: pinmux@fff11000 { + compatible = "pinctrl-single"; + reg = <0x0 0xfff11000 0x0 0x73c>; + #gpio-range-cells = <0x3>; + #pinctrl-cells = <1>; + pinctrl-single,register-width = <0x20>; + pinctrl-single,function-mask = <0x7>; + /* pin base, nr pins & gpio function */ + pinctrl-single,gpio-range = <&range 0 46 0>; + + pwr_key_pmx_func: pwr_key_pmx_func { + pinctrl-single,pins = < + 0x064 MUX_M0 /* GPIO_203 */ + >; + }; + + pd_pmx_func: pd_pmx_func{ + pinctrl-single,pins = < + 0x080 MUX_M0 /* GPIO_221 */ + >; + }; + + i2s2_pmx_func: i2s2_pmx_func { + pinctrl-single,pins = < + 0x050 MUX_M1 /* I2S2_DI */ + 0x054 MUX_M1 /* I2S2_DO */ + 0x058 MUX_M1 /* I2S2_XCLK */ + 0x05c MUX_M1 /* I2S2_XFS */ + >; + }; + + spi0_pmx_func: spi0_pmx_func { + pinctrl-single,pins = < + 0x094 MUX_M1 /* SPI0_CLK */ + 0x098 MUX_M1 /* SPI0_DI */ + 0x09c MUX_M1 /* SPI0_DO */ + 0x0a0 MUX_M1 /* SPI0_CS0_N */ + >; + }; + + spi2_pmx_func: spi2_pmx_func { + pinctrl-single,pins = < + 0x710 MUX_M1 /* SPI2_CLK */ + 0x714 MUX_M1 /* SPI2_DI */ + 0x718 MUX_M1 /* SPI2_DO */ + 0x71c MUX_M1 /* SPI2_CS0_N */ + >; + }; + + spi3_pmx_func: spi3_pmx_func { + pinctrl-single,pins = < + 0x72c MUX_M1 /* SPI3_CLK */ + 0x730 MUX_M1 /* SPI3_DI */ + 0x734 MUX_M1 /* SPI3_DO */ + 0x738 MUX_M1 /* SPI3_CS0_N */ + >; + }; + + i2c0_pmx_func: i2c0_pmx_func { + pinctrl-single,pins = < + 0x020 MUX_M1 /* I2C0_SCL */ + 0x024 MUX_M1 /* I2C0_SDA */ + >; + }; + + i2c1_pmx_func: i2c1_pmx_func { + pinctrl-single,pins = < + 0x028 MUX_M1 /* I2C1_SCL */ + 0x02c MUX_M1 /* I2C1_SDA */ + >; + }; + i2c2_pmx_func: i2c2_pmx_func { + pinctrl-single,pins = < + 0x030 MUX_M1 /* I2C2_SCL */ + 0x034 MUX_M1 /* I2C2_SDA */ + >; + }; + + pcie_clkreq_pmx_func: pcie_clkreq_pmx_func { + pinctrl-single,pins = < + 0x084 MUX_M1 /* PCIE0_CLKREQ_N */ + >; + }; + + gpio185_pmx_func: gpio185_pmx_func { + pinctrl-single,pins = <0x01C 0x1>; + }; + + gpio185_pmx_idle: gpio185_pmx_idle { + pinctrl-single,pins = <0x01C 0x0>; + }; }; pmx2: pinmux@e896c800 {
@@ -184,6 +331,108 @@ PULL_UP DRIVE7_02MA DRIVE6_MASK >; }; + + i2c3_cfg_func: i2c3_cfg_func { + pinctrl-single,pins = < + 0x014 0x0 /* I2C3_SCL */ + 0x018 0x0 /* I2C3_SDA */ + >; + pinctrl-single,bias-pulldown = < + PULL_DIS + PULL_DOWN + PULL_DIS + PULL_DOWN + >; + pinctrl-single,bias-pullup = < + PULL_DIS + PULL_UP + PULL_DIS + PULL_UP + >; + pinctrl-single,drive-strength = < + DRIVE7_04MA DRIVE6_MASK + >; + }; + + i2c4_cfg_func: i2c4_cfg_func { + pinctrl-single,pins = < + 0x040 0x0 /* I2C4_SCL */ + 0x044 0x0 /* I2C4_SDA */ + >; + pinctrl-single,bias-pulldown = < + PULL_DIS + PULL_DOWN + PULL_DIS + PULL_DOWN + >; + pinctrl-single,bias-pullup = < + PULL_DIS + PULL_UP + PULL_DIS + PULL_UP + >; + pinctrl-single,drive-strength = < + DRIVE7_04MA DRIVE6_MASK + >; + }; + + cam0_rst_cfg_func: cam0_rst_cfg_func { + pinctrl-single,pins = < + 0x714 0x0 /* CAM0_RST */ + >; + pinctrl-single,bias-pulldown = <PULL_DIS PULL_DOWN PULL_DIS PULL_DOWN>; + pinctrl-single,bias-pullup = <PULL_DIS PULL_UP PULL_DIS PULL_UP>; + pinctrl-single,drive-strength = <DRIVE7_04MA DRIVE6_MASK>; + }; + + cam1_rst_cfg_func: cam1_rst_cfg_func { + pinctrl-single,pins = < + 0x04C 0x0 /* CAM1_RST */ + >; + pinctrl-single,bias-pulldown = <PULL_DIS PULL_DOWN PULL_DIS PULL_DOWN>; + pinctrl-single,bias-pullup = <PULL_DIS PULL_UP PULL_DIS PULL_UP>; + pinctrl-single,drive-strength = <DRIVE7_04MA DRIVE6_MASK>; + }; + + cam0_pwd_n_cfg_func: cam0_pwd_n_cfg_func { + pinctrl-single,pins = < + 0x09C 0x0 /* CAM0_PWD_N */ + >; + pinctrl-single,bias-pulldown = <PULL_DIS PULL_DOWN PULL_DIS PULL_DOWN>; + pinctrl-single,bias-pullup = <PULL_DIS PULL_UP PULL_DIS PULL_UP>; + pinctrl-single,drive-strength = <DRIVE7_04MA DRIVE6_MASK>; + }; + + cam1_pwd_n_cfg_func: cam1_pwd_n_cfg_func { + pinctrl-single,pins = < + 0x048 0x0 /* CAM1_PWD_N */ + >; + pinctrl-single,bias-pulldown = <PULL_DIS PULL_DOWN PULL_DIS PULL_DOWN>; + pinctrl-single,bias-pullup = <PULL_DIS PULL_UP PULL_DIS PULL_UP>; + pinctrl-single,drive-strength = <DRIVE7_04MA DRIVE6_MASK>; + }; + + isp0_cfg_func: isp0_cfg_func { + pinctrl-single,pins = < + 0x01C 0x0 /* ISP_CLK0 */ + 0x028 0x0 /* ISP_SCL0 */ + 0x02C 0x0 /* ISP_SDA0 */ + >; + pinctrl-single,bias-pulldown = <PULL_DIS PULL_DOWN PULL_DIS PULL_DOWN>; + pinctrl-single,bias-pullup = <PULL_DIS PULL_UP PULL_DIS PULL_UP>; + pinctrl-single,drive-strength = <DRIVE7_04MA DRIVE6_MASK>; + }; + + isp1_cfg_func: isp1_cfg_func { + pinctrl-single,pins = < + 0x020 0x0 /* ISP_CLK1 */ + 0x030 0x0 /* ISP_SCL1 */ + 0x034 0x0 /* ISP_SDA1 */ + >; + pinctrl-single,bias-pulldown = <PULL_DIS PULL_DOWN PULL_DIS PULL_DOWN>; + pinctrl-single,bias-pullup = <PULL_DIS PULL_UP PULL_DIS PULL_UP>; + pinctrl-single,drive-strength = <DRIVE7_04MA DRIVE6_MASK>; + }; }; pmx5: pinmux@fc182000 {
@@ -338,22 +587,299 @@ DRIVE6_MASK }; }; - pmx1: pinmux@fff11000 { - compatible = "pinctrl-single"; - reg = <0x0 0xfff11000 0x0 0x73c>; - #gpio-range-cells = <0x3>; - #pinctrl-cells = <1>; - pinctrl-single,register-width = <0x20>; - pinctrl-single,function-mask = <0x7>; - /* pin base, nr pins & gpio function */ - pinctrl-single,gpio-range = <&range 0 46 0>; - }; - pmx16: pinmux@fff11800 { compatible = "pinconf-single"; reg = <0x0 0xfff11800 0x0 0x73c>; #pinctrl-cells = <1>; pinctrl-single,register-width = <0x20>; + + pwr_key_cfg_func: pwr_key_cfg_func { + pinctrl-single,pins = < + 0x090 0x0 /* GPIO_203 */ + >; + pinctrl-single,bias-pulldown = <PULL_DIS PULL_DOWN PULL_DIS PULL_DOWN>; + pinctrl-single,bias-pullup = <PULL_UP PULL_UP PULL_DIS PULL_UP>; + pinctrl-single,drive-strength = <DRIVE7_02MA DRIVE6_MASK>; + }; + + usb_cfg_func: usb_cfg_func { + pinctrl-single,pins = < + 0x0AC 0x0 /* GPIO_221 */ + >; + pinctrl-single,bias-pulldown = < + PULL_DIS + PULL_DOWN + PULL_DIS + PULL_DOWN + >; + pinctrl-single,bias-pullup = < + PULL_UP + PULL_UP + PULL_DIS + PULL_UP + >; + pinctrl-single,drive-strength = < + DRIVE7_02MA DRIVE6_MASK + >; + }; + + spi0_cfg_func: spi0_cfg_func { + pinctrl-single,pins = < + 0x0c8 0x0 /* SPI0_DI */ + 0x0cc 0x0 /* SPI0_DO */ + 0x0d0 0x0 /* SPI0_CS0_N */ + >; + pinctrl-single,bias-pulldown = < + PULL_DIS + PULL_DOWN + PULL_DIS + PULL_DOWN + >; + pinctrl-single,bias-pullup = < + PULL_DIS + PULL_UP + PULL_DIS + PULL_UP + >; + pinctrl-single,drive-strength = < + DRIVE7_06MA DRIVE6_MASK + >; + }; + + spi2_cfg_func: spi2_cfg_func { + pinctrl-single,pins = < + 0x714 0x0 /* SPI2_DI */ + 0x718 0x0 /* SPI2_DO */ + 0x71c 0x0 /* SPI2_CS0_N */ + >; + pinctrl-single,bias-pulldown = < + PULL_DIS + PULL_DOWN + PULL_DIS + PULL_DOWN + >; + pinctrl-single,bias-pullup = < + PULL_DIS + PULL_UP + PULL_DIS + PULL_UP + >; + pinctrl-single,drive-strength = < + DRIVE7_06MA DRIVE6_MASK + >; + }; + + spi3_cfg_func: spi3_cfg_func { + pinctrl-single,pins = < + 0x730 0x0 /* SPI3_DI */ + 0x734 0x0 /* SPI3_DO */ + 0x738 0x0 /* SPI3_CS0_N */ + >; + pinctrl-single,bias-pulldown = < + PULL_DIS + PULL_DOWN + PULL_DIS + PULL_DOWN + >; + pinctrl-single,bias-pullup = < + PULL_DIS + PULL_UP + PULL_DIS + PULL_UP + >; + pinctrl-single,drive-strength = < + DRIVE7_06MA DRIVE6_MASK + >; + }; + + spi0_clk_cfg_func: spi0_clk_cfg_func { + pinctrl-single,pins = < + 0x0c4 0x0 /* SPI0_CLK */ + >; + pinctrl-single,bias-pulldown = < + PULL_DIS + PULL_DOWN + PULL_DIS + PULL_DOWN + >; + pinctrl-single,bias-pullup = < + PULL_DIS + PULL_UP + PULL_DIS + PULL_UP + >; + pinctrl-single,drive-strength = < + DRIVE7_10MA DRIVE6_MASK + >; + }; + + spi2_clk_cfg_func: spi2_clk_cfg_func { + pinctrl-single,pins = < + 0x710 0x0 /* SPI2_CLK */ + >; + pinctrl-single,bias-pulldown = < + PULL_DIS + PULL_DOWN + PULL_DIS + PULL_DOWN + >; + pinctrl-single,bias-pullup = < + PULL_DIS + PULL_UP + PULL_DIS + PULL_UP + >; + pinctrl-single,drive-strength = < + DRIVE7_10MA DRIVE6_MASK + >; + }; + + spi3_clk_cfg_func: spi3_clk_cfg_func { + pinctrl-single,pins = < + 0x72c 0x0 /* SPI3_CLK */ + >; + pinctrl-single,bias-pulldown = < + PULL_DIS + PULL_DOWN + PULL_DIS + PULL_DOWN + >; + pinctrl-single,bias-pullup = < + PULL_DIS + PULL_UP + PULL_DIS + PULL_UP + >; + pinctrl-single,drive-strength = < + DRIVE7_10MA DRIVE6_MASK + >; + }; + + i2c0_cfg_func: i2c0_cfg_func { + pinctrl-single,pins = < + 0x04c 0x0 /* I2C0_SCL */ + 0x050 0x0 /* I2C0_SDA */ + >; + pinctrl-single,bias-pulldown = < + PULL_DIS + PULL_DOWN + PULL_DIS + PULL_DOWN + >; + pinctrl-single,bias-pullup = < + PULL_DIS + PULL_UP + PULL_DIS + PULL_UP + >; + pinctrl-single,drive-strength = < + DRIVE7_04MA DRIVE6_MASK + >; + }; + + i2c1_cfg_func: i2c1_cfg_func { + pinctrl-single,pins = < + 0x054 0x0 /* I2C1_SCL */ + 0x058 0x0 /* I2C1_SDA */ + >; + pinctrl-single,bias-pulldown = < + PULL_DIS + PULL_DOWN + PULL_DIS + PULL_DOWN + >; + pinctrl-single,bias-pullup = < + PULL_DIS + PULL_UP + PULL_DIS + PULL_UP + >; + pinctrl-single,drive-strength = < + DRIVE7_04MA DRIVE6_MASK + >; + }; + + i2c2_cfg_func: i2c2_cfg_func { + pinctrl-single,pins = < + 0x05c 0x0 /* I2C2_SCL */ + 0x060 0x0 /* I2C2_SDA */ + >; + pinctrl-single,bias-pulldown = < + PULL_DIS + PULL_DOWN + PULL_DIS + PULL_DOWN + >; + pinctrl-single,bias-pullup = < + PULL_DIS + PULL_UP + PULL_DIS + PULL_UP + >; + pinctrl-single,drive-strength = < + DRIVE7_04MA DRIVE6_MASK + >; + }; + + pcie_clkreq_cfg_func: pcie_clkreq_cfg_func { + pinctrl-single,pins = < + 0x0b0 0x0 + >; + pinctrl-single,bias-pulldown = < + PULL_DIS + PULL_DOWN + PULL_DIS + PULL_DOWN + >; + pinctrl-single,bias-pullup = < + PULL_DIS + PULL_UP + PULL_DIS + PULL_UP + >; + pinctrl-single,drive-strength = < + DRIVE7_06MA DRIVE6_MASK + >; + }; + i2s2_cfg_func: i2s2_cfg_func { + pinctrl-single,pins = < + 0x07c 0x0 /* I2S2_DI */ + 0x080 0x0 /* I2S2_DO */ + 0x084 0x0 /* I2S2_XCLK */ + 0x088 0x0 /* I2S2_XFS */ + >; + pinctrl-single,bias-pulldown = < + PULL_DIS + PULL_DOWN + PULL_DIS + PULL_DOWN + >; + pinctrl-single,bias-pullup = < + PULL_UP + PULL_UP + PULL_DIS + PULL_UP + >; + pinctrl-single,drive-strength = < + DRIVE7_02MA DRIVE6_MASK + >; + }; + + gpio185_cfg_func: gpio185_cfg_func { + pinctrl-single,pins = <0x048 0>; + pinctrl-single,bias-pulldown = <0 2 0 2>; + pinctrl-single,bias-pullup = <0 1 0 1>; + pinctrl-single,drive-strength = <0x00 0x70>; + pinctrl-single,slew-rate = <0x0 0x80>; + }; + + gpio185_cfg_idle: gpio185_cfg_idle { + pinctrl-single,pins = <0x048 0>; + pinctrl-single,bias-pulldown = <2 2 0 2>; + pinctrl-single,bias-pullup = <0 1 0 1>; + pinctrl-single,drive-strength = <0x00 0x70>; + pinctrl-single,slew-rate = <0x0 0x80>; + }; }; }; };
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 11/49 staging: hikey9xx/gpu: Add support 10.1 inch special HDMI displays.
In reply to Mauro Carvalho ChehabFrom: Xiubin Zhang <[email protected]>
Adjust pixel clock for compatibility with 10.1 inch special displays.
--- drivers/staging/hikey9xx/gpu/kirin_drm_dss.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/staging/hikey9xx/gpu/kirin_drm_dss.c +4 -0
@@ -270,6 +270,10 @@ static void dss_ldi_set_mode(struct dss_crtc *acrtc)else clk_Hz = mode->clock *1000UL ; +/* Adjust pixel clock for compatibility with 10.1 inch special displays. */ +if (mode->clock ==148500 && mode->width_mm ==532 && mode->height_mm ==299 ) + clk_Hz =152000 *1000UL ; +DRM_INFO ("HDMI real need clock = %llu \n" , clk_Hz);hdmi_pxl_ppll7_init (ctx, clk_Hz); adj_mode->clock = clk_Hz /1000 ;
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 22/49 staging: hikey9xx/gpu: cleanup encoder attach logic
In reply to Mauro Carvalho ChehabPlace both adv7535 and panel logic at the same routine, cleaning up things a little bit and fixing the includes.
--- .../hikey9xx/gpu/kirin9xx_dw_drm_dsi.c | 58 ++++++++++--------- 1 file changed, 31 insertions(+), 27 deletions(-)
drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c +31 -27
@@ -25,7 +25,8 @@#include <drm/drm_of.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_mipi_dsi.h> -#include <drm/drm_encoder_slave.h> +#include <drm/drm_encoder.h> +#include <drm/drm_device.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_panel.h> #include <drm/drm_probe_helper.h>
@@ -1483,17 +1484,31 @@ static const struct drm_encoder_funcs dw_encoder_funcs = {static int dw_drm_encoder_init (struct device *dev,struct drm_device *drm_dev, -struct drm_encoder *encoder) +struct drm_encoder *encoder, +struct drm_bridge *bridge) {int ret; -u32 crtc_mask =drm_of_find_possible_crtcs (drm_dev, dev->of_node); +u32 crtc_mask; +dev_info (dev,"%s:\n" , __func__); + +/* Link drm_bridge to encoder */ +if (!bridge) { +DRM_INFO ("no dsi bridge to attach the encoder\n" ); +return 0 ; + } + + crtc_mask =drm_of_find_possible_crtcs (drm_dev, dev->of_node);if (!crtc_mask) {DRM_ERROR ("failed to find crtc mask\n" );return -EINVAL ; } +dev_info (dev,"Initializing CRTC encoder: %d\n" , + crtc_mask); + encoder->possible_crtcs = crtc_mask; + encoder->possible_clones =0 ; ret =drm_encoder_init (drm_dev, encoder, &dw_encoder_funcs,DRM_MODE_ENCODER_DSI ,NULL );if (ret) {
@@ -1503,7 +1518,14 @@ static int dw_drm_encoder_init(struct device *dev,drm_encoder_helper_add (encoder, &dw_encoder_helper_funcs); -return 0 ; +/* associate the bridge to dsi encoder */ + ret =drm_bridge_attach (encoder, bridge,NULL ,0 ); +if (ret) { +DRM_ERROR ("failed to attach external bridge\n" ); +drm_encoder_cleanup (encoder); + } + +return ret; } static int dsi_host_attach(struct mipi_dsi_host *host,
@@ -1677,22 +1699,6 @@ static int dsi_host_init(struct device *dev, struct dw_dsi *dsi)return 0 ; } -static int dsi_bridge_init (struct drm_device *dev,struct dw_dsi *dsi) -{ -struct drm_encoder *encoder = &dsi->encoder; -struct drm_bridge *bridge = dsi->bridge; -int ret; - -/* associate the bridge to dsi encoder */ - ret =drm_bridge_attach (encoder, bridge,NULL ,0 ); -if (ret) { -DRM_ERROR ("failed to attach external bridge\n" ); -return ret; - } - -return 0 ; -} -static int dsi_connector_get_modes (struct drm_connector *connector) {struct dw_dsi *dsi =connector_to_dsi (connector);
@@ -1766,6 +1772,7 @@ static int dsi_connector_init(struct drm_device *dev, struct dw_dsi *dsi)if (ret)return ret; +dev_info (dev->dev,"Attaching CRTC encoder\n" ); ret =drm_connector_attach_encoder (connector, encoder);if (ret)return ret;
@@ -1784,16 +1791,13 @@ static int dsi_bind(struct device *dev, struct device *master, void *data)struct drm_device *drm_dev = data;int ret; - ret =dw_drm_encoder_init (dev, drm_dev, &dsi->encoder); +DRM_INFO ("dsi_bind\n" ); + + ret =dw_drm_encoder_init (dev, drm_dev, &dsi->encoder, + dsi->bridge);if (ret)return ret; -if (dsi->bridge) { - ret =dsi_bridge_init (drm_dev, dsi); -if (ret) -return ret; - } -if (dsi->panel) { ret =dsi_connector_init (drm_dev, dsi);if (ret)
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 40/49 staging: hikey9xx/gpu: get rid of input/output macros
In reply to Mauro Carvalho ChehabThe DPE headers define several macros for I/O. Get rid of them by replacing by the Linux ones.
In the specific case of outp32(), I used this small coccinelle script to change them to writel():
@ rule1 @ expression addr, val; @@ -outp32(addr, val) +writel(val, addr)
--- .../staging/hikey9xx/gpu/kirin960_dpe_reg.h | 15 -- .../staging/hikey9xx/gpu/kirin970_dpe_reg.h | 15 -- .../hikey9xx/gpu/kirin9xx_drm_dpe_utils.c | 251 ++++++++++-------- .../staging/hikey9xx/gpu/kirin9xx_drm_dss.c | 24 +- .../hikey9xx/gpu/kirin9xx_drm_overlay_utils.c | 14 +- .../hikey9xx/gpu/kirin9xx_dw_drm_dsi.c | 24 +- drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c | 20 +- 7 files changed, 180 insertions(+), 183 deletions(-)
drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h +0 -15
@@ -3218,21 +3218,6 @@ struct mipi_ifbc_division {/*****************************************************************************/ -#define outp32 (addr, val) writel(val, addr) -#define outp16 (addr, val) writew(val, addr) -#define outp8 (addr, val) writeb(val, addr) -#define outp (addr, val) outp32(addr, val) - -#define inp32 (addr) readl(addr) -#define inp16 (addr) readw(addr) -#define inp8 (addr) readb(addr) -#define inp (addr) inp32(addr) - -#define inpw (port) readw(port) -#define outpw (port, val) writew(val, port) -#define inpdw (port) readl(port) -#define outpdw (port, val) writel(val, port) -#ifndef ALIGN_DOWN #define ALIGN_DOWN (val, al) ((val) & ~((al) - 1))#endif
drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h +0 -15
@@ -4206,21 +4206,6 @@ struct mipi_ifbc_division {/*****************************************************************************/ -#define outp32 (addr, val) writel(val, addr) -#define outp16 (addr, val) writew(val, addr) -#define outp8 (addr, val) writeb(val, addr) -#define outp (addr, val) outp32(addr, val) - -#define inp32 (addr) readl(addr) -#define inp16 (addr) readw(addr) -#define inp8 (addr) readb(addr) -#define inp (addr) inp32(addr) - -#define inpw (port) readw(port) -#define outpw (port, val) writew(val, port) -#define inpdw (port) readl(port) -#define outpdw (port, val) writel(val, port) -#ifndef ALIGN_DOWN #define ALIGN_DOWN (val, al) ((val) & ~((al) - 1))#endif
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c +139 -112
343 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c +12 -12
@@ -215,7 +215,7 @@ int hdmi_pxl_ppll7_init(struct dss_hw_ctx *ctx, u64 pixel_clock) frac = (u64)(ceil_temp * vco_freq_output - sys_clock_fref / refdiv * fbdiv) * refdiv * frac_range; frac = (u64 )frac / sys_clock_fref; - ppll7ctrl0 =inp32 (ctx->pmctrl_base +MIDIA_PPLL7_CTRL0 ); + ppll7ctrl0 =readl (ctx->pmctrl_base +MIDIA_PPLL7_CTRL0 ); ppll7ctrl0 &= ~MIDIA_PPLL7_FREQ_DEVIDER_MASK ; ppll7ctrl0_val =0x0 ;
@@ -223,9 +223,9 @@ int hdmi_pxl_ppll7_init(struct dss_hw_ctx *ctx, u64 pixel_clock) ppll7ctrl0_val &=MIDIA_PPLL7_FREQ_DEVIDER_MASK ; ppll7ctrl0 |= ppll7ctrl0_val; -outp32 (ctx->pmctrl_base +MIDIA_PPLL7_CTRL0 , ppll7ctrl0); +writel (ppll7ctrl0, ctx->pmctrl_base +MIDIA_PPLL7_CTRL0 ); - ppll7ctrl1 =inp32 (ctx->pmctrl_base +MIDIA_PPLL7_CTRL1 ); + ppll7ctrl1 =readl (ctx->pmctrl_base +MIDIA_PPLL7_CTRL1 ); ppll7ctrl1 &= ~MIDIA_PPLL7_FRAC_MODE_MASK ; ppll7ctrl1_val =0x0 ;
@@ -233,7 +233,7 @@ int hdmi_pxl_ppll7_init(struct dss_hw_ctx *ctx, u64 pixel_clock) ppll7ctrl1_val &=MIDIA_PPLL7_FRAC_MODE_MASK ; ppll7ctrl1 |= ppll7ctrl1_val; -outp32 (ctx->pmctrl_base +MIDIA_PPLL7_CTRL1 , ppll7ctrl1); +writel (ppll7ctrl1, ctx->pmctrl_base +MIDIA_PPLL7_CTRL1 );DRM_INFO ("PLL7 set to (0x%0x, 0x%0x)\n" , ppll7ctrl0, ppll7ctrl1);
@@ -438,16 +438,16 @@ static irqreturn_t dss_irq_handler(int irq, void *data)u32 isr_s2 =0 ;u32 mask =0 ; - isr_s1 =inp32 (dss_base +GLB_CPU_PDP_INTS ); - isr_s2 =inp32 (dss_base +DSS_LDI0_OFFSET +LDI_CPU_ITF_INTS ); + isr_s1 =readl (dss_base +GLB_CPU_PDP_INTS ); + isr_s2 =readl (dss_base +DSS_LDI0_OFFSET +LDI_CPU_ITF_INTS );DRM_INFO_ONCE ("isr_s1 = 0x%x!\n" , isr_s1);DRM_INFO_ONCE ("isr_s2 = 0x%x!\n" , isr_s2); -outp32 (dss_base +DSS_LDI0_OFFSET +LDI_CPU_ITF_INTS , isr_s2); -outp32 (dss_base +GLB_CPU_PDP_INTS , isr_s1); +writel (isr_s2, dss_base +DSS_LDI0_OFFSET +LDI_CPU_ITF_INTS ); +writel (isr_s1, dss_base +GLB_CPU_PDP_INTS ); - isr_s1 &= ~(inp32 (dss_base +GLB_CPU_PDP_INT_MSK )); - isr_s2 &= ~(inp32 (dss_base +DSS_LDI0_OFFSET +LDI_CPU_ITF_INT_MSK )); + isr_s1 &= ~(readl (dss_base +GLB_CPU_PDP_INT_MSK )); + isr_s2 &= ~(readl (dss_base +DSS_LDI0_OFFSET +LDI_CPU_ITF_INT_MSK ));if (isr_s2 &BIT_VACTIVE0_END ) { ctx->vactive0_end_flag++;
@@ -460,9 +460,9 @@ static irqreturn_t dss_irq_handler(int irq, void *data) }if (isr_s2 &BIT_LDI_UNFLOW ) { - mask =inp32 (dss_base +DSS_LDI0_OFFSET +LDI_CPU_ITF_INT_MSK ); + mask =readl (dss_base +DSS_LDI0_OFFSET +LDI_CPU_ITF_INT_MSK ); mask |=BIT_LDI_UNFLOW ; -outp32 (dss_base +DSS_LDI0_OFFSET +LDI_CPU_ITF_INT_MSK , mask); +writel (mask, dss_base +DSS_LDI0_OFFSET +LDI_CPU_ITF_INT_MSK );DRM_ERROR ("ldi underflow!\n" ); }
drivers/staging/hikey9xx/gpu/kirin9xx_drm_overlay_utils.c +7 -7
@@ -1298,10 +1298,10 @@ static void hisi_dss_qos_on(struct dss_hw_ctx *ctx) noc_dss_base = ctx->noc_dss_base; -outp32 (noc_dss_base +0xc ,0x2 ); -outp32 (noc_dss_base +0x8c ,0x2 ); -outp32 (noc_dss_base +0x10c ,0x2 ); -outp32 (noc_dss_base +0x18c ,0x2 ); +writel (0x2 , noc_dss_base +0xc ); +writel (0x2 , noc_dss_base +0x8c ); +writel (0x2 , noc_dss_base +0x10c ); +writel (0x2 , noc_dss_base +0x18c ); }static void hisi_dss_mif_on (struct dss_hw_ctx *ctx)
@@ -1427,13 +1427,13 @@ void hisi_dss_unflow_handler(struct dss_hw_ctx *ctx, bool unmask) dss_base = ctx->base; - tmp =inp32 (dss_base +DSS_LDI0_OFFSET +LDI_CPU_ITF_INT_MSK ); + tmp =readl (dss_base +DSS_LDI0_OFFSET +LDI_CPU_ITF_INT_MSK );if (unmask) tmp &= ~BIT_LDI_UNFLOW ;else tmp |=BIT_LDI_UNFLOW ; -outp32 (dss_base +DSS_LDI0_OFFSET +LDI_CPU_ITF_INT_MSK , tmp); +writel (tmp, dss_base +DSS_LDI0_OFFSET +LDI_CPU_ITF_INT_MSK ); }void hisifb_mctl_sw_clr (struct dss_crtc *acrtc)
@@ -1457,7 +1457,7 @@ void hisifb_mctl_sw_clr(struct dss_crtc *acrtc)set_reg (mctl_base +MCTL_CTL_CLEAR ,0x1 ,1 ,0 );while (1 ) { - mctl_status =inp32 (mctl_base +MCTL_CTL_STATUS ); + mctl_status =readl (mctl_base +MCTL_CTL_STATUS );if (((mctl_status &0x10 ) ==0 ) || (delay_count >500 )) { is_timeout = (delay_count >100 ) ? true : false; delay_count =0 ;
drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c +12 -12
@@ -279,10 +279,10 @@ static void set_reg(char __iomem *addr, uint32_t val, uint8_t bw,u32 mask = (1UL << bw) -1UL ;u32 tmp =0 ; - tmp =inp32 (addr); + tmp =readl (addr); tmp &= ~(mask << bs); -outp32 (addr, tmp | ((val & mask) << bs)); +writel (tmp | ((val & mask) << bs), addr); }void dsi_set_output_client (struct drm_device *dev)
@@ -1078,11 +1078,11 @@ static void dsi_mipi_init(struct dw_dsi *dsi, char __iomem *mipi_dsi_base,set_reg (mipi_dsi_base +MIPIDSI_CLKMGR_CFG_OFFSET , dsi->phy.clk_division,8 ,0 );set_reg (mipi_dsi_base +MIPIDSI_CLKMGR_CFG_OFFSET , dsi->phy.clk_division,8 ,8 ); -outp32 (mipi_dsi_base +MIPIDSI_PHY_RSTZ_OFFSET ,0x00000000 ); +writel (0x00000000 , mipi_dsi_base +MIPIDSI_PHY_RSTZ_OFFSET ); -outp32 (mipi_dsi_base +MIPIDSI_PHY_TST_CTRL0_OFFSET ,0x00000000 ); -outp32 (mipi_dsi_base +MIPIDSI_PHY_TST_CTRL0_OFFSET ,0x00000001 ); -outp32 (mipi_dsi_base +MIPIDSI_PHY_TST_CTRL0_OFFSET ,0x00000000 ); +writel (0x00000000 , mipi_dsi_base +MIPIDSI_PHY_TST_CTRL0_OFFSET ); +writel (0x00000001 , mipi_dsi_base +MIPIDSI_PHY_TST_CTRL0_OFFSET ); +writel (0x00000000 , mipi_dsi_base +MIPIDSI_PHY_TST_CTRL0_OFFSET );#if defined(CONFIG_DRM_HISI_KIRIN970 )dsi_phy_tst_set (mipi_dsi_base,0x0042 ,0x21 );
@@ -1194,12 +1194,12 @@ static void dsi_mipi_init(struct dw_dsi *dsi, char __iomem *mipi_dsi_base, }#endif -outp32 (mipi_dsi_base +MIPIDSI_PHY_RSTZ_OFFSET ,0x00000007 ); +writel (0x00000007 , mipi_dsi_base +MIPIDSI_PHY_RSTZ_OFFSET ); is_ready = false; dw_jiffies = jiffies +HZ /2 ; do { - tmp = inp32(mipi_dsi_base + MIPIDSI_PHY_STATUS_OFFSET); + tmp = readl(mipi_dsi_base + MIPIDSI_PHY_STATUS_OFFSET); if ((tmp & 0x00000001) == 0x00000001) { is_ready = true; break;
@@ -1223,7 +1223,7 @@ static void dsi_mipi_init(struct dw_dsi *dsi, char __iomem *mipi_dsi_base, is_ready = false; dw_jiffies = jiffies +HZ /2 ; do { - tmp = inp32(mipi_dsi_base + MIPIDSI_PHY_STATUS_OFFSET); + tmp = readl(mipi_dsi_base + MIPIDSI_PHY_STATUS_OFFSET); if ((tmp & cmp_stopstate_val) == cmp_stopstate_val) { is_ready = true; break;
@@ -1383,7 +1383,7 @@ static int mipi_dsi_on_sub1(struct dw_dsi *dsi, char __iomem *mipi_dsi_base,/* dsi memory init */ #if defined(CONFIG_DRM_HISI_KIRIN970 ) -outp32 (mipi_dsi_base +DSI_MEM_CTRL ,0x02600008 ); +writel (0x02600008 , mipi_dsi_base +DSI_MEM_CTRL );#endif /* switch to cmd mode */
@@ -1422,7 +1422,7 @@ static int mipi_dsi_on_sub2(struct dw_dsi *dsi, char __iomem *mipi_dsi_base)DRM_DEBUG ("pctrl_dphytx_stopcnt = %llu\n" , pctrl_dphytx_stopcnt);//FIXME: -outp32 (dsi->ctx->pctrl_base +PERI_CTRL29 , (u32 )pctrl_dphytx_stopcnt); +writel ((u32 )pctrl_dphytx_stopcnt, dsi->ctx->pctrl_base +PERI_CTRL29 );#endif return 0 ;
@@ -2015,7 +2015,7 @@ static int dsi_parse_dt(struct platform_device *pdev, struct dw_dsi *dsi)DRM_INFO ("dsi cur_client is %d <0->hdmi;1->panel>\n" , dsi->cur_client);/*dis-reset*/ /*ip_reset_dis_dsi0, ip_reset_dis_dsi1*/ -outp32 (ctx->peri_crg_base +PERRSTDIS3 ,0x30000000 ); +writel (0x30000000 , ctx->peri_crg_base +PERRSTDIS3 ); ctx->dss_dphy0_ref_clk =devm_clk_get (&pdev->dev,"clk_txdphy0_ref" );if (IS_ERR (ctx->dss_dphy0_ref_clk)) {
drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c +10 -10
@@ -177,14 +177,14 @@ int hisi_pwm_set_backlight(struct backlight_device *bl, uint32_t bl_level) bl_level = (bl_level *PWM_OUT_PRECISION ) / bl_max; -outp32 (pwm_base +PWM_LOCK_OFFSET ,0x1acce551 ); -outp32 (pwm_base +PWM_CTL_OFFSET ,0x0 ); -outp32 (pwm_base +PWM_CFG_OFFSET ,0x2 ); -outp32 (pwm_base +PWM_PR0_OFFSET ,0x1 ); -outp32 (pwm_base +PWM_PR1_OFFSET ,0x2 ); -outp32 (pwm_base +PWM_CTL_OFFSET ,0x1 ); -outp32 (pwm_base +PWM_C0_MR_OFFSET , (PWM_OUT_PRECISION -1 )); -outp32 (pwm_base +PWM_C0_MR0_OFFSET , bl_level); +writel (0x1acce551 , pwm_base +PWM_LOCK_OFFSET ); +writel (0x0 , pwm_base +PWM_CTL_OFFSET ); +writel (0x2 , pwm_base +PWM_CFG_OFFSET ); +writel (0x1 , pwm_base +PWM_PR0_OFFSET ); +writel (0x2 , pwm_base +PWM_PR1_OFFSET ); +writel (0x1 , pwm_base +PWM_CTL_OFFSET ); +writel ((PWM_OUT_PRECISION -1 ), pwm_base +PWM_C0_MR_OFFSET ); +writel (bl_level, pwm_base +PWM_C0_MR0_OFFSET );return 0 ; }
@@ -214,7 +214,7 @@ int hisi_pwm_on(void)return 0 ;// dis-reset pwm -outp32 (peri_crg_base +PERRSTDIS2 ,0x1 ); +writel (0x1 , peri_crg_base +PERRSTDIS2 ); clk_tmp = g_pwm_clk;if (clk_tmp) {
@@ -276,7 +276,7 @@ int hisi_pwm_off(void) }//reset pwm -outp32 (peri_crg_base +PERRSTEN2 ,0x1 ); +writel (0x1 , peri_crg_base +PERRSTEN2 ); g_pwm_on =0 ;
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 47/49 dts: add support for Hikey 970 DRM
In reply to Mauro Carvalho ChehabAdd the needed bits for the DRM driver to work with the Hikey 970 board.
--- .../boot/dts/hisilicon/hi3670-hikey970.dts | 52 +++++++ arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 6 + .../boot/dts/hisilicon/hikey970-drm.dtsi | 130 ++++++++++++++++++ 3 files changed, 188 insertions(+) create mode 100644 arch/arm64/boot/dts/hisilicon/hikey970-drm.dtsi
arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts +52 -0
@@ -13,6 +13,7 @@ #include "hi3670.dtsi" #include "hikey970-pinctrl.dtsi" #include "hikey970-pmic.dtsi" +#include "hikey970-drm.dtsi" / { model = "HiKey970";
@@ -40,6 +41,27 @@ memory@0 { reg = <0x0 0x0 0x0 0x0>; }; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + drm_dma_reserved: drm_dma_mem_region { + compatible = "shared-dma-pool"; + reg = <0 0x32200000 0 0x8000000>; + alignment = <0x400000>; + no-map; + }; + }; + + fixed_3v3: regulator-3v3 { + compatible = "regulator-fixed"; + regulator-name = "fixed-3.3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + wlan_en: wlan-en-1-8v { compatible = "regulator-fixed"; regulator-name = "wlan-en-regulator";
@@ -435,3 +457,33 @@ &uart6 { label = "LS-UART1"; status = "okay"; }; + +&i2c4 { + status = "okay"; + + adv7533: adv7533@39 { + compatible = "adi,adv7533"; + reg = <0x39>, <0x3f>, <0x3c>, <0x38>; + reg-names = "main", "edid", "cec", "packet"; + v1p2-supply = <&ldo3>; + avdd-supply = <&ldo3>; + dvdd-supply = <&ldo3>; + pvdd-supply = <&ldo3>; + a2vdd-supply = <&ldo3>; + v3p3-supply = <&fixed_3v3>; + + interrupt-parent = <&gpio1>; + interrupts = <1 2>; + pd-gpio = <&gpio27 1 0>; + sel-gpio = <&gpio25 7 0>; + adi,dsi-lanes = <4>; + adi,disable-timing-generator; + #sound-dai-cells = <0>; + + port { + adv7533_in: endpoint { + remote-endpoint = <&dsi_out0>; + }; + }; + }; +};
arch/arm64/boot/dts/hisilicon/hi3670.dtsi +6 -0
@@ -194,6 +194,12 @@ media2_crg: media2_crgctrl@e8900000 { #clock-cells = <1>; }; + iomcu_rst: reset { + compatible = "hisilicon,hi3660-reset"; + hisi,rst-syscon = <&iomcu>; + #reset-cells = <2>; + }; + uart0: serial@fdf02000 { compatible = "arm,pl011", "arm,primecell"; reg = <0x0 0xfdf02000 0x0 0x1000>;
arch/arm64/boot/dts/hisilicon/hikey970-drm.dtsi new file +130 -0
130 lines not on this page · raw message
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 44/49 dts: hisilicon: hi3670.dtsi: add I2C settings
In reply to Mauro Carvalho ChehabThe I2C buses are not declared at the device tree. As this will be needed by further patches, add them, keeping all in disabled state. Per-board settings can override it.
--- arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 71 +++++++++++++++++++++++ 1 file changed, 71 insertions(+)
arch/arm64/boot/dts/hisilicon/hi3670.dtsi +71 -0
@@ -723,5 +723,76 @@ dwmmc2: dwmmc2@fc183000 { card-detect-delay = <200>; status = "disabled"; }; + + /* I2C */ + i2c0: i2c@ffd71000 { + compatible = "snps,designware-i2c"; + reg = <0x0 0xffd71000 0x0 0x1000>; + interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>; + #address-cells = <1>; + #size-cells = <0>; + clock-frequency = <400000>; + clocks = <&iomcu HI3670_CLK_GATE_I2C0>; + resets = <&iomcu_rst 0x20 3>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pmx_func &i2c0_cfg_func>; + status = "disabled"; + }; + + i2c1: i2c@ffd72000 { + compatible = "snps,designware-i2c"; + reg = <0x0 0xffd72000 0x0 0x1000>; + interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; + #address-cells = <1>; + #size-cells = <0>; + clock-frequency = <400000>; + clocks = <&iomcu HI3670_CLK_GATE_I2C1>; + resets = <&iomcu_rst 0x20 4>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pmx_func &i2c1_cfg_func>; + status = "disabled"; + }; + + i2c2: i2c@ffd73000 { + compatible = "snps,designware-i2c"; + reg = <0x0 0xffd73000 0x0 0x1000>; + interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>; + #address-cells = <1>; + #size-cells = <0>; + clock-frequency = <400000>; + clocks = <&iomcu HI3670_CLK_GATE_I2C2>; + resets = <&iomcu_rst 0x20 5>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c2_pmx_func &i2c2_cfg_func>; + status = "disabled"; + }; + + i2c3: i2c@fdf0c000 { + compatible = "snps,designware-i2c"; + reg = <0x0 0xfdf0c000 0x0 0x1000>; + interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>; + #address-cells = <1>; + #size-cells = <0>; + clock-frequency = <400000>; + clocks = <&crg_ctrl HI3670_CLK_GATE_I2C3>; + resets = <&crg_rst 0x78 7>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c3_pmx_func &i2c3_cfg_func>; + status = "disabled"; + }; + + i2c4: i2c@fdf0d000 { + compatible = "snps,designware-i2c"; + reg = <0x0 0xfdf0d000 0x0 0x1000>; + interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>; + #address-cells = <1>; + #size-cells = <0>; + clock-frequency = <400000>; + clocks = <&crg_ctrl HI3670_CLK_GATE_I2C4>; + resets = <&crg_rst 0x78 27>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c4_pmx_func &i2c4_cfg_func>; + status = "disabled"; + }; }; };
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 13/49 staging: hikey9xx/gpu: rename the Kirin9xx namespace
In reply to Mauro Carvalho ChehabThere's already a driver with the same namespace for an older Kirin chipset. Rename this one, in order to make it clearer that this is the driver for Kirin 960/970.
---
.../staging/hikey9xx/gpu/{kirin_dpe_reg.h => kirin9xx_dpe_reg.h} | 0
.../gpu/{kirin_drm_dpe_utils.c => kirin9xx_drm_dpe_utils.c} | 0
.../gpu/{kirin_drm_dpe_utils.h => kirin9xx_drm_dpe_utils.h} | 0
.../staging/hikey9xx/gpu/{kirin_drm_drv.c => kirin9xx_drm_drv.c} | 0
.../staging/hikey9xx/gpu/{kirin_drm_drv.h => kirin9xx_drm_drv.h} | 0
.../staging/hikey9xx/gpu/{kirin_drm_dss.c => kirin9xx_drm_dss.c} | 0
.../{kirin_drm_overlay_utils.c => kirin9xx_drm_overlay_utils.c} | 0
.../staging/hikey9xx/gpu/{dw_drm_dsi.c => kirin9xx_dw_drm_dsi.c} | 0
.../staging/hikey9xx/gpu/{dw_dsi_reg.h => kirin9xx_dw_dsi_reg.h} | 0
drivers/staging/hikey9xx/gpu/{kirin_fb.c => kirin9xx_fb.c} | 0
.../hikey9xx/gpu/{kirin_fb_panel.h => kirin9xx_fb_panel.h} | 0
drivers/staging/hikey9xx/gpu/{kirin_fbdev.c => kirin9xx_fbdev.c} | 0
drivers/staging/hikey9xx/gpu/{kirin_pwm.c => kirin9xx_pwm.c} | 0
13 files changed, 0 insertions(+), 0 deletions(-)
rename drivers/staging/hikey9xx/gpu/{kirin_dpe_reg.h => kirin9xx_dpe_reg.h} (100%)
rename drivers/staging/hikey9xx/gpu/{kirin_drm_dpe_utils.c => kirin9xx_drm_dpe_utils.c} (100%)
rename drivers/staging/hikey9xx/gpu/{kirin_drm_dpe_utils.h => kirin9xx_drm_dpe_utils.h} (100%)
rename drivers/staging/hikey9xx/gpu/{kirin_drm_drv.c => kirin9xx_drm_drv.c} (100%)
rename drivers/staging/hikey9xx/gpu/{kirin_drm_drv.h => kirin9xx_drm_drv.h} (100%)
rename drivers/staging/hikey9xx/gpu/{kirin_drm_dss.c => kirin9xx_drm_dss.c} (100%)
rename drivers/staging/hikey9xx/gpu/{kirin_drm_overlay_utils.c => kirin9xx_drm_overlay_utils.c} (100%)
rename drivers/staging/hikey9xx/gpu/{dw_drm_dsi.c => kirin9xx_dw_drm_dsi.c} (100%)
rename drivers/staging/hikey9xx/gpu/{dw_dsi_reg.h => kirin9xx_dw_dsi_reg.h} (100%)
rename drivers/staging/hikey9xx/gpu/{kirin_fb.c => kirin9xx_fb.c} (100%)
rename drivers/staging/hikey9xx/gpu/{kirin_fb_panel.h => kirin9xx_fb_panel.h} (100%)
rename drivers/staging/hikey9xx/gpu/{kirin_fbdev.c => kirin9xx_fbdev.c} (100%)
rename drivers/staging/hikey9xx/gpu/{kirin_pwm.c => kirin9xx_pwm.c} (100%)drivers/staging/hikey9xx/gpu/kirin9xx_dpe_reg.h renamed from drivers/staging/hikey9xx/gpu/kirin_dpe_reg.h +0 -0
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c renamed from drivers/staging/hikey9xx/gpu/kirin_drm_dpe_utils.c +0 -0
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.h renamed from drivers/staging/hikey9xx/gpu/kirin_drm_dpe_utils.h +0 -0
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c renamed from drivers/staging/hikey9xx/gpu/kirin_drm_drv.c +0 -0
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h renamed from drivers/staging/hikey9xx/gpu/kirin_drm_drv.h +0 -0
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c renamed from drivers/staging/hikey9xx/gpu/kirin_drm_dss.c +0 -0
drivers/staging/hikey9xx/gpu/kirin9xx_drm_overlay_utils.c renamed from drivers/staging/hikey9xx/gpu/kirin_drm_overlay_utils.c +0 -0
drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c renamed from drivers/staging/hikey9xx/gpu/dw_drm_dsi.c +0 -0
drivers/staging/hikey9xx/gpu/kirin9xx_dw_dsi_reg.h renamed from drivers/staging/hikey9xx/gpu/dw_dsi_reg.h +0 -0
drivers/staging/hikey9xx/gpu/kirin9xx_fb.c renamed from drivers/staging/hikey9xx/gpu/kirin_fb.c +0 -0
drivers/staging/hikey9xx/gpu/kirin9xx_fb_panel.h renamed from drivers/staging/hikey9xx/gpu/kirin_fb_panel.h +0 -0
drivers/staging/hikey9xx/gpu/kirin9xx_fbdev.c renamed from drivers/staging/hikey9xx/gpu/kirin_fbdev.c +0 -0
drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c renamed from drivers/staging/hikey9xx/gpu/kirin_pwm.c +0 -0
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 49/49 dt: display: Add binds for the DPE and DSI controller for Kirin 960/970
In reply to Mauro Carvalho ChehabAdd a description of the bindings used by Kirin 960/970 Display Serial Interface (DSI) controller and by its Display Engine (DPE).
--- .../display/hisilicon,hi3660-dpe.yaml | 99 +++++++++++++++++ .../display/hisilicon,hi3660-dsi.yaml | 102 ++++++++++++++++++ .../boot/dts/hisilicon/hikey970-drm.dtsi | 4 +- 3 files changed, 203 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/hisilicon,hi3660-dpe.yaml create mode 100644 Documentation/devicetree/bindings/display/hisilicon,hi3660-dsi.yaml
Documentation/devicetree/bindings/display/hisilicon,hi3660-dpe.yaml new file +99 -0
@@ -0,0 +1,99 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/display/hisilicon,hi3660-dpe.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: HiSilicon SPMI controller + +maintainers: + - Mauro Carvalho Chehab <[email protected]> + +description: | + The HiSilicon Display Engine (DPE) s the display controller which grab + image data from memory, do composition, do post image processing, + generate RGB timing stream and transfer to DSI. + +properties: + $nodename: + pattern: "dpe@[0-9a-f]+" + + compatible: + enum: + - hisilicon,kirin960-dpe + - hisilicon,kirin970-dpe + + reg: + minItems: 1 + + interrupts: + maxItems: 1 + + clocks: + minItems: 1 + description: Clocks used by the ISP and by the display + + clock-names: + description: Names for the clock lines + + dma-coherent: true + + port: + type: object + description: A port node pointing to the display output endpoint. + + + iommu-info: + type: object + description: IOMMU address and size to be used by GPU + + properties: + start-addr: + const: start address for IOMMU + size: + const: size of the mapped region + +examples: + - | + dpe: dpe@e8600000 { + compatible = "hisilicon,kirin970-dpe"; + memory-region = <&drm_dma_reserved>; + reg = <0 0xE8600000 0 0xC0000>, + <0 0xFFF35000 0 0x1000>, + <0 0xFFF0A000 0 0x1000>, + <0 0xE8A09000 0 0x1000>, + <0 0xE86C0000 0 0x10000>, + <0 0xFFF31000 0 0x1000>, + <0 0xE87FF000 0 0x1000>; + + interrupts = <0 245 4>; + + clocks = <&media1_crg HI3670_ACLK_GATE_DSS>, + <&media1_crg HI3670_PCLK_GATE_DSS>, + <&media1_crg HI3670_CLK_GATE_EDC0>, + <&media1_crg HI3670_CLK_GATE_LDI0>, + <&media1_crg HI3670_CLK_GATE_DSS_AXI_MM>, + <&media1_crg HI3670_PCLK_GATE_MMBUF>, + <&crg_ctrl HI3670_PCLK_GATE_PCTRL>; + + clock-names = "aclk_dss", + "pclk_dss", + "clk_edc0", + "clk_ldi0", + "clk_dss_axi_mm", + "pclk_mmbuf", + "pclk_pctrl"; + + dma-coherent; + + port { + dpe_out: endpoint { + remote-endpoint = <&dsi_in>; + }; + }; + + iommu_info { + start-addr = <0x8000>; + size = <0xbfff8000>; + }; + };
Documentation/devicetree/bindings/display/hisilicon,hi3660-dsi.yaml new file +102 -0
102 lines not on this page · raw message
arch/arm64/boot/dts/hisilicon/hikey970-drm.dtsi +2 -2
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 / { - dpe: dpe@E8600000 { + dpe: dpe@e8600000 { compatible = "hisilicon,kirin970-dpe"; memory-region = <&drm_dma_reserved>; // DSS, PERI_CRG, SCTRL, PCTRL, NOC_DSS_Service_Target, PMCTRL, MEDIA_CRG
@@ -44,7 +44,7 @@ iommu_info { }; }; - dsi: dsi@E8601000 { + dsi: dsi@e8601000 { compatible = "hisilicon,kirin970-dsi"; reg = <0 0xE8601000 0 0x7F000>, <0 0xFFF35000 0 0x1000>,
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 18/49 staging: hikey9xx/gpu: port driver to upstream kAPIs
In reply to Mauro Carvalho ChehabThere were several changes at the upstream kAPIs since Kernel 4.4. Update the driver for it to build with the upstream Kernel.
--- .../staging/hikey9xx/gpu/kirin9xx_drm_drv.c | 28 +++--- .../staging/hikey9xx/gpu/kirin9xx_drm_dss.c | 26 +++--- .../hikey9xx/gpu/kirin9xx_drm_overlay_utils.c | 6 +- .../hikey9xx/gpu/kirin9xx_dw_drm_dsi.c | 86 ++++++------------- 4 files changed, 57 insertions(+), 89 deletions(-)
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c +14 -14
@@ -46,7 +46,6 @@ static int kirin_drm_kms_cleanup(struct drm_device *dev) priv->fbdev =NULL ;drm_kms_helper_poll_fini (dev); -drm_vblank_cleanup (dev); dc_ops->cleanup (dev);drm_mode_config_cleanup (dev);devm_kfree (dev->dev, priv);
@@ -80,7 +79,7 @@ static void kirin_fbdev_output_poll_changed(struct drm_device *dev) }static const struct drm_mode_config_funcs kirin_drm_mode_config_funcs = { - .fb_create = drm_fb_cma_create, + .fb_create = drm_gem_fb_create, .output_poll_changed = kirin_fbdev_output_poll_changed, .atomic_check = drm_atomic_helper_check, .atomic_commit = drm_atomic_helper_commit,
@@ -182,12 +181,14 @@ static int kirin_gem_cma_dumb_create(struct drm_file *file,static int kirin_drm_connectors_register (struct drm_device *dev) { -struct drm_connector *connector; +struct drm_connector_list_iter conn_iter;struct drm_connector *failed_connector; +struct drm_connector *connector;int ret;mutex_lock (&dev->mode_config.mutex); -drm_for_each_connector (connector, dev) { +drm_connector_list_iter_begin (dev, &conn_iter); +drm_for_each_connector_iter (connector, &conn_iter) { ret =drm_connector_register (connector);if (ret) { failed_connector = connector;
@@ -199,7 +200,8 @@ static int kirin_drm_connectors_register(struct drm_device *dev)return 0 ; err: -drm_for_each_connector (connector, dev) { +drm_connector_list_iter_begin (dev, &conn_iter); +drm_for_each_connector_iter (connector, &conn_iter) {if (failed_connector == connector)break ;drm_connector_unregister (connector);
@@ -210,15 +212,13 @@ static int kirin_drm_connectors_register(struct drm_device *dev) }static struct drm_driver kirin_drm_driver = { - .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_PRIME | + .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC |DRIVER_RENDER , .fops = &kirin_drm_fops, .gem_free_object = drm_gem_cma_free_object, .gem_vm_ops = &drm_gem_cma_vm_ops, .dumb_create = kirin_gem_cma_dumb_create, - .dumb_map_offset = drm_gem_cma_dumb_map_offset, - .dumb_destroy = drm_gem_dumb_destroy, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
@@ -258,14 +258,10 @@ static int kirin_drm_bind(struct device *dev)struct drm_device *drm_dev;int ret; -//drm_platform_init(&kirin_drm_driver, to_platform_device(dev)); - drm_dev =drm_dev_alloc (driver, dev);if (!drm_dev)return -ENOMEM ; - drm_dev->platformdev =to_platform_device (dev); - ret =kirin_drm_kms_init (drm_dev);if (ret) goto err_drm_dev_unref;
@@ -290,14 +286,18 @@ static int kirin_drm_bind(struct device *dev) err_kms_cleanup:kirin_drm_kms_cleanup (drm_dev); err_drm_dev_unref: -drm_dev_unref (drm_dev); +drm_dev_put (drm_dev);return ret; }static void kirin_drm_unbind (struct device *dev) { -drm_put_dev (dev_get_drvdata (dev)); +struct drm_device *drm_dev =dev_get_drvdata (dev); + +drm_dev_unregister (drm_dev); +kirin_drm_kms_cleanup (drm_dev); +drm_dev_put (drm_dev); }static const struct component_master_ops kirin_drm_ops = {
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c +13 -13
@@ -458,7 +458,8 @@ static irqreturn_t dss_irq_handler(int irq, void *data)return IRQ_HANDLED ; } -static void dss_crtc_enable (struct drm_crtc *crtc) +static void dss_crtc_enable (struct drm_crtc *crtc, +struct drm_crtc_state *old_state) {struct dss_crtc *acrtc =to_dss_crtc (crtc);struct dss_hw_ctx *ctx = acrtc->ctx;
@@ -477,7 +478,8 @@ static void dss_crtc_enable(struct drm_crtc *crtc)drm_crtc_vblank_on (crtc); } -static void dss_crtc_disable (struct drm_crtc *crtc) +static void dss_crtc_disable (struct drm_crtc *crtc, +struct drm_crtc_state *old_state) {struct dss_crtc *acrtc =to_dss_crtc (crtc);
@@ -529,8 +531,8 @@ static void dss_crtc_atomic_flush(struct drm_crtc *crtc, }static const struct drm_crtc_helper_funcs dss_crtc_helper_funcs = { - .enable = dss_crtc_enable, - .disable = dss_crtc_disable, + .atomic_enable = dss_crtc_enable, + .atomic_disable = dss_crtc_disable, .mode_set_nofb = dss_crtc_mode_set_nofb, .atomic_begin = dss_crtc_atomic_begin, .atomic_flush = dss_crtc_atomic_flush,
@@ -541,7 +543,6 @@ static const struct drm_crtc_funcs dss_crtc_funcs = { .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, .reset = drm_atomic_helper_crtc_reset, - .set_property = drm_atomic_helper_crtc_set_property, .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, };
@@ -597,7 +598,7 @@ static int dss_plane_atomic_check(struct drm_plane *plane,if (!crtc || !fb)return 0 ; - fmt =dss_get_format (fb->pixel_format); + fmt =dss_get_format (fb->format->format);if (fmt ==HISI_FB_PIXEL_FORMAT_UNSUPPORT )return -EINVAL ;
@@ -645,7 +646,6 @@ static const struct drm_plane_helper_funcs dss_plane_helper_funcs = {static struct drm_plane_funcs dss_plane_funcs = { .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane, - .set_property = drm_atomic_helper_plane_set_property, .destroy = drm_plane_cleanup, .reset = drm_atomic_helper_plane_reset, .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
@@ -665,7 +665,8 @@ static int dss_plane_init(struct drm_device *dev, struct dss_plane *aplane,return ret; ret =drm_universal_plane_init (dev, &aplane->base,1 , &dss_plane_funcs, - fmts, fmts_cnt, type,NULL ); + fmts, fmts_cnt,NULL , + type,NULL );if (ret) {DRM_ERROR ("fail to init plane, ch=%d\n" , aplane->ch);return ret;
@@ -859,7 +860,7 @@ static int dss_dts_parse(struct platform_device *pdev, struct dss_hw_ctx *ctx)static int dss_drm_init (struct drm_device *dev) { -struct platform_device *pdev = dev->platformdev; +struct platform_device *pdev =to_platform_device (dev->dev);struct dss_data *dss;struct dss_hw_ctx *ctx;struct dss_crtc *acrtc;
@@ -927,7 +928,6 @@ static int dss_drm_init(struct drm_device *dev)disable_irq (ctx->irq); - dev->driver->get_vblank_counter = drm_vblank_no_hw_counter; dev->driver->enable_vblank = dss_enable_vblank; dev->driver->disable_vblank = dss_disable_vblank;
@@ -936,7 +936,7 @@ static int dss_drm_init(struct drm_device *dev)static void dss_drm_cleanup (struct drm_device *dev) { -struct platform_device *pdev = dev->platformdev; +struct platform_device *pdev =to_platform_device (dev->dev);struct dss_data *dss =platform_get_drvdata (pdev);struct drm_crtc *crtc = &dss->acrtc.base;
@@ -948,7 +948,7 @@ static int dss_drm_suspend(struct platform_device *pdev, pm_message_t state)struct dss_data *dss =platform_get_drvdata (pdev);struct drm_crtc *crtc = &dss->acrtc.base; -dss_crtc_disable (crtc); +dss_crtc_disable (crtc,NULL );return 0 ; }
@@ -959,7 +959,7 @@ static int dss_drm_resume(struct platform_device *pdev)struct drm_crtc *crtc = &dss->acrtc.base;dss_crtc_mode_set_nofb (crtc); -dss_crtc_enable (crtc); +dss_crtc_enable (crtc,NULL );return 0 ; }
drivers/staging/hikey9xx/gpu/kirin9xx_drm_overlay_utils.c +3 -3
@@ -1547,7 +1547,7 @@ void hisi_fb_pan_display(struct drm_plane *plane) mode = &acrtc->base.state->mode; adj_mode = &acrtc->base.state->adjusted_mode; - bpp = fb->bits_per_pixel /8 ; + bpp = fb->format->cpp[0 ]; stride = fb->pitches[0 ];#ifndef CMA_BUFFER_USED
@@ -1566,12 +1566,12 @@ void hisi_fb_pan_display(struct drm_plane *plane) hal_fmt =HISI_FB_PIXEL_FORMAT_BGRA_8888 ;//dss_get_format(fb->pixel_format); DRM_DEBUG_DRIVER ("channel%d: src:(%d,%d, %dx%d) crtc:(%d,%d, %dx%d), rect(%d,%d,%d,%d)," -"fb:%dx%d, pixel_format=%d, stride=%d, paddr=0x%x, bpp=%d, bits_per_pixel=%d.\n" , +"fb:%dx%d, pixel_format=%d, stride=%d, paddr=0x%x, bpp=%d.\n" , chn_idx, src_x, src_y, src_w, src_h, crtc_x, crtc_y, crtc_w, crtc_h, rect.left, rect.top, rect.right, rect.bottom, fb->width, fb->height, hal_fmt, - stride, display_addr, bpp, fb->bits_per_pixel); + stride, display_addr, bpp); hfp = mode->hsync_start - mode->hdisplay; hbp = mode->htotal - mode->hsync_end;
drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c +27 -59
205 lines not on this page · raw message
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 25/49 staging: hikey9xx/gpu: do some code cleanups
In reply to Mauro Carvalho Chehab- Get rid of a global var meant to store one of its priv structs;
- Change the name of the driver, in order to not be confused with the kirin6220;
- Remove some unneeded ifdef;
- use drm_of.h helper.
--- .../staging/hikey9xx/gpu/kirin9xx_drm_drv.c | 81 +++++++------------ 1 file changed, 30 insertions(+), 51 deletions(-)
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c +30 -51
@@ -25,20 +25,22 @@#include <drm/drm_fb_cma_helper.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_of.h> #include <drm/drm_probe_helper.h> #include <drm/drm_vblank.h> #include "kirin9xx_drm_drv.h" -static struct kirin_dc_ops *dc_ops; -static int kirin_drm_kms_cleanup (struct drm_device *dev) {struct kirin_drm_private *priv = dev->dev_private; +static struct kirin_dc_ops const *dc_ops;if (priv->fbdev) priv->fbdev =NULL ; + dc_ops =of_device_get_match_data (dev->dev); +drm_kms_helper_poll_fini (dev); dc_ops->cleanup (dev);drm_mode_config_cleanup (dev);
@@ -78,6 +80,7 @@ static void kirin_drm_mode_config_init(struct drm_device *dev)static int kirin_drm_kms_init (struct drm_device *dev) {struct kirin_drm_private *priv = dev->dev_private; +static struct kirin_dc_ops const *dc_ops;int ret; priv =devm_kzalloc (dev->dev,sizeof (*priv),GFP_KERNEL );
@@ -92,6 +95,7 @@ static int kirin_drm_kms_init(struct drm_device *dev)kirin_drm_mode_config_init (dev);/* display controller init */ + dc_ops =of_device_get_match_data (dev->dev); ret = dc_ops->init (dev);if (ret) goto err_mode_config_cleanup;
@@ -209,27 +213,17 @@ static struct drm_driver kirin_drm_driver = { .gem_prime_vunmap = drm_gem_cma_prime_vunmap, .gem_prime_mmap = drm_gem_cma_prime_mmap, - .name = "kirin", - .desc = "Hisilicon Kirin SoCs' DRM Driver", + .name = "kirin9xx", + .desc = "Hisilicon Kirin9xx SoCs' DRM Driver", .date = "20170309", .major = 1, .minor = 0, }; -#ifdef CONFIG_OF -/* NOTE: the CONFIG_OF case duplicates the same code as exynos or imx -* (or probably any other).. so probably some room for some helpers -*/ static int compare_of (struct device *dev,void *data) {return dev->of_node == data; } -#else -static int compare_dev (struct device *dev,void *data) -{ -return dev == data; -} -#endif static int kirin_drm_bind (struct device *dev) {
@@ -288,57 +282,30 @@ static const struct component_master_ops kirin_drm_ops = { .unbind = kirin_drm_unbind, }; -static struct device_node *kirin_get_remote_node (struct device_node *np) -{ -struct device_node *endpoint, *remote; - -/* get the first endpoint, in our case only one remote node -* is connected to display controller. -*/ - endpoint =of_graph_get_next_endpoint (np,NULL ); -if (!endpoint) { -DRM_ERROR ("no valid endpoint node\n" ); -return ERR_PTR (-ENODEV ); - } -of_node_put (endpoint); - - remote =of_graph_get_remote_port_parent (endpoint); -if (!remote) { -DRM_ERROR ("no valid remote node\n" ); -return ERR_PTR (-ENODEV ); - } -of_node_put (remote); - -if (!of_device_is_available (remote)) { -DRM_ERROR ("not available for remote node\n" ); -return ERR_PTR (-ENODEV ); - } - -return remote; -} -static int kirin_drm_platform_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;struct device_node *np = dev->of_node;struct component_match *match =NULL ;struct device_node *remote; +static struct kirin_dc_ops const *dc_ops;int ret; - dc_ops = (struct kirin_dc_ops *)of_device_get_match_data (dev); + dc_ops =of_device_get_match_data (dev);if (!dc_ops) {DRM_ERROR ("failed to get dt id data\n" );return -EINVAL ; }DRM_INFO ("the device node is %s\n" , np->name); - remote =kirin_get_remote_node (np); -if (IS_ERR (remote)) -return PTR_ERR (remote); + remote =of_graph_get_remote_node (np,0 ,0 ); +if (!remote) +return -ENODEV ;DRM_INFO ("the device remote node is %s\n" , remote->name); -component_match_add (dev, &match, compare_of, remote); +drm_of_component_match_add (dev, &match, compare_of, remote); +of_node_put (remote);if (ret)DRM_ERROR ("cma device init failed!" );
@@ -347,13 +314,20 @@ static int kirin_drm_platform_probe(struct platform_device *pdev)static int kirin_drm_platform_remove (struct platform_device *pdev) { +static struct kirin_dc_ops const *dc_ops; + + dc_ops =of_device_get_match_data (&pdev->dev);component_master_del (&pdev->dev, &kirin_drm_ops); - dc_ops =NULL ;return 0 ; }static int kirin_drm_platform_suspend (struct platform_device *pdev,pm_message_t state) { +static struct kirin_dc_ops const *dc_ops; +struct device *dev = &pdev->dev; + + dc_ops =of_device_get_match_data (dev); +DRM_INFO ("+. pdev->name is %s, m_message is %d \n" , pdev->name, state.event);if (!dc_ops) {DRM_ERROR ("dc_ops is NULL\n" );
@@ -366,6 +340,11 @@ static int kirin_drm_platform_suspend(struct platform_device *pdev, pm_message_tstatic int kirin_drm_platform_resume (struct platform_device *pdev) { +static struct kirin_dc_ops const *dc_ops; +struct device *dev = &pdev->dev; + + dc_ops =of_device_get_match_data (dev); +if (!dc_ops) {DRM_ERROR ("dc_ops is NULL\n" );return -EINVAL ;
@@ -376,7 +355,7 @@ static int kirin_drm_platform_resume(struct platform_device *pdev) }static const struct of_device_id kirin_drm_dt_ids[] = { - { .compatible ="hisilicon,hi3660-dpe" , + { .compatible ="hisilicon,kirin960-dpe" , .data = &dss_dc_ops, }, { .compatible ="hisilicon,kirin970-dpe" ,
@@ -392,7 +371,7 @@ static struct platform_driver kirin_drm_platform_driver = { .suspend = kirin_drm_platform_suspend, .resume = kirin_drm_platform_resume, .driver = { - .name = "kirin-drm", + .name = "kirin9xx-drm", .of_match_table = kirin_drm_dt_ids, }, };
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 31/49 staging: hikey9xx/gpu: fix driver name
In reply to Mauro Carvalho Chehab--- drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c +1 -1
@@ -2074,7 +2074,7 @@ static struct platform_driver dsi_driver = { .probe = dsi_probe, .remove = dsi_remove, .driver = { - .name = "dw-dsi", + .name = "kirin9xx-dw-dsi", .of_match_table = dsi_of_match, }, };
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 26/49 staging: hikey9xx/gpu: use default GEM_CMA fops
In reply to Mauro Carvalho ChehabInstead of implementing it at the code, use the default methods from CMA helper
--- drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c +1 -13
@@ -141,19 +141,7 @@ static int kirin_drm_kms_init(struct drm_device *dev)return ret; } -static const struct file_operations kirin_drm_fops = { - .owner =THIS_MODULE , - .open = drm_open, - .release = drm_release, - .unlocked_ioctl = drm_ioctl, -#ifdef CONFIG_COMPAT - .compat_ioctl = drm_compat_ioctl, -#endif - .poll = drm_poll, - .read = drm_read, - .llseek = no_llseek, - .mmap = drm_gem_cma_mmap, -}; +DEFINE_DRM_GEM_CMA_FOPS (kirin_drm_fops); static int kirin_gem_cma_dumb_create(struct drm_file *file, struct drm_device *dev,
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 12/49 staging: hikey9xx/gpu: get rid of adv7535 fork
In reply to Mauro Carvalho ChehabThe OOT had a fork of adv7535 with some changes for it to work with a failing EDID retrival I/O.
Get rid of it, as we'll be using the upstream driver.
--- drivers/staging/hikey9xx/gpu/hdmi/adv7535.c | 1678 ----------------- drivers/staging/hikey9xx/gpu/hdmi/adv7535.h | 351 ---- .../staging/hikey9xx/gpu/hdmi/adv7535_audio.c | 313 --- 3 files changed, 2342 deletions(-) delete mode 100644 drivers/staging/hikey9xx/gpu/hdmi/adv7535.c delete mode 100644 drivers/staging/hikey9xx/gpu/hdmi/adv7535.h delete mode 100644 drivers/staging/hikey9xx/gpu/hdmi/adv7535_audio.c
drivers/staging/hikey9xx/gpu/hdmi/adv7535.c deleted +0 -1678
@@ -1,1678 +0,0 @@ -/* -* Analog Devices ADV7511 HDMI transmitter driver -* -* Copyright 2012 Analog Devices Inc. -* -* Licensed under the GPL-2. -*/ - -#include <linux/device.h> -#include <linux/gpio/consumer.h> -#include <linux/i2c.h> -#include <linux/module.h> -#include <linux/regmap.h> -#include <linux/slab.h> -#include <linux/of_graph.h> - -#include <drm/drmP.h> -#include <drm/drm_crtc_helper.h> -#include <drm/drm_edid.h> -#include <drm/drm_encoder_slave.h> -#include <drm/drm_atomic.h> -#include <drm/drm_atomic_helper.h> -#include <drm/drm_mipi_dsi.h> - -#include <linux/regulator/consumer.h> -#include <linux/regulator/driver.h> -#include <linux/regulator/machine.h> - -#include "adv7535.h" - -//#define HPD_ENABLE 1 -#define HPD_ENABLE 0 -//#define TEST_COLORBAR_DISPLAY -#ifdef CONFIG_HDMI_ADV7511_AUDIO -extern int adv7511_audio_init (struct device *dev); -#endif -static struct adv7511 *encoder_to_adv7511 (struct drm_encoder *encoder) -{ -return to_encoder_slave (encoder)->slave_priv; -} - -/* ADI recommended values for proper operation. */ -static const struct reg_sequence adv7511_fixed_registers[] = { - {0x98 ,0x03 }, - {0x9a ,0xe0 }, - {0x9c ,0x30 }, - {0x9d ,0x61 }, - {0xa2 ,0xa4 }, - {0xa3 ,0xa4 }, - {0xe0 ,0xd0 }, - {0xf9 ,0x00 }, - {0x55 ,0x02 }, -}; - -/* ADI recommended values for proper operation. */ -static const struct reg_sequence adv7533_fixed_registers[] = { - {0x16 ,0x20 }, - {0x9a ,0xe0 }, - {0xba ,0x70 }, - {0xde ,0x82 }, - {0xe4 ,0x40 }, - {0xe5 ,0x80 }, -}; - -static const struct reg_sequence adv7533_cec_fixed_registers[] = { - {0x15 ,0xd0 }, - {0x17 ,0xd0 }, - {0x24 ,0x20 }, - {0x57 ,0x11 }, - {0x05 ,0xc8 }, -}; - -/* ----------------------------------------------------------------------------- -* Register access -*/ - -static const uint8_t adv7511_register_defaults[] = { -0x12 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,/* 00 */ -0x00 ,0x00 ,0x01 ,0x0e ,0xbc ,0x18 ,0x01 ,0x13 , -0x25 ,0x37 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,/* 10 */ -0x46 ,0x62 ,0x04 ,0xa8 ,0x00 ,0x00 ,0x1c ,0x84 , -0x1c ,0xbf ,0x04 ,0xa8 ,0x1e ,0x70 ,0x02 ,0x1e ,/* 20 */ -0x00 ,0x00 ,0x04 ,0xa8 ,0x08 ,0x12 ,0x1b ,0xac , -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,/* 30 */ -0x00 ,0x00 ,0x00 ,0x80 ,0x00 ,0x00 ,0x00 ,0xb0 , -0x00 ,0x50 ,0x90 ,0x7e ,0x79 ,0x70 ,0x00 ,0x00 ,/* 40 */ -0x00 ,0xa8 ,0x80 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x02 ,0x0d ,0x00 ,0x00 ,0x00 ,0x00 ,/* 50 */ -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,/* 60 */ -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x01 ,0x0a ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,/* 70 */ -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,/* 80 */ -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 ,0xc0 ,0x00 ,0x00 ,0x00 ,/* 90 */ -0x0b ,0x02 ,0x00 ,0x18 ,0x5a ,0x60 ,0x00 ,0x00 , -0x00 ,0x00 ,0x80 ,0x80 ,0x08 ,0x04 ,0x00 ,0x00 ,/* a0 */ -0x00 ,0x00 ,0x00 ,0x40 ,0x00 ,0x00 ,0x40 ,0x14 , -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,/* b0 */ -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,/* c0 */ -0x00 ,0x03 ,0x00 ,0x00 ,0x02 ,0x00 ,0x01 ,0x04 , -0x30 ,0xff ,0x80 ,0x80 ,0x80 ,0x00 ,0x00 ,0x00 ,/* d0 */ -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x10 ,0x01 , -0x80 ,0x75 ,0x00 ,0x00 ,0x60 ,0x00 ,0x00 ,0x00 ,/* e0 */ -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x75 ,0x11 ,0x00 ,/* f0 */ -0x00 ,0x7c ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -}; - -static bool adv7511_register_volatile (struct device *dev,unsigned int reg) -{ -switch (reg) { -case ADV7511_REG_CHIP_REVISION : -case ADV7511_REG_SPDIF_FREQ : -case ADV7511_REG_CTS_AUTOMATIC1 : -case ADV7511_REG_CTS_AUTOMATIC2 : -case ADV7511_REG_VIC_DETECTED : -case ADV7511_REG_VIC_SEND : -case ADV7511_REG_AUX_VIC_DETECTED : -case ADV7511_REG_STATUS : -case ADV7511_REG_GC (1 ): -case ADV7511_REG_INT (0 ): -case ADV7511_REG_INT (1 ): -case ADV7511_REG_PLL_STATUS : -case ADV7511_REG_AN (0 ): -case ADV7511_REG_AN (1 ): -case ADV7511_REG_AN (2 ): -case ADV7511_REG_AN (3 ): -case ADV7511_REG_AN (4 ): -case ADV7511_REG_AN (5 ): -case ADV7511_REG_AN (6 ): -case ADV7511_REG_AN (7 ): -case ADV7511_REG_HDCP_STATUS : -case ADV7511_REG_BCAPS : -case ADV7511_REG_BKSV (0 ): -case ADV7511_REG_BKSV (1 ): -case ADV7511_REG_BKSV (2 ): -case ADV7511_REG_BKSV (3 ): -case ADV7511_REG_BKSV (4 ): -case ADV7511_REG_DDC_STATUS : -case ADV7511_REG_BSTATUS (0 ): -case ADV7511_REG_BSTATUS (1 ): -case ADV7511_REG_CHIP_ID_HIGH : -case ADV7511_REG_CHIP_ID_LOW : -return true; - } - -return false; -} - -static const struct regmap_config adv7511_regmap_config = { - .reg_bits =8 , - .val_bits =8 , - - .max_register =0xff , - .cache_type =REGCACHE_RBTREE , - .reg_defaults_raw = adv7511_register_defaults, - .num_reg_defaults_raw =ARRAY_SIZE (adv7511_register_defaults), - - .volatile_reg = adv7511_register_volatile, -}; - -static const struct regmap_config adv7533_cec_regmap_config = { - .reg_bits =8 , - .val_bits =8 , - - .max_register =0xff , - .cache_type =REGCACHE_RBTREE , -}; - -static const struct regmap_config adv7533_packet_regmap_config = { - .reg_bits =8 , - .val_bits =8 , - - .max_register =0xff , - .cache_type =REGCACHE_RBTREE , -}; - - -/* ----------------------------------------------------------------------------- -* Hardware configuration -*/ - -static void adv7511_set_colormap (struct adv7511 *adv7511,bool enable, -const uint16_t *coeff, -unsigned int scaling_factor) -{ -unsigned int i; - -regmap_update_bits (adv7511->regmap,ADV7511_REG_CSC_UPPER (1 ), -ADV7511_CSC_UPDATE_MODE ,ADV7511_CSC_UPDATE_MODE ); - -if (enable) { -for (i =0 ; i <12 ; ++i) { -regmap_update_bits (adv7511->regmap, -ADV7511_REG_CSC_UPPER (i), -0x1f , coeff[i] >>8 ); -regmap_write (adv7511->regmap, -ADV7511_REG_CSC_LOWER (i), - coeff[i] &0xff ); - } - } - -if (enable) -regmap_update_bits (adv7511->regmap,ADV7511_REG_CSC_UPPER (0 ), -0xe0 ,0x80 | (scaling_factor <<5 )); -else -regmap_update_bits (adv7511->regmap,ADV7511_REG_CSC_UPPER (0 ), -0x80 ,0x00 ); - -regmap_update_bits (adv7511->regmap,ADV7511_REG_CSC_UPPER (1 ), -ADV7511_CSC_UPDATE_MODE ,0 ); -} - -int adv7511_packet_enable (struct adv7511 *adv7511,unsigned int packet) -{ -if (packet &0xff ) -regmap_update_bits (adv7511->regmap,ADV7511_REG_PACKET_ENABLE0 , - packet,0xff ); - -if (packet &0xff00 ) { - packet >>=8 ; -regmap_update_bits (adv7511->regmap,ADV7511_REG_PACKET_ENABLE1 , - packet,0xff ); - } - -return 0 ; -} - -int adv7511_packet_disable (struct adv7511 *adv7511,unsigned int packet) -{ -if (packet &0xff ) -regmap_update_bits (adv7511->regmap,ADV7511_REG_PACKET_ENABLE0 , - packet,0x00 ); - -if (packet &0xff00 ) { - packet >>=8 ; -regmap_update_bits (adv7511->regmap,ADV7511_REG_PACKET_ENABLE1 , - packet,0x00 ); - } - -return 0 ; -} - -/* Coefficients for adv7511 color space conversion */ -static const uint16_t adv7511_csc_ycbcr_to_rgb[] = { -0x0734 ,0x04ad ,0x0000 ,0x1c1b , -0x1ddc ,0x04ad ,0x1f24 ,0x0135 , -0x0000 ,0x04ad ,0x087c ,0x1b77 , -}; - -static void adv7511_set_config_csc (struct adv7511 *adv7511, -struct drm_connector *connector, -bool rgb) -{ -struct adv7511_video_config config; -bool output_format_422, output_format_ycbcr; -unsigned int mode; -uint8_t infoframe[17 ]; - -if (adv7511->edid) - config.hdmi_mode =drm_detect_hdmi_monitor (adv7511->edid); -else - config.hdmi_mode = false; - -hdmi_avi_infoframe_init (&config.avi_infoframe); - - config.avi_infoframe.scan_mode =HDMI_SCAN_MODE_UNDERSCAN ; - -if (rgb) { - config.csc_enable = false; - config.avi_infoframe.colorspace =HDMI_COLORSPACE_RGB ; - }else { - config.csc_scaling_factor =ADV7511_CSC_SCALING_4 ; - config.csc_coefficents = adv7511_csc_ycbcr_to_rgb; - -if ((connector->display_info.color_formats & -DRM_COLOR_FORMAT_YCRCB422 ) && - config.hdmi_mode) { - config.csc_enable = false; - config.avi_infoframe.colorspace = -HDMI_COLORSPACE_YUV422 ; - }else { - config.csc_enable = true; - config.avi_infoframe.colorspace =HDMI_COLORSPACE_RGB ; - } - } - -if (config.hdmi_mode) { - mode =ADV7511_HDMI_CFG_MODE_HDMI ; - -switch (config.avi_infoframe.colorspace) { -case HDMI_COLORSPACE_YUV444 : - output_format_422 = false; - output_format_ycbcr = true; -break ; -case HDMI_COLORSPACE_YUV422 : - output_format_422 = true; - output_format_ycbcr = true; -break ; -default : - output_format_422 = false; - output_format_ycbcr = false; -break ; - } - }else { - mode =ADV7511_HDMI_CFG_MODE_DVI ; - output_format_422 = false; - output_format_ycbcr = false; - } - -adv7511_packet_disable (adv7511,ADV7511_PACKET_ENABLE_AVI_INFOFRAME ); - -adv7511_set_colormap (adv7511, config.csc_enable, - config.csc_coefficents, - config.csc_scaling_factor); - -regmap_update_bits (adv7511->regmap,ADV7511_REG_VIDEO_INPUT_CFG1 ,0x81 , - (output_format_422 <<7 ) | output_format_ycbcr); - -regmap_update_bits (adv7511->regmap,ADV7511_REG_HDCP_HDMI_CFG , -ADV7511_HDMI_CFG_MODE_MASK , mode); - -hdmi_avi_infoframe_pack (&config.avi_infoframe, infoframe, -sizeof (infoframe)); - -/* The AVI infoframe id is not configurable */ -regmap_bulk_write (adv7511->regmap,ADV7511_REG_AVI_INFOFRAME_VERSION , - infoframe +1 ,sizeof (infoframe) -1 ); - -adv7511_packet_enable (adv7511,ADV7511_PACKET_ENABLE_AVI_INFOFRAME ); -} - -static void adv7511_set_link_config (struct adv7511 *adv7511, -const struct adv7511_link_config *config) -{ -/* -* The input style values documented in the datasheet don't match the -* hardware register field values :-( -*/ -static const unsigned int input_styles[4 ] = {0 ,2 ,1 ,3 }; - -unsigned int clock_delay; -unsigned int color_depth; -unsigned int input_id; - - clock_delay = (config->clock_delay +1200 ) /400 ; - color_depth = config->input_color_depth ==8 ?3 - : (config->input_color_depth ==10 ?1 :2 ); - -/* TODO Support input ID 6 */ -if (config->input_colorspace !=HDMI_COLORSPACE_YUV422 ) - input_id = config->input_clock ==ADV7511_INPUT_CLOCK_DDR - ?5 :0 ; -else if (config->input_clock ==ADV7511_INPUT_CLOCK_DDR ) - input_id = config->embedded_sync ?8 :7 ; -else if (config->input_clock ==ADV7511_INPUT_CLOCK_2X ) - input_id = config->embedded_sync ?4 :3 ; -else - input_id = config->embedded_sync ?2 :1 ; - -regmap_update_bits (adv7511->regmap,ADV7511_REG_I2C_FREQ_ID_CFG ,0xf , - input_id); -regmap_update_bits (adv7511->regmap,ADV7511_REG_VIDEO_INPUT_CFG1 ,0x7e , - (color_depth <<4 ) | - (input_styles[config->input_style] <<2 )); -regmap_write (adv7511->regmap,ADV7511_REG_VIDEO_INPUT_CFG2 , - config->input_justification <<3 ); -regmap_write (adv7511->regmap,ADV7511_REG_TIMING_GEN_SEQ , - config->sync_pulse <<2 ); - -regmap_write (adv7511->regmap,0xba , clock_delay <<5 ); - - adv7511->embedded_sync = config->embedded_sync; - adv7511->hsync_polarity = config->hsync_polarity; - adv7511->vsync_polarity = config->vsync_polarity; - adv7511->rgb = config->input_colorspace ==HDMI_COLORSPACE_RGB ; -} - -static void adv7511_dsi_config_tgen (struct adv7511 *adv7511) -{ -struct drm_display_mode *mode = &adv7511->curr_mode; -u8 clock_div_by_lanes[] = {6 ,4 ,3 };/* 2, 3, 4 lanes */ -unsigned int hsw, hfp, hbp, vsw, vfp, vbp; - - hsw = mode->hsync_end - mode->hsync_start; - hfp = mode->hsync_start - mode->hdisplay; - hbp = mode->htotal - mode->hsync_end; - vsw = mode->vsync_end - mode->vsync_start; - vfp = mode->vsync_start - mode->vdisplay; - vbp = mode->vtotal - mode->vsync_end; - -#ifdef TEST_COLORBAR_DISPLAY -/* set pixel clock auto mode */ -regmap_write (adv7511->regmap_cec,0x16 , -0x00 ); -#else -/* set pixel clock divider mode */ -regmap_write (adv7511->regmap_cec,0x16 , - clock_div_by_lanes[adv7511->num_dsi_lanes -2 ] <<3 ); -#endif - -/* horizontal porch params */ -regmap_write (adv7511->regmap_cec,0x28 , mode->htotal >>4 ); -regmap_write (adv7511->regmap_cec,0x29 , (mode->htotal <<4 ) &0xff ); -regmap_write (adv7511->regmap_cec,0x2a , hsw >>4 ); -regmap_write (adv7511->regmap_cec,0x2b , (hsw <<4 ) &0xff ); -regmap_write (adv7511->regmap_cec,0x2c , hfp >>4 ); -regmap_write (adv7511->regmap_cec,0x2d , (hfp <<4 ) &0xff ); -regmap_write (adv7511->regmap_cec,0x2e , hbp >>4 ); -regmap_write (adv7511->regmap_cec,0x2f , (hbp <<4 ) &0xff ); - -/* vertical porch params */ -regmap_write (adv7511->regmap_cec,0x30 , mode->vtotal >>4 ); -regmap_write (adv7511->regmap_cec,0x31 , (mode->vtotal <<4 ) &0xff ); -regmap_write (adv7511->regmap_cec,0x32 , vsw >>4 ); -regmap_write (adv7511->regmap_cec,0x33 , (vsw <<4 ) &0xff ); -regmap_write (adv7511->regmap_cec,0x34 , vfp >>4 ); -regmap_write (adv7511->regmap_cec,0x35 , (vfp <<4 ) &0xff ); -regmap_write (adv7511->regmap_cec,0x36 , vbp >>4 ); -regmap_write (adv7511->regmap_cec,0x37 , (vbp <<4 ) &0xff ); -} - -static void adv7511_dsi_receiver_dpms (struct adv7511 *adv7511) -{ -if (adv7511->type !=ADV7533 ) -return ; - -if (adv7511->powered) { -struct mipi_dsi_device *dsi = adv7511->dsi; - -adv7511_dsi_config_tgen (adv7511); - -/* set number of dsi lanes */ -regmap_write (adv7511->regmap_cec,0x1c , dsi->lanes <<4 ); - -#ifdef TEST_COLORBAR_DISPLAY -/* reset internal timing generator */ -regmap_write (adv7511->regmap_cec,0x27 ,0xcb ); -regmap_write (adv7511->regmap_cec,0x27 ,0x8b ); -regmap_write (adv7511->regmap_cec,0x27 ,0xcb ); -#else -/* disable internal timing generator */ -regmap_write (adv7511->regmap_cec,0x27 ,0x0b ); -#endif - - -/* enable hdmi */ -regmap_write (adv7511->regmap_cec,0x03 ,0x89 ); -#ifdef TEST_COLORBAR_DISPLAY -/*enable test mode */ -regmap_write (adv7511->regmap_cec,0x55 ,0x80 );//display colorbar -#else -/* disable test mode */ -regmap_write (adv7511->regmap_cec,0x55 ,0x00 ); -#endif -/* disable test mode */ -//regmap_write(adv7511->regmap_cec, 0x55, 0x00); -/* SPD */ - { -static const unsigned char spd_if[] = { -0x83 ,0x01 ,25 ,0x00 , -'L' ,'i' ,'n' ,'a' ,'r' ,'o' ,0 ,0 , -'9' ,'6' ,'b' ,'o' ,'a' ,'r' ,'d' ,'s' , -':' ,'H' ,'i' ,'k' ,'e' ,'y' ,0 ,0 , - }; -int n; - -for (n =0 ; n <sizeof (spd_if); n++) -regmap_write (adv7511->regmap_packet, n, spd_if[n]); - -/* enable send SPD */ -regmap_update_bits (adv7511->regmap,0x40 ,BIT (6 ),BIT (6 )); - } - -/* force audio */ -/* hide Audio infoframe updates */ -regmap_update_bits (adv7511->regmap,0x4a ,BIT (5 ),BIT (5 )); - -/* i2s, internal mclk, mclk-256 */ -regmap_update_bits (adv7511->regmap,0x0a ,0x1f ,1 ); -regmap_update_bits (adv7511->regmap,0x0b ,0xe0 ,0 ); -/* enable i2s, use i2s format, sample rate from i2s */ -regmap_update_bits (adv7511->regmap,0x0c ,0xc7 ,BIT (2 )); -/* 16 bit audio */ -regmap_update_bits (adv7511->regmap,0x0d ,0xff ,16 ); -/* 16-bit audio */ -regmap_update_bits (adv7511->regmap,0x14 ,0x0f ,2 <<4 ); -/* 48kHz */ -regmap_update_bits (adv7511->regmap,0x15 ,0xf0 ,2 <<4 ); -/* enable N/CTS, enable Audio sample packets */ -regmap_update_bits (adv7511->regmap,0x44 ,BIT (5 ),BIT (5 )); -/* N = 6144 */ -regmap_write (adv7511->regmap,1 , (6144 >>16 ) &0xf ); -regmap_write (adv7511->regmap,2 , (6144 >>8 ) &0xff ); -regmap_write (adv7511->regmap,3 , (6144 ) &0xff ); -/* automatic cts */ -regmap_update_bits (adv7511->regmap,0x0a ,BIT (7 ),0 ); -/* enable N/CTS */ -regmap_update_bits (adv7511->regmap,0x44 ,BIT (6 ),BIT (6 )); -/* not copyrighted */ -regmap_update_bits (adv7511->regmap,0x12 ,BIT (5 ),BIT (5 )); - -/* left source */ -regmap_update_bits (adv7511->regmap,0x0e ,7 <<3 ,0 ); -/* right source */ -regmap_update_bits (adv7511->regmap,0x0e ,7 <<0 ,1 ); -/* number of channels: sect 4.5.4: set to 0 */ -regmap_update_bits (adv7511->regmap,0x73 ,7 ,1 ); -/* number of channels: sect 4.5.4: set to 0 */ -regmap_update_bits (adv7511->regmap,0x73 ,0xf0 ,1 <<4 ); -/* sample rate: 48kHz */ -regmap_update_bits (adv7511->regmap,0x74 ,7 <<2 ,3 <<2 ); -/* channel allocation reg: sect 4.5.4: set to 0 */ -regmap_update_bits (adv7511->regmap,0x76 ,0xff ,0 ); -/* enable audio infoframes */ -regmap_update_bits (adv7511->regmap,0x44 ,BIT (3 ),BIT (3 )); - -/* AV mute disable */ -regmap_update_bits (adv7511->regmap,0x4b ,BIT (7 ) |BIT (6 ),BIT (7 )); - -/* use Audio infoframe updated info */ -regmap_update_bits (adv7511->regmap,0x4a ,BIT (5 ),0 ); - }else { -regmap_write (adv7511->regmap_cec,0x03 ,0x0b ); -regmap_write (adv7511->regmap_cec,0x27 ,0x0b ); - } -} - -static void adv7511_power_on (struct adv7511 *adv7511) -{ - adv7511->current_edid_segment =-1 ; - -regmap_write (adv7511->regmap,ADV7511_REG_INT (0 ), -ADV7511_INT0_EDID_READY ); -regmap_write (adv7511->regmap,ADV7511_REG_INT (1 ), -ADV7511_INT1_DDC_ERROR ); -regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER , -ADV7511_POWER_POWER_DOWN ,0 ); - -/* -* Per spec it is allowed to pulse the HDP signal to indicate that the -* EDID information has changed. Some monitors do this when they wakeup -* from standby or are enabled. When the HDP goes low the adv7511 is -* reset and the outputs are disabled which might cause the monitor to -* go to standby again. To avoid this we ignore the HDP pin for the -* first few seconds after enabling the output. -*/ -regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER2 , -ADV7511_REG_POWER2_HDP_SRC_MASK , -ADV7511_REG_POWER2_HDP_SRC_NONE ); - -/* -* Most of the registers are reset during power down or when HPD is low. -*/ -regcache_sync (adv7511->regmap); - -if (adv7511->type ==ADV7533 ) -regmap_register_patch (adv7511->regmap_cec, - adv7533_cec_fixed_registers, -ARRAY_SIZE (adv7533_cec_fixed_registers)); - adv7511->powered = true; - -adv7511_dsi_receiver_dpms (adv7511); -} - -static void adv7511_power_off (struct adv7511 *adv7511) -{ -/* TODO: setup additional power down modes */ -regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER , -ADV7511_POWER_POWER_DOWN , -ADV7511_POWER_POWER_DOWN ); -regcache_mark_dirty (adv7511->regmap); - - adv7511->powered = false; - -adv7511_dsi_receiver_dpms (adv7511); -} - -/* ----------------------------------------------------------------------------- -* Interrupt and hotplug detection -*/ - -#if HPD_ENABLE -static bool adv7511_hpd (struct adv7511 *adv7511) -{ -unsigned int irq0; -int ret; - - ret =regmap_read (adv7511->regmap,ADV7511_REG_INT (0 ), &irq0); -if (ret <0 ) -return false; - -if (irq0 &ADV7511_INT0_HDP ) { -regmap_write (adv7511->regmap,ADV7511_REG_INT (0 ), -ADV7511_INT0_HDP ); -return true; - } - -return false; -} -#endif - -static int adv7511_irq_process (struct adv7511 *adv7511,bool process_hpd) -{ -unsigned int irq0, irq1; -int ret; - - ret =regmap_read (adv7511->regmap,ADV7511_REG_INT (0 ), &irq0); -if (ret <0 ) -return ret; - - ret =regmap_read (adv7511->regmap,ADV7511_REG_INT (1 ), &irq1); -if (ret <0 ) -return ret; - -regmap_write (adv7511->regmap,ADV7511_REG_INT (0 ), irq0); -regmap_write (adv7511->regmap,ADV7511_REG_INT (1 ), irq1); - -if (process_hpd && irq0 &ADV7511_INT0_HDP && adv7511->encoder) -drm_helper_hpd_irq_event (adv7511->encoder->dev); - -if (irq0 &ADV7511_INT0_EDID_READY || irq1 &ADV7511_INT1_DDC_ERROR ) { - adv7511->edid_read = true; - -if (adv7511->i2c_main->irq) -wake_up_all (&adv7511->wq); - } - -return 0 ; -} - -static irqreturn_t adv7511_irq_handler (int irq,void *devid) -{ -struct adv7511 *adv7511 = devid; -int ret; - - ret =adv7511_irq_process (adv7511, true); -return ret <0 ?IRQ_NONE :IRQ_HANDLED ; -} - -/* ----------------------------------------------------------------------------- -* EDID retrieval -*/ - -static int adv7511_wait_for_edid (struct adv7511 *adv7511,int timeout) -{ -int ret; - -if (adv7511->i2c_main->irq) { - ret =wait_event_interruptible_timeout (adv7511->wq, - adv7511->edid_read,msecs_to_jiffies (timeout)); - }else { -for (; timeout >0 ; timeout -=25 ) { - ret =adv7511_irq_process (adv7511, false); -if (ret <0 ) -break ; - -if (adv7511->edid_read) -break ; - -msleep (25 ); - } - } - -return adv7511->edid_read ?0 : -EIO ; -} - -static int adv7511_get_edid_block (void *data,u8 *buf,unsigned int block, -size_t len) -{ -struct adv7511 *adv7511 = data; -struct i2c_msg xfer[2 ]; -uint8_t offset; -unsigned int i; -int ret; - -if (len >128 ) -return -EINVAL ; - -if (adv7511->current_edid_segment != block /2 ) { -unsigned int status; - - ret =regmap_read (adv7511->regmap,ADV7511_REG_DDC_STATUS , - &status); -if (ret <0 ) -return ret; - -if (status !=2 ) { - adv7511->edid_read = false; -regmap_write (adv7511->regmap,ADV7511_REG_EDID_SEGMENT , - block); - ret =adv7511_wait_for_edid (adv7511,200 ); -if (ret <0 ) -return ret; - } - -/* Break this apart, hopefully more I2C controllers will -* support 64 byte transfers than 256 byte transfers -*/ - - xfer[0 ].addr = adv7511->i2c_edid->addr; - xfer[0 ].flags =0 ; - xfer[0 ].len =1 ; - xfer[0 ].buf = &offset; - xfer[1 ].addr = adv7511->i2c_edid->addr; - xfer[1 ].flags =I2C_M_RD ; - xfer[1 ].len =64 ; - xfer[1 ].buf = adv7511->edid_buf; - - offset =0 ; - -for (i =0 ; i <4 ; ++i) { - ret =i2c_transfer (adv7511->i2c_edid->adapter, xfer, -ARRAY_SIZE (xfer)); -if (ret <0 ) -return ret; -else if (ret !=2 ) -return -EIO ; - - xfer[1 ].buf +=64 ; - offset +=64 ; - } - - adv7511->current_edid_segment = block /2 ; - } - -if (block %2 ==0 ) -memcpy (buf, adv7511->edid_buf, len); -else -memcpy (buf, adv7511->edid_buf +128 , len); - -return 0 ; -} - -/* ----------------------------------------------------------------------------- -* ADV75xx helpers -*/ -static int adv7511_get_modes (struct adv7511 *adv7511, -struct drm_connector *connector) -{ -struct edid *edid; -unsigned int count; - -/* Reading the EDID only works if the device is powered */ -if (!adv7511->powered) { -regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER2 , -ADV7511_REG_POWER2_HDP_SRC_MASK , -ADV7511_REG_POWER2_HDP_SRC_NONE ); -regmap_write (adv7511->regmap,ADV7511_REG_INT (0 ), -ADV7511_INT0_EDID_READY ); -regmap_write (adv7511->regmap,ADV7511_REG_INT (1 ), -ADV7511_INT1_DDC_ERROR ); -regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER , -ADV7511_POWER_POWER_DOWN ,0 ); - adv7511->current_edid_segment =-1 ; -/* wait some time for edid is ready */ -msleep (200 ); - } - - edid =drm_do_get_edid (connector, adv7511_get_edid_block, adv7511); - -if (!adv7511->powered) -regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER , -ADV7511_POWER_POWER_DOWN , -ADV7511_POWER_POWER_DOWN ); - -kfree (adv7511->edid); - adv7511->edid = edid; -if (!edid) -return 0 ; - -drm_mode_connector_update_edid_property (connector, edid); - count =drm_add_edid_modes (connector, edid); - -adv7511_set_config_csc (adv7511, connector, adv7511->rgb); - -return count; -} - -static enum drm_connector_status -adv7511_detect (struct adv7511 *adv7511, -struct drm_connector *connector) -{ -enum drm_connector_status status; -unsigned int val; -unsigned int time =0 ; -#if HPD_ENABLE -bool hpd; -#endif -int ret; - - ret =regmap_read (adv7511->regmap,ADV7511_REG_STATUS , &val); -if (ret <0 ) { -DRM_ERROR ("regmap_read fail, ret = %d \n" , ret); -return connector_status_disconnected; - } - -if (val &ADV7511_STATUS_HPD ) { -DRM_INFO ("connected : regmap_read val = 0x%x \n" , val); - status = connector_status_connected; - }else { -DRM_INFO ("disconnected : regmap_read val = 0x%x \n" , val); - status = connector_status_disconnected; - } - -#if HPD_ENABLE - hpd =adv7511_hpd (adv7511); - -/* The chip resets itself when the cable is disconnected, so in case -* there is a pending HPD interrupt and the cable is connected there was -* at least one transition from disconnected to connected and the chip -* has to be reinitialized. */ -if (status == connector_status_connected && hpd && adv7511->powered) { -regcache_mark_dirty (adv7511->regmap); -adv7511_power_on (adv7511); -adv7511_get_modes (adv7511, connector); -if (adv7511->status == connector_status_connected) - status = connector_status_disconnected; - }else { -/* Renable HDP sensing */ -regmap_update_bits (adv7511->regmap,ADV7511_REG_POWER2 , -ADV7511_REG_POWER2_HDP_SRC_MASK , -ADV7511_REG_POWER2_HDP_SRC_BOTH ); - } -#endif - -if (status == connector_status_disconnected) { -do { - ret =regmap_read (adv7511->regmap,ADV7511_REG_STATUS , &val); -if (ret <0 ) { -DRM_ERROR ("regmap_read fail, ret = %d \n" , ret); -return connector_status_disconnected; - } - -if (val &ADV7511_STATUS_HPD ) { -DRM_INFO ("connected : regmap_read val = 0x%x \n" , val); - status = connector_status_connected; - }else { -DRM_INFO ("disconnected : regmap_read val = 0x%x \n" , val); - status = connector_status_disconnected; - } - time ++; -mdelay (20 ); - }while (status == connector_status_disconnected && time <10 ); - } - -if (time >=10 ) -DRM_ERROR ("Read connector status timout, time = %d \n" , time); - - adv7511->status = status; - -DRM_INFO ("hdmi connector status = %d \n" , status); -return status; -} - -static int adv7511_mode_valid (struct adv7511 *adv7511, -struct drm_display_mode *mode) -{ -if (mode->clock >165000 ) -return MODE_CLOCK_HIGH ; -/* -* some work well modes which want to put in the front of the mode list. -*/ -printk ("Checking mode %ix%i@%i clock: %i..." , - mode->hdisplay, mode->vdisplay,drm_mode_vrefresh (mode), mode->clock); -if ((mode->hdisplay ==1920 && mode->vdisplay ==1080 && mode->clock ==148500 ) || - (mode->hdisplay ==1280 && mode->vdisplay ==800 && mode->clock ==83496 ) || - (mode->hdisplay ==1280 && mode->vdisplay ==720 && mode->clock ==74440 ) || - (mode->hdisplay ==1280 && mode->vdisplay ==720 && mode->clock ==74250 ) || - (mode->hdisplay ==1024 && mode->vdisplay ==768 && mode->clock ==75000 ) || - (mode->hdisplay ==1024 && mode->vdisplay ==768 && mode->clock ==81833 ) || - (mode->hdisplay ==800 && mode->vdisplay ==600 && mode->clock ==40000 )) { - mode->type |=DRM_MODE_TYPE_PREFERRED ; -printk ("OK\n" ); -return MODE_OK ; - } -printk ("BAD\n" ); -return MODE_BAD ; -} - -static void adv7511_mode_set (struct adv7511 *adv7511, -struct drm_display_mode *mode, -struct drm_display_mode *adj_mode) -{ -unsigned int low_refresh_rate; -unsigned int hsync_polarity =0 ; -unsigned int vsync_polarity =0 ; - -if (adv7511->embedded_sync) { -unsigned int hsync_offset, hsync_len; -unsigned int vsync_offset, vsync_len; - - hsync_offset = adj_mode->crtc_hsync_start - - adj_mode->crtc_hdisplay; - vsync_offset = adj_mode->crtc_vsync_start - - adj_mode->crtc_vdisplay; - hsync_len = adj_mode->crtc_hsync_end - - adj_mode->crtc_hsync_start; - vsync_len = adj_mode->crtc_vsync_end - - adj_mode->crtc_vsync_start; - -/* The hardware vsync generator has a off-by-one bug */ - vsync_offset +=1 ; - -regmap_write (adv7511->regmap,ADV7511_REG_HSYNC_PLACEMENT_MSB , - ((hsync_offset >>10 ) &0x7 ) <<5 ); -regmap_write (adv7511->regmap,ADV7511_REG_SYNC_DECODER (0 ), - (hsync_offset >>2 ) &0xff ); -regmap_write (adv7511->regmap,ADV7511_REG_SYNC_DECODER (1 ), - ((hsync_offset &0x3 ) <<6 ) | - ((hsync_len >>4 ) &0x3f )); -regmap_write (adv7511->regmap,ADV7511_REG_SYNC_DECODER (2 ), - ((hsync_len &0xf ) <<4 ) | - ((vsync_offset >>6 ) &0xf )); -regmap_write (adv7511->regmap,ADV7511_REG_SYNC_DECODER (3 ), - ((vsync_offset &0x3f ) <<2 ) | - ((vsync_len >>8 ) &0x3 )); -regmap_write (adv7511->regmap,ADV7511_REG_SYNC_DECODER (4 ), - vsync_len &0xff ); - - hsync_polarity = !(adj_mode->flags &DRM_MODE_FLAG_PHSYNC ); - vsync_polarity = !(adj_mode->flags &DRM_MODE_FLAG_PVSYNC ); - }else { -enum adv7511_sync_polarity mode_hsync_polarity; -enum adv7511_sync_polarity mode_vsync_polarity; - -/** -* If the input signal is always low or always high we want to -* invert or let it passthrough depending on the polarity of the -* current mode. -**/ -if (adj_mode->flags &DRM_MODE_FLAG_NHSYNC ) - mode_hsync_polarity =ADV7511_SYNC_POLARITY_LOW ; -else - mode_hsync_polarity =ADV7511_SYNC_POLARITY_HIGH ; - -if (adj_mode->flags &DRM_MODE_FLAG_NVSYNC ) - mode_vsync_polarity =ADV7511_SYNC_POLARITY_LOW ; -else - mode_vsync_polarity =ADV7511_SYNC_POLARITY_HIGH ; - -if (adv7511->hsync_polarity != mode_hsync_polarity && - adv7511->hsync_polarity != -ADV7511_SYNC_POLARITY_PASSTHROUGH ) - hsync_polarity =1 ; - -if (adv7511->vsync_polarity != mode_vsync_polarity && - adv7511->vsync_polarity != -ADV7511_SYNC_POLARITY_PASSTHROUGH ) - vsync_polarity =1 ; - } - -if (mode->vrefresh <=24000 ) - low_refresh_rate =ADV7511_LOW_REFRESH_RATE_24HZ ; -else if (mode->vrefresh <=25000 ) - low_refresh_rate =ADV7511_LOW_REFRESH_RATE_25HZ ; -else if (mode->vrefresh <=30000 ) - low_refresh_rate =ADV7511_LOW_REFRESH_RATE_30HZ ; -else - low_refresh_rate =ADV7511_LOW_REFRESH_RATE_NONE ; - -regmap_update_bits (adv7511->regmap,0xfb , -0x6 , low_refresh_rate <<1 ); -regmap_update_bits (adv7511->regmap,0x17 , -0x60 , (vsync_polarity <<6 ) | (hsync_polarity <<5 )); - -if (adv7511->type ==ADV7533 && adv7511->num_dsi_lanes ==4 ) { -struct mipi_dsi_device *dsi = adv7511->dsi; -int lanes, ret; - -if (adj_mode->clock >80000 ) - lanes =4 ; -else - lanes =3 ; - -if (lanes != dsi->lanes) { -mipi_dsi_detach (dsi); - dsi->lanes = lanes; - ret =mipi_dsi_attach (dsi); -if (ret) { -DRM_ERROR ("Failed to change host lanes\n" ); -return ; - } - } - } - -drm_mode_copy (&adv7511->curr_mode, adj_mode); - -/* -* TODO Test first order 4:2:2 to 4:4:4 up conversion method, which is -* supposed to give better results. -*/ - - adv7511->f_tmds = mode->clock; -} - -/* ----------------------------------------------------------------------------- -* Encoder operations -*/ - -static int adv7511_encoder_get_modes (struct drm_encoder *encoder, -struct drm_connector *connector) -{ -struct adv7511 *adv7511 =encoder_to_adv7511 (encoder); - -return adv7511_get_modes (adv7511, connector); -} - -static void adv7511_encoder_dpms (struct drm_encoder *encoder,int mode) -{ -struct adv7511 *adv7511 =encoder_to_adv7511 (encoder); - -if (mode ==DRM_MODE_DPMS_ON ) -adv7511_power_on (adv7511); -else -adv7511_power_off (adv7511); -} - -static enum drm_connector_status -adv7511_encoder_detect (struct drm_encoder *encoder, -struct drm_connector *connector) -{ -struct adv7511 *adv7511 =encoder_to_adv7511 (encoder); - -return adv7511_detect (adv7511, connector); -} - -static int adv7511_encoder_mode_valid (struct drm_encoder *encoder, -struct drm_display_mode *mode) -{ -struct adv7511 *adv7511 =encoder_to_adv7511 (encoder); - -return adv7511_mode_valid (adv7511, mode); -} - -static void adv7511_encoder_mode_set (struct drm_encoder *encoder, -struct drm_display_mode *mode, -struct drm_display_mode *adj_mode) -{ -struct adv7511 *adv7511 =encoder_to_adv7511 (encoder); - -adv7511_mode_set (adv7511, mode, adj_mode); -} - -static struct drm_encoder_slave_funcs adv7511_encoder_funcs = { - .dpms = adv7511_encoder_dpms, - .mode_valid = adv7511_encoder_mode_valid, - .mode_set = adv7511_encoder_mode_set, - .detect = adv7511_encoder_detect, - .get_modes = adv7511_encoder_get_modes, -}; - -/* ----------------------------------------------------------------------------- -* Bridge and connector functions -*/ - -static struct adv7511 *connector_to_adv7511 (struct drm_connector *connector) -{ - return container_of(connector, struct adv7511, connector); -} - -/* Connector helper functions */ -static int adv7533_connector_get_modes (struct drm_connector *connector) -{ -struct adv7511 *adv =connector_to_adv7511 (connector); - -return adv7511_get_modes (adv, connector); -} - -static struct drm_encoder * -adv7533_connector_best_encoder (struct drm_connector *connector) -{ -struct adv7511 *adv =connector_to_adv7511 (connector); - -return adv->bridge.encoder; -} - -static enum drm_mode_status -adv7533_connector_mode_valid (struct drm_connector *connector, -struct drm_display_mode *mode) -{ -struct adv7511 *adv =connector_to_adv7511 (connector); - -return adv7511_mode_valid (adv, mode); -} - -static struct drm_connector_helper_funcs adv7533_connector_helper_funcs = { - .get_modes = adv7533_connector_get_modes, - .best_encoder = adv7533_connector_best_encoder, - .mode_valid = adv7533_connector_mode_valid, -}; - -static enum drm_connector_status -adv7533_connector_detect (struct drm_connector *connector,bool force) -{ -struct adv7511 *adv =connector_to_adv7511 (connector); - -return adv7511_detect (adv, connector); -} - -static struct drm_connector_funcs adv7533_connector_funcs = { - .dpms = drm_atomic_helper_connector_dpms, - .fill_modes = drm_helper_probe_single_connector_modes, - .detect = adv7533_connector_detect, - .destroy = drm_connector_cleanup, - .reset = drm_atomic_helper_connector_reset, - .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, - .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, -}; - -/* Bridge funcs */ -static struct adv7511 *bridge_to_adv7511 (struct drm_bridge *bridge) -{ - return container_of(bridge, struct adv7511, bridge); -} - -static void adv7533_bridge_pre_enable (struct drm_bridge *bridge) -{ -struct adv7511 *adv =bridge_to_adv7511 (bridge); - -adv7511_power_on (adv); -} - -static void adv7533_bridge_post_disable (struct drm_bridge *bridge) -{ -struct adv7511 *adv =bridge_to_adv7511 (bridge); - -#if HPD_ENABLE -if (!adv->powered) -return ; -#endif - -adv7511_power_off (adv); -} - -static void adv7533_bridge_enable (struct drm_bridge *bridge) -{ -} - -static void adv7533_bridge_disable (struct drm_bridge *bridge) -{ -} - -static void adv7533_bridge_mode_set (struct drm_bridge *bridge, -struct drm_display_mode *mode, -struct drm_display_mode *adj_mode) -{ -struct adv7511 *adv =bridge_to_adv7511 (bridge); - -adv7511_mode_set (adv, mode, adj_mode); -} - -static int adv7533_attach_dsi (struct adv7511 *adv7511) -{ -struct device *dev = &adv7511->i2c_main->dev; -struct mipi_dsi_device *dsi; -struct mipi_dsi_host *host; -int ret; -const struct mipi_dsi_device_info info = { .type ="adv7533" , - .channel =0 , - .node =NULL , - }; - - host =of_find_mipi_dsi_host_by_node (adv7511->host_node); -if (!host) { -dev_err (dev,"failed to find dsi host\n" ); -return -EPROBE_DEFER ; - } - - dsi =mipi_dsi_device_register_full (host, &info); -if (IS_ERR (dsi)) { -dev_err (dev,"failed to create dummy dsi device\n" ); - ret =PTR_ERR (dsi); - goto err_dsi_device; - } - - adv7511->dsi = dsi; - - dsi->lanes = adv7511->num_dsi_lanes; - dsi->format =MIPI_DSI_FMT_RGB888 ; - dsi->mode_flags =MIPI_DSI_MODE_VIDEO |MIPI_DSI_MODE_VIDEO_SYNC_PULSE - |MIPI_DSI_MODE_EOT_PACKET |MIPI_DSI_MODE_VIDEO_HSE ; - - ret =mipi_dsi_attach (dsi); -if (ret <0 ) { -dev_err (dev,"failed to attach dsi to host\n" ); - goto err_dsi_attach; - } - -return 0 ; - -err_dsi_attach: -mipi_dsi_device_unregister (dsi); -err_dsi_device: -return ret; -} - -static int adv7533_bridge_attach (struct drm_bridge *bridge) -{ -struct adv7511 *adv =bridge_to_adv7511 (bridge); -int ret; - - adv->encoder = bridge->encoder; - -if (!bridge->encoder) { -DRM_ERROR ("Parent encoder object not found" ); -return -ENODEV ; - } - -#if HPD_ENABLE - adv->connector.polled =DRM_CONNECTOR_POLL_HPD ; -#endif - - ret =drm_connector_init (bridge->dev, &adv->connector, - &adv7533_connector_funcs,DRM_MODE_CONNECTOR_HDMIA ); -if (ret) { -DRM_ERROR ("Failed to initialize connector with drm\n" ); -return ret; - } -drm_connector_helper_add (&adv->connector, - &adv7533_connector_helper_funcs); -drm_mode_connector_attach_encoder (&adv->connector, adv->encoder); - -#if HPD_ENABLE -drm_helper_hpd_irq_event (adv->connector.dev); -#endif - -adv7533_attach_dsi (adv); - -return ret; -} - -static struct drm_bridge_funcs adv7533_bridge_funcs = { - .pre_enable = adv7533_bridge_pre_enable, - .enable = adv7533_bridge_enable, - .disable = adv7533_bridge_disable, - .post_disable = adv7533_bridge_post_disable, - .mode_set = adv7533_bridge_mode_set, - .attach = adv7533_bridge_attach, -}; - -/* =========================================================*/ -static int adv7533_init_regulators (struct adv7511 *adv75xx,struct device *dev) -{ -int ret; - - adv75xx->vdd =devm_regulator_get (dev,"vdd" ); -if (IS_ERR (adv75xx->vdd)) { - ret =PTR_ERR (adv75xx->vdd); -dev_err (dev,"failed to get vdd regulator %d\n" , ret); -return ret; - } - - adv75xx->v1p2 =devm_regulator_get (dev,"v1p2" ); -if (IS_ERR (adv75xx->v1p2)) { - ret =PTR_ERR (adv75xx->v1p2); -dev_err (dev,"failed to get v1p2 regulator %d\n" , ret); -return ret; - } - - ret =regulator_set_voltage (adv75xx->vdd,1800000 ,1800000 ); -if (ret) { -dev_err (dev,"failed to set avdd voltage %d\n" , ret); -return ret; - } - - -DRM_INFO (" adv75xx->vdd = %d \n" ,regulator_get_voltage (adv75xx->vdd)); -/*ret = regulator_set_voltage(adv75xx->v1p2, 1200000, 1200000); -if (ret) { -dev_err(dev, "failed to set v1p2 voltage %d\n", ret); -return ret; -}*/ - -/* keep the regulators always on */ - ret =regulator_enable (adv75xx->vdd); -if (ret) { -dev_err (dev,"failed to enable vdd %d\n" , ret); -return ret; - } - -/*ret = regulator_enable(adv75xx->v1p2); -if (ret) { -dev_err(dev, "failed to enable v1p2 %d\n", ret); -//return ret; -}*/ - -return 0 ; -} - -/* ----------------------------------------------------------------------------- -* Probe & remove -*/ - -static int adv7511_parse_dt (struct device_node *np, -struct adv7511_link_config *config) -{ -const char *str; -int ret; - -of_property_read_u32 (np,"adi,input-depth" , &config->input_color_depth); -if (config->input_color_depth !=8 && config->input_color_depth !=10 && - config->input_color_depth !=12 ) -return -EINVAL ; - - ret =of_property_read_string (np,"adi,input-colorspace" , &str); -if (ret <0 ) -return ret; - -if (!strcmp (str,"rgb" )) - config->input_colorspace =HDMI_COLORSPACE_RGB ; -else if (!strcmp (str,"yuv422" )) - config->input_colorspace =HDMI_COLORSPACE_YUV422 ; -else if (!strcmp (str,"yuv444" )) - config->input_colorspace =HDMI_COLORSPACE_YUV444 ; -else -return -EINVAL ; - - ret =of_property_read_string (np,"adi,input-clock" , &str); -if (ret <0 ) -return ret; - -if (!strcmp (str,"1x" )) - config->input_clock =ADV7511_INPUT_CLOCK_1X ; -else if (!strcmp (str,"2x" )) - config->input_clock =ADV7511_INPUT_CLOCK_2X ; -else if (!strcmp (str,"ddr" )) - config->input_clock =ADV7511_INPUT_CLOCK_DDR ; -else -return -EINVAL ; - -if (config->input_colorspace ==HDMI_COLORSPACE_YUV422 || - config->input_clock !=ADV7511_INPUT_CLOCK_1X ) { - ret =of_property_read_u32 (np,"adi,input-style" , - &config->input_style); -if (ret) -return ret; - -if (config->input_style <1 || config->input_style >3 ) -return -EINVAL ; - - ret =of_property_read_string (np,"adi,input-justification" , - &str); -if (ret <0 ) -return ret; - -if (!strcmp (str,"left" )) - config->input_justification = -ADV7511_INPUT_JUSTIFICATION_LEFT ; -else if (!strcmp (str,"evenly" )) - config->input_justification = -ADV7511_INPUT_JUSTIFICATION_EVENLY ; -else if (!strcmp (str,"right" )) - config->input_justification = -ADV7511_INPUT_JUSTIFICATION_RIGHT ; -else -return -EINVAL ; - - }else { - config->input_style =1 ; - config->input_justification =ADV7511_INPUT_JUSTIFICATION_LEFT ; - } - -of_property_read_u32 (np,"adi,clock-delay" , &config->clock_delay); -if (config->clock_delay <-1200 || config->clock_delay >1600 ) -return -EINVAL ; - - config->embedded_sync =of_property_read_bool (np,"adi,embedded-sync" ); - -/* Hardcode the sync pulse configurations for now. */ - config->sync_pulse =ADV7511_INPUT_SYNC_PULSE_NONE ; - config->vsync_polarity =ADV7511_SYNC_POLARITY_PASSTHROUGH ; - config->hsync_polarity =ADV7511_SYNC_POLARITY_PASSTHROUGH ; - -return 0 ; -} - -static int adv7533_parse_dt (struct device_node *np,struct adv7511 *adv7511) -{ -u32 num_lanes; -struct device_node *endpoint; - -of_property_read_u32 (np,"adi,dsi-lanes" , &num_lanes); - -if (num_lanes <1 || num_lanes >4 ) -return -EINVAL ; - - adv7511->num_dsi_lanes = num_lanes; - - endpoint =of_graph_get_next_endpoint (np,NULL ); -if (!endpoint) { -DRM_ERROR ("adv dsi input endpoint not found\n" ); -return -ENODEV ; - } - - adv7511->host_node =of_graph_get_remote_port_parent (endpoint); -if (!adv7511->host_node) { -DRM_ERROR ("dsi host node not found\n" ); -of_node_put (endpoint); -return -ENODEV ; - } - -of_node_put (endpoint); -of_node_put (adv7511->host_node); - -/* TODO: Check if these need to be parsed by DT or not */ - adv7511->rgb = true; - adv7511->embedded_sync = false; - -return 0 ; -} - -static const int edid_i2c_addr =0x7e ; -static const int packet_i2c_addr =0x70 ; -static const int cec_i2c_addr =0x78 ; - -static const struct of_device_id adv7511_of_ids[] = { - { .compatible ="adi,adv7511" , .data = (void *)ADV7511 }, - { .compatible ="adi,adv7511w" , .data = (void *)ADV7511 }, - { .compatible ="adi,adv7513" , .data = (void *)ADV7511 }, - { .compatible ="adi,adv7533" , .data = (void *)ADV7533 }, - { } -}; -MODULE_DEVICE_TABLE (of, adv7511_of_ids); - -static int adv7511_probe (struct i2c_client *i2c,const struct i2c_device_id *id) -{ -struct adv7511_link_config link_config; -struct adv7511 *adv7511; -struct device *dev = &i2c->dev; -unsigned int val; -int ret; - -if (!dev->of_node) -return -EINVAL ; - - adv7511 =devm_kzalloc (dev,sizeof (*adv7511),GFP_KERNEL ); -if (!adv7511) -return -ENOMEM ; - - adv7511->powered = false; - adv7511->status = connector_status_disconnected; - -if (dev->of_node) { -const struct of_device_id *of_id; - - of_id =of_match_node (adv7511_of_ids, dev->of_node); - adv7511->type = (enum adv7511_type ) of_id->data; - }else { - adv7511->type = id->driver_data; - } - -DRM_INFO ("adv match_node ok \n" ); -memset (&link_config,0 ,sizeof (link_config)); - -if (adv7511->type ==ADV7511 ) - ret =adv7511_parse_dt (dev->of_node, &link_config); -else - ret =adv7533_parse_dt (dev->of_node, adv7511); -if (ret) -return ret; - -DRM_INFO ("adv parse_dt ok , adv7511->type = %d <0--ADV7511, 1--ADV7533>\n" , adv7511->type); - -if (adv7511->type ==ADV7533 ) { - ret =adv7533_init_regulators (adv7511, dev);// adv7533 vdd--1.8v v1p2--1.2v -if (ret) -return ret; - } -DRM_INFO ("adv7533_init_regulators ok \n" ); -/* -* The power down GPIO is optional. If present, toggle it from active to -* inactive to wake up the encoder. -*/ - adv7511->gpio_pd =devm_gpiod_get_optional (dev,"pd" ,GPIOD_OUT_HIGH ); -if (IS_ERR (adv7511->gpio_pd)) -return PTR_ERR (adv7511->gpio_pd); - -if (adv7511->gpio_pd) { -mdelay (5 ); -gpiod_set_value_cansleep (adv7511->gpio_pd,0 ); - } - -DRM_INFO ("adv get gpio_pd ok \n" ); - - adv7511->regmap =devm_regmap_init_i2c (i2c, &adv7511_regmap_config); -if (IS_ERR (adv7511->regmap)) -return PTR_ERR (adv7511->regmap); - -DRM_INFO ("adv devm_regmap_init_i2c ok \n" ); - ret =regmap_read (adv7511->regmap,ADV7511_REG_CHIP_REVISION , &val); -if (ret) -return ret; -dev_dbg (dev,"Rev. %d\n" , val); -DRM_INFO ("regmap_read ok, regmap_read Rev.= %d \n" , val); - -if (adv7511->type ==ADV7511 ) { - ret =regmap_register_patch (adv7511->regmap, - adv7511_fixed_registers, -ARRAY_SIZE (adv7511_fixed_registers)); -if (ret) -return ret; - }else { - ret =regmap_register_patch (adv7511->regmap, - adv7533_fixed_registers, -ARRAY_SIZE (adv7533_fixed_registers)); -if (ret) -return ret; - } - -regmap_write (adv7511->regmap,ADV7511_REG_EDID_I2C_ADDR , edid_i2c_addr); -regmap_write (adv7511->regmap,ADV7511_REG_PACKET_I2C_ADDR , - packet_i2c_addr); -regmap_write (adv7511->regmap,ADV7511_REG_CEC_I2C_ADDR , cec_i2c_addr); -adv7511_packet_disable (adv7511,0xffff ); - - adv7511->i2c_main = i2c; - - adv7511->i2c_packet =i2c_new_dummy (i2c->adapter, packet_i2c_addr >>1 ); -if (!adv7511->i2c_packet) -return -ENOMEM ; - - adv7511->i2c_edid =i2c_new_dummy (i2c->adapter, edid_i2c_addr >>1 ); -if (!adv7511->i2c_edid) - goto err_i2c_unregister_packet; - - adv7511->i2c_cec =i2c_new_dummy (i2c->adapter, cec_i2c_addr >>1 ); -if (!adv7511->i2c_cec) { - ret = -ENOMEM ; - goto err_i2c_unregister_edid; - } - - adv7511->regmap_cec =devm_regmap_init_i2c (adv7511->i2c_cec, - &adv7533_cec_regmap_config); -if (IS_ERR (adv7511->regmap_cec)) { - ret =PTR_ERR (adv7511->regmap_cec); - goto err_i2c_unregister_cec; - } - - adv7511->regmap_packet =devm_regmap_init_i2c (adv7511->i2c_packet, - &adv7533_packet_regmap_config); -if (IS_ERR (adv7511->regmap_packet)) { - ret =PTR_ERR (adv7511->regmap_packet); - goto err_i2c_unregister_cec; - } - -if (adv7511->type ==ADV7533 ) { - ret =regmap_register_patch (adv7511->regmap_cec, - adv7533_cec_fixed_registers, -ARRAY_SIZE (adv7533_cec_fixed_registers)); -if (ret) -return ret; - } - -if (i2c->irq) { -init_waitqueue_head (&adv7511->wq); - - ret =devm_request_threaded_irq (dev, i2c->irq,NULL , - adv7511_irq_handler, -IRQF_ONESHOT ,dev_name (dev), - adv7511); -if (ret) - goto err_i2c_unregister_cec; - } - -/* CEC is unused for now */ -regmap_write (adv7511->regmap,ADV7511_REG_CEC_CTRL , -ADV7511_CEC_CTRL_POWER_DOWN ); - -adv7511_power_off (adv7511); - -i2c_set_clientdata (i2c, adv7511); - -if (adv7511->type ==ADV7511 ) -adv7511_set_link_config (adv7511, &link_config); - -if (adv7511->type ==ADV7533 ) { - adv7511->bridge.funcs = &adv7533_bridge_funcs; - adv7511->bridge.of_node = dev->of_node; - - ret =drm_bridge_add (&adv7511->bridge); -if (ret) { -dev_err (dev,"failed to add adv7533 bridge\n" ); - goto err_i2c_unregister_cec; - } - } -#ifdef CONFIG_HDMI_ADV7511_AUDIO -adv7511_audio_init (dev); -#endif -return 0 ; - -err_i2c_unregister_cec: -i2c_unregister_device (adv7511->i2c_cec); -err_i2c_unregister_edid: -i2c_unregister_device (adv7511->i2c_edid); -err_i2c_unregister_packet: -i2c_unregister_device (adv7511->i2c_packet); - -return ret; -} - -static int adv7511_remove (struct i2c_client *i2c) -{ -struct adv7511 *adv7511 =i2c_get_clientdata (i2c); - -//adv7511_audio_exit(&i2c->dev); -i2c_unregister_device (adv7511->i2c_cec); -i2c_unregister_device (adv7511->i2c_edid); - -kfree (adv7511->edid); - -if (adv7511->type ==ADV7533 ) { -mipi_dsi_detach (adv7511->dsi); -//mipi_dsi_unregister_device(adv7511->dsi); -drm_bridge_remove (&adv7511->bridge); - } - -return 0 ; -} - -static int adv7511_encoder_init (struct i2c_client *i2c,struct drm_device *dev, -struct drm_encoder_slave *encoder) -{ - -struct adv7511 *adv7511 =i2c_get_clientdata (i2c); - -if (adv7511->type ==ADV7533 ) -return -ENODEV ; - - encoder->slave_priv = adv7511; - encoder->slave_funcs = &adv7511_encoder_funcs; - - adv7511->encoder = &encoder->base; - -return 0 ; -} - -static const struct i2c_device_id adv7511_i2c_ids[] = { - {"adv7511" ,ADV7511 }, - {"adv7511w" ,ADV7511 }, - {"adv7513" ,ADV7511 }, - {"adv7533" ,ADV7533 }, - { } -}; -MODULE_DEVICE_TABLE (i2c, adv7511_i2c_ids); - -static struct drm_i2c_encoder_driver adv7511_driver = { - .i2c_driver = { - .driver = { - .name ="adv7511" , - .of_match_table = adv7511_of_ids, - }, - .id_table = adv7511_i2c_ids, - .probe = adv7511_probe, - .remove = adv7511_remove, - }, - - .encoder_init = adv7511_encoder_init, -}; - -static int __init adv7511_init (void ) -{ -return drm_i2c_encoder_register (THIS_MODULE , &adv7511_driver); -} -module_init (adv7511_init); - -static void __exit adv7511_exit(void) -{ -drm_i2c_encoder_unregister (&adv7511_driver); -} -module_exit (adv7511_exit); - -MODULE_AUTHOR ("Lars-Peter Clausen <[email protected]>" ); -MODULE_DESCRIPTION ("ADV7511 HDMI transmitter driver" ); -MODULE_LICENSE ("GPL" );
drivers/staging/hikey9xx/gpu/hdmi/adv7535.h deleted +0 -351
351 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/hdmi/adv7535_audio.c deleted +0 -313
313 lines not on this page · raw message
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 38/49 staging: hikey9xx/gpu: add kirin9xx driver to the building system
In reply to Mauro Carvalho ChehabNow that everything is in place, add the driver to the building system.
--- drivers/staging/hikey9xx/Kconfig | 3 ++ drivers/staging/hikey9xx/Makefile | 1 + drivers/staging/hikey9xx/gpu/Kconfig | 52 ++++++--------------------- drivers/staging/hikey9xx/gpu/Makefile | 21 ++++------- 4 files changed, 22 insertions(+), 55 deletions(-)
drivers/staging/hikey9xx/Kconfig +3 -0
@@ -36,3 +36,6 @@ config REGULATOR_HI6421V600 This driver provides support for the voltage regulators on HiSilicon Hi6421v600 PMU / Codec IC. This is used on Kirin 3670 boards, like HiKey 970. + +# DRM/KMS driver +source "drivers/staging/hikey9xx/gpu/Kconfig"
drivers/staging/hikey9xx/Makefile +1 -0
@@ -3,3 +3,4 @@ obj-$(CONFIG_SPMI_HISI3670) += hisi-spmi-controller.o obj-$(CONFIG_MFD_HI6421_SPMI) += hi6421-spmi-pmic.o obj-$(CONFIG_REGULATOR_HI6421V600) += hi6421v600-regulator.o +obj-y += gpu/
drivers/staging/hikey9xx/gpu/Kconfig +11 -41
63 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/Makefile +7 -14
@@ -1,15 +1,8 @@ -EXTRA_CFLAGS += \ - -Iinclude/drm -kirin-drm-y := kirin_fbdev.o \ - kirin_fb.o \ - kirin_drm_drv.o \ - kirin_drm_dss.o \ - kirin_drm_dpe_utils.o \ - kirin_drm_overlay_utils.o \ - kirin_pwm.o \ - hdmi/adv7535.o \ +# SPDX-License-Identifier: GPL-2.0-only +kirin9xx-drm-y := kirin9xx_drm_drv.o \ + kirin9xx_drm_dss.o \ + kirin9xx_drm_dpe_utils.o \ + kirin9xx_drm_overlay_utils.o - -obj-$(CONFIG_HDMI_ADV7511_AUDIO) += hdmi/adv7535_audio.o -obj-$(CONFIG_DRM_KIRIN_960) += kirin-drm.o -obj-$(CONFIG_HISI_KIRIN_DW_DSI) += dw_drm_dsi.o +obj-$(CONFIG_DRM_HISI_KIRIN9XX) += kirin9xx-drm.o kirin9xx_pwm.o +obj-$(CONFIG_DRM_HISI_KIRIN9XX_DSI) += kirin9xx_dw_drm_dsi.o
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 36/49 staging: hikey9xx/gpu: solve most coding style issues
In reply to Mauro Carvalho ChehabThere are lots of coding style issues on this driver, as reported by checkpatch.
Address most of them.
--- .../staging/hikey9xx/gpu/kirin960_dpe_reg.h | 340 +++-- .../staging/hikey9xx/gpu/kirin970_dpe_reg.h | 1199 ++++++++--------- .../hikey9xx/gpu/kirin9xx_drm_dpe_utils.c | 285 ++-- .../hikey9xx/gpu/kirin9xx_drm_dpe_utils.h | 4 +- .../staging/hikey9xx/gpu/kirin9xx_drm_drv.c | 2 +- .../staging/hikey9xx/gpu/kirin9xx_drm_drv.h | 4 +- .../staging/hikey9xx/gpu/kirin9xx_drm_dss.c | 62 +- .../hikey9xx/gpu/kirin9xx_drm_overlay_utils.c | 116 +- .../hikey9xx/gpu/kirin9xx_dw_drm_dsi.c | 226 ++-- .../staging/hikey9xx/gpu/kirin9xx_fb_panel.h | 18 +- drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c | 26 +- 11 files changed, 1140 insertions(+), 1142 deletions(-)
drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h +167 -173
@@ -28,11 +28,11 @@#include <drm/drm_plane.h> #include <drm/drm_crtc.h> -#define FB_ACCEL_HI62xx 0x1 -#define FB_ACCEL_HI363x 0x2 -#define FB_ACCEL_HI365x 0x4 -#define FB_ACCEL_HI625x 0x8 -#define FB_ACCEL_HI366x 0x10 +#define FB_ACCEL_HI62xx 0x1 +#define FB_ACCEL_HI363x 0x2 +#define FB_ACCEL_HI365x 0x4 +#define FB_ACCEL_HI625x 0x8 +#define FB_ACCEL_HI366x 0x10#define FB_ACCEL_KIRIN970_ES 0x20#define FB_ACCEL_KIRIN970 0x40#define FB_ACCEL_KIRIN660 0x80
@@ -40,9 +40,9 @@#define FB_ACCEL_KIRIN980 0x200#define FB_ACCEL_PLATFORM_TYPE_FPGA 0x10000000 //FPGA#define FB_ACCEL_PLATFORM_TYPE_ASIC 0x20000000 //ASIC -/******************************************************************************* -** -*/ + +/******************************************************************************/ +enum dss_chn_idx {DSS_RCHN_NONE =-1 ,DSS_RCHN_D2 =0 ,
@@ -104,32 +104,32 @@ enum dss_ovl_idx {#define DSS_WCH_MAX (2)typedef struct dss_img { -uint32_t format; -uint32_t width; -uint32_t height; -uint32_t bpp;/* bytes per pixel */ -uint32_t buf_size; -uint32_t stride; -uint32_t stride_plane1; -uint32_t stride_plane2; -uint64_t phy_addr; -uint64_t vir_addr; -uint32_t offset_plane1; -uint32_t offset_plane2; +u32 format; +u32 width; +u32 height; +u32 bpp;/* bytes per pixel */ +u32 buf_size; +u32 stride; +u32 stride_plane1; +u32 stride_plane2; +u64 phy_addr; +u64 vir_addr; +u32 offset_plane1; +u32 offset_plane2; -uint64_t afbc_header_addr; -uint64_t afbc_payload_addr; -uint32_t afbc_header_stride; -uint32_t afbc_payload_stride; -uint32_t afbc_scramble_mode; -uint32_t mmbuf_base; -uint32_t mmbuf_size; +u64 afbc_header_addr; +u64 afbc_payload_addr; +u32 afbc_header_stride; +u32 afbc_payload_stride; +u32 afbc_scramble_mode; +u32 mmbuf_base; +u32 mmbuf_size; -uint32_t mmu_enable; -uint32_t csc_mode; -uint32_t secure_mode; -int32_t shared_fd; -uint32_t reserved0; +u32 mmu_enable; +u32 csc_mode; +u32 secure_mode; +s32 shared_fd; +u32 reserved0; }dss_img_t ; typedef struct drm_dss_layer {
@@ -137,20 +137,18 @@ typedef struct drm_dss_layer {dss_rect_t src_rect;dss_rect_t src_rect_mask;dss_rect_t dst_rect; -uint32_t transform; -int32_t blending; -uint32_t glb_alpha; -uint32_t color;/* background color or dim color */ -int32_t layer_idx; -int32_t chn_idx; -uint32_t need_cap; -int32_t acquire_fence; +u32 transform; +s32 blending; +u32 glb_alpha; +u32 color;/* background color or dim color */ +s32 layer_idx; +s32 chn_idx; +u32 need_cap; +s32 acquire_fence; } drm_dss_layer_t; +/******************************************************************************/ -/******************************************************************************* -** -*/ #define DEFAULT_MIPI_CLK_RATE (192 * 100000L)#define DEFAULT_PCLK_DSI_RATE (120 * 1000000L)
@@ -178,9 +176,8 @@ typedef struct drm_dss_layer {#define GPIO_PG_SEL_B (76)#define GPIO_TX_RX_B (78) -/******************************************************************************* -** -*/ +/******************************************************************************/ +#define CRGPERI_PLL0_CLK_RATE (1600000000UL)#define CRGPERI_PLL2_CLK_RATE (960000000UL)#define CRGPERI_PLL3_CLK_RATE (1600000000UL)
@@ -195,10 +192,10 @@ typedef struct drm_dss_layer {#define DSS_MAX_PXL0_CLK_288M (288000000UL)/*dss clk power off */ -#define DEFAULT_DSS_CORE_CLK_RATE_POWER_OFF (277000000UL) -#define DEFAULT_DSS_PXL0_CLK_RATE_POWER_OFF (277000000UL) -#define DEFAULT_DSS_MMBUF_CLK_RATE_POWER_OFF (238000000UL) -#define DEFAULT_DSS_PXL1_CLK_RATE_POWER_OFF (238000000UL) +#define DEFAULT_DSS_CORE_CLK_RATE_POWER_OFF (277000000UL) +#define DEFAULT_DSS_PXL0_CLK_RATE_POWER_OFF (277000000UL) +#define DEFAULT_DSS_MMBUF_CLK_RATE_POWER_OFF (238000000UL) +#define DEFAULT_DSS_PXL1_CLK_RATE_POWER_OFF (238000000UL)#define MMBUF_SIZE_MAX (288 * 1024)#define HISI_DSS_CMDLIST_MAX (16)
@@ -234,7 +231,7 @@ typedef struct drm_dss_layer {#define DEFAULT_ACLK_DPCTRL_RATE_CS 207000000UL#define DEFAULT_MIDIA_PPLL7_CLOCK_FREQ 1782000000UL -#define KIRIN970_VCO_MIN_FREQ_OUPUT 1000000/*Boston: 1000 * 1000*/ +#define KIRIN970_VCO_MIN_FREQ_OUTPUT 1000000/*Boston: 1000 * 1000*/ #define KIRIN970_SYS_19M2 19200/*Boston: 19.2f * 1000 */ #define MIDIA_PPLL7_CTRL0 0x50c
@@ -249,7 +246,7 @@ typedef struct drm_dss_layer {/* * DSS Registers -*/ +*/ /* MACROS */ #define DSS_WIDTH (width) ((width) - 1)
@@ -470,9 +467,7 @@ enum dss_rdma_idx { DSS_RDMA_MAX, }; -/******************************************************************************* -** -*/ +/*****************************************************************************/ #define PEREN0 (0x000)#define PERDIS0 (0x004)
@@ -539,9 +534,8 @@ enum dss_rdma_idx {#define PCTRL_DPHYTX_CTRL1 BIT(1)#define PCTRL_DPHYTX_CTRL0 BIT(0) -/******************************************************************************* -** -*/ +/*****************************************************************************/ +#define BIT_DSS_GLB_INTS BIT(30)#define BIT_MMU_IRPT_S BIT(29)#define BIT_MMU_IRPT_NS BIT(28)
@@ -706,8 +700,8 @@ enum dss_rdma_idx {#define BIT_CE_HIST1_RW_COLLIDE_IND BIT(1)#define BIT_CE_HIST0_RW_COLLIDE_IND BIT(0) -/******************************************************************************* -** MODULE BASE ADDRESS +/* +* MODULE BASE ADDRESS */ #define DSS_MIPI_DSI0_OFFSET (0x00001000)
@@ -884,8 +878,8 @@ enum dss_rdma_idx {#define DSS_DSC_OFFSET (0x7DC00)#define DSS_LDI1_OFFSET (0x7E000) -/******************************************************************************* -** GLB +/* +* GLB */ #define GLB_DSS_TAG (DSS_GLB0_OFFSET + 0x0000)
@@ -947,8 +941,8 @@ enum dss_rdma_idx {#define GLB_DSS_MEM_CTRL (DSS_GLB0_OFFSET + 0x0600)#define GLB_DSS_PM_CTRL (DSS_GLB0_OFFSET + 0x0604) -/******************************************************************************* -** DBG +/* +* DBG */ #define DBG_CRC_DBG_OV0 (0x0000)#define DBG_CRC_DBG_OV1 (0x0004)
@@ -991,8 +985,8 @@ enum dss_rdma_idx {#define DBG_RCH8_INTS (0x02A4)#define DBG_RCH8_INT_MSK (0x02A8) -/******************************************************************************* -** CMDLIST +/* +* CMDLIST */ #define CMDLIST_CH0_PENDING_CLR (0x0000)
@@ -1054,8 +1048,8 @@ enum dss_rdma_idx {#define BIT_CMDLIST_CH1_INTS BIT(1)#define BIT_CMDLIST_CH0_INTS BIT(0) -/******************************************************************************* -** AIF +/* +* AIF */ #define AIF0_CH0_OFFSET (DSS_VBIF0_AIF + 0x00)#define AIF0_CH0_ADD_OFFSET (DSS_VBIF0_AIF + 0x04)
@@ -1178,8 +1172,8 @@ typedef struct dss_aif_bw {u8 is_used; } dss_aif_bw_t; -/******************************************************************************* -** MIF +/* +* MIF */ #define MIF_ENABLE (0x0000)#define MIF_MEM_CTRL (0x0004)
@@ -1227,8 +1221,8 @@ typedef struct dss_mif { } dss_mif_t;/* -** stretch blt, linear/tile, rotation, pixel format -** 0 0 000 +* stretch blt, linear/tile, rotation, pixel format +* 0 0 000 */ enum dss_mmu_tlb_tag_org { MMU_TLB_TAG_ORG_0x0 =0x0 ,
@@ -1260,8 +1254,8 @@ enum dss_mmu_tlb_tag_org { MMU_TLB_TAG_ORG_0x1F = 0x1F, }; -/******************************************************************************* -**SMMU +/* +* SMMU */ #define SMMU_SCR (0x0000)#define SMMU_MEMCTRL (0x0004)
@@ -1383,8 +1377,8 @@ typedef struct dss_smmu {u8 smmu_smrx_ns_used[DSS_CHN_MAX_DEFINE ]; } dss_smmu_t; -/******************************************************************************* -** RDMA +/* +* RDMA */ #define DMA_OFT_X0 (0x0000)
@@ -1447,8 +1441,8 @@ typedef struct dss_smmu {#define CH_CLK_SEL (0x00E0)#define CH_CLK_EN (0x00E4) -/******************************************************************************* -** DFC +/* +* DFC */ #define DFC_DISP_SIZE (0x0000)#define DFC_PIX_IN_NUM (0x0004)
@@ -1473,8 +1467,8 @@ typedef struct dss_dfc {u32 padding_ctl; } dss_dfc_t; -/******************************************************************************* -** SCF +/* +* SCF */ #define DSS_SCF_H0_Y_COEF_OFFSET (0x0000)#define DSS_SCF_Y_COEF_OFFSET (0x2000)
@@ -1506,7 +1500,7 @@ typedef struct dss_dfc {#define SCF_CLK_SEL (0x00F8)#define SCF_CLK_EN (0x00FC)#define WCH_SCF_COEF_MEM_CTRL (0x0218) -#define WCH_SCF_LB_MEM_CTRL (0x290) +#define WCH_SCF_LB_MEM_CTRL (0x290)/* MACROS */ #define SCF_MIN_INPUT (16)
@@ -1514,7 +1508,7 @@ typedef struct dss_dfc {/* Threshold for SCF Stretch and SCF filter */ #define RDMA_STRETCH_THRESHOLD (2) -#define SCF_INC_FACTOR (1 << 18) +#define SCF_INC_FACTOR BIT(18)#define SCF_UPSCALE_MAX (60)#define SCF_DOWNSCALE_MAX (60)#define SCF_EDGE_FACTOR (3)
@@ -1630,8 +1624,8 @@ typedef struct dss_arsr2p {u32 ivbottom1; } dss_arsr2p_t; -/******************************************************************************* -** POST_CLIP v g +/* +* POST_CLIP v g */ #define POST_CLIP_DISP_SIZE (0x0000)#define POST_CLIP_CTL_HRZ (0x0010)
@@ -1645,8 +1639,8 @@ typedef struct dss_post_clip {u32 ctl_clip_en; } dss_post_clip_t; -/******************************************************************************* -** PCSC v +/* +* PCSC v */ #define PCSC_IDC0 (0x0000)#define PCSC_IDC2 (0x0004)
@@ -1664,9 +1658,10 @@ typedef struct dss_pcsc {u32 pcsc_idc0; } dss_pcsc_t; -/******************************************************************************* -** CSC +/* +* CSC */ +#define CSC_IDC0 (0x0000)#define CSC_IDC2 (0x0004)#define CSC_ODC0 (0x0008)
@@ -1693,19 +1688,19 @@ typedef struct dss_csc {u32 mprec; } dss_csc_t; -/******************************************************************************* -**channel DEBUG +/* +* channel DEBUG */ #define CH_DEBUG_SEL (0x600) -/******************************************************************************* -** VPP +/* +* VPP */ #define VPP_CTRL (0x700)#define VPP_MEM_CTRL (0x704) -/******************************************************************************* -**DMA BUF +/* +* DMA BUF */ #define DMA_BUF_CTRL (0x800)#define DMA_BUF_SIZE (0x850)
@@ -1733,15 +1728,15 @@ typedef struct dss_csc {#define AFBCD_MONITOR_REG2_OFFSET (0x94C)#define AFBCD_MONITOR_REG3_OFFSET (0x950)#define AFBCD_DEBUG_REG0_OFFSET (0x954) -#define AFBCD_CREG_FBCD_CTRL_MODE (0x960) -#define AFBCD_HREG_HDR_PTR_L1 (0x964) -#define AFBCD_HREG_PLD_PTR_L1 (0x968) -#define AFBCD_HEADER_SRTIDE_1 (0x96C) -#define AFBCD_PAYLOAD_SRTIDE_1 (0x970) -#define AFBCD_HREG_HDR_PTR_L1 (0x964) -#define AFBCD_HREG_PLD_PTR_L1 (0x968) -#define AFBCD_HEADER_SRTIDE_1 (0x96C) -#define AFBCD_PAYLOAD_SRTIDE_1 (0x970) +#define AFBCD_CREG_FBCD_CTRL_MODE (0x960) +#define AFBCD_HREG_HDR_PTR_L1 (0x964) +#define AFBCD_HREG_PLD_PTR_L1 (0x968) +#define AFBCD_HEADER_SRTIDE_1 (0x96C) +#define AFBCD_PAYLOAD_SRTIDE_1 (0x970) +#define AFBCD_HREG_HDR_PTR_L1 (0x964) +#define AFBCD_HREG_PLD_PTR_L1 (0x968) +#define AFBCD_HEADER_SRTIDE_1 (0x96C) +#define AFBCD_PAYLOAD_SRTIDE_1 (0x970)#define AFBCD_BLOCK_TYPE (0x974)#define AFBCD_MM_BASE_1 (0x978)#define AFBCD_MM_BASE_2 (0x97C)
@@ -1763,12 +1758,12 @@ typedef struct dss_csc {#define AFBCE_THRESHOLD (0x92C)#define AFBCE_SCRAMBLE_MODE (0x930)#define AFBCE_HEADER_POINTER_OFFSET (0x934) -#define AFBCE_CREG_FBCE_CTRL_MODE (0x950) -#define AFBCE_HREG_HDR_PTR_L1 (0x954) -#define AFBCE_HREG_PLD_PTR_L1 (0x958) -#define AFBCE_HEADER_SRTIDE_1 (0x95C) -#define AFBCE_PAYLOAD_SRTIDE_1 (0x960) -#define AFBCE_MEM_CTRL_1 (0x968) +#define AFBCE_CREG_FBCE_CTRL_MODE (0x950) +#define AFBCE_HREG_HDR_PTR_L1 (0x954) +#define AFBCE_HREG_PLD_PTR_L1 (0x958) +#define AFBCE_HEADER_SRTIDE_1 (0x95C) +#define AFBCE_PAYLOAD_SRTIDE_1 (0x960) +#define AFBCE_MEM_CTRL_1 (0x968)#define FBCD_CREG_FBCD_CTRL_GATE (0x98C)#define ROT_FIRST_LNS (0x530)
@@ -1954,8 +1949,8 @@ typedef struct dss_wdma {u8 rot_used; } dss_wdma_t; -/******************************************************************************* -** MCTL MUTEX0 1 2 3 4 5 +/* +* MCTL MUTEX0 1 2 3 4 5 */ #define MCTL_CTL_EN (0x0000)#define MCTL_CTL_MUTEX (0x0004)
@@ -1990,8 +1985,8 @@ typedef struct dss_wdma {#define MCTL_CTL_CLK_EN (0x0084)#define MCTL_CTL_DBG (0x00E0) -/******************************************************************************* -** MCTL SYS +/* +* MCTL SYS */ #define MCTL_CTL_SECU_CFG (0x0000)#define MCTL_PAY_SECU_FLUSH_EN (0x0018)
@@ -2157,8 +2152,8 @@ typedef struct dss_mctl_sys {u8 wch_ov_sel_used[DSS_WCH_MAX ]; } dss_mctl_sys_t; -/******************************************************************************* -** OVL +/* +* OVL */ #define OVL_SIZE (0x0000)#define OVL_BG_COLOR (0x4)
@@ -2320,45 +2315,45 @@ typedef struct dss_mctl_sys {#define OVL_6LAYER_NUM (6)#define OVL_2LAYER_NUM (2) -/******************************************************************************* -** OVL -*/ +/* +* OVL +*/ #define OV_SIZE (0x000) -#define OV_BG_COLOR_RGB (0x004) -#define OV_BG_COLOR_A (0x008) -#define OV_DST_STARTPOS (0x00C) -#define OV_DST_ENDPOS (0x010) -#define OV_GCFG (0x014) -#define OV_LAYER0_POS (0x030) -#define OV_LAYER0_SIZE (0x034) +#define OV_BG_COLOR_RGB (0x004) +#define OV_BG_COLOR_A (0x008) +#define OV_DST_STARTPOS (0x00C) +#define OV_DST_ENDPOS (0x010) +#define OV_GCFG (0x014) +#define OV_LAYER0_POS (0x030) +#define OV_LAYER0_SIZE (0x034)#define OV_LAYER0_SRCLOKEY (0x038) -#define OV_LAYER0_SRCHIKEY (0x03C) -#define OV_LAYER0_DSTLOKEY (0x040) -#define OV_LAYER0_DSTHIKEY (0x044) -#define OV_LAYER0_PATTERN_RGB (0x048) -#define OV_LAYER0_PATTERN_A (0x04C) -#define OV_LAYER0_ALPHA_MODE (0x050) -#define OV_LAYER0_ALPHA_A (0x054) -#define OV_LAYER0_CFG (0x058) -#define OV_LAYER0_PSPOS (0x05C) -#define OV_LAYER0_PEPOS (0x060) -#define OV_LAYER0_INFO_ALPHA (0x064) -#define OV_LAYER0_INFO_SRCCOLOR (0x068) -#define OV_LAYER0_DBG_INFO (0x06C) +#define OV_LAYER0_SRCHIKEY (0x03C) +#define OV_LAYER0_DSTLOKEY (0x040) +#define OV_LAYER0_DSTHIKEY (0x044) +#define OV_LAYER0_PATTERN_RGB (0x048) +#define OV_LAYER0_PATTERN_A (0x04C) +#define OV_LAYER0_ALPHA_MODE (0x050) +#define OV_LAYER0_ALPHA_A (0x054) +#define OV_LAYER0_CFG (0x058) +#define OV_LAYER0_PSPOS (0x05C) +#define OV_LAYER0_PEPOS (0x060) +#define OV_LAYER0_INFO_ALPHA (0x064) +#define OV_LAYER0_INFO_SRCCOLOR (0x068) +#define OV_LAYER0_DBG_INFO (0x06C)#define OV8_BASE_DBG_INFO (0x340)#define OV8_RD_SHADOW_SEL (0x344)#define OV8_CLK_SEL (0x348) -#define OV8_CLK_EN (0x34C) -#define OV8_BLOCK_SIZE (0x350) -#define OV8_BLOCK_DBG (0x354) -#define OV8_REG_DEFAULT (0x358) +#define OV8_CLK_EN (0x34C) +#define OV8_BLOCK_SIZE (0x350) +#define OV8_BLOCK_DBG (0x354) +#define OV8_REG_DEFAULT (0x358)#define OV2_BASE_DBG_INFO (0x200)#define OV2_RD_SHADOW_SEL (0x204)#define OV2_CLK_SEL (0x208) -#define OV2_CLK_EN (0x20C) -#define OV2_BLOCK_SIZE (0x210) -#define OV2_BLOCK_DBG (0x214) -#define OV2_REG_DEFAULT (0x218) +#define OV2_CLK_EN (0x20C) +#define OV2_BLOCK_SIZE (0x210) +#define OV2_BLOCK_DBG (0x214) +#define OV2_REG_DEFAULT (0x218)#define OV_8LAYER_NUM (8) typedef struct dss_ovl_layer {
@@ -2405,8 +2400,8 @@ typedef struct dss_ovl_alpha {u32 fix_mode; } dss_ovl_alpha_t; -/******************************************************************************* -** DBUF +/* +* DBUF */ #define DBUF_FRM_SIZE (0x0000)#define DBUF_FRM_HSIZE (0x0004)
@@ -2440,8 +2435,8 @@ typedef struct dss_ovl_alpha {#define DBUF_DFS_RAM_MANAGE (0x00A8)#define DBUF_DFS_DATA_FILL_OUT (0x00AC) -/******************************************************************************* -** DPP +/* +* DPP */ #define DPP_RD_SHADOW_SEL (0x000)#define DPP_DEFAULT (0x004)
@@ -2576,11 +2571,11 @@ typedef struct dss_ovl_alpha {#define ACE_Y_EXT (0x03C)#define ACE_U_EXT (0x040)#define ACE_V_EXT (0x044) -#define ACE_Y_ATTENU (0x048) +#define ACE_Y_ATTENU (0x048)#define ACE_U_ATTENU (0x04C)#define ACE_V_ATTENU (0x050)#define ACE_ROTA (0x054) -#define ACE_ROTB (0x058) +#define ACE_ROTB (0x058)#define ACE_Y_CORE (0x05C)#define ACE_U_CORE (0x060)#define ACE_V_CORE (0x064)
@@ -2683,8 +2678,8 @@ typedef struct dss_arsr1p {#define ARSR1P_LSC_CFG3 (0x080)#define ARSR1P_FORCE_CLK_ON_CFG (0x084) -/******************************************************************************* -** BIT EXT +/* +* BIT EXT */ #define BIT_EXT0_CTL (0x000)
@@ -2768,8 +2763,8 @@ typedef struct dss_arsr1p {#define HIACE_GAMMA_RAM_B_CFG_PM_CTRL (0x0144)#define HIACE_LHIST_RAM_CFG_PM_CTRL (0x0148) -/******************************************************************************* -** IFBC +/* +* IFBC */ #define IFBC_SIZE (0x0000)#define IFBC_CTRL (0x0004)
@@ -2793,8 +2788,8 @@ typedef struct dss_arsr1p {#define IFBC_PAD (0x004C)#define IFBC_REG_DEFAULT (0x0050) -/******************************************************************************* -** DSC +/* +* DSC */ #define DSC_VERSION (0x0000)#define DSC_PPS_IDENTIFIER (0x0004)
@@ -2844,8 +2839,8 @@ typedef struct dss_arsr1p {#define DSC_RD_SHADOW_SEL (0x00B4)#define DSC_REG_DEFAULT (0x00B8) -/******************************************************************************* -** LDI +/* +* LDI */ #define LDI_DPI0_HRZ_CTRL0 (0x0000)#define LDI_DPI0_HRZ_CTRL1 (0x0004)
@@ -2902,8 +2897,8 @@ typedef struct dss_arsr1p {#define LDI_MODULE_CLK_SEL (0x0258)#define LDI_MODULE_CLK_EN (0x025C) -/******************************************************************************* -** MIPI DSI +/* +* MIPI DSI */ #define MIPIDSI_VERSION_OFFSET (0x0000)#define MIPIDSI_PWR_UP_OFFSET (0x0004)
@@ -2986,8 +2981,8 @@ typedef struct dss_arsr1p {#define VID_VACTIVE_LINES_ACT (0x0160)#define SDF_3D_ACT (0x0190) -/******************************************************************************* -** MMBUF +/* +* MMBUF */ #define SMC_LOCK (0x0000)#define SMC_MEM_LP (0x0004)
@@ -3094,12 +3089,12 @@ struct dss_hw_ctx { };typedef struct dss_clk_rate { -uint64_t dss_pri_clk_rate; -uint64_t dss_pclk_dss_rate; -uint64_t dss_pclk_pctrl_rate; -uint64_t dss_mmbuf_rate; -uint32_t dss_voltage_value;//0:0.7v, 2:0.8v -uint32_t reserved; +u64 dss_pri_clk_rate; +u64 dss_pclk_dss_rate; +u64 dss_pclk_pctrl_rate; +u64 dss_mmbuf_rate; +u32 dss_voltage_value;//0:0.7v, 2:0.8v +u32 reserved; }dss_clk_rate_t ;struct dss_crtc {
@@ -3221,9 +3216,8 @@ typedef struct mipi_ifbc_division {u32 pxl0_dsi_gt_en; } mipi_ifbc_division_t; -/******************************************************************************* -** -*/ +/*****************************************************************************/ +#define outp32 (addr, val) writel(val, addr)#define outp16 (addr, val) writew(val, addr)#define outp8 (addr, val) writeb(val, addr)
drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h +585 -614
1,795 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c +155 -130
523 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.h +2 -2
@@ -16,7 +16,7 @@#ifndef KIRIN_DRM_DPE_UTILS_H #define KIRIN_DRM_DPE_UTILS_H -#if defined (CONFIG_DRM_HISI_KIRIN970 ) +#if defined(CONFIG_DRM_HISI_KIRIN970 )#include "kirin970_dpe_reg.h" #else #include "kirin960_dpe_reg.h"
@@ -24,7 +24,7 @@#include "kirin9xx_drm_drv.h" void set_reg (char __iomem *addr,uint32_t val,uint8_t bw,uint8_t bs); -uint32_t set_bits32 (uint32_t old_val,uint32_t val,uint8_t bw,uint8_t bs); +u32 set_bits32 (u32 old_val,uint32_t val,uint8_t bw,uint8_t bs);void init_dbuf (struct dss_crtc *acrtc);void init_dpp (struct dss_crtc *acrtc);
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c +1 -1
@@ -312,7 +312,7 @@ static int kirin_drm_platform_suspend(struct platform_device *pdev, pm_message_t dc_ops =of_device_get_match_data (dev); -DRM_INFO ("+. pdev->name is %s, m_message is %d \n" , pdev->name, state.event); +DRM_INFO ("+. pdev->name is %s, m_message is %d\n" , pdev->name, state.event);if (!dc_ops) {DRM_ERROR ("dc_ops is NULL\n" );return -EINVAL ;
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h +2 -2
@@ -48,9 +48,9 @@ struct kirin_fbdev { };extern const struct kirin_dc_ops dss_dc_ops; -extern void dsi_set_output_client (struct drm_device *dev); +void dsi_set_output_client (struct drm_device *dev);struct drm_framebuffer *kirin_framebuffer_init (struct drm_device *dev, -struct drm_mode_fb_cmd2 *mode_cmd); +struct drm_mode_fb_cmd2 *mode_cmd);#endif /* __KIRIN_DRM_DRV_H__ */
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c +30 -32
19 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_drm_overlay_utils.c +56 -60
116 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c +121 -105
226 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_fb_panel.h +9 -9
Lines of this file are not shown. View the raw message.
drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c +12 -14
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Part of the diff is not shown here. View the raw message.
PATCH 33/49 staging: hikey9xx/gpu: re-work the mode validation code
In reply to Mauro Carvalho ChehabDo some cleanups at the mode validation code. Right now, there is a known issue with this driver which makes it to set up some invalid modes, depending on the display.
We don't know yet what the issue is, so, instead, let's add a table with the modes which are known to work.
--- .../staging/hikey9xx/gpu/kirin9xx_drm_dss.c | 274 +++++++++++------- .../hikey9xx/gpu/kirin9xx_dw_drm_dsi.c | 34 +++ 2 files changed, 211 insertions(+), 97 deletions(-)
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c +177 -97
@@ -103,8 +103,9 @@ u32 dss_get_format(u32 pixel_format) }/******************************************************************************* -** -*/ +** +*/ +int hdmi_ceil (uint64_t a,uint64_t b) {if (b ==0 )
@@ -117,99 +118,108 @@ int hdmi_ceil(uint64_t a, uint64_t b) } } -int hdmi_pxl_ppll7_init (struct dss_hw_ctx *ctx,uint64_t pixel_clock) +int hdmi_pxl_ppll7_init (struct dss_hw_ctx *ctx,u64 pixel_clock) { -uint64_t refdiv, fbdiv, frac, postdiv1, postdiv2; -uint64_t vco_min_freq_output =KIRIN970_VCO_MIN_FREQ_OUPUT ; -uint64_t sys_clock_fref =KIRIN970_SYS_19M2 ; -uint64_t ppll7_freq_divider; -uint64_t vco_freq_output; -uint64_t frac_range =0x1000000 ;/*2^24*/ -uint64_t pixel_clock_ori; -uint64_t pixel_clock_cur; -uint32_t ppll7ctrl0; -uint32_t ppll7ctrl1; -uint32_t ppll7ctrl0_val; -uint32_t ppll7ctrl1_val; -int i, ret; +u64 vco_min_freq_output =KIRIN970_VCO_MIN_FREQ_OUPUT ; +u64 refdiv, fbdiv, frac, postdiv1 =0 , postdiv2 =0 ; +u64 dss_pxl0_clk =7 *144000000UL ; +u64 sys_clock_fref =KIRIN970_SYS_19M2 ; +u64 ppll7_freq_divider; +u64 vco_freq_output; +u64 frac_range =0x1000000 ;/*2^24*/ +u64 pixel_clock_ori; +u64 pixel_clock_cur; +u32 ppll7ctrl0; +u32 ppll7ctrl1; +u32 ppll7ctrl0_val; +u32 ppll7ctrl1_val;int ceil_temp; -int freq_divider_list[22 ] = {1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 , -12 ,14 ,15 ,16 ,20 ,21 ,24 , -25 ,30 ,36 ,42 ,49 }; - -int postdiv1_list[22 ] = {1 ,2 ,3 ,4 ,5 ,6 ,7 ,4 ,3 ,5 , -4 ,7 ,5 ,4 ,5 ,7 ,6 ,5 ,6 ,6 , -7 ,7 }; - -int postdiv2_list[22 ] = {1 ,1 ,1 ,1 ,1 ,1 ,1 ,2 ,3 ,2 , +int i, ret; +const int freq_divider_list[22 ] = { +1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 , +9 ,10 ,12 ,14 ,15 ,16 ,20 ,21 , +24 ,25 ,30 ,36 ,42 ,49 + }; +const int postdiv1_list[22 ] = { +1 ,2 ,3 ,4 ,5 ,6 ,7 ,4 ,3 ,5 , +4 ,7 ,5 ,4 ,5 ,7 ,6 ,5 ,6 ,6 , +7 ,7 + }; +const int postdiv2_list[22 ] = { +1 ,1 ,1 ,1 ,1 ,1 ,1 ,2 ,3 ,2 ,3 ,2 ,3 ,4 ,4 ,3 ,4 ,5 ,5 ,6 , -6 ,7 }; - ret =0 ; - postdiv1 =0 ; - postdiv2 =0 ; -if (pixel_clock ==0 ) -return -EINVAL ; +6 ,7 + }; -if (ctx ==NULL ) { -DRM_ERROR ("NULL Pointer\n" ); +if (!pixel_clock) { +DRM_ERROR ("Pixel clock can't be zero!\n" );return -EINVAL ; } pixel_clock_ori = pixel_clock; + pixel_clock_cur = pixel_clock_ori; -if (pixel_clock_ori <=255000000 ) - pixel_clock_cur = pixel_clock *7 ; -else if (pixel_clock_ori <=415000000 ) - pixel_clock_cur = pixel_clock *5 ; -else if (pixel_clock_ori <=594000000 ) - pixel_clock_cur = pixel_clock *3 ; -else { -DRM_ERROR ("Clock don't support!!\n" ); +if (pixel_clock_ori <=255000000 ) { + pixel_clock_cur *=7 ; + dss_pxl0_clk /=7 ; + }else if (pixel_clock_ori <=415000000 ) { + pixel_clock_cur *=5 ; + dss_pxl0_clk /=5 ; + }else if (pixel_clock_ori <=594000000 ) { + pixel_clock_cur *=3 ; + dss_pxl0_clk /=3 ; + }else { +DRM_ERROR ("Clock not supported!\n" );return -EINVAL ; } pixel_clock_cur = pixel_clock_cur /1000 ; ceil_temp =hdmi_ceil (vco_min_freq_output, pixel_clock_cur); -if (ceil_temp <0 ) +if (ceil_temp <0 ) { +DRM_ERROR ("pixel_clock_cur can't be zero!\n" );return -EINVAL ; + } - ppll7_freq_divider = (uint64_t )ceil_temp; + ppll7_freq_divider = (u64 )ceil_temp; -for (i =0 ; i <22 ; i++) { +for (i =0 ; i <ARRAY_SIZE (freq_divider_list); i++) {if (freq_divider_list[i] >= ppll7_freq_divider) { ppll7_freq_divider = freq_divider_list[i]; postdiv1 = postdiv1_list[i]; postdiv2 = postdiv2_list[i]; -DRM_INFO ("postdiv1=0x%llx, POSTDIV2=0x%llx\n" , postdiv1, postdiv2);break ; } } +if (i ==ARRAY_SIZE (freq_divider_list)) { +DRM_ERROR ("Can't find a valid setting for PLL7!\n" ); +return -EINVAL ; + } + vco_freq_output = ppll7_freq_divider * pixel_clock_cur; -if (vco_freq_output ==0 ) +if (!vco_freq_output) { +DRM_ERROR ("Can't find a valid setting for VCO_FREQ!\n" );return -EINVAL ; + } ceil_temp =hdmi_ceil (400000 , vco_freq_output); - -if (ceil_temp <0 ) +if (ceil_temp <0 ) { +DRM_ERROR ("Can't find a valid setting for PLL7!\n" );return -EINVAL ; + } refdiv = ((vco_freq_output * ceil_temp) >=494000 ) ?1 :2 ; -DRM_DEBUG ("refdiv=0x%llx\n" , refdiv); - fbdiv = (vco_freq_output * ceil_temp) * refdiv / sys_clock_fref; -DRM_DEBUG ("fbdiv=0x%llx\n" , fbdiv); - frac = (uint64_t )(ceil_temp * vco_freq_output - sys_clock_fref / refdiv * fbdiv) * refdiv * frac_range; - frac = (uint64_t )frac / sys_clock_fref; -DRM_DEBUG ("frac=0x%llx\n" , frac); + frac = (u64)(ceil_temp * vco_freq_output - sys_clock_fref / refdiv * fbdiv) * refdiv * frac_range; + frac = (u64 )frac / sys_clock_fref; ppll7ctrl0 =inp32 (ctx->pmctrl_base +MIDIA_PPLL7_CTRL0 ); ppll7ctrl0 &= ~MIDIA_PPLL7_FREQ_DEVIDER_MASK ; ppll7ctrl0_val =0x0 ; - ppll7ctrl0_val |= (uint32_t )(postdiv2 <<23 | postdiv1 <<20 | fbdiv <<8 | refdiv <<2 ); + ppll7ctrl0_val |= (u32)(postdiv2 <<23 | postdiv1 <<20 | fbdiv <<8 | refdiv <<2 ); ppll7ctrl0_val &=MIDIA_PPLL7_FREQ_DEVIDER_MASK ; ppll7ctrl0 |= ppll7ctrl0_val;
@@ -219,47 +229,30 @@ int hdmi_pxl_ppll7_init(struct dss_hw_ctx *ctx, uint64_t pixel_clock) ppll7ctrl1 &= ~MIDIA_PPLL7_FRAC_MODE_MASK ; ppll7ctrl1_val =0x0 ; - ppll7ctrl1_val |= (uint32_t )(1 <<25 |0 <<24 | frac); + ppll7ctrl1_val |= (u32)(1 <<25 |0 <<24 | frac); ppll7ctrl1_val &=MIDIA_PPLL7_FRAC_MODE_MASK ; ppll7ctrl1 |= ppll7ctrl1_val;outp32 (ctx->pmctrl_base +MIDIA_PPLL7_CTRL1 , ppll7ctrl1); -#if 1 - ret =clk_set_rate (ctx->dss_pxl0_clk,144000000UL ); -#else -/*comfirm ldi1 switch ppll7*/ -if (pixel_clock_ori <=255000000 ) - ret =clk_set_rate (ctx->dss_pxl0_clk,DEFAULT_MIDIA_PPLL7_CLOCK_FREQ /7 ); -else if (pixel_clock_ori <=415000000 ) - ret =clk_set_rate (ctx->dss_pxl0_clk,DEFAULT_MIDIA_PPLL7_CLOCK_FREQ /5 ); -else if (pixel_clock_ori <=594000000 ) - ret =clk_set_rate (ctx->dss_pxl0_clk,DEFAULT_MIDIA_PPLL7_CLOCK_FREQ /3 ); -else { -DRM_ERROR ("Clock don't support!!\n" ); -return -EINVAL ; - } -#endif +DRM_INFO ("PLL7 set to (0x%0x, 0x%0x)\n" , ppll7ctrl0, ppll7ctrl1); + + ret =clk_set_rate (ctx->dss_pxl0_clk, dss_pxl0_clk); +if (ret <0 ) +DRM_ERROR ("%s: clk_set_rate(dss_pxl0_clk, %llu) failed: %d!\n" , + __func__, dss_pxl0_clk, ret); +else +DRM_INFO ("dss_pxl0_clk:[%llu]->[%lu].\n" , + dss_pxl0_clk,clk_get_rate (ctx->dss_pxl0_clk)); -if (ret <0 ) { -DRM_ERROR ("dss_pxl0_clk clk_set_rate(%llu) failed, error=%d!\n" , - pixel_clock_cur, ret); - }return ret; } -/******************************************************************************* -** -*/ -static void dss_ldi_set_mode (struct dss_crtc *acrtc) +static u64 dss_calculate_clock (struct dss_crtc *acrtc, +const struct drm_display_mode *mode) { -int ret; -uint64_t clk_Hz; -struct dss_hw_ctx *ctx = acrtc->ctx; -struct drm_display_mode *mode = &acrtc->base.state->mode; -struct drm_display_mode *adj_mode = &acrtc->base.state->adjusted_mode; +u64 clk_Hz; -DRM_INFO ("mode->clock(org) = %u\n" , mode->clock);if (acrtc->ctx->g_dss_version_tag ==FB_ACCEL_KIRIN970 ) {if (mode->clock ==148500 ) clk_Hz =144000 *1000UL ;
@@ -275,10 +268,6 @@ static void dss_ldi_set_mode(struct dss_crtc *acrtc)/* Adjust pixel clock for compatibility with 10.1 inch special displays. */ if (mode->clock ==148500 && mode->width_mm ==532 && mode->height_mm ==299 ) clk_Hz =152000 *1000UL ; - -DRM_INFO ("HDMI real need clock = %llu \n" , clk_Hz); -hdmi_pxl_ppll7_init (ctx, clk_Hz); - adj_mode->clock = clk_Hz /1000 ; }else {if (mode->clock ==148500 ) clk_Hz =144000 *1000UL ;
@@ -290,19 +279,40 @@ static void dss_ldi_set_mode(struct dss_crtc *acrtc) clk_Hz =72000 *1000UL ; else clk_Hz = mode->clock *1000UL ; + } -/* -* Success should be guaranteed in mode_valid call back, -* so failure shouldn't happen here -*/ +return clk_Hz; +} + +static void dss_ldi_set_mode (struct dss_crtc *acrtc) +{ +struct drm_display_mode *adj_mode = &acrtc->base.state->adjusted_mode; +struct drm_display_mode *mode = &acrtc->base.state->mode; +struct dss_hw_ctx *ctx = acrtc->ctx; +u32 clock = mode->clock; +u64 clk_Hz; +int ret; + + clk_Hz =dss_calculate_clock (acrtc, mode); + +DRM_INFO ("Requested clock %u kHz, setting to %llu kHz\n" , + clock, clk_Hz /1000 ); + +if (acrtc->ctx->g_dss_version_tag ==FB_ACCEL_KIRIN970 ) { + ret =hdmi_pxl_ppll7_init (ctx, clk_Hz); + }else { ret =clk_set_rate (ctx->dss_pxl0_clk, clk_Hz); -if (ret) { -DRM_ERROR ("failed to set pixel clk %llu Hz (%d)\n" , clk_Hz, ret); +if (!ret) { + clk_Hz =clk_get_rate (ctx->dss_pxl0_clk); +DRM_INFO ("dss_pxl0_clk:[%llu]->[%lu].\n" , + clk_Hz,clk_get_rate (ctx->dss_pxl0_clk)); } - adj_mode->clock =clk_get_rate (ctx->dss_pxl0_clk) /1000 ; } -DRM_INFO ("dss_pxl0_clk [%llu]->[%lu] \n" , clk_Hz,clk_get_rate (ctx->dss_pxl0_clk)); +if (ret) +DRM_ERROR ("failed to set pixel clock\n" ); +else + adj_mode->clock = clk_Hz /1000 ;dpe_init (acrtc); }
@@ -460,6 +470,75 @@ static irqreturn_t dss_irq_handler(int irq, void *data)return IRQ_HANDLED ; } +static bool dss_crtc_mode_fixup (struct drm_crtc *crtc, +const struct drm_display_mode *mode, +struct drm_display_mode *adj_mode) +{ +struct dss_crtc *acrtc =to_dss_crtc (crtc); +struct dss_hw_ctx *ctx = acrtc->ctx; +u64 clk_Hz; + +/* Check if clock is too high */ +if (mode->clock >594000 ) +return false; +/* +* FIXME: the code should, instead, do some calculus instead of +* hardcoding the modes. Clearly, there's something missing at +* dss_calculate_clock() +*/ + +#if 0 +/* +* HACK: reports at Hikey 970 mailing lists with the downstream +* Official Linaro 4.9 driver seem to indicate that some monitor +* modes aren't properly set. There, this hack was added. +* +* On my monitors, this wasn't needed, but better to keep this +* code here, together with this notice, just in case. +*/ +if ((mode->hdisplay ==1920 && mode->vdisplay ==1080 && mode->clock ==148500 ) + || (mode->hdisplay ==1920 && mode->vdisplay ==1080 && mode->clock ==148352 ) + || (mode->hdisplay ==1920 && mode->vdisplay ==1080 && mode->clock ==80192 ) + || (mode->hdisplay ==1920 && mode->vdisplay ==1080 && mode->clock ==74250 ) + || (mode->hdisplay ==1920 && mode->vdisplay ==1080 && mode->clock ==61855 ) + || (mode->hdisplay ==1680 && mode->vdisplay ==1050 && mode->clock ==147116 ) + || (mode->hdisplay ==1680 && mode->vdisplay ==1050 && mode->clock ==146250 ) + || (mode->hdisplay ==1680 && mode->vdisplay ==1050 && mode->clock ==144589 ) + || (mode->hdisplay ==1600 && mode->vdisplay ==1200 && mode->clock ==160961 ) + || (mode->hdisplay ==1600 && mode->vdisplay ==900 && mode->clock ==118963 ) + || (mode->hdisplay ==1440 && mode->vdisplay ==900 && mode->clock ==126991 ) + || (mode->hdisplay ==1280 && mode->vdisplay ==1024 && mode->clock ==128946 ) + || (mode->hdisplay ==1280 && mode->vdisplay ==1024 && mode->clock ==98619 ) + || (mode->hdisplay ==1280 && mode->vdisplay ==960 && mode->clock ==102081 ) + || (mode->hdisplay ==1280 && mode->vdisplay ==800 && mode->clock ==83496 ) + || (mode->hdisplay ==1280 && mode->vdisplay ==720 && mode->clock ==74440 ) + || (mode->hdisplay ==1280 && mode->vdisplay ==720 && mode->clock ==74250 ) + || (mode->hdisplay ==1024 && mode->vdisplay ==768 && mode->clock ==78800 ) + || (mode->hdisplay ==1024 && mode->vdisplay ==768 && mode->clock ==75000 ) + || (mode->hdisplay ==1024 && mode->vdisplay ==768 && mode->clock ==81833 ) + || (mode->hdisplay ==800 && mode->vdisplay ==600 && mode->clock ==48907 ) + || (mode->hdisplay ==800 && mode->vdisplay ==600 && mode->clock ==40000 ) + || (mode->hdisplay ==800 && mode->vdisplay ==480 && mode->clock ==32000 ) + ) +#endif + { + clk_Hz =dss_calculate_clock (acrtc, mode); + +/* +* On Kirin970, PXL0 clock is set to a const value, +* independently of the pixel clock. +*/ +if (acrtc->ctx->g_dss_version_tag !=FB_ACCEL_KIRIN970 ) + clk_Hz =clk_round_rate (ctx->dss_pxl0_clk, mode->clock *1000 ); + + adj_mode->clock = clk_Hz /1000 ; + +return true; + } + +return false; +} +static void dss_crtc_enable (struct drm_crtc *crtc,struct drm_crtc_state *old_state) {
@@ -533,6 +612,7 @@ static void dss_crtc_atomic_flush(struct drm_crtc *crtc, }static const struct drm_crtc_helper_funcs dss_crtc_helper_funcs = { + .mode_fixup = dss_crtc_mode_fixup, .atomic_enable = dss_crtc_enable, .atomic_disable = dss_crtc_disable, .mode_set_nofb = dss_crtc_mode_set_nofb,
drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c +34 -0
@@ -1457,6 +1457,39 @@ static void dsi_encoder_enable(struct drm_encoder *encoder) dsi->enable = true; } +static enum drm_mode_status dsi_encoder_mode_valid (struct drm_encoder *encoder, +const struct drm_display_mode *mode) + +{ +const struct drm_crtc_helper_funcs *crtc_funcs; +struct drm_display_mode adj_mode; +int clock = mode->clock; +struct drm_crtc *crtc; + +drm_for_each_crtc (crtc, encoder->dev) { +drm_mode_copy (&adj_mode, mode); + + crtc_funcs = crtc->helper_private; +if (crtc_funcs && crtc_funcs->mode_fixup) { +if (!crtc_funcs->mode_fixup (crtc, mode, &adj_mode)) { +DRM_INFO ("Discarded mode: %ix%i@%i, clock: %i (adjusted to %i)" , + mode->hdisplay, mode->vdisplay, +drm_mode_vrefresh (mode), + mode->clock, clock); + +return MODE_BAD ; + } + clock = adj_mode.clock; + } + } + +DRM_INFO ("Valid mode: %ix%i@%i, clock %i (adjusted to %i)" , + mode->hdisplay, mode->vdisplay,drm_mode_vrefresh (mode), + mode->clock, clock); + +return MODE_OK ; +} +static void dsi_encoder_mode_set (struct drm_encoder *encoder,struct drm_display_mode *mode,struct drm_display_mode *adj_mode)
@@ -1476,6 +1509,7 @@ static int dsi_encoder_atomic_check(struct drm_encoder *encoder,static const struct drm_encoder_helper_funcs dw_encoder_helper_funcs = { .atomic_check = dsi_encoder_atomic_check, + .mode_valid = dsi_encoder_mode_valid, .mode_set = dsi_encoder_mode_set, .enable = dsi_encoder_enable, .disable = dsi_encoder_disable
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 32/49 staging: hikey9xx/gpu: get rid of iommu_format
In reply to Mauro Carvalho ChehabThose aren't needed anymore.
--- drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h | 1 - drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h | 1 - drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h | 2 -- 3 files changed, 4 deletions(-)
drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h +0 -1
@@ -3087,7 +3087,6 @@ struct dss_hw_ctx {struct iommu_domain *mmu_domain;struct ion_client *ion_client;struct ion_handle *ion_handle; -struct iommu_map_format iommu_format;char __iomem *screen_base;unsigned long smem_start;unsigned long screen_size;
drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h +0 -1
@@ -4100,7 +4100,6 @@ struct dss_hw_ctx {struct iommu_domain *mmu_domain;struct ion_client *ion_client;struct ion_handle *ion_handle; -struct iommu_map_format iommu_format;char __iomem *screen_base;unsigned long smem_start;unsigned long screen_size;
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h +0 -2
@@ -18,7 +18,6 @@#include <drm/drm_print.h> #include <linux/iommu.h> -#include <linux/hisi/hisi-iommu.h> #define MAX_CRTC 2
@@ -41,7 +40,6 @@ struct kirin_fbdev {struct ion_client *ion_client;struct ion_handle *ion_handle; -struct iommu_map_format iommu_format;void *screen_base;unsigned long smem_start;unsigned long screen_size;
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 34/49 staging: hikey9xx/gpu: add support for enable/disable ldo3 regulator
In reply to Mauro Carvalho ChehabThis is needed for the DRM to work. Ok, right now, this is enabled on default fastboot logic, but, as soon as we enable the proper SPMI driver, such code is needed.
--- drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h | 4 +--- drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c | 6 +++--- drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c | 8 -------- drivers/staging/hikey9xx/gpu/kirin9xx_fb_panel.h | 4 +--- 4 files changed, 5 insertions(+), 17 deletions(-)
drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h +1 -3
@@ -41,9 +41,7 @@#define FB_ACCEL_PLATFORM_TYPE_ASIC 0x20000000 //ASIC/* vcc name */ -#define REGULATOR_PDP_NAME "regulator_dsssubsys" -#define REGULATOR_MMBUF "regulator_mmbuf" -#define REGULATOR_MEDIA_NAME "regulator_media_subsys" +#define REGULATOR_PDP_NAME "ldo3"/******************************************************************************* **
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c +3 -3
@@ -967,13 +967,13 @@ int dpe_regulator_enable(struct dss_hw_ctx *ctx) {int ret =0 ; -DRM_INFO ("+. \n" ); +DRM_INFO ("enabling DPE regulator\n" );if (NULL == ctx) {DRM_ERROR ("NULL ptr.\n" );return -EINVAL ; } -//ret = regulator_enable(ctx->dpe_regulator); + ret =regulator_enable (ctx->dpe_regulator);if (ret) {DRM_ERROR (" dpe regulator_enable failed, error=%d!\n" , ret);return -EINVAL ;
@@ -998,7 +998,7 @@ int dpe_regulator_disable(struct dss_hw_ctx *ctx)dpe_set_common_clk_rate_on_pll0 (ctx);#endif -//ret = regulator_disable(ctx->dpe_regulator); + ret =regulator_disable (ctx->dpe_regulator);if (ret !=0 ) {DRM_ERROR ("dpe regulator_disable failed, error=%d!\n" , ret);return -EINVAL ;
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c +0 -8
@@ -873,20 +873,12 @@ static int dss_dts_parse(struct platform_device *pdev, struct dss_hw_ctx *ctx)DRM_INFO ("dss irq = %d. \n" , ctx->irq); -#ifndef DSS_POWER_UP_ON_UEFI #if defined (CONFIG_DRM_HISI_KIRIN970 ) ctx->dpe_regulator =devm_regulator_get (dev,REGULATOR_PDP_NAME );if (!ctx->dpe_regulator) {DRM_ERROR ("failed to get dpe_regulator resource! ret=%d.\n" , ret);return -ENXIO ; } - - ctx->mediacrg_regulator =devm_regulator_get (dev,REGULATOR_MEDIA_NAME ); -if (!ctx->mediacrg_regulator) { -DRM_ERROR ("failed to get mediacrg_regulator resource! ret=%d.\n" , ret); -return -ENXIO ; - } -#endif #endif ctx->dss_mmbuf_clk =devm_clk_get (dev,"clk_dss_axi_mm" );
drivers/staging/hikey9xx/gpu/kirin9xx_fb_panel.h +1 -3
@@ -38,9 +38,7 @@#define DEV_NAME_LCD_BKL "lcd_backlight0"/* vcc name */ -#define REGULATOR_PDP_NAME "regulator_dsssubsys" -#define REGULATOR_MMBUF "regulator_mmbuf" -#define REGULATOR_MEDIA_NAME "regulator_media_subsys" +#define REGULATOR_PDP_NAME "ldo3"/* irq name */
Signature · 6 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/49 staging: hikey9xx: Add hisilicon DRM driver for hikey960/970
In reply to Mauro Carvalho ChehabFrom: Chen Feng <[email protected]>
Add initial driver for hikey960 DRM driver, backported from OOT tree. Later patches will be needed to make this driver work.
[jstultz: Rework patchset to use upstream adv7511 and remove duplicated code]
[[email protected]: port just a subset of the
original patch and place it at staging]
--- drivers/staging/hikey9xx/gpu/Kconfig | 52 + drivers/staging/hikey9xx/gpu/Makefile | 12 + drivers/staging/hikey9xx/gpu/dw_drm_dsi.c | 1650 +++++++++ drivers/staging/hikey9xx/gpu/dw_dsi_reg.h | 145 + drivers/staging/hikey9xx/gpu/kirin_dpe_reg.h | 3114 +++++++++++++++++ .../hikey9xx/gpu/kirin_drm_dpe_utils.c | 731 ++++ .../hikey9xx/gpu/kirin_drm_dpe_utils.h | 58 + drivers/staging/hikey9xx/gpu/kirin_drm_drv.c | 380 ++ drivers/staging/hikey9xx/gpu/kirin_drm_drv.h | 60 + drivers/staging/hikey9xx/gpu/kirin_drm_dss.c | 701 ++++ .../hikey9xx/gpu/kirin_drm_overlay_utils.c | 1288 +++++++ drivers/staging/hikey9xx/gpu/kirin_fb.c | 94 + drivers/staging/hikey9xx/gpu/kirin_fbdev.c | 470 +++ 13 files changed, 8755 insertions(+) create mode 100644 drivers/staging/hikey9xx/gpu/Kconfig create mode 100644 drivers/staging/hikey9xx/gpu/Makefile create mode 100644 drivers/staging/hikey9xx/gpu/dw_drm_dsi.c create mode 100644 drivers/staging/hikey9xx/gpu/dw_dsi_reg.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin_dpe_reg.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin_drm_dpe_utils.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin_drm_dpe_utils.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin_drm_drv.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin_drm_drv.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin_drm_dss.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin_drm_overlay_utils.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin_fb.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin_fbdev.c
drivers/staging/hikey9xx/gpu/Kconfig new file +52 -0
@@ -0,0 +1,52 @@ +config DRM_HISI_KIRIN + tristate "DRM Support for Hisilicon Kirin series SoCs Platform" + depends on DRM && OF && ARM64 + select DRM_KMS_HELPER + select DRM_GEM_CMA_HELPER + select DRM_KMS_CMA_HELPER + select HISI_KIRIN_DW_DSI + help + Choose this option if you have a hisilicon Kirin chipsets(hi6220). + If M is selected the module will be called kirin-drm. + +config DRM_KIRIN_960 + tristate "DRM Support for Hisilicon Kirin960 series SoCs Platform" + depends on DRM && OF && ARM64 + select DRM_KMS_HELPER + select DRM_GEM_CMA_HELPER + select DRM_KMS_CMA_HELPER + select HISI_KIRIN_DW_DSI + help + Choose this option if you have a hisilicon Kirin chipsets(kirin960). + If M is selected the module will be called kirin-drm. + +config HISI_KIRIN_DW_DSI + tristate "HiSilicon Kirin specific extensions for Synopsys DW MIPI DSI" + depends on DRM_HISI_KIRIN || DRM_KIRIN_960 + select DRM_MIPI_DSI + select DRM_PANEL + help + This selects support for HiSilicon Kirin SoC specific extensions for + the Synopsys DesignWare DSI driver. If you want to enable MIPI DSI on + hi6220 based SoC, you should selet this option. + +config DRM_PANEL_HIKEY960_NTE300NTS + tristate "Hikey960 NTE300NTS video mode panel" + depends on OF + depends on DRM_MIPI_DSI + help + Say Y here if you want to enable LCD panel driver for Hikey960 boadr. + Current support panel: NTE300NTS(1920X1200) + +config HISI_FB_970 + tristate "DRM Support for Hisilicon Kirin970 series SoCs Platform" + depends on DRM && OF && ARM64 + depends on DRM_MIPI_DSI + help + Choose this option if you have a hisilicon Kirin chipsets(kirin970). + If M is selected the module will be called kirin-drm. + +config HDMI_ADV7511_AUDIO + tristate "HDMI Support ADV7511 audio" + help + Choose this option to support HDMI ADV7511 audio.
drivers/staging/hikey9xx/gpu/Makefile new file +12 -0
@@ -0,0 +1,12 @@ +EXTRA_CFLAGS += \ + -Iinclude/drm + +kirin-drm-y := kirin_fbdev.o \ + kirin_fb.o \ + kirin_drm_drv.o \ + kirin_drm_dss.o \ + kirin_drm_dpe_utils.o \ + kirin_drm_overlay_utils.o \ + +obj-$(CONFIG_DRM_KIRIN_960) += kirin-drm.o +obj-$(CONFIG_HISI_KIRIN_DW_DSI) += dw_drm_dsi.o
drivers/staging/hikey9xx/gpu/dw_drm_dsi.c new file +1650 -0
1,650 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/dw_dsi_reg.h new file +145 -0
145 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_dpe_reg.h new file +3114 -0
1,141 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_drm_dpe_utils.c new file +731 -0
731 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_drm_dpe_utils.h new file +58 -0
58 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_drm_drv.c new file +380 -0
380 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_drm_drv.h new file +60 -0
60 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_drm_dss.c new file +701 -0
701 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_drm_overlay_utils.c new file +1288 -0
1,288 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_fb.c new file +94 -0
94 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_fbdev.c new file +470 -0
470 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.26.2
Part of the diff is not shown here. View the raw message.
PATCH 42/49 staging: hikey9xx/gpu: place common definitions at kirin9xx_dpe.h
In reply to Mauro Carvalho ChehabThere are lots of things that are identical for both Kirin 960 and Kirin 970. Place those identical ones on a common file, removing unused structs.
--- .../gpu/drm/hisilicon/kirin/kirin9xx_dpe.h | 2411 +++++++++++++ .../staging/hikey9xx/gpu/kirin960_dpe_reg.h | 3002 +--------------- .../staging/hikey9xx/gpu/kirin970_dpe_reg.h | 3044 +---------------- .../hikey9xx/gpu/kirin9xx_drm_dpe_utils.c | 22 +- .../hikey9xx/gpu/kirin9xx_drm_dpe_utils.h | 199 +- .../hikey9xx/gpu/kirin9xx_drm_overlay_utils.c | 6 + .../hikey9xx/gpu/kirin9xx_dw_drm_dsi.c | 12 +- drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c | 6 + 8 files changed, 2653 insertions(+), 6049 deletions(-) create mode 100644 drivers/gpu/drm/hisilicon/kirin/kirin9xx_dpe.h
drivers/gpu/drm/hisilicon/kirin/kirin9xx_dpe.h new file +2411 -0
@@ -0,0 +1,2411 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* +* 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_DPE_H__ +#define __KIRIN_DPE_H__ + +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/string.h> +#include <linux/platform_device.h> +#include <linux/device.h> +#include <linux/kernel.h> +#include <linux/wait.h> +#include <linux/bug.h> +#include <linux/iommu.h> +#include <linux/regulator/consumer.h> +#include <linux/regulator/driver.h> +#include <linux/regulator/machine.h> + +#include <drm/drm_plane.h> +#include <drm/drm_crtc.h> + +/* vcc name */ +#define REGULATOR_PDP_NAME "ldo3" + +enum dss_chn_idx { +DSS_RCHN_NONE =-1 , +DSS_RCHN_D2 =0 , +DSS_RCHN_D3 , +DSS_RCHN_V0 , +DSS_RCHN_G0 , +DSS_RCHN_V1 , +DSS_RCHN_G1 , +DSS_RCHN_D0 , +DSS_RCHN_D1 , + +DSS_WCHN_W0 , +DSS_WCHN_W1 , + +DSS_CHN_MAX , + +DSS_RCHN_V2 =DSS_CHN_MAX ,/*for copybit, only supported in chicago*/ +DSS_WCHN_W2 , + +DSS_COPYBIT_MAX , +}; + +struct dss_rect_ltrb { +s32 left; +s32 top; +s32 right; +s32 bottom; +}; + +enum { +DSI_1_LANES =0 , +DSI_2_LANES , +DSI_3_LANES , +DSI_4_LANES , +}; + +enum dss_ovl_idx { +DSS_OVL0 =0 , +DSS_OVL1 , +DSS_OVL2 , +DSS_OVL3 , +DSS_OVL_IDX_MAX , +}; + +enum lcd_orientation { +LCD_LANDSCAPE =0 , +LCD_PORTRAIT , +}; + +enum lcd_format { +LCD_RGB888 =0 , +LCD_RGB101010 , +LCD_RGB565 , +}; + +enum lcd_rgb_order { +LCD_RGB =0 , +LCD_BGR , +}; + +enum dss_addr { +DSS_ADDR_PLANE0 =0 , +DSS_ADDR_PLANE1 , +DSS_ADDR_PLANE2 , +}; + +enum dss_transform { +DSS_TRANSFORM_NOP =0x0 , +DSS_TRANSFORM_FLIP_H =0x01 , +DSS_TRANSFORM_FLIP_V =0x02 , +DSS_TRANSFORM_ROT =0x04 , +}; + +enum dss_dfc_format { +DFC_PIXEL_FORMAT_RGB_565 =0 , +DFC_PIXEL_FORMAT_XRGB_4444 , +DFC_PIXEL_FORMAT_ARGB_4444 , +DFC_PIXEL_FORMAT_XRGB_5551 , +DFC_PIXEL_FORMAT_ARGB_5551 , +DFC_PIXEL_FORMAT_XRGB_8888 , +DFC_PIXEL_FORMAT_ARGB_8888 , +DFC_PIXEL_FORMAT_BGR_565 , +DFC_PIXEL_FORMAT_XBGR_4444 , +DFC_PIXEL_FORMAT_ABGR_4444 , +DFC_PIXEL_FORMAT_XBGR_5551 , +DFC_PIXEL_FORMAT_ABGR_5551 , +DFC_PIXEL_FORMAT_XBGR_8888 , +DFC_PIXEL_FORMAT_ABGR_8888 , + +DFC_PIXEL_FORMAT_YUV444 , +DFC_PIXEL_FORMAT_YVU444 , +DFC_PIXEL_FORMAT_YUYV422 , +DFC_PIXEL_FORMAT_YVYU422 , +DFC_PIXEL_FORMAT_VYUY422 , +DFC_PIXEL_FORMAT_UYVY422 , +}; + +enum dss_dma_format { +DMA_PIXEL_FORMAT_RGB_565 =0 , +DMA_PIXEL_FORMAT_ARGB_4444 , +DMA_PIXEL_FORMAT_XRGB_4444 , +DMA_PIXEL_FORMAT_ARGB_5551 , +DMA_PIXEL_FORMAT_XRGB_5551 , +DMA_PIXEL_FORMAT_ARGB_8888 , +DMA_PIXEL_FORMAT_XRGB_8888 , + +DMA_PIXEL_FORMAT_RESERVED0 , + + DMA_PIXEL_FORMAT_YUYV_422_Pkg, +DMA_PIXEL_FORMAT_YUV_420_SP_HP , +DMA_PIXEL_FORMAT_YUV_420_P_HP , +DMA_PIXEL_FORMAT_YUV_422_SP_HP , +DMA_PIXEL_FORMAT_YUV_422_P_HP , +DMA_PIXEL_FORMAT_AYUV_4444 , +}; + +enum dss_buf_format { +DSS_BUF_LINEAR =0 , +DSS_BUF_TILE , +}; + +enum dss_blend_mode { +DSS_BLEND_CLEAR =0 , +DSS_BLEND_SRC , +DSS_BLEND_DST , +DSS_BLEND_SRC_OVER_DST , +DSS_BLEND_DST_OVER_SRC , +DSS_BLEND_SRC_IN_DST , +DSS_BLEND_DST_IN_SRC , +DSS_BLEND_SRC_OUT_DST , +DSS_BLEND_DST_OUT_SRC , +DSS_BLEND_SRC_ATOP_DST , +DSS_BLEND_DST_ATOP_SRC , +DSS_BLEND_SRC_XOR_DST , +DSS_BLEND_SRC_ADD_DST , +DSS_BLEND_FIX_OVER , +DSS_BLEND_FIX_PER0 , +DSS_BLEND_FIX_PER1 , +DSS_BLEND_FIX_PER2 , +DSS_BLEND_FIX_PER3 , +DSS_BLEND_FIX_PER4 , +DSS_BLEND_FIX_PER5 , +DSS_BLEND_FIX_PER6 , +DSS_BLEND_FIX_PER7 , +DSS_BLEND_FIX_PER8 , +DSS_BLEND_FIX_PER9 , +DSS_BLEND_FIX_PER10 , +DSS_BLEND_FIX_PER11 , +DSS_BLEND_FIX_PER12 , +DSS_BLEND_FIX_PER13 , +DSS_BLEND_FIX_PER14 , +DSS_BLEND_FIX_PER15 , +DSS_BLEND_FIX_PER16 , +DSS_BLEND_FIX_PER17 , + +DSS_BLEND_MAX , +}; + +enum dss_chn_cap { +MODULE_CAP_ROT , +MODULE_CAP_SCL , +MODULE_CAP_CSC , +MODULE_CAP_SHARPNESS_1D , +MODULE_CAP_SHARPNESS_2D , +MODULE_CAP_CE , +MODULE_CAP_AFBCD , +MODULE_CAP_AFBCE , +MODULE_CAP_YUV_PLANAR , +MODULE_CAP_YUV_SEMI_PLANAR , +MODULE_CAP_YUV_PACKAGE , +MODULE_CAP_MAX , +}; + +enum dss_ovl_module { +MODULE_OVL_BASE , +MODULE_MCTL_BASE , +MODULE_OVL_MAX , +}; + +enum dss_axi_idx { +AXI_CHN0 =0 , +AXI_CHN1 , +AXI_CHN_MAX , +}; + + + +enum dss_rdma_idx { +DSS_RDMA0 =0 , +DSS_RDMA1 , +DSS_RDMA2 , +DSS_RDMA3 , +DSS_RDMA4 , +DSS_RDMA_MAX , +}; + +/*****************************************************************************/ + +#define FB_ACCEL_HI62xx 0x1 +#define FB_ACCEL_HI363x 0x2 +#define FB_ACCEL_HI365x 0x4 +#define FB_ACCEL_HI625x 0x8 +#define FB_ACCEL_HI366x 0x10 +#define FB_ACCEL_KIRIN970_ES 0x20 +#define FB_ACCEL_KIRIN970 0x40 +#define FB_ACCEL_KIRIN660 0x80 +#define FB_ACCEL_KIRIN980_ES 0x100 +#define FB_ACCEL_KIRIN980 0x200 +#define FB_ACCEL_PLATFORM_TYPE_FPGA 0x10000000 //FPGA +#define FB_ACCEL_PLATFORM_TYPE_ASIC 0x20000000 //ASIC + +/******************************************************************************/ + +#define DSS_WCH_MAX (2) + +/******************************************************************************/ + +#define DEFAULT_MIPI_CLK_RATE (192 * 100000L) +#define DEFAULT_PCLK_DSI_RATE (120 * 1000000L) + +#define DSS_MAX_PXL0_CLK_144M (144000000UL) + +#define DSS_ADDR 0xE8600000 +#define DSS_DSI_ADDR (DSS_ADDR + 0x01000) +#define DSS_LDI_ADDR (DSS_ADDR + 0x7d000) +#define PMC_BASE (0xFFF31000) +#define PERI_CRG_BASE (0xFFF35000) +#define SCTRL_BASE (0xFFF0A000) +#define PCTRL_BASE (0xE8A09000) + +#define GPIO_LCD_POWER_1V2 (54) +#define GPIO_LCD_STANDBY (67) +#define GPIO_LCD_RESETN (65) +#define GPIO_LCD_GATING (60) +#define GPIO_LCD_PCLK_GATING (58) +#define GPIO_LCD_REFCLK_GATING (59) +#define GPIO_LCD_SPICS (168) +#define GPIO_LCD_DRV_EN (73) + +#define GPIO_PG_SEL_A (72) +#define GPIO_TX_RX_A (74) +#define GPIO_PG_SEL_B (76) +#define GPIO_TX_RX_B (78) + +/******************************************************************************/ + +#define DEFAULT_DSS_CORE_CLK_08V_RATE (535000000UL) +#define DEFAULT_DSS_CORE_CLK_07V_RATE (400000000UL) +#define DEFAULT_DSS_CORE_CLK_RATE_L1 (300000000UL) +#define DEFAULT_DSS_MMBUF_CLK_RATE_L1 (238000000UL) + +#define DEFAULT_PCLK_DSS_RATE (114000000UL) +#define DEFAULT_PCLK_PCTRL_RATE (80000000UL) +#define DSS_MAX_PXL0_CLK_288M (288000000UL) + +/*dss clk power off */ +#define DEFAULT_DSS_CORE_CLK_RATE_POWER_OFF (277000000UL) +#define DEFAULT_DSS_PXL1_CLK_RATE_POWER_OFF (238000000UL) + +#define MMBUF_SIZE_MAX (288 * 1024) +#define HISI_DSS_CMDLIST_MAX (16) +#define HISI_DSS_CMDLIST_IDXS_MAX (0xFFFF) +#define HISI_DSS_COPYBIT_CMDLIST_IDXS (0xC000) +#define HISI_DSS_DPP_MAX_SUPPORT_BIT (0x7ff) +#define HISIFB_DSS_PLATFORM_TYPE (FB_ACCEL_HI366x | FB_ACCEL_PLATFORM_TYPE_ASIC) + +#define DSS_MIF_SMMU_SMRX_IDX_STEP (16) +#define CRG_PERI_DIS3_DEFAULT_VAL (0x0002F000) +#define SCF_LINE_BUF (2560) +#define DSS_GLB_MODULE_CLK_SEL_DEFAULT_VAL (0xF0000008) +#define DSS_LDI_CLK_SEL_DEFAULT_VAL (0x00000004) +#define DSS_DBUF_MEM_CTRL_DEFAULT_VAL (0x00000008) +#define DSS_SMMU_RLD_EN0_DEFAULT_VAL (0xffffffff) +#define DSS_SMMU_RLD_EN1_DEFAULT_VAL (0xffffff8f) +#define DSS_SMMU_OUTSTANDING_VAL (0xf) +#define DSS_MIF_CTRL2_INVAL_SEL3_STRIDE_MASK (0xc) +#define DSS_AFBCE_ENC_OS_CFG_DEFAULT_VAL (0x7) +#define TUI_SEC_RCH (DSS_RCHN_V0) +#define DSS_CHN_MAX_DEFINE (DSS_COPYBIT_MAX) + +/* perf stat */ +#define DSS_DEVMEM_PERF_BASE (0xFDF10000) +#define CRG_PERIPH_APB_PERRSTSTAT0_REG (0x68) +#define CRG_PERIPH_APB_IP_RST_PERF_STAT_BIT (18) +#define PERF_SAMPSTOP_REG (0x10) +#define DEVMEM_PERF_SIZE (0x100) + +/* dp clock used for hdmi */ +#define DEFAULT_AUXCLK_DPCTRL_RATE 16000000UL +#define DEFAULT_ACLK_DPCTRL_RATE_ES 288000000UL +#define DEFAULT_ACLK_DPCTRL_RATE_CS 207000000UL +#define DEFAULT_MIDIA_PPLL7_CLOCK_FREQ 1782000000UL + +#define KIRIN970_VCO_MIN_FREQ_OUTPUT 1000000/*Boston: 1000 * 1000*/ +#define KIRIN970_SYS_19M2 19200/*Boston: 19.2f * 1000 */ + +#define MIDIA_PPLL7_CTRL0 0x50c +#define MIDIA_PPLL7_CTRL1 0x510 + +#define MIDIA_PPLL7_FREQ_DEVIDER_MASK GENMASK(25, 2) +#define MIDIA_PPLL7_FRAC_MODE_MASK GENMASK(25, 0) + +#define ACCESS_REGISTER_FN_MAIN_ID_HDCP 0xc500aa01 +#define ACCESS_REGISTER_FN_SUB_ID_HDCP_CTRL (0x55bbccf1) +#define ACCESS_REGISTER_FN_SUB_ID_HDCP_INT (0x55bbccf2) + +/* DSS Registers */ + +/* MACROS */ +#define DSS_WIDTH (width) ((width) - 1) +#define DSS_HEIGHT (height) ((height) - 1) + +#define RES_540P (960 * 540) +#define RES_720P (1280 * 720) +#define RES_1080P (1920 * 1080) +#define RES_1200P (1920 * 1200) +#define RES_1440P (2560 * 1440) +#define RES_1600P (2560 * 1600) +#define RES_4K_PHONE (3840 * 2160) +#define RES_4K_PAD (3840 * 2400) + +#define DFC_MAX_CLIP_NUM (31) + +/* for DFS */ +/* 1480 * 144bits */ +#define DFS_TIME (80) +#define DFS_TIME_MIN (50) +#define DFS_TIME_MIN_4K (10) +#define DBUF0_DEPTH (1408) +#define DBUF1_DEPTH (512) +#define DBUF_WIDTH_BIT (144) + +#define GET_THD_RQOS_IN (max_depth) ((max_depth) * 10 / 100) +#define GET_THD_RQOS_OUT (max_depth) ((max_depth) * 30 / 100) +#define GET_THD_WQOS_IN (max_depth) ((max_depth) * 95 / 100) +#define GET_THD_WQOS_OUT (max_depth) ((max_depth) * 70 / 100) +#define GET_THD_CG_IN (max_depth) ((max_depth) - 1) +#define GET_THD_CG_OUT (max_depth) ((max_depth) * 70 / 100) +#define GET_FLUX_REQ_IN (max_depth) ((max_depth) * 50 / 100) +#define GET_FLUX_REQ_OUT (max_depth) ((max_depth) * 90 / 100) +#define GET_THD_OTHER_DFS_CG_HOLD (max_depth) (0x20) +#define GET_THD_OTHER_WR_WAIT (max_depth) ((max_depth) * 90 / 100) + +#define GET_RDMA_ROT_HQOS_ASSERT_LEV (max_depth) ((max_depth) * 30 / 100) +#define GET_RDMA_ROT_HQOS_REMOVE_LEV (max_depth) ((max_depth) * 60 / 100) + +#define AXI0_MAX_DSS_CHN_THRESHOLD (3) +#define AXI1_MAX_DSS_CHN_THRESHOLD (3) + +#define DEFAULT_AXI_CLK_RATE0 (120 * 1000000) +#define DEFAULT_AXI_CLK_RATE1 (240 * 1000000) +#define DEFAULT_AXI_CLK_RATE2 (360 * 1000000) +#define DEFAULT_AXI_CLK_RATE3 (480 * 1000000) +#define DEFAULT_AXI_CLK_RATE4 (667 * 1000000) +#define DEFAULT_AXI_CLK_RATE5 (800 * 1000000) + +/*****************************************************************************/ + +#define PEREN0 (0x000) +#define PERDIS0 (0x004) +#define PEREN2 (0x020) +#define PERDIS2 (0x024) +#define PERCLKEN2 (0x028) +#define PERSTAT2 (0x02C) +#define PEREN3 (0x030) +#define PERDIS3 (0x034) +#define PERCLKEN3 (0x038) +#define PERSTAT3 (0x03C) +#define PEREN5 (0x050) +#define PERDIS5 (0x054) +#define PERCLKEN5 (0x058) +#define PERSTAT5 (0x05C) +#define PERRSTDIS0 (0x064) +#define PERRSTEN2 (0x078) +#define PERRSTDIS2 (0x07C) +#define PERRSTEN3 (0x084) +#define PERRSTDIS3 (0x088) +#define PERRSTSTAT3 (0x08c) +#define PERRSTEN4 (0x090) +#define PERRSTDIS4 (0x094) +#define PERRSTSTAT4 (0x098) +#define CLKDIV3 (0x0B4) +#define CLKDIV5 (0x0BC) +#define CLKDIV10 (0x0D0) +#define CLKDIV18 (0x0F0) +#define CLKDIV20 (0x0F8) +#define ISOEN (0x144) +#define ISODIS (0x148) +#define ISOSTAT (0x14c) +#define PERPWREN (0x150) +#define PERPWRDIS (0x154) +#define PERPWRSTAT (0x158) +#define PERI_AUTODIV8 (0x380) +#define PERI_AUTODIV9 (0x384) +#define PERI_AUTODIV10 (0x388) + +#define NOC_POWER_IDLEREQ (0x380) +#define NOC_POWER_IDLEACK (0x384) +#define NOC_POWER_IDLE (0x388) + +#define SCPERCLKEN1 (0x048) +#define SCCLKDIV2 (0x258) +#define SCCLKDIV4 (0x260) + +#define PERI_CTRL23 (0x060) +#define PERI_CTRL29 (0x078) +#define PERI_CTRL30 (0x07C) +#define PERI_CTRL32 (0x084) +#define PERI_STAT0 (0x094) +#define PERI_STAT1 (0x098) +#define PERI_STAT16 (0x0D4) + +#define PCTRL_DPHYTX_ULPSEXIT1 BIT(4) +#define PCTRL_DPHYTX_ULPSEXIT0 BIT(3) + +#define PCTRL_DPHYTX_CTRL1 BIT(1) +#define PCTRL_DPHYTX_CTRL0 BIT(0) + +/*****************************************************************************/ + +#define BIT_DSS_GLB_INTS BIT(30) +#define BIT_MMU_IRPT_S BIT(29) +#define BIT_MMU_IRPT_NS BIT(28) +#define BIT_DBG_MCTL_INTS BIT(27) +#define BIT_DBG_WCH1_INTS BIT(26) +#define BIT_DBG_WCH0_INTS BIT(25) +#define BIT_DBG_RCH7_INTS BIT(24) +#define BIT_DBG_RCH6_INTS BIT(23) +#define BIT_DBG_RCH5_INTS BIT(22) +#define BIT_DBG_RCH4_INTS BIT(21) +#define BIT_DBG_RCH3_INTS BIT(20) +#define BIT_DBG_RCH2_INTS BIT(19) +#define BIT_DBG_RCH1_INTS BIT(18) +#define BIT_DBG_RCH0_INTS BIT(17) +#define BIT_ITF0_INTS BIT(16) +#define BIT_DPP_INTS BIT(15) +#define BIT_CMDLIST13 BIT(14) +#define BIT_CMDLIST12 BIT(13) +#define BIT_CMDLIST11 BIT(12) +#define BIT_CMDLIST10 BIT(11) +#define BIT_CMDLIST9 BIT(10) +#define BIT_CMDLIST8 BIT(9) +#define BIT_CMDLIST7 BIT(8) +#define BIT_CMDLIST6 BIT(7) +#define BIT_CMDLIST5 BIT(6) +#define BIT_CMDLIST4 BIT(5) +#define BIT_CMDLIST3 BIT(4) +#define BIT_CMDLIST2 BIT(3) +#define BIT_CMDLIST1 BIT(2) +#define BIT_CMDLIST0 BIT(1) + +#define BIT_SDP_DSS_GLB_INTS BIT(29) +#define BIT_SDP_MMU_IRPT_S BIT(28) +#define BIT_SDP_MMU_IRPT_NS BIT(27) +#define BIT_SDP_DBG_MCTL_INTS BIT(26) +#define BIT_SDP_DBG_WCH1_INTS BIT(25) +#define BIT_SDP_DBG_WCH0_INTS BIT(24) +#define BIT_SDP_DBG_RCH7_INTS BIT(23) +#define BIT_SDP_DBG_RCH6_INTS BIT(22) +#define BIT_SDP_DBG_RCH5_INTS BIT(21) +#define BIT_SDP_DBG_RCH4_INTS BIT(20) +#define BIT_SDP_DBG_RCH3_INTS BIT(19) +#define BIT_SDP_DBG_RCH2_INTS BIT(18) +#define BIT_SDP_DBG_RCH1_INTS BIT(17) +#define BIT_SDP_DBG_RCH0_INTS BIT(16) +#define BIT_SDP_ITF1_INTS BIT(15) +#define BIT_SDP_CMDLIST13 BIT(14) +#define BIT_SDP_CMDLIST12 BIT(13) +#define BIT_SDP_CMDLIST11 BIT(12) +#define BIT_SDP_CMDLIST10 BIT(11) +#define BIT_SDP_CMDLIST9 BIT(10) +#define BIT_SDP_CMDLIST8 BIT(9) +#define BIT_SDP_CMDLIST7 BIT(8) +#define BIT_SDP_CMDLIST6 BIT(7) +#define BIT_SDP_CMDLIST5 BIT(6) +#define BIT_SDP_CMDLIST4 BIT(5) +#define BIT_SDP_CMDLIST3 BIT(4) +#define BIT_SDP_SDP_CMDLIST2 BIT(3) +#define BIT_SDP_CMDLIST1 BIT(2) +#define BIT_SDP_CMDLIST0 BIT(1) +#define BIT_SDP_RCH_CE_INTS BIT(0) + +#define BIT_OFF_DSS_GLB_INTS BIT(31) +#define BIT_OFF_MMU_IRPT_S BIT(30) +#define BIT_OFF_MMU_IRPT_NS BIT(29) +#define BIT_OFF_DBG_MCTL_INTS BIT(28) +#define BIT_OFF_DBG_WCH1_INTS BIT(27) +#define BIT_OFF_DBG_WCH0_INTS BIT(26) +#define BIT_OFF_DBG_RCH7_INTS BIT(25) +#define BIT_OFF_DBG_RCH6_INTS BIT(24) +#define BIT_OFF_DBG_RCH5_INTS BIT(23) +#define BIT_OFF_DBG_RCH4_INTS BIT(22) +#define BIT_OFF_DBG_RCH3_INTS BIT(21) +#define BIT_OFF_DBG_RCH2_INTS BIT(20) +#define BIT_OFF_DBG_RCH1_INTS BIT(19) +#define BIT_OFF_DBG_RCH0_INTS BIT(18) +#define BIT_OFF_WCH1_INTS BIT(17) +#define BIT_OFF_WCH0_INTS BIT(16) +#define BIT_OFF_WCH0_WCH1_FRM_END_INT BIT(15) +#define BIT_OFF_CMDLIST13 BIT(14) +#define BIT_OFF_CMDLIST12 BIT(13) +#define BIT_OFF_CMDLIST11 BIT(12) +#define BIT_OFF_CMDLIST10 BIT(11) +#define BIT_OFF_CMDLIST9 BIT(10) +#define BIT_OFF_CMDLIST8 BIT(9) +#define BIT_OFF_CMDLIST7 BIT(8) +#define BIT_OFF_CMDLIST6 BIT(7) +#define BIT_OFF_CMDLIST5 BIT(6) +#define BIT_OFF_CMDLIST4 BIT(5) +#define BIT_OFF_CMDLIST3 BIT(4) +#define BIT_OFF_CMDLIST2 BIT(3) +#define BIT_OFF_CMDLIST1 BIT(2) +#define BIT_OFF_CMDLIST0 BIT(1) +#define BIT_OFF_RCH_CE_INTS BIT(0) + +#define BIT_OFF_CAM_DBG_WCH2_INTS BIT(4) +#define BIT_OFF_CAM_DBG_RCH8_INTS BIT(3) +#define BIT_OFF_CAM_WCH2_FRMEND_INTS BIT(2) +#define BIT_OFF_CAM_CMDLIST15_INTS BIT(1) +#define BIT_OFF_CAM_CMDLIST14_INTS BIT(0) + +#define BIT_VACTIVE_CNT BIT(14) +#define BIT_DSI_TE_TRI BIT(13) +#define BIT_LCD_TE0_PIN BIT(12) +#define BIT_LCD_TE1_PIN BIT(11) +#define BIT_VACTIVE1_END BIT(10) +#define BIT_VACTIVE1_START BIT(9) +#define BIT_VACTIVE0_END BIT(8) +#define BIT_VACTIVE0_START BIT(7) +#define BIT_VFRONTPORCH BIT(6) +#define BIT_VBACKPORCH BIT(5) +#define BIT_VSYNC BIT(4) +#define BIT_VFRONTPORCH_END BIT(3) +#define BIT_LDI_UNFLOW BIT(2) +#define BIT_FRM_END BIT(1) +#define BIT_FRM_START BIT(0) + +#define BIT_CTL_FLUSH_EN BIT(21) +#define BIT_SCF_FLUSH_EN BIT(19) +#define BIT_DPP0_FLUSH_EN BIT(18) +#define BIT_DBUF1_FLUSH_EN BIT(17) +#define BIT_DBUF0_FLUSH_EN BIT(16) +#define BIT_OV3_FLUSH_EN BIT(15) +#define BIT_OV2_FLUSH_EN BIT(14) +#define BIT_OV1_FLUSH_EN BIT(13) +#define BIT_OV0_FLUSH_EN BIT(12) +#define BIT_WB1_FLUSH_EN BIT(11) +#define BIT_WB0_FLUSH_EN BIT(10) +#define BIT_DMA3_FLUSH_EN BIT(9) +#define BIT_DMA2_FLUSH_EN BIT(8) +#define BIT_DMA1_FLUSH_EN BIT(7) +#define BIT_DMA0_FLUSH_EN BIT(6) +#define BIT_RGB1_FLUSH_EN BIT(4) +#define BIT_RGB0_FLUSH_EN BIT(3) +#define BIT_VIG1_FLUSH_EN BIT(1) +#define BIT_VIG0_FLUSH_EN BIT(0) + +#define BIT_BUS_DBG_INT BIT(5) +#define BIT_CRC_SUM_INT BIT(4) +#define BIT_CRC_ITF1_INT BIT(3) +#define BIT_CRC_ITF0_INT BIT(2) +#define BIT_CRC_OV1_INT BIT(1) +#define BIT_CRC_OV0_INT BIT(0) + +#define BIT_SBL_SEND_FRAME_OUT BIT(19) +#define BIT_SBL_STOP_FRAME_OUT BIT(18) +#define BIT_SBL_BACKLIGHT_OUT BIT(17) +#define BIT_SBL_DARKENH_OUT BIT(16) +#define BIT_SBL_BRIGHTPTR_OUT BIT(15) +#define BIT_STRENGTH_INROI_OUT BIT(14) +#define BIT_STRENGTH_OUTROI_OUT BIT(13) +#define BIT_DONE_OUT BIT(12) +#define BIT_PPROC_DONE_OUT BIT(11) + +#define BIT_HIACE_IND BIT(8) +#define BIT_STRENGTH_INTP BIT(7) +#define BIT_BACKLIGHT_INTP BIT(6) +#define BIT_CE_END_IND BIT(5) +#define BIT_CE_CANCEL_IND BIT(4) +#define BIT_CE_LUT1_RW_COLLIDE_IND BIT(3) +#define BIT_CE_LUT0_RW_COLLIDE_IND BIT(2) +#define BIT_CE_HIST1_RW_COLLIDE_IND BIT(1) +#define BIT_CE_HIST0_RW_COLLIDE_IND BIT(0) + +/* MODULE BASE ADDRESS */ + +#define DSS_MIPI_DSI0_OFFSET (0x00001000) +#define DSS_MIPI_DSI1_OFFSET (0x00001400) + +#define DSS_GLB0_OFFSET (0x12000) + +#define DSS_DBG_OFFSET (0x11000) + +#define DSS_CMDLIST_OFFSET (0x2000) + +#define DSS_VBIF0_AIF (0x7000) +#define DSS_VBIF1_AIF (0x9000) + +#define DSS_MIF_OFFSET (0xA000) + +#define DSS_MCTRL_SYS_OFFSET (0x10000) + +#define DSS_MCTRL_CTL0_OFFSET (0x10800) +#define DSS_MCTRL_CTL1_OFFSET (0x10900) +#define DSS_MCTRL_CTL2_OFFSET (0x10A00) +#define DSS_MCTRL_CTL3_OFFSET (0x10B00) +#define DSS_MCTRL_CTL4_OFFSET (0x10C00) +#define DSS_MCTRL_CTL5_OFFSET (0x10D00) + +#define DSS_RCH_VG0_DMA_OFFSET (0x20000) +#define DSS_RCH_VG0_DFC_OFFSET (0x20100) +#define DSS_RCH_VG0_SCL_OFFSET (0x20200) +#define DSS_RCH_VG0_ARSR_OFFSET (0x20300) +#define DSS_RCH_VG0_PCSC_OFFSET (0x20400) +#define DSS_RCH_VG0_CSC_OFFSET (0x20500) +#define DSS_RCH_VG0_DEBUG_OFFSET (0x20600) +#define DSS_RCH_VG0_VPP_OFFSET (0x20700) +#define DSS_RCH_VG0_DMA_BUF_OFFSET (0x20800) +#define DSS_RCH_VG0_AFBCD_OFFSET (0x20900) +#define DSS_RCH_VG0_REG_DEFAULT_OFFSET (0x20A00) +#define DSS_RCH_VG0_SCL_LUT_OFFSET (0x21000) +#define DSS_RCH_VG0_ARSR_LUT_OFFSET (0x25000) + +#define DSS_RCH_VG1_DMA_OFFSET (0x28000) +#define DSS_RCH_VG1_DFC_OFFSET (0x28100) +#define DSS_RCH_VG1_SCL_OFFSET (0x28200) +#define DSS_RCH_VG1_CSC_OFFSET (0x28500) +#define DSS_RCH_VG1_DEBUG_OFFSET (0x28600) +#define DSS_RCH_VG1_VPP_OFFSET (0x28700) +#define DSS_RCH_VG1_DMA_BUF_OFFSET (0x28800) +#define DSS_RCH_VG1_AFBCD_OFFSET (0x28900) +#define DSS_RCH_VG1_REG_DEFAULT_OFFSET (0x28A00) +#define DSS_RCH_VG1_SCL_LUT_OFFSET (0x29000) + +#define DSS_RCH_VG2_DMA_OFFSET (0x30000) +#define DSS_RCH_VG2_DFC_OFFSET (0x30100) +#define DSS_RCH_VG2_SCL_OFFSET (0x30200) +#define DSS_RCH_VG2_CSC_OFFSET (0x30500) +#define DSS_RCH_VG2_DEBUG_OFFSET (0x30600) +#define DSS_RCH_VG2_VPP_OFFSET (0x30700) +#define DSS_RCH_VG2_DMA_BUF_OFFSET (0x30800) +#define DSS_RCH_VG2_REG_DEFAULT_OFFSET (0x30A00) +#define DSS_RCH_VG2_SCL_LUT_OFFSET (0x31000) + +#define DSS_RCH_G0_DMA_OFFSET (0x38000) +#define DSS_RCH_G0_DFC_OFFSET (0x38100) +#define DSS_RCH_G0_SCL_OFFSET (0x38200) +#define DSS_RCH_G0_CSC_OFFSET (0x38500) +#define DSS_RCH_G0_DEBUG_OFFSET (0x38600) +#define DSS_RCH_G0_DMA_BUF_OFFSET (0x38800) +#define DSS_RCH_G0_AFBCD_OFFSET (0x38900) +#define DSS_RCH_G0_REG_DEFAULT_OFFSET (0x38A00) + +#define DSS_RCH_G1_DMA_OFFSET (0x40000) +#define DSS_RCH_G1_DFC_OFFSET (0x40100) +#define DSS_RCH_G1_SCL_OFFSET (0x40200) +#define DSS_RCH_G1_CSC_OFFSET (0x40500) +#define DSS_RCH_G1_DEBUG_OFFSET (0x40600) +#define DSS_RCH_G1_DMA_BUF_OFFSET (0x40800) +#define DSS_RCH_G1_AFBCD_OFFSET (0x40900) +#define DSS_RCH_G1_REG_DEFAULT_OFFSET (0x40A00) + +#define DSS_RCH_D2_DMA_OFFSET (0x50000) +#define DSS_RCH_D2_DFC_OFFSET (0x50100) +#define DSS_RCH_D2_CSC_OFFSET (0x50500) +#define DSS_RCH_D2_DEBUG_OFFSET (0x50600) +#define DSS_RCH_D2_DMA_BUF_OFFSET (0x50800) + +#define DSS_RCH_D3_DMA_OFFSET (0x51000) +#define DSS_RCH_D3_DFC_OFFSET (0x51100) +#define DSS_RCH_D3_CSC_OFFSET (0x51500) +#define DSS_RCH_D3_DEBUG_OFFSET (0x51600) +#define DSS_RCH_D3_DMA_BUF_OFFSET (0x51800) + +#define DSS_RCH_D0_DMA_OFFSET (0x52000) +#define DSS_RCH_D0_DFC_OFFSET (0x52100) +#define DSS_RCH_D0_CSC_OFFSET (0x52500) +#define DSS_RCH_D0_DEBUG_OFFSET (0x52600) +#define DSS_RCH_D0_DMA_BUF_OFFSET (0x52800) +#define DSS_RCH_D0_AFBCD_OFFSET (0x52900) + +#define DSS_RCH_D1_DMA_OFFSET (0x53000) +#define DSS_RCH_D1_DFC_OFFSET (0x53100) +#define DSS_RCH_D1_CSC_OFFSET (0x53500) +#define DSS_RCH_D1_DEBUG_OFFSET (0x53600) +#define DSS_RCH_D1_DMA_BUF_OFFSET (0x53800) + +#define DSS_WCH0_DMA_OFFSET (0x5A000) +#define DSS_WCH0_DFC_OFFSET (0x5A100) +#define DSS_WCH0_CSC_OFFSET (0x5A500) +#define DSS_WCH0_DEBUG_OFFSET (0x5A600) +#define DSS_WCH0_DMA_BUFFER_OFFSET (0x5A800) +#define DSS_WCH0_AFBCE_OFFSET (0x5A900) + +#define DSS_WCH1_DMA_OFFSET (0x5C000) +#define DSS_WCH1_DFC_OFFSET (0x5C100) +#define DSS_WCH1_CSC_OFFSET (0x5C500) +#define DSS_WCH1_DEBUG_OFFSET (0x5C600) +#define DSS_WCH1_DMA_BUFFER_OFFSET (0x5C800) +#define DSS_WCH1_AFBCE_OFFSET (0x5C900) + +#define DSS_WCH2_DMA_OFFSET (0x5E000) +#define DSS_WCH2_DFC_OFFSET (0x5E100) +#define DSS_WCH2_CSC_OFFSET (0x5E500) +#define DSS_WCH2_ROT_OFFSET (0x5E500) +#define DSS_WCH2_DEBUG_OFFSET (0x5E600) +#define DSS_WCH2_DMA_BUFFER_OFFSET (0x5E800) +#define DSS_WCH2_AFBCE_OFFSET (0x5E900) + +#define DSS_OVL0_OFFSET (0x60000) +#define DSS_OVL1_OFFSET (0x60400) +#define DSS_OVL2_OFFSET (0x60800) +#define DSS_OVL3_OFFSET (0x60C00) + +#define DSS_DBUF0_OFFSET (0x6D000) +#define DSS_DBUF1_OFFSET (0x6E000) + +#define DSS_HI_ACE_OFFSET (0x6F000) + +#define DSS_DPP_OFFSET (0x70000) +#define DSS_TOP_OFFSET (0x70000) +#define DSS_DPP_COLORBAR_OFFSET (0x70100) +#define DSS_DPP_DITHER_OFFSET (0x70200) +#define DSS_DPP_CSC_RGB2YUV10B_OFFSET (0x70300) +#define DSS_DPP_CSC_YUV2RGB10B_OFFSET (0x70400) +#define DSS_DPP_GAMA_OFFSET (0x70600) +#define DSS_DPP_ACM_OFFSET (0x70700) +#define DSS_DPP_ACE_OFFSET (0x70800) +#define DSS_DPP_GAMA_LUT_OFFSET (0x71000) +#define DSS_DPP_ACM_LUT_OFFSET (0x72000) +#define DSS_DPP_ACE_LUT_OFFSET (0x79000) + +#define DSS_DPP_SBL_OFFSET (0x7C000) +#define DSS_LDI0_OFFSET (0x7D000) +#define DSS_IFBC_OFFSET (0x7D800) +#define DSS_DSC_OFFSET (0x7DC00) +#define DSS_LDI1_OFFSET (0x7E000) + +/* GLB */ +#define GLB_DSS_TAG (DSS_GLB0_OFFSET + 0x0000) + +#define GLB_APB_CTL (DSS_GLB0_OFFSET + 0x0004) + +#define GLB_DSS_AXI_RST_EN (DSS_GLB0_OFFSET + 0x0118) +#define GLB_DSS_APB_RST_EN (DSS_GLB0_OFFSET + 0x011C) +#define GLB_DSS_CORE_RST_EN (DSS_GLB0_OFFSET + 0x0120) +#define GLB_PXL0_DIV2_RST_EN (DSS_GLB0_OFFSET + 0x0124) +#define GLB_PXL0_DIV4_RST_EN (DSS_GLB0_OFFSET + 0x0128) +#define GLB_PXL0_RST_EN (DSS_GLB0_OFFSET + 0x012C) +#define GLB_PXL0_DSI_RST_EN (DSS_GLB0_OFFSET + 0x0130) +#define GLB_DSS_PXL1_RST_EN (DSS_GLB0_OFFSET + 0x0134) +#define GLB_MM_AXI_CLK_RST_EN (DSS_GLB0_OFFSET + 0x0138) +#define GLB_AFBCD0_IP_RST_EN (DSS_GLB0_OFFSET + 0x0140) +#define GLB_AFBCD1_IP_RST_EN (DSS_GLB0_OFFSET + 0x0144) +#define GLB_AFBCD2_IP_RST_EN (DSS_GLB0_OFFSET + 0x0148) +#define GLB_AFBCD3_IP_RST_EN (DSS_GLB0_OFFSET + 0x014C) +#define GLB_AFBCD4_IP_RST_EN (DSS_GLB0_OFFSET + 0x0150) +#define GLB_AFBCD5_IP_RST_EN (DSS_GLB0_OFFSET + 0x0154) +#define GLB_AFBCD6_IP_RST_EN (DSS_GLB0_OFFSET + 0x0158) +#define GLB_AFBCD7_IP_RST_EN (DSS_GLB0_OFFSET + 0x015C) +#define GLB_AFBCE0_IP_RST_EN (DSS_GLB0_OFFSET + 0x0160) +#define GLB_AFBCE1_IP_RST_EN (DSS_GLB0_OFFSET + 0x0164) + +#define GLB_MCU_PDP_INTS (DSS_GLB0_OFFSET + 0x20C) +#define GLB_MCU_PDP_INT_MSK (DSS_GLB0_OFFSET + 0x210) +#define GLB_MCU_SDP_INTS (DSS_GLB0_OFFSET + 0x214) +#define GLB_MCU_SDP_INT_MSK (DSS_GLB0_OFFSET + 0x218) +#define GLB_MCU_OFF_INTS (DSS_GLB0_OFFSET + 0x21C) +#define GLB_MCU_OFF_INT_MSK (DSS_GLB0_OFFSET + 0x220) +#define GLB_MCU_OFF_CAM_INTS (DSS_GLB0_OFFSET + 0x2B4) +#define GLB_MCU_OFF_CAM_INT_MSK (DSS_GLB0_OFFSET + 0x2B8) +#define GLB_CPU_PDP_INTS (DSS_GLB0_OFFSET + 0x224) +#define GLB_CPU_PDP_INT_MSK (DSS_GLB0_OFFSET + 0x228) +#define GLB_CPU_SDP_INTS (DSS_GLB0_OFFSET + 0x22C) +#define GLB_CPU_SDP_INT_MSK (DSS_GLB0_OFFSET + 0x230) +#define GLB_CPU_OFF_INTS (DSS_GLB0_OFFSET + 0x234) +#define GLB_CPU_OFF_INT_MSK (DSS_GLB0_OFFSET + 0x238) +#define GLB_CPU_OFF_CAM_INTS (DSS_GLB0_OFFSET + 0x2AC) +#define GLB_CPU_OFF_CAM_INT_MSK (DSS_GLB0_OFFSET + 0x2B0) + +#define GLB_MODULE_CLK_SEL (DSS_GLB0_OFFSET + 0x0300) +#define GLB_MODULE_CLK_EN (DSS_GLB0_OFFSET + 0x0304) + +#define GLB_GLB0_DBG_SEL (DSS_GLB0_OFFSET + 0x310) +#define GLB_GLB1_DBG_SEL (DSS_GLB0_OFFSET + 0x314) +#define GLB_DBG_IRQ_CPU (DSS_GLB0_OFFSET + 0x320) +#define GLB_DBG_IRQ_MCU (DSS_GLB0_OFFSET + 0x324) + +#define GLB_TP_SEL (DSS_GLB0_OFFSET + 0x0400) +#define GLB_CRC_DBG_LDI0 (DSS_GLB0_OFFSET + 0x0404) +#define GLB_CRC_DBG_LDI1 (DSS_GLB0_OFFSET + 0x0408) +#define GLB_CRC_LDI0_EN (DSS_GLB0_OFFSET + 0x040C) +#define GLB_CRC_LDI0_FRM (DSS_GLB0_OFFSET + 0x0410) +#define GLB_CRC_LDI1_EN (DSS_GLB0_OFFSET + 0x0414) +#define GLB_CRC_LDI1_FRM (DSS_GLB0_OFFSET + 0x0418) + +#define GLB_DSS_MEM_CTRL (DSS_GLB0_OFFSET + 0x0600) +#define GLB_DSS_PM_CTRL (DSS_GLB0_OFFSET + 0x0604) + +/* DBG */ +#define DBG_CRC_DBG_OV0 (0x0000) +#define DBG_CRC_DBG_OV1 (0x0004) +#define DBG_CRC_DBG_SUM (0x0008) +#define DBG_CRC_OV0_EN (0x000C) +#define DBG_DSS_GLB_DBG_O (0x0010) +#define DBG_DSS_GLB_DBG_I (0x0014) +#define DBG_CRC_OV0_FRM (0x0018) +#define DBG_CRC_OV1_EN (0x001C) +#define DBG_CRC_OV1_FRM (0x0020) +#define DBG_CRC_SUM_EN (0x0024) +#define DBG_CRC_SUM_FRM (0x0028) + +#define DBG_MCTL_INTS (0x023C) +#define DBG_MCTL_INT_MSK (0x0240) +#define DBG_WCH0_INTS (0x0244) +#define DBG_WCH0_INT_MSK (0x0248) +#define DBG_WCH1_INTS (0x024C) +#define DBG_WCH1_INT_MSK (0x0250) +#define DBG_RCH0_INTS (0x0254) +#define DBG_RCH0_INT_MSK (0x0258) +#define DBG_RCH1_INTS (0x025C) +#define DBG_RCH1_INT_MSK (0x0260) +#define DBG_RCH2_INTS (0x0264) +#define DBG_RCH2_INT_MSK (0x0268) +#define DBG_RCH3_INTS (0x026C) +#define DBG_RCH3_INT_MSK (0x0270) +#define DBG_RCH4_INTS (0x0274) +#define DBG_RCH4_INT_MSK (0x0278) +#define DBG_RCH5_INTS (0x027C) +#define DBG_RCH5_INT_MSK (0x0280) +#define DBG_RCH6_INTS (0x0284) +#define DBG_RCH6_INT_MSK (0x0288) +#define DBG_RCH7_INTS (0x028C) +#define DBG_RCH7_INT_MSK (0x0290) +#define DBG_DSS_GLB_INTS (0x0294) +#define DBG_DSS_GLB_INT_MSK (0x0298) +#define DBG_WCH2_INTS (0x029C) +#define DBG_WCH2_INT_MSK (0x02A0) +#define DBG_RCH8_INTS (0x02A4) +#define DBG_RCH8_INT_MSK (0x02A8) + +/* CMDLIST */ + +#define CMDLIST_CH0_PENDING_CLR (0x0000) +#define CMDLIST_CH0_CTRL (0x0004) +#define CMDLIST_CH0_STATUS (0x0008) +#define CMDLIST_CH0_STAAD (0x000C) +#define CMDLIST_CH0_CURAD (0x0010) +#define CMDLIST_CH0_INTE (0x0014) +#define CMDLIST_CH0_INTC (0x0018) +#define CMDLIST_CH0_INTS (0x001C) +#define CMDLIST_CH0_SCENE (0x0020) +#define CMDLIST_CH0_DBG (0x0028) + +#define CMDLIST_DBG (0x0700) +#define CMDLIST_BUF_DBG_EN (0x0704) +#define CMDLIST_BUF_DBG_CNT_CLR (0x0708) +#define CMDLIST_BUF_DBG_CNT (0x070C) +#define CMDLIST_TIMEOUT_TH (0x0710) +#define CMDLIST_START (0x0714) +#define CMDLIST_ADDR_MASK_EN (0x0718) +#define CMDLIST_ADDR_MASK_DIS (0x071C) +#define CMDLIST_ADDR_MASK_STATUS (0x0720) +#define CMDLIST_TASK_CONTINUE (0x0724) +#define CMDLIST_TASK_STATUS (0x0728) +#define CMDLIST_CTRL (0x072C) +#define CMDLIST_SECU (0x0730) +#define CMDLIST_INTS (0x0734) +#define CMDLIST_SWRST (0x0738) +#define CMD_MEM_CTRL (0x073C) +#define CMD_CLK_SEL (0x0740) +#define CMD_CLK_EN (0x0744) + +#define HISI_DSS_MIN_ROT_AFBCE_BLOCK_SIZE (256) +#define HISI_DSS_MAX_ROT_AFBCE_BLOCK_SIZE (480) + +#define BIT_CMDLIST_CH_TASKDONE_INTS BIT(7) +#define BIT_CMDLIST_CH_TIMEOUT_INTS BIT(6) +#define BIT_CMDLIST_CH_BADCMD_INTS BIT(5) +#define BIT_CMDLIST_CH_START_INTS BIT(4) +#define BIT_CMDLIST_CH_PENDING_INTS BIT(3) +#define BIT_CMDLIST_CH_AXIERR_INTS BIT(2) +#define BIT_CMDLIST_CH_ALLDONE_INTS BIT(1) +#define BIT_CMDLIST_CH_ONEDONE_INTS BIT(0) + +#define BIT_CMDLIST_CH15_INTS BIT(15) +#define BIT_CMDLIST_CH14_INTS BIT(14) +#define BIT_CMDLIST_CH13_INTS BIT(13) +#define BIT_CMDLIST_CH12_INTS BIT(12) +#define BIT_CMDLIST_CH11_INTS BIT(11) +#define BIT_CMDLIST_CH10_INTS BIT(10) +#define BIT_CMDLIST_CH9_INTS BIT(9) +#define BIT_CMDLIST_CH8_INTS BIT(8) +#define BIT_CMDLIST_CH7_INTS BIT(7) +#define BIT_CMDLIST_CH6_INTS BIT(6) +#define BIT_CMDLIST_CH5_INTS BIT(5) +#define BIT_CMDLIST_CH4_INTS BIT(4) +#define BIT_CMDLIST_CH3_INTS BIT(3) +#define BIT_CMDLIST_CH2_INTS BIT(2) +#define BIT_CMDLIST_CH1_INTS BIT(1) +#define BIT_CMDLIST_CH0_INTS BIT(0) + +/* AIF */ +#define AIF0_CH0_OFFSET (DSS_VBIF0_AIF + 0x00) +#define AIF0_CH1_OFFSET (DSS_VBIF0_AIF + 0x20) +#define AIF0_CH2_OFFSET (DSS_VBIF0_AIF + 0x40) +#define AIF0_CH3_OFFSET (DSS_VBIF0_AIF + 0x60) +#define AIF0_CH4_OFFSET (DSS_VBIF0_AIF + 0x80) +#define AIF0_CH5_OFFSET (DSS_VBIF0_AIF + 0xA0) +#define AIF0_CH6_OFFSET (DSS_VBIF0_AIF + 0xC0) +#define AIF0_CH7_OFFSET (DSS_VBIF0_AIF + 0xE0) +#define AIF0_CH8_OFFSET (DSS_VBIF0_AIF + 0x100) +#define AIF0_CH9_OFFSET (DSS_VBIF0_AIF + 0x120) +#define AIF0_CH10_OFFSET (DSS_VBIF0_AIF + 0x140) +#define AIF0_CH11_OFFSET (DSS_VBIF0_AIF + 0x160) +#define AIF0_CH12_OFFSET (DSS_VBIF0_AIF + 0x180) + +#define AIF1_CH0_OFFSET (DSS_VBIF1_AIF + 0x00) +#define AIF1_CH1_OFFSET (DSS_VBIF1_AIF + 0x20) +#define AIF1_CH2_OFFSET (DSS_VBIF1_AIF + 0x40) +#define AIF1_CH3_OFFSET (DSS_VBIF1_AIF + 0x60) +#define AIF1_CH4_OFFSET (DSS_VBIF1_AIF + 0x80) +#define AIF1_CH5_OFFSET (DSS_VBIF1_AIF + 0xA0) +#define AIF1_CH6_OFFSET (DSS_VBIF1_AIF + 0xC0) +#define AIF1_CH7_OFFSET (DSS_VBIF1_AIF + 0xE0) +#define AIF1_CH8_OFFSET (DSS_VBIF1_AIF + 0x100) +#define AIF1_CH9_OFFSET (DSS_VBIF1_AIF + 0x120) +#define AIF1_CH10_OFFSET (DSS_VBIF1_AIF + 0x140) +#define AIF1_CH11_OFFSET (DSS_VBIF1_AIF + 0x160) +#define AIF1_CH12_OFFSET (DSS_VBIF1_AIF + 0x180) + +/* aif dmax */ + +#define AIF_CH_CTL (0x0000) + +#define AIF_CH_CTL_ADD (0x0004) + +/* aif common */ +#define AXI0_RID_MSK0 (0x0800) +#define AXI0_RID_MSK1 (0x0804) +#define AXI0_WID_MSK (0x0808) +#define AXI0_R_QOS_MAP (0x080c) +#define AXI1_RID_MSK0 (0x0810) +#define AXI1_RID_MSK1 (0x0814) +#define AXI1_WID_MSK (0x0818) +#define AXI1_R_QOS_MAP (0x081c) +#define AIF_CLK_SEL0 (0x0820) +#define AIF_CLK_SEL1 (0x0824) +#define AIF_CLK_EN0 (0x0828) +#define AIF_CLK_EN1 (0x082c) +#define MONITOR_CTRL (0x0830) +#define MONITOR_TIMER_INI (0x0834) +#define DEBUG_BUF_BASE (0x0838) +#define DEBUG_CTRL (0x083C) +#define AIF_SHADOW_READ (0x0840) +#define AIF_MEM_CTRL (0x0844) +#define AIF_MONITOR_EN (0x0848) +#define AIF_MONITOR_CTRL (0x084C) +#define AIF_MONITOR_SAMPLE_MUN (0x0850) +#define AIF_MONITOR_SAMPLE_TIME (0x0854) +#define AIF_MONITOR_SAMPLE_FLOW (0x0858) + +/* aif debug */ +#define AIF_MONITOR_READ_DATA (0x0880) +#define AIF_MONITOR_WRITE_DATA (0x0884) +#define AIF_MONITOR_WINDOW_CYCLE (0x0888) +#define AIF_MONITOR_WBURST_CNT (0x088C) +#define AIF_MONITOR_MIN_WR_CYCLE (0x0890) +#define AIF_MONITOR_MAX_WR_CYCLE (0x0894) +#define AIF_MONITOR_AVR_WR_CYCLE (0x0898) +#define AIF_MONITOR_MIN_WRW_CYCLE (0x089C) +#define AIF_MONITOR_MAX_WRW_CYCLE (0x08A0) +#define AIF_MONITOR_AVR_WRW_CYCLE (0x08A4) +#define AIF_MONITOR_RBURST_CNT (0x08A8) +#define AIF_MONITOR_MIN_RD_CYCLE (0x08AC) +#define AIF_MONITOR_MAX_RD_CYCLE (0x08B0) +#define AIF_MONITOR_AVR_RD_CYCLE (0x08B4) +#define AIF_MONITOR_MIN_RDW_CYCLE (0x08B8) +#define AIF_MONITOR_MAX_RDW_CYCLE (0x08BC) +#define AIF_MONITOR_AVR_RDW_CYCLE (0x08C0) +#define AIF_CH_STAT_0 (0x08C4) +#define AIF_CH_STAT_1 (0x08C8) + +#define AIF_MODULE_CLK_SEL (0x0A04) +#define AIF_MODULE_CLK_EN (0x0A08) + +/* MIF */ + +/* +* stretch blt, linear/tile, rotation, pixel format +* 0 0 000 +*/ +enum dss_mmu_tlb_tag_org { + MMU_TLB_TAG_ORG_0x0 =0x0 , + MMU_TLB_TAG_ORG_0x1 =0x1 , + MMU_TLB_TAG_ORG_0x2 =0x2 , + MMU_TLB_TAG_ORG_0x3 =0x3 , + MMU_TLB_TAG_ORG_0x4 =0x4 , + MMU_TLB_TAG_ORG_0x7 =0x7 , + + MMU_TLB_TAG_ORG_0x8 =0x8 , + MMU_TLB_TAG_ORG_0x9 =0x9 , + MMU_TLB_TAG_ORG_0xA =0xA , + MMU_TLB_TAG_ORG_0xB =0xB , + MMU_TLB_TAG_ORG_0xC =0xC , + MMU_TLB_TAG_ORG_0xF =0xF , + + MMU_TLB_TAG_ORG_0x10 =0x10 , + MMU_TLB_TAG_ORG_0x11 =0x11 , + MMU_TLB_TAG_ORG_0x12 =0x12 , + MMU_TLB_TAG_ORG_0x13 =0x13 , + MMU_TLB_TAG_ORG_0x14 =0x14 , + MMU_TLB_TAG_ORG_0x17 =0x17 , + + MMU_TLB_TAG_ORG_0x18 =0x18 , + MMU_TLB_TAG_ORG_0x19 =0x19 , + MMU_TLB_TAG_ORG_0x1A =0x1A , + MMU_TLB_TAG_ORG_0x1B =0x1B , + MMU_TLB_TAG_ORG_0x1C =0x1C , + MMU_TLB_TAG_ORG_0x1F =0x1F , +}; + +#define MIF_ENABLE (0x0000) +#define MIF_MEM_CTRL (0x0004) + +#define MIF_CTRL0 (0x000) +#define MIF_CTRL1 (0x004) +#define MIF_CTRL2 (0x008) +#define MIF_CTRL3 (0x00C) +#define MIF_CTRL4 (0x010) +#define MIF_CTRL5 (0x014) +#define REG_DEFAULT (0x0500) +#define MIF_SHADOW_READ (0x0504) +#define MIF_CLK_CTL (0x0508) + +#define MIF_STAT0 (0x0600) + +#define MIF_STAT1 (0x0604) + +#define MIF_STAT2 (0x0608) + +#define MIF_CTRL_OFFSET (0x20) +#define MIF_CH0_OFFSET (DSS_MIF_OFFSET + MIF_CTRL_OFFSET * 1) +#define MIF_CH1_OFFSET (DSS_MIF_OFFSET + MIF_CTRL_OFFSET * 2) +#define MIF_CH2_OFFSET (DSS_MIF_OFFSET + MIF_CTRL_OFFSET * 3) +#define MIF_CH3_OFFSET (DSS_MIF_OFFSET + MIF_CTRL_OFFSET * 4) +#define MIF_CH4_OFFSET (DSS_MIF_OFFSET + MIF_CTRL_OFFSET * 5) +#define MIF_CH5_OFFSET (DSS_MIF_OFFSET + MIF_CTRL_OFFSET * 6) +#define MIF_CH6_OFFSET (DSS_MIF_OFFSET + MIF_CTRL_OFFSET * 7) +#define MIF_CH7_OFFSET (DSS_MIF_OFFSET + MIF_CTRL_OFFSET * 8) +#define MIF_CH8_OFFSET (DSS_MIF_OFFSET + MIF_CTRL_OFFSET * 9) +#define MIF_CH9_OFFSET (DSS_MIF_OFFSET + MIF_CTRL_OFFSET * 10) +#define MIF_CH10_OFFSET (DSS_MIF_OFFSET + MIF_CTRL_OFFSET * 11) +#define MIF_CH11_OFFSET (DSS_MIF_OFFSET + MIF_CTRL_OFFSET * 12) +#define MIF_CTRL_NUM (12) + +#define LITTLE_LAYER_BUF_SIZE (256 * 1024) +#define MIF_STRIDE_UNIT (4 * 1024) + +/* SMMU */ +#define SMMU_SCR (0x0000) +#define SMMU_MEMCTRL (0x0004) +#define SMMU_LP_CTRL (0x0008) +#define SMMU_PRESS_REMAP (0x000C) +#define SMMU_INTMASK_NS (0x0010) +#define SMMU_INTRAW_NS (0x0014) +#define SMMU_INTSTAT_NS (0x0018) +#define SMMU_INTCLR_NS (0x001C) + +#define SMMU_SMRx_NS (0x0020) +#define SMMU_RLD_EN0_NS (0x01F0) +#define SMMU_RLD_EN1_NS (0x01F4) +#define SMMU_RLD_EN2_NS (0x01F8) +#define SMMU_CB_SCTRL (0x0200) +#define SMMU_CB_TTBR0 (0x0204) +#define SMMU_CB_TTBR1 (0x0208) +#define SMMU_CB_TTBCR (0x020C) +#define SMMU_OFFSET_ADDR_NS (0x0210) +#define SMMU_SCACHEI_ALL (0x0214) +#define SMMU_SCACHEI_L1 (0x0218) +#define SMMU_SCACHEI_L2L3 (0x021C) +#define SMMU_FAMA_CTRL0 (0x0220) +#define SMMU_FAMA_CTRL1 (0x0224) +#define SMMU_ADDR_MSB (0x0300) +#define SMMU_ERR_RDADDR (0x0304) +#define SMMU_ERR_WRADDR (0x0308) +#define SMMU_FAULT_ADDR_TCU (0x0310) +#define SMMU_FAULT_ID_TCU (0x0314) + +#define SMMU_FAULT_ADDR_TBUx (0x0320) +#define SMMU_FAULT_ID_TBUx (0x0324) +#define SMMU_FAULT_INFOx (0x0328) +#define SMMU_DBGRPTR_TLB (0x0380) +#define SMMU_DBGRDATA_TLB (0x0380) +#define SMMU_DBGRDATA0_CACHE (0x038C) +#define SMMU_DBGRDATA1_CACHE (0x0390) +#define SMMU_DBGAXI_CTRL (0x0394) +#define SMMU_OVA_ADDR (0x0398) +#define SMMU_OPA_ADDR (0x039C) +#define SMMU_OVA_CTRL (0x03A0) +#define SMMU_OPREF_ADDR (0x03A4) +#define SMMU_OPREF_CTRL (0x03A8) +#define SMMU_OPREF_CNT (0x03AC) + +#define SMMU_SMRx_S (0x0500) +#define SMMU_RLD_EN0_S (0x06F0) +#define SMMU_RLD_EN1_S (0x06F4) +#define SMMU_RLD_EN2_S (0x06F8) +#define SMMU_INTMAS_S (0x0700) +#define SMMU_INTRAW_S (0x0704) +#define SMMU_INTSTAT_S (0x0708) +#define SMMU_INTCLR_S (0x070C) +#define SMMU_SCR_S (0x0710) +#define SMMU_SCB_SCTRL (0x0714) +#define SMMU_SCB_TTBR (0x0718) +#define SMMU_SCB_TTBCR (0x071C) +#define SMMU_OFFSET_ADDR_S (0x0720) + +#define SMMU_SID_NUM (64) + +/* RDMA */ + +#define DMA_OFT_X0 (0x0000) +#define DMA_OFT_Y0 (0x0004) +#define DMA_OFT_X1 (0x0008) +#define DMA_OFT_Y1 (0x000C) +#define DMA_MASK0 (0x0010) +#define DMA_MASK1 (0x0014) +#define DMA_STRETCH_SIZE_VRT (0x0018) +#define DMA_CTRL (0x001C) +#define DMA_TILE_SCRAM (0x0020) + +#define DMA_PULSE (0x0028) +#define DMA_CORE_GT (0x002C) +#define RWCH_CFG0 (0x0030) + +#define WDMA_DMA_SW_MASK_EN (0x004C) +#define WDMA_DMA_START_MASK0 (0x0050) +#define WDMA_DMA_END_MASK0 (0x0054) +#define WDMA_DMA_START_MASK1 (0x0058) +#define WDMA_DMA_END_MASK1 (0x005C) + +#define DMA_DATA_ADDR0 (0x0060) +#define DMA_STRIDE0 (0x0064) +#define DMA_STRETCH_STRIDE0 (0x0068) +#define DMA_DATA_NUM0 (0x006C) + +#define DMA_TEST0 (0x0070) +#define DMA_TEST1 (0x0074) +#define DMA_TEST3 (0x0078) +#define DMA_TEST4 (0x007C) +#define DMA_STATUS_Y (0x0080) + +#define DMA_DATA_ADDR1 (0x0084) +#define DMA_STRIDE1 (0x0088) +#define DMA_STRETCH_STRIDE1 (0x008C) +#define DMA_DATA_NUM1 (0x0090) + +#define DMA_TEST0_U (0x0094) +#define DMA_TEST1_U (0x0098) +#define DMA_TEST3_U (0x009C) +#define DMA_TEST4_U (0x00A0) +#define DMA_STATUS_U (0x00A4) + +#define DMA_DATA_ADDR2 (0x00A8) +#define DMA_STRIDE2 (0x00AC) +#define DMA_STRETCH_STRIDE2 (0x00B0) +#define DMA_DATA_NUM2 (0x00B4) + +#define DMA_TEST0_V (0x00B8) +#define DMA_TEST1_V (0x00BC) +#define DMA_TEST3_V (0x00C0) +#define DMA_TEST4_V (0x00C4) +#define DMA_STATUS_V (0x00C8) + +#define CH_RD_SHADOW (0x00D0) +#define CH_CTL (0x00D4) +#define CH_SECU_EN (0x00D8) +#define CH_SW_END_REQ (0x00DC) +#define CH_CLK_SEL (0x00E0) +#define CH_CLK_EN (0x00E4) + +/* DFC */ +#define DFC_DISP_SIZE (0x0000) +#define DFC_PIX_IN_NUM (0x0004) +#define DFC_DISP_FMT (0x000C) +#define DFC_CLIP_CTL_HRZ (0x0010) +#define DFC_CLIP_CTL_VRZ (0x0014) +#define DFC_CTL_CLIP_EN (0x0018) +#define DFC_ICG_MODULE (0x001C) +#define DFC_DITHER_ENABLE (0x0020) +#define DFC_PADDING_CTL (0x0024) + +#define DSS_SCF_H0_Y_COEF_OFFSET (0x0000) +#define DSS_SCF_Y_COEF_OFFSET (0x2000) +#define DSS_SCF_UV_COEF_OFFSET (0x2800) + +#define SCF_EN_HSCL_STR (0x0000) +#define SCF_EN_VSCL_STR (0x0004) +#define SCF_H_V_ORDER (0x0008) +#define SCF_SCF_CORE_GT (0x000C) +#define SCF_INPUT_WIDTH_HEIGHT (0x0010) +#define SCF_OUTPUT_WIDTH_HEIGHT (0x0014) +#define SCF_COEF_MEM_CTRL (0x0018) +#define SCF_EN_HSCL (0x001C) +#define SCF_EN_VSCL (0x0020) +#define SCF_ACC_HSCL (0x0024) +#define SCF_ACC_HSCL1 (0x0028) +#define SCF_INC_HSCL (0x0034) +#define SCF_ACC_VSCL (0x0038) +#define SCF_ACC_VSCL1 (0x003C) +#define SCF_INC_VSCL (0x0048) +#define SCF_EN_NONLINEAR (0x004C) +#define SCF_EN_MMP (0x007C) +#define SCF_DB_H0 (0x0080) +#define SCF_DB_H1 (0x0084) +#define SCF_DB_V0 (0x0088) +#define SCF_DB_V1 (0x008C) +#define SCF_LB_MEM_CTRL (0x0090) +#define SCF_RD_SHADOW (0x00F0) +#define SCF_CLK_SEL (0x00F8) +#define SCF_CLK_EN (0x00FC) +#define WCH_SCF_COEF_MEM_CTRL (0x0218) +#define WCH_SCF_LB_MEM_CTRL (0x290) + +/* MACROS */ +#define SCF_MIN_INPUT (16) +#define SCF_MIN_OUTPUT (16) + +/* SCF */ + +enum scl_coef_lut_idx { +SCL_COEF_NONE_IDX =-1 , +SCL_COEF_YUV_IDX =0 , +SCL_COEF_RGB_IDX =1 , +SCL_COEF_IDX_MAX =2 , +}; + +/* Threshold for SCF Stretch and SCF filter */ +#define RDMA_STRETCH_THRESHOLD (2) +#define SCF_INC_FACTOR BIT(18) +#define SCF_UPSCALE_MAX (60) +#define SCF_DOWNSCALE_MAX (60) +#define SCF_EDGE_FACTOR (3) +#define ARSR2P_INC_FACTOR (65536) + +/* ARSR2P v0 */ +#define ARSR2P_INPUT_WIDTH_HEIGHT (0x000) +#define ARSR2P_OUTPUT_WIDTH_HEIGHT (0x004) +#define ARSR2P_IHLEFT (0x008) + +#define ARSR2P_LUT_COEFY_V_OFFSET (0x0000) +#define ARSR2P_LUT_COEFY_H_OFFSET (0x0100) +#define ARSR2P_LUT_COEFA_V_OFFSET (0x0300) +#define ARSR2P_LUT_COEFA_H_OFFSET (0x0400) +#define ARSR2P_LUT_COEFUV_V_OFFSET (0x0600) +#define ARSR2P_LUT_COEFUV_H_OFFSET (0x0700) + +/* POST_CLIP v g */ +#define POST_CLIP_DISP_SIZE (0x0000) + +/* PCSC v */ +#define PCSC_IDC0 (0x0000) +#define PCSC_IDC2 (0x0004) +#define PCSC_ODC0 (0x0008) +#define PCSC_ODC2 (0x000C) +#define PCSC_P0 (0x0010) +#define PCSC_P1 (0x0014) +#define PCSC_P2 (0x0018) +#define PCSC_P3 (0x001C) +#define PCSC_P4 (0x0020) +#define PCSC_ICG_MODULE (0x0024) +#define PCSC_MPREC (0x0028) + +/* CSC */ + +#define CSC_IDC0 (0x0000) +#define CSC_IDC2 (0x0004) +#define CSC_ODC0 (0x0008) +#define CSC_ODC2 (0x000C) +#define CSC_P0 (0x0010) +#define CSC_P1 (0x0014) +#define CSC_P2 (0x0018) +#define CSC_P3 (0x001C) +#define CSC_P4 (0x0020) +#define CSC_MPREC (0x0028) + +#define CH_DEBUG_SEL (0x600) + +/* VPP */ +#define VPP_CTRL (0x700) +#define VPP_MEM_CTRL (0x704) + +/* DMA BUF */ +#define DMA_BUF_CTRL (0x800) +#define DMA_BUF_SIZE (0x850) +#define DMA_BUF_MEM_CTRL (0x854) +#define DMA_BUF_DBG0 (0x0838) +#define DMA_BUF_DBG1 (0x083c) + +#define AFBCD_HREG_HDR_PTR_LO (0x900) +#define AFBCD_HREG_PIC_WIDTH (0x904) +#define AFBCD_HREG_PIC_HEIGHT (0x90C) +#define AFBCD_HREG_FORMAT (0x910) +#define AFBCD_CTL (0x914) +#define AFBCD_STR (0x918) +#define AFBCD_LINE_CROP (0x91C) +#define AFBCD_INPUT_HEADER_STRIDE (0x920) +#define AFBCD_PAYLOAD_STRIDE (0x924) +#define AFBCD_MM_BASE_0 (0x928) +#define AFBCD_AFBCD_PAYLOAD_POINTER (0x930) +#define AFBCD_HEIGHT_BF_STR (0x934) +#define AFBCD_OS_CFG (0x938) +#define AFBCD_MEM_CTRL (0x93C) +#define AFBCD_SCRAMBLE_MODE (0x940) +#define AFBCD_HEADER_POINTER_OFFSET (0x944) +#define AFBCD_MONITOR_REG1_OFFSET (0x948) +#define AFBCD_MONITOR_REG2_OFFSET (0x94C) +#define AFBCD_MONITOR_REG3_OFFSET (0x950) +#define AFBCD_DEBUG_REG0_OFFSET (0x954) +#define AFBCD_CREG_FBCD_CTRL_MODE (0x960) +#define AFBCD_HREG_HDR_PTR_L1 (0x964) +#define AFBCD_HREG_PLD_PTR_L1 (0x968) +#define AFBCD_HEADER_SRTIDE_1 (0x96C) +#define AFBCD_PAYLOAD_SRTIDE_1 (0x970) +#define AFBCD_HREG_HDR_PTR_L1 (0x964) +#define AFBCD_HREG_PLD_PTR_L1 (0x968) +#define AFBCD_HEADER_SRTIDE_1 (0x96C) +#define AFBCD_PAYLOAD_SRTIDE_1 (0x970) +#define AFBCD_BLOCK_TYPE (0x974) +#define AFBCD_MM_BASE_1 (0x978) +#define AFBCD_MM_BASE_2 (0x97C) +#define AFBCD_MM_BASE_3 (0x980) +#define HFBCD_MEM_CTRL (0x984) +#define HFBCD_MEM_CTRL_1 (0x988) + +#define AFBCE_HREG_PIC_BLKS (0x900) +#define AFBCE_HREG_FORMAT (0x904) +#define AFBCE_PICTURE_SIZE (0x910) +#define AFBCE_CTL (0x914) +#define AFBCE_HEADER_SRTIDE (0x918) +#define AFBCE_PAYLOAD_STRIDE (0x91C) +#define AFBCE_ENC_OS_CFG (0x920) +#define AFBCE_MEM_CTRL (0x924) +#define AFBCE_QOS_CFG (0x928) +#define AFBCE_THRESHOLD (0x92C) +#define AFBCE_SCRAMBLE_MODE (0x930) +#define AFBCE_HEADER_POINTER_OFFSET (0x934) +#define AFBCE_CREG_FBCE_CTRL_MODE (0x950) +#define AFBCE_HREG_HDR_PTR_L1 (0x954) +#define AFBCE_HREG_PLD_PTR_L1 (0x958) +#define AFBCE_HEADER_SRTIDE_1 (0x95C) +#define AFBCE_PAYLOAD_SRTIDE_1 (0x960) +#define AFBCE_MEM_CTRL_1 (0x968) +#define FBCD_CREG_FBCD_CTRL_GATE (0x98C) + +#define ROT_FIRST_LNS (0x530) +#define ROT_STATE (0x534) +#define ROT_CPU_CTL0 (0x540) +#define ROT_CPU_START0 (0x544) +#define ROT_CPU_ADDR0 (0x548) +#define ROT_CPU_RDATA0 (0x54C) +#define ROT_CPU_RDATA1 (0x550) +#define ROT_CPU_WDATA0 (0x554) +#define ROT_CPU_WDATA1 (0x558) +#define ROT_CPU_CTL1 (0x55C) +#define ROT_CPU_START1 (0x560) +#define ROT_CPU_ADDR1 (0x564) +#define ROT_CPU_RDATA2 (0x568) +#define ROT_CPU_RDATA3 (0x56C) +#define ROT_CPU_WDATA2 (0x570) +#define ROT_CPU_WDATA3 (0x574) + +#define CH_REG_DEFAULT (0x0A00) + +/* MACROS */ +#define MIN_INTERLEAVE (7) +#define MAX_TILE_SURPORT_NUM (6) + +/* DMA aligned limited: 128bits aligned */ +#define DMA_ALIGN_BYTES (128 / BITS_PER_BYTE) +#define DMA_ADDR_ALIGN (128 / BITS_PER_BYTE) +#define DMA_STRIDE_ALIGN (128 / BITS_PER_BYTE) + +#define TILE_DMA_ADDR_ALIGN (256 * 1024) + +#define DMA_IN_WIDTH_MAX (2048) +#define DMA_IN_HEIGHT_MAX (8192) + +#define AFBC_PIC_WIDTH_MIN (16) +#define AFBC_PIC_WIDTH_MAX (8192) +#define AFBC_PIC_HEIGHT_MIN (16) +#define AFBC_PIC_HEIGHT_MAX (4096) + +#define AFBCD_TOP_CROP_MAX (15) +#define AFBCD_BOTTOM_CROP_MAX (15) + +#define AFBC_HEADER_STRIDE_BLOCK (16) + +#define AFBC_PAYLOAD_STRIDE_BLOCK (1024) + +#define AFBC_SUPER_GRAPH_HEADER_ADDR_ALIGN (128) + +#define AFBC_PAYLOAD_ADDR_ALIGN_32 (1024) +#define AFBC_PAYLOAD_STRIDE_ALIGN_32 (1024) +#define AFBC_PAYLOAD_ADDR_ALIGN_16 (512) +#define AFBC_PAYLOAD_STRIDE_ALIGN_16 (512) + +#define AFBC_BLOCK_ALIGN (16) + +#define AFBCE_IN_WIDTH_MAX (512) +#define WROT_IN_WIDTH_MAX (512) + +#define MMBUF_BASE (0x40) +#define MMBUF_LINE_NUM (8) +#define MMBUF_ADDR_ALIGN (64) + +enum DSS_AFBC_HALF_BLOCK_MODE { +AFBC_HALF_BLOCK_UPPER_LOWER_ALL =0 , +AFBC_HALF_BLOCK_LOWER_UPPER_ALL , +AFBC_HALF_BLOCK_UPPER_ONLY , +AFBC_HALF_BLOCK_LOWER_ONLY , +}; + +/* MCTL MUTEX0 1 2 3 4 5 */ +#define MCTL_CTL_EN (0x0000) +#define MCTL_CTL_MUTEX (0x0004) +#define MCTL_CTL_MUTEX_STATUS (0x0008) +#define MCTL_CTL_MUTEX_ITF (0x000C) +#define MCTL_CTL_MUTEX_DBUF (0x0010) +#define MCTL_CTL_MUTEX_SCF (0x0014) +#define MCTL_CTL_MUTEX_OV (0x0018) +#define MCTL_CTL_MUTEX_WCH0 (0x0020) +#define MCTL_CTL_MUTEX_WCH1 (0x0024) +#define MCTL_CTL_MUTEX_WCH2 (0x0028) +#define MCTL_CTL_MUTEX_RCH8 (0x002C) +#define MCTL_CTL_MUTEX_RCH0 (0x0030) +#define MCTL_CTL_MUTEX_RCH1 (0x0034) +#define MCTL_CTL_MUTEX_RCH2 (0x0038) +#define MCTL_CTL_MUTEX_RCH3 (0x003C) +#define MCTL_CTL_MUTEX_RCH4 (0x0040) +#define MCTL_CTL_MUTEX_RCH5 (0x0044) +#define MCTL_CTL_MUTEX_RCH6 (0x0048) +#define MCTL_CTL_MUTEX_RCH7 (0x004C) +#define MCTL_CTL_TOP (0x0050) +#define MCTL_CTL_FLUSH_STATUS (0x0054) +#define MCTL_CTL_CLEAR (0x0058) +#define MCTL_CTL_CACK_TOUT (0x0060) +#define MCTL_CTL_MUTEX_TOUT (0x0064) +#define MCTL_CTL_STATUS (0x0068) +#define MCTL_CTL_INTEN (0x006C) +#define MCTL_CTL_SW_ST (0x0070) +#define MCTL_CTL_ST_SEL (0x0074) +#define MCTL_CTL_END_SEL (0x0078) +#define MCTL_CTL_CLK_SEL (0x0080) +#define MCTL_CTL_CLK_EN (0x0084) +#define MCTL_CTL_DBG (0x00E0) + +/* MCTL SYS */ + +enum dss_mctl_idx { +DSS_MCTL0 =0 , +DSS_MCTL1 , +DSS_MCTL2 , +DSS_MCTL3 , +DSS_MCTL4 , +DSS_MCTL5 , +DSS_MCTL_IDX_MAX , +}; + +#define MCTL_CTL_SECU_CFG (0x0000) +#define MCTL_PAY_SECU_FLUSH_EN (0x0018) +#define MCTL_CTL_SECU_GATE0 (0x0080) +#define MCTL_CTL_SECU_GATE1 (0x0084) +#define MCTL_CTL_SECU_GATE2 (0x0088) +#define MCTL_DSI0_SECU_CFG_EN (0x00A0) +#define MCTL_DSI1_SECU_CFG_EN (0x00A4) + +#define MCTL_RCH0_FLUSH_EN (0x0100) +#define MCTL_RCH1_FLUSH_EN (0x0104) +#define MCTL_RCH2_FLUSH_EN (0x0108) +#define MCTL_RCH3_FLUSH_EN (0x010C) +#define MCTL_RCH4_FLUSH_EN (0x0110) +#define MCTL_RCH5_FLUSH_EN (0x0114) +#define MCTL_RCH6_FLUSH_EN (0x0118) +#define MCTL_RCH7_FLUSH_EN (0x011C) +#define MCTL_WCH0_FLUSH_EN (0x0120) +#define MCTL_WCH1_FLUSH_EN (0x0124) +#define MCTL_OV0_FLUSH_EN (0x0128) +#define MCTL_OV1_FLUSH_EN (0x012C) +#define MCTL_OV2_FLUSH_EN (0x0130) +#define MCTL_OV3_FLUSH_EN (0x0134) +#define MCTL_RCH8_FLUSH_EN (0x0138) +#define MCTL_WCH2_FLUSH_EN (0x013C) + +#define MCTL_RCH0_OV_OEN (0x0160) +#define MCTL_RCH1_OV_OEN (0x0164) +#define MCTL_RCH2_OV_OEN (0x0168) +#define MCTL_RCH3_OV_OEN (0x016C) +#define MCTL_RCH4_OV_OEN (0x0170) +#define MCTL_RCH5_OV_OEN (0x0174) +#define MCTL_RCH6_OV_OEN (0x0178) +#define MCTL_RCH7_OV_OEN (0x017C) + +#define MCTL_RCH_OV0_SEL (0x0180) +#define MCTL_RCH_OV1_SEL (0x0184) +#define MCTL_RCH_OV2_SEL (0x0188) +#define MCTL_RCH_OV3_SEL (0x018C) + +#define MCTL_WCH0_OV_IEN (0x01A0) +#define MCTL_WCH1_OV_IEN (0x01A4) + +#define MCTL_WCH_OV2_SEL (0x01A8) +#define MCTL_WCH_OV3_SEL (0x01AC) + +#define MCTL_WB_ENC_SEL (0x01B0) +#define MCTL_DSI_MUX_SEL (0x01B4) + +#define MCTL_RCH0_STARTY (0x01C0) +#define MCTL_RCH1_STARTY (0x01C4) +#define MCTL_RCH2_STARTY (0x01C8) +#define MCTL_RCH3_STARTY (0x01CC) +#define MCTL_RCH4_STARTY (0x01D0) +#define MCTL_RCH5_STARTY (0x01D4) +#define MCTL_RCH6_STARTY (0x01D8) +#define MCTL_RCH7_STARTY (0x01DC) + +#define MCTL_MCTL_CLK_SEL (0x01F0) +#define MCTL_MCTL_CLK_EN (0x01F4) +#define MCTL_MOD_CLK_SEL (0x01F8) +#define MCTL_MOD_CLK_EN (0x01FC) + +#define MCTL_MOD0_DBG (0x0200) +#define MCTL_MOD1_DBG (0x0204) +#define MCTL_MOD2_DBG (0x0208) +#define MCTL_MOD3_DBG (0x020C) +#define MCTL_MOD4_DBG (0x0210) +#define MCTL_MOD5_DBG (0x0214) +#define MCTL_MOD6_DBG (0x0218) +#define MCTL_MOD7_DBG (0x021C) +#define MCTL_MOD8_DBG (0x0220) +#define MCTL_MOD9_DBG (0x0224) +#define MCTL_MOD10_DBG (0x0228) +#define MCTL_MOD11_DBG (0x022C) +#define MCTL_MOD12_DBG (0x0230) +#define MCTL_MOD13_DBG (0x0234) +#define MCTL_MOD14_DBG (0x0238) +#define MCTL_MOD15_DBG (0x023C) +#define MCTL_MOD16_DBG (0x0240) +#define MCTL_MOD17_DBG (0x0244) +#define MCTL_MOD18_DBG (0x0248) +#define MCTL_MOD19_DBG (0x024C) +#define MCTL_MOD20_DBG (0x0250) +#define MCTL_MOD0_STATUS (0x0280) +#define MCTL_MOD1_STATUS (0x0284) +#define MCTL_MOD2_STATUS (0x0288) +#define MCTL_MOD3_STATUS (0x028C) +#define MCTL_MOD4_STATUS (0x0290) +#define MCTL_MOD5_STATUS (0x0294) +#define MCTL_MOD6_STATUS (0x0298) +#define MCTL_MOD7_STATUS (0x029C) +#define MCTL_MOD8_STATUS (0x02A0) +#define MCTL_MOD9_STATUS (0x02A4) +#define MCTL_MOD10_STATUS (0x02A8) +#define MCTL_MOD11_STATUS (0x02AC) +#define MCTL_MOD12_STATUS (0x02B0) +#define MCTL_MOD13_STATUS (0x02B4) +#define MCTL_MOD14_STATUS (0x02B8) +#define MCTL_MOD15_STATUS (0x02BC) +#define MCTL_MOD16_STATUS (0x02C0) +#define MCTL_MOD17_STATUS (0x02C4) +#define MCTL_MOD18_STATUS (0x02C8) +#define MCTL_MOD19_STATUS (0x02CC) +#define MCTL_MOD20_STATUS (0x02D0) +#define MCTL_SW_DBG (0x0300) +#define MCTL_SW0_STATUS0 (0x0304) +#define MCTL_SW0_STATUS1 (0x0308) +#define MCTL_SW0_STATUS2 (0x030C) +#define MCTL_SW0_STATUS3 (0x0310) +#define MCTL_SW0_STATUS4 (0x0314) +#define MCTL_SW0_STATUS5 (0x0318) +#define MCTL_SW0_STATUS6 (0x031C) +#define MCTL_SW0_STATUS7 (0x0320) +#define MCTL_SW1_STATUS (0x0324) + +#define MCTL_MOD_DBG_CH_NUM (10) +#define MCTL_MOD_DBG_OV_NUM (4) +#define MCTL_MOD_DBG_DBUF_NUM (2) +#define MCTL_MOD_DBG_SCF_NUM (1) +#define MCTL_MOD_DBG_ITF_NUM (2) +#define MCTL_MOD_DBG_ADD_CH_NUM (2) + +/* OVL */ +#define OVL_SIZE (0x0000) +#define OVL_BG_COLOR (0x4) +#define OVL_DST_STARTPOS (0x8) +#define OVL_DST_ENDPOS (0xC) +#define OVL_GCFG (0x10) +#define OVL_LAYER0_POS (0x14) +#define OVL_LAYER0_SIZE (0x18) +#define OVL_LAYER0_SRCLOKEY (0x1C) +#define OVL_LAYER0_SRCHIKEY (0x20) +#define OVL_LAYER0_DSTLOKEY (0x24) +#define OVL_LAYER0_DSTHIKEY (0x28) +#define OVL_LAYER0_PATTERN (0x2C) +#define OVL_LAYER0_ALPHA (0x30) +#define OVL_LAYER0_CFG (0x34) +#define OVL_LAYER0_INFO_ALPHA (0x40) +#define OVL_LAYER0_INFO_SRCCOLOR (0x44) +#define OVL_LAYER1_POS (0x50) +#define OVL_LAYER1_SIZE (0x54) +#define OVL_LAYER1_SRCLOKEY (0x58) +#define OVL_LAYER1_SRCHIKEY (0x5C) +#define OVL_LAYER1_DSTLOKEY (0x60) +#define OVL_LAYER1_DSTHIKEY (0x64) +#define OVL_LAYER1_PATTERN (0x68) +#define OVL_LAYER1_ALPHA (0x6C) +#define OVL_LAYER1_CFG (0x70) +#define OVL_LAYER1_INFO_ALPHA (0x7C) +#define OVL_LAYER1_INFO_SRCCOLOR (0x80) +#define OVL_LAYER2_POS (0x8C) +#define OVL_LAYER2_SIZE (0x90) +#define OVL_LAYER2_SRCLOKEY (0x94) +#define OVL_LAYER2_SRCHIKEY (0x98) +#define OVL_LAYER2_DSTLOKEY (0x9C) +#define OVL_LAYER2_DSTHIKEY (0xA0) +#define OVL_LAYER2_PATTERN (0xA4) +#define OVL_LAYER2_ALPHA (0xA8) +#define OVL_LAYER2_CFG (0xAC) +#define OVL_LAYER2_INFO_ALPHA (0xB8) +#define OVL_LAYER2_INFO_SRCCOLOR (0xBC) +#define OVL_LAYER3_POS (0xC8) +#define OVL_LAYER3_SIZE (0xCC) +#define OVL_LAYER3_SRCLOKEY (0xD0) +#define OVL_LAYER3_SRCHIKEY (0xD4) +#define OVL_LAYER3_DSTLOKEY (0xD8) +#define OVL_LAYER3_DSTHIKEY (0xDC) +#define OVL_LAYER3_PATTERN (0xE0) +#define OVL_LAYER3_ALPHA (0xE4) +#define OVL_LAYER3_CFG (0xE8) +#define OVL_LAYER3_INFO_ALPHA (0xF4) +#define OVL_LAYER3_INFO_SRCCOLOR (0xF8) +#define OVL_LAYER4_POS (0x104) +#define OVL_LAYER4_SIZE (0x108) +#define OVL_LAYER4_SRCLOKEY (0x10C) +#define OVL_LAYER4_SRCHIKEY (0x110) +#define OVL_LAYER4_DSTLOKEY (0x114) +#define OVL_LAYER4_DSTHIKEY (0x118) +#define OVL_LAYER4_PATTERN (0x11C) +#define OVL_LAYER4_ALPHA (0x120) +#define OVL_LAYER4_CFG (0x124) +#define OVL_LAYER4_INFO_ALPHA (0x130) +#define OVL_LAYER4_INFO_SRCCOLOR (0x134) +#define OVL_LAYER5_POS (0x140) +#define OVL_LAYER5_SIZE (0x144) +#define OVL_LAYER5_SRCLOKEY (0x148) +#define OVL_LAYER5_SRCHIKEY (0x14C) +#define OVL_LAYER5_DSTLOKEY (0x150) +#define OVL_LAYER5_DSTHIKEY (0x154) +#define OVL_LAYER5_PATTERN (0x158) +#define OVL_LAYER5_ALPHA (0x15C) +#define OVL_LAYER5_CFG (0x160) +#define OVL_LAYER5_INFO_ALPHA (0x16C) +#define OVL_LAYER5_INFO_SRCCOLOR (0x170) +#define OVL_LAYER6_POS (0x14) +#define OVL_LAYER6_SIZE (0x18) +#define OVL_LAYER6_SRCLOKEY (0x1C) +#define OVL_LAYER6_SRCHIKEY (0x20) +#define OVL_LAYER6_DSTLOKEY (0x24) +#define OVL_LAYER6_DSTHIKEY (0x28) +#define OVL_LAYER6_PATTERN (0x2C) +#define OVL_LAYER6_ALPHA (0x30) +#define OVL_LAYER6_CFG (0x34) +#define OVL_LAYER6_INFO_ALPHA (0x40) +#define OVL_LAYER6_INFO_SRCCOLOR (0x44) +#define OVL_LAYER7_POS (0x50) +#define OVL_LAYER7_SIZE (0x54) +#define OVL_LAYER7_SRCLOKEY (0x58) +#define OVL_LAYER7_SRCHIKEY (0x5C) +#define OVL_LAYER7_DSTLOKEY (0x60) +#define OVL_LAYER7_DSTHIKEY (0x64) +#define OVL_LAYER7_PATTERN (0x68) +#define OVL_LAYER7_ALPHA (0x6C) +#define OVL_LAYER7_CFG (0x70) +#define OVL_LAYER7_INFO_ALPHA (0x7C) +#define OVL_LAYER7_INFO_SRCCOLOR (0x80) +#define OVL_LAYER0_ST_INFO (0x48) +#define OVL_LAYER1_ST_INFO (0x84) +#define OVL_LAYER2_ST_INFO (0xC0) +#define OVL_LAYER3_ST_INFO (0xFC) +#define OVL_LAYER4_ST_INFO (0x138) +#define OVL_LAYER5_ST_INFO (0x174) +#define OVL_LAYER6_ST_INFO (0x48) +#define OVL_LAYER7_ST_INFO (0x84) +#define OVL_LAYER0_IST_INFO (0x4C) +#define OVL_LAYER1_IST_INFO (0x88) +#define OVL_LAYER2_IST_INFO (0xC4) +#define OVL_LAYER3_IST_INFO (0x100) +#define OVL_LAYER4_IST_INFO (0x13C) +#define OVL_LAYER5_IST_INFO (0x178) +#define OVL_LAYER6_IST_INFO (0x4C) +#define OVL_LAYER7_IST_INFO (0x88) +#define OVL_LAYER0_PSPOS (0x38) +#define OVL_LAYER0_PEPOS (0x3C) +#define OVL_LAYER1_PSPOS (0x74) +#define OVL_LAYER1_PEPOS (0x78) +#define OVL_LAYER2_PSPOS (0xB0) +#define OVL_LAYER2_PEPOS (0xB4) +#define OVL_LAYER3_PSPOS (0xEC) +#define OVL_LAYER3_PEPOS (0xF0) +#define OVL_LAYER4_PSPOS (0x128) +#define OVL_LAYER4_PEPOS (0x12C) +#define OVL_LAYER5_PSPOS (0x164) +#define OVL_LAYER5_PEPOS (0x168) +#define OVL_LAYER6_PSPOS (0x38) +#define OVL_LAYER6_PEPOS (0x3C) +#define OVL_LAYER7_PSPOS (0x74) +#define OVL_LAYER7_PEPOS (0x78) + +#define OVL6_BASE_ST_INFO (0x17C) +#define OVL6_BASE_IST_INFO (0x180) +#define OVL6_GATE_CTRL (0x184) +#define OVL6_RD_SHADOW_SEL (0x188) +#define OVL6_OV_CLK_SEL (0x18C) +#define OVL6_OV_CLK_EN (0x190) +#define OVL6_BLOCK_SIZE (0x1A0) +#define OVL6_BLOCK_DBG (0x1A4) +#define OVL6_REG_DEFAULT (0x1A8) + +#define OVL2_BASE_ST_INFO (0x8C) +#define OVL2_BASE_IST_INFO (0x90) +#define OVL2_GATE_CTRL (0x94) +#define OVL2_OV_RD_SHADOW_SEL (0x98) +#define OVL2_OV_CLK_SEL (0x9C) +#define OVL2_OV_CLK_EN (0xA0) +#define OVL2_BLOCK_SIZE (0xB0) +#define OVL2_BLOCK_DBG (0xB4) +#define OVL2_REG_DEFAULT (0xB8) + +/* LAYER0_CFG */ +#define BIT_OVL_LAYER_SRC_CFG BIT(8) +#define BIT_OVL_LAYER_ENABLE BIT(0) + +/* LAYER0_INFO_ALPHA */ +#define BIT_OVL_LAYER_SRCALPHA_FLAG BIT(3) +#define BIT_OVL_LAYER_DSTALPHA_FLAG BIT(2) + +/* LAYER0_INFO_SRCCOLOR */ +#define BIT_OVL_LAYER_SRCCOLOR_FLAG BIT(0) + +#define OVL_6LAYER_NUM (6) +#define OVL_2LAYER_NUM (2) + +/* OVL */ +#define OV_SIZE (0x000) +#define OV_BG_COLOR_RGB (0x004) +#define OV_BG_COLOR_A (0x008) +#define OV_DST_STARTPOS (0x00C) +#define OV_DST_ENDPOS (0x010) +#define OV_GCFG (0x014) +#define OV_LAYER0_POS (0x030) +#define OV_LAYER0_SIZE (0x034) +#define OV_LAYER0_SRCLOKEY (0x038) +#define OV_LAYER0_SRCHIKEY (0x03C) +#define OV_LAYER0_DSTLOKEY (0x040) +#define OV_LAYER0_DSTHIKEY (0x044) +#define OV_LAYER0_PATTERN_RGB (0x048) +#define OV_LAYER0_PATTERN_A (0x04C) +#define OV_LAYER0_ALPHA_MODE (0x050) +#define OV_LAYER0_ALPHA_A (0x054) +#define OV_LAYER0_CFG (0x058) +#define OV_LAYER0_PSPOS (0x05C) +#define OV_LAYER0_PEPOS (0x060) +#define OV_LAYER0_INFO_ALPHA (0x064) +#define OV_LAYER0_INFO_SRCCOLOR (0x068) +#define OV_LAYER0_DBG_INFO (0x06C) +#define OV8_BASE_DBG_INFO (0x340) +#define OV8_RD_SHADOW_SEL (0x344) +#define OV8_CLK_SEL (0x348) +#define OV8_CLK_EN (0x34C) +#define OV8_BLOCK_SIZE (0x350) +#define OV8_BLOCK_DBG (0x354) +#define OV8_REG_DEFAULT (0x358) +#define OV2_BASE_DBG_INFO (0x200) +#define OV2_RD_SHADOW_SEL (0x204) +#define OV2_CLK_SEL (0x208) +#define OV2_CLK_EN (0x20C) +#define OV2_BLOCK_SIZE (0x210) +#define OV2_BLOCK_DBG (0x214) +#define OV2_REG_DEFAULT (0x218) + +#define OV_8LAYER_NUM (8) + +/* DBUF */ +#define DBUF_FRM_SIZE (0x0000) +#define DBUF_FRM_HSIZE (0x0004) +#define DBUF_SRAM_VALID_NUM (0x0008) +#define DBUF_WBE_EN (0x000C) +#define DBUF_THD_FILL_LEV0 (0x0010) +#define DBUF_DFS_FILL_LEV1 (0x0014) +#define DBUF_THD_RQOS (0x0018) +#define DBUF_THD_WQOS (0x001C) +#define DBUF_THD_CG (0x0020) +#define DBUF_THD_OTHER (0x0024) +#define DBUF_FILL_LEV0_CNT (0x0028) +#define DBUF_FILL_LEV1_CNT (0x002C) +#define DBUF_FILL_LEV2_CNT (0x0030) +#define DBUF_FILL_LEV3_CNT (0x0034) +#define DBUF_FILL_LEV4_CNT (0x0038) +#define DBUF_ONLINE_FILL_LEVEL (0x003C) +#define DBUF_WB_FILL_LEVEL (0x0040) +#define DBUF_DFS_STATUS (0x0044) +#define DBUF_THD_FLUX_REQ_BEF (0x0048) +#define DBUF_DFS_LP_CTRL (0x004C) +#define DBUF_RD_SHADOW_SEL (0x0050) +#define DBUF_MEM_CTRL (0x0054) +#define DBUF_PM_CTRL (0x0058) +#define DBUF_CLK_SEL (0x005C) +#define DBUF_CLK_EN (0x0060) +#define DBUF_THD_FLUX_REQ_AFT (0x0064) +#define DBUF_THD_DFS_OK (0x0068) +#define DBUF_FLUX_REQ_CTRL (0x006C) +#define DBUF_REG_DEFAULT (0x00A4) +#define DBUF_DFS_RAM_MANAGE (0x00A8) +#define DBUF_DFS_DATA_FILL_OUT (0x00AC) + +/* DPP */ +#define DPP_RD_SHADOW_SEL (0x000) +#define DPP_DEFAULT (0x004) +#define DPP_ID (0x008) +#define DPP_IMG_SIZE_BEF_SR (0x00C) +#define DPP_IMG_SIZE_AFT_SR (0x010) +#define DPP_SBL (0x014) +#define DPP_SBL_MEM_CTRL (0x018) +#define DPP_ARSR1P_MEM_CTRL (0x01C) +#define DPP_CLK_SEL (0x020) +#define DPP_CLK_EN (0x024) +#define DPP_DBG1_CNT (0x028) +#define DPP_DBG2_CNT (0x02C) +#define DPP_DBG1 (0x030) +#define DPP_DBG2 (0x034) +#define DPP_DBG3 (0x038) +#define DPP_DBG4 (0x03C) +#define DPP_INTS (0x040) +#define DPP_INT_MSK (0x044) +#define DPP_ARSR1P (0x048) +#define DPP_DBG_CNT DPP_DBG1_CNT + +#define DPP_CLRBAR_CTRL (0x100) +#define DPP_CLRBAR_1ST_CLR (0x104) +#define DPP_CLRBAR_2ND_CLR (0x108) +#define DPP_CLRBAR_3RD_CLR (0x10C) + +#define DPP_CLIP_TOP (0x180) +#define DPP_CLIP_BOTTOM (0x184) +#define DPP_CLIP_LEFT (0x188) +#define DPP_CLIP_RIGHT (0x18C) +#define DPP_CLIP_EN (0x190) +#define DPP_CLIP_DBG (0x194) + +#define CSC10B_IDC0 (0x000) +#define CSC10B_IDC1 (0x004) +#define CSC10B_IDC2 (0x008) +#define CSC10B_ODC0 (0x00C) +#define CSC10B_ODC1 (0x010) +#define CSC10B_ODC2 (0x014) +#define CSC10B_P00 (0x018) +#define CSC10B_P01 (0x01C) +#define CSC10B_P02 (0x020) +#define CSC10B_P10 (0x024) +#define CSC10B_P11 (0x028) +#define CSC10B_P12 (0x02C) +#define CSC10B_P20 (0x030) +#define CSC10B_P21 (0x034) +#define CSC10B_P22 (0x038) +#define CSC10B_MODULE_EN (0x03C) +#define CSC10B_MPREC (0x040) + +#define GAMA_EN (0x000) +#define GAMA_MEM_CTRL (0x004) + +#define ACM_EN (0x000) +#define ACM_SATA_OFFSET (0x004) +#define ACM_HUESEL (0x008) +#define ACM_CSC_IDC0 (0x00C) +#define ACM_CSC_IDC1 (0x010) +#define ACM_CSC_IDC2 (0x014) +#define ACM_CSC_P00 (0x018) +#define ACM_CSC_P01 (0x01C) +#define ACM_CSC_P02 (0x020) +#define ACM_CSC_P10 (0x024) +#define ACM_CSC_P11 (0x028) +#define ACM_CSC_P12 (0x02C) +#define ACM_CSC_P20 (0x030) +#define ACM_CSC_P21 (0x034) +#define ACM_CSC_P22 (0x038) +#define ACM_CSC_MRREC (0x03C) +#define ACM_R0_H (0x040) +#define ACM_R1_H (0x044) +#define ACM_R2_H (0x048) +#define ACM_R3_H (0x04C) +#define ACM_R4_H (0x050) +#define ACM_R5_H (0x054) +#define ACM_R6_H (0x058) +#define ACM_LUT_DIS0 (0x05C) +#define ACM_LUT_DIS1 (0x060) +#define ACM_LUT_DIS2 (0x064) +#define ACM_LUT_DIS3 (0x068) +#define ACM_LUT_DIS4 (0x06C) +#define ACM_LUT_DIS5 (0x070) +#define ACM_LUT_DIS6 (0x074) +#define ACM_LUT_DIS7 (0x078) +#define ACM_LUT_PARAM0 (0x07C) +#define ACM_LUT_PARAM1 (0x080) +#define ACM_LUT_PARAM2 (0x084) +#define ACM_LUT_PARAM3 (0x088) +#define ACM_LUT_PARAM4 (0x08C) +#define ACM_LUT_PARAM5 (0x090) +#define ACM_LUT_PARAM6 (0x094) +#define ACM_LUT_PARAM7 (0x098) +#define ACM_LUT_SEL (0x09C) +#define ACM_MEM_CTRL (0x0A0) +#define ACM_DEBUG_TOP (0x0A4) +#define ACM_DEBUG_CFG (0x0A8) +#define ACM_DEBUG_W (0x0AC) + +#define ACE_EN (0x000) +#define ACE_SKIN_CFG (0x004) +#define ACE_LUT_SEL (0x008) +#define ACE_HIST_IND (0x00C) +#define ACE_ACTIVE (0x010) +#define ACE_DBG (0x014) +#define ACE_MEM_CTRL (0x018) +#define ACE_IN_SEL (0x01C) +#define ACE_R2Y (0x020) +#define ACE_G2Y (0x024) +#define ACE_B2Y (0x028) +#define ACE_Y_OFFSET (0x02C) +#define ACE_Y_CEN (0x030) +#define ACE_U_CEN (0x034) +#define ACE_V_CEN (0x038) +#define ACE_Y_EXT (0x03C) +#define ACE_U_EXT (0x040) +#define ACE_V_EXT (0x044) +#define ACE_Y_ATTENU (0x048) +#define ACE_U_ATTENU (0x04C) +#define ACE_V_ATTENU (0x050) +#define ACE_ROTA (0x054) +#define ACE_ROTB (0x058) +#define ACE_Y_CORE (0x05C) +#define ACE_U_CORE (0x060) +#define ACE_V_CORE (0x064) + +#define LCP_XCC_COEF_00 (0x000) +#define LCP_XCC_COEF_01 (0x004) +#define LCP_XCC_COEF_02 (0x008) +#define LCP_XCC_COEF_03 (0x00C) +#define LCP_XCC_COEF_10 (0x010) +#define LCP_XCC_COEF_11 (0x014) +#define LCP_XCC_COEF_12 (0x018) +#define LCP_XCC_COEF_13 (0x01C) +#define LCP_XCC_COEF_20 (0x020) +#define LCP_XCC_COEF_21 (0x024) +#define LCP_XCC_COEF_22 (0x028) +#define LCP_XCC_COEF_23 (0x02C) + +#define ARSR1P_INC_FACTOR (65536) + +/* BIT EXT */ +#define BIT_EXT0_CTL (0x000) + +#define U_GAMA_R_COEF (0x000) +#define U_GAMA_G_COEF (0x400) +#define U_GAMA_B_COEF (0x800) +#define U_GAMA_R_LAST_COEF (0x200) +#define U_GAMA_G_LAST_COEF (0x600) +#define U_GAMA_B_LAST_COEF (0xA00) + +#define ACM_U_H_COEF (0x000) +#define ACM_U_SATA_COEF (0x200) +#define ACM_U_SATR0_COEF (0x300) +#define ACM_U_SATR1_COEF (0x340) +#define ACM_U_SATR2_COEF (0x380) +#define ACM_U_SATR3_COEF (0x3C0) +#define ACM_U_SATR4_COEF (0x400) +#define ACM_U_SATR5_COEF (0x440) +#define ACM_U_SATR6_COEF (0x480) +#define ACM_U_SATR7_COEF (0x4C0) + +#define LCP_U_DEGAMA_R_COEF (0x5000) +#define LCP_U_DEGAMA_G_COEF (0x5400) +#define LCP_U_DEGAMA_B_COEF (0x5800) +#define LCP_U_DEGAMA_R_LAST_COEF (0x5200) +#define LCP_U_DEGAMA_G_LAST_COEF (0x5600) +#define LCP_U_DEGAMA_B_LAST_COEF (0x5A00) + +#define ACE_HIST0 (0x000) +#define ACE_HIST1 (0x400) +#define ACE_LUT0 (0x800) +#define ACE_LUT1 (0xA00) + +#define HIACE_INT_STAT (0x0000) +#define HIACE_INT_UNMASK (0x0004) +#define HIACE_BYPASS_ACE (0x0008) +#define HIACE_BYPASS_ACE_STAT (0x000c) +#define HIACE_UPDATE_LOCAL (0x0010) +#define HIACE_LOCAL_VALID (0x0014) +#define HIACE_GAMMA_AB_SHADOW (0x0018) +#define HIACE_GAMMA_AB_WORK (0x001c) +#define HIACE_GLOBAL_HIST_AB_SHADOW (0x0020) +#define HIACE_GLOBAL_HIST_AB_WORK (0x0024) +#define HIACE_IMAGE_INFO (0x0030) +#define HIACE_HALF_BLOCK_H_W (0x0034) +#define HIACE_XYWEIGHT (0x0038) +#define HIACE_LHIST_SFT (0x003c) +#define HIACE_HUE (0x0050) +#define HIACE_SATURATION (0x0054) +#define HIACE_VALUE (0x0058) +#define HIACE_SKIN_GAIN (0x005c) +#define HIACE_UP_LOW_TH (0x0060) +#define HIACE_UP_CNT (0x0070) +#define HIACE_LOW_CNT (0x0074) +#define HIACE_GLOBAL_HIST_LUT_ADDR (0x0080) +#define HIACE_LHIST_EN (0x0100) +#define HIACE_LOCAL_HIST_VxHy_2z_2z1 (0x0104) +#define HIACE_GAMMA_EN (0x0108) +#define HIACE_GAMMA_VxHy_3z2_3z1_3z_W (0x010c) +#define HIACE_GAMMA_EN_HV_R (0x0110) +#define HIACE_GAMMA_VxHy_3z2_3z1_3z_R (0x0114) +#define HIACE_INIT_GAMMA (0x0120) +#define HIACE_MANUAL_RELOAD (0x0124) +#define HIACE_RAMCLK_FUNC (0x0128) +#define HIACE_CLK_GATE (0x012c) +#define HIACE_GAMMA_RAM_A_CFG_MEM_CTRL (0x0130) +#define HIACE_GAMMA_RAM_B_CFG_MEM_CTRL (0x0134) +#define HIACE_LHIST_RAM_CFG_MEM_CTRL (0x0138) +#define HIACE_GAMMA_RAM_A_CFG_PM_CTRL (0x0140) +#define HIACE_GAMMA_RAM_B_CFG_PM_CTRL (0x0144) +#define HIACE_LHIST_RAM_CFG_PM_CTRL (0x0148) + +/* IFBC */ +#define IFBC_SIZE (0x0000) +#define IFBC_CTRL (0x0004) +#define IFBC_HIMAX_CTRL0 (0x0008) +#define IFBC_HIMAX_CTRL1 (0x000C) +#define IFBC_HIMAX_CTRL2 (0x0010) +#define IFBC_HIMAX_CTRL3 (0x0014) +#define IFBC_EN (0x0018) +#define IFBC_MEM_CTRL (0x001C) +#define IFBC_INSERT (0x0020) +#define IFBC_HIMAX_TEST_MODE (0x0024) +#define IFBC_CORE_GT (0x0028) +#define IFBC_PM_CTRL (0x002C) +#define IFBC_RD_SHADOW (0x0030) +#define IFBC_ORISE_CTL (0x0034) +#define IFBC_ORSISE_DEBUG0 (0x0038) +#define IFBC_ORSISE_DEBUG1 (0x003C) +#define IFBC_RSP_COMP_TEST (0x0040) +#define IFBC_CLK_SEL (0x044) +#define IFBC_CLK_EN (0x048) +#define IFBC_PAD (0x004C) +#define IFBC_REG_DEFAULT (0x0050) + +/* DSC */ +#define DSC_VERSION (0x0000) +#define DSC_PPS_IDENTIFIER (0x0004) +#define DSC_EN (0x0008) +#define DSC_CTRL (0x000C) +#define DSC_PIC_SIZE (0x0010) +#define DSC_SLICE_SIZE (0x0014) +#define DSC_CHUNK_SIZE (0x0018) +#define DSC_INITIAL_DELAY (0x001C) +#define DSC_RC_PARAM0 (0x0020) +#define DSC_RC_PARAM1 (0x0024) +#define DSC_RC_PARAM2 (0x0028) +#define DSC_RC_PARAM3 (0x002C) +#define DSC_FLATNESS_QP_TH (0x0030) +#define DSC_RC_PARAM4 (0x0034) +#define DSC_RC_PARAM5 (0x0038) +#define DSC_RC_BUF_THRESH0 (0x003C) +#define DSC_RC_BUF_THRESH1 (0x0040) +#define DSC_RC_BUF_THRESH2 (0x0044) +#define DSC_RC_BUF_THRESH3 (0x0048) +#define DSC_RC_RANGE_PARAM0 (0x004C) +#define DSC_RC_RANGE_PARAM1 (0x0050) +#define DSC_RC_RANGE_PARAM2 (0x0054) +#define DSC_RC_RANGE_PARAM3 (0x0058) +#define DSC_RC_RANGE_PARAM4 (0x005C) +#define DSC_RC_RANGE_PARAM5 (0x0060) +#define DSC_RC_RANGE_PARAM6 (0x0064) +#define DSC_RC_RANGE_PARAM7 (0x0068) +#define DSC_ADJUSTMENT_BITS (0x006C) +#define DSC_BITS_PER_GRP (0x0070) +#define DSC_MULTI_SLICE_CTL (0x0074) +#define DSC_OUT_CTRL (0x0078) +#define DSC_CLK_SEL (0x007C) +#define DSC_CLK_EN (0x0080) +#define DSC_MEM_CTRL (0x0084) +#define DSC_ST_DATAIN (0x0088) +#define DSC_ST_DATAOUT (0x008C) +#define DSC0_ST_SLC_POS (0x0090) +#define DSC1_ST_SLC_POS (0x0094) +#define DSC0_ST_PIC_POS (0x0098) +#define DSC1_ST_PIC_POS (0x009C) +#define DSC0_ST_FIFO (0x00A0) +#define DSC1_ST_FIFO (0x00A4) +#define DSC0_ST_LINEBUF (0x00A8) +#define DSC1_ST_LINEBUF (0x00AC) +#define DSC_ST_ITFC (0x00B0) +#define DSC_RD_SHADOW_SEL (0x00B4) +#define DSC_REG_DEFAULT (0x00B8) + +/* LDI */ +#define LDI_DPI0_HRZ_CTRL0 (0x0000) +#define LDI_DPI0_HRZ_CTRL1 (0x0004) +#define LDI_DPI0_HRZ_CTRL2 (0x0008) +#define LDI_VRT_CTRL0 (0x000C) +#define LDI_VRT_CTRL1 (0x0010) +#define LDI_VRT_CTRL2 (0x0014) +#define LDI_PLR_CTRL (0x0018) +#define LDI_SH_MASK_INT (0x001C) +#define LDI_3D_CTRL (0x0020) +#define LDI_CTRL (0x0024) +#define LDI_WORK_MODE (0x0028) +#define LDI_DE_SPACE_LOW (0x002C) +#define LDI_DSI_CMD_MOD_CTRL (0x0030) +#define LDI_DSI_TE_CTRL (0x0034) +#define LDI_DSI_TE_HS_NUM (0x0038) +#define LDI_DSI_TE_HS_WD (0x003C) +#define LDI_DSI_TE_VS_WD (0x0040) +#define LDI_FRM_MSK (0x0044) +#define LDI_FRM_MSK_UP (0x0048) +#define LDI_VINACT_MSK_LEN (0x0050) +#define LDI_VSTATE (0x0054) +#define LDI_DPI0_HSTATE (0x0058) +#define LDI_DPI1_HSTATE (0x005C) +#define LDI_CMD_EVENT_SEL (0x0060) +#define LDI_SRAM_LP_CTRL (0x0064) +#define LDI_ITF_RD_SHADOW (0x006C) +#define LDI_DPI1_HRZ_CTRL0 (0x00F0) +#define LDI_DPI1_HRZ_CTRL1 (0x00F4) +#define LDI_DPI1_HRZ_CTRL2 (0x00F8) +#define LDI_OVERLAP_SIZE (0x00FC) +#define LDI_MEM_CTRL (0x0100) +#define LDI_PM_CTRL (0x0104) +#define LDI_CLK_SEL (0x0108) +#define LDI_CLK_EN (0x010C) +#define LDI_IF_BYPASS (0x0110) +#define LDI_FRM_VALID_DBG (0x0118) +/* LDI GLB*/ +#define LDI_PXL0_DIV2_GT_EN (0x0210) +#define LDI_PXL0_DIV4_GT_EN (0x0214) +#define LDI_PXL0_GT_EN (0x0218) +#define LDI_PXL0_DSI_GT_EN (0x021C) +#define LDI_PXL0_DIVXCFG (0x0220) +#define LDI_DSI1_CLK_SEL (0x0224) +#define LDI_VESA_CLK_SEL (0x0228) +/* DSI1 RST*/ +#define LDI_DSI1_RST_SEL (0x0238) +/* LDI INTERRUPT*/ +#define LDI_MCU_ITF_INTS (0x0240) +#define LDI_MCU_ITF_INT_MSK (0x0244) +#define LDI_CPU_ITF_INTS (0x0248) +#define LDI_CPU_ITF_INT_MSK (0x024C) +/* LDI MODULE CLOCK GATING*/ +#define LDI_MODULE_CLK_SEL (0x0258) +#define LDI_MODULE_CLK_EN (0x025C) + +/* MIPI DSI */ +#define MIPIDSI_VERSION_OFFSET (0x0000) +#define MIPIDSI_PWR_UP_OFFSET (0x0004) +#define MIPIDSI_CLKMGR_CFG_OFFSET (0x0008) +#define MIPIDSI_DPI_VCID_OFFSET (0x000c) +#define MIPIDSI_DPI_COLOR_CODING_OFFSET (0x0010) +#define MIPIDSI_DPI_CFG_POL_OFFSET (0x0014) +#define MIPIDSI_DPI_LP_CMD_TIM_OFFSET (0x0018) +#define MIPIDSI_PCKHDL_CFG_OFFSET (0x002c) +#define MIPIDSI_GEN_VCID_OFFSET (0x0030) +#define MIPIDSI_MODE_CFG_OFFSET (0x0034) +#define MIPIDSI_VID_MODE_CFG_OFFSET (0x0038) +#define MIPIDSI_VID_PKT_SIZE_OFFSET (0x003c) +#define MIPIDSI_VID_NUM_CHUNKS_OFFSET (0x0040) +#define MIPIDSI_VID_NULL_SIZE_OFFSET (0x0044) +#define MIPIDSI_VID_HSA_TIME_OFFSET (0x0048) +#define MIPIDSI_VID_HBP_TIME_OFFSET (0x004c) +#define MIPIDSI_VID_HLINE_TIME_OFFSET (0x0050) +#define MIPIDSI_VID_VSA_LINES_OFFSET (0x0054) +#define MIPIDSI_VID_VBP_LINES_OFFSET (0x0058) +#define MIPIDSI_VID_VFP_LINES_OFFSET (0x005c) +#define MIPIDSI_VID_VACTIVE_LINES_OFFSET (0x0060) +#define MIPIDSI_EDPI_CMD_SIZE_OFFSET (0x0064) +#define MIPIDSI_CMD_MODE_CFG_OFFSET (0x0068) +#define MIPIDSI_GEN_HDR_OFFSET (0x006c) +#define MIPIDSI_GEN_PLD_DATA_OFFSET (0x0070) +#define MIPIDSI_CMD_PKT_STATUS_OFFSET (0x0074) +#define MIPIDSI_TO_CNT_CFG_OFFSET (0x0078) +#define MIPIDSI_HS_RD_TO_CNT_OFFSET (0x007C) +#define MIPIDSI_LP_RD_TO_CNT_OFFSET (0x0080) +#define MIPIDSI_HS_WR_TO_CNT_OFFSET (0x0084) +#define MIPIDSI_LP_WR_TO_CNT_OFFSET (0x0088) +#define MIPIDSI_BTA_TO_CNT_OFFSET (0x008C) +#define MIPIDSI_SDF_3D_OFFSET (0x0090) +#define MIPIDSI_LPCLK_CTRL_OFFSET (0x0094) +#define MIPIDSI_DSC_PARAMETER_OFFSET (0x00f0) +#define MIPIDSI_PHY_TMR_RD_CFG_OFFSET (0x00f4) +#define MIPIDSI_PHY_TMR_LPCLK_CFG_OFFSET (0x0098) +#define MIPIDSI_PHY_TMR_CFG_OFFSET (0x009c) +#define MIPIDSI_PHY_RSTZ_OFFSET (0x00a0) +#define MIPIDSI_PHY_IF_CFG_OFFSET (0x00a4) +#define MIPIDSI_PHY_ULPS_CTRL_OFFSET (0x00a8) +#define MIPIDSI_PHY_TX_TRIGGERS_OFFSET (0x00ac) +#define MIPIDSI_PHY_STATUS_OFFSET (0x00b0) +#define MIPIDSI_PHY_TST_CTRL0_OFFSET (0x00b4) +#define MIPIDSI_PHY_TST_CTRL1_OFFSET (0x00b8) +#define MIPIDSI_PHY_TST_CLK_PRE_DELAY (0x00B0) +#define MIPIDSI_PHY_TST_CLK_POST_DELAY (0x00B1) +#define MIPIDSI_PHY_TST_CLK_TLPX (0x00B2) +#define MIPIDSI_PHY_TST_CLK_PREPARE (0x00B3) +#define MIPIDSI_PHY_TST_CLK_ZERO (0x00B4) +#define MIPIDSI_PHY_TST_CLK_TRAIL (0x00B5) +#define MIPIDSI_PHY_TST_DATA_PRE_DELAY (0x0070) +#define MIPIDSI_PHY_TST_DATA_POST_DELAY (0x0071) +#define MIPIDSI_PHY_TST_DATA_TLPX (0x0072) +#define MIPIDSI_PHY_TST_DATA_PREPARE (0x0073) +#define MIPIDSI_PHY_TST_DATA_ZERO (0x0074) +#define MIPIDSI_PHY_TST_DATA_TRAIL (0x0075) +#define MIPIDSI_PHY_TST_LANE_TRANSMISSION_PROPERTY (0x0077) +#define MIPIDSI_INT_ST0_OFFSET (0x00bc) +#define MIPIDSI_INT_ST1_OFFSET (0x00c0) +#define MIPIDSI_INT_MSK0_OFFSET (0x00c4) +#define MIPIDSI_INT_MSK1_OFFSET (0x00c8) +#define INT_FORCE0 (0x00D8) +#define INT_FORCE1 (0x00DC) +#define VID_SHADOW_CTRL (0x0100) +#define DPI_VCID_ACT (0x010C) +#define DPI_COLOR_CODING_ACT (0x0110) +#define DPI_LP_CMD_TIM_ACT (0x0118) +#define VID_MODE_CFG_ACT (0x0138) +#define VID_PKT_SIZE_ACT (0x013C) +#define VID_NUM_CHUNKS_ACT (0x0140) +#define VID_NULL_SIZE_ACT (0x0144) +#define VID_HSA_TIME_ACT (0x0148) +#define VID_HBP_TIME_ACT (0x014C) +#define VID_HLINE_TIME_ACT (0x0150) +#define VID_VSA_LINES_ACT (0x0154) +#define VID_VBP_LINES_ACT (0x0158) +#define VID_VFP_LINES_ACT (0x015C) +#define VID_VACTIVE_LINES_ACT (0x0160) +#define SDF_3D_ACT (0x0190) + +/* MMBUF */ +#define SMC_LOCK (0x0000) +#define SMC_MEM_LP (0x0004) +#define SMC_GCLK_CS (0x000C) +#define SMC_QOS_BACKDOOR (0x0010) +#define SMC_DFX_WCMD_CNT_1ST (0x0014) +#define SMC_DFX_WCMD_CNT_2ND (0x0018) +#define SMC_DFX_WCMD_CNT_3RD (0x001C) +#define SMC_DFX_WCMD_CNT_4TH (0x0020) +#define SMC_DFX_RCMD_CNT_1ST (0x0024) +#define SMC_DFX_RCMD_CNT_2ND (0x0028) +#define SMC_DFX_RCMD_CNT_3RD (0x002C) +#define SMC_DFX_RCMD_CNT_4TH (0x0030) +#define SMC_CS_IDLE (0x0034) +#define SMC_DFX_BFIFO_CNT0 (0x0038) +#define SMC_DFX_RDFIFO_CNT1 (0x003C) +#define SMC_SP_SRAM_STATE0 (0x0040) +#define SMC_SP_SRAM_STATE1 (0x0044) + +#define MIPI_DPHY_NUM (2) + +struct mipi_ifbc_division { +u32 xres_div; +u32 yres_div; +u32 comp_mode; +u32 pxl0_div2_gt_en; +u32 pxl0_div4_gt_en; +u32 pxl0_divxcfg; +u32 pxl0_dsi_gt_en; +}; + +/* MMBUF */ + +/* IFBC compress mode */ +enum IFBC_TYPE { +IFBC_TYPE_NONE =0 , +IFBC_TYPE_ORISE2X , +IFBC_TYPE_ORISE3X , +IFBC_TYPE_HIMAX2X , +IFBC_TYPE_RSP2X , +IFBC_TYPE_RSP3X , +IFBC_TYPE_VESA2X_SINGLE , +IFBC_TYPE_VESA3X_SINGLE , +IFBC_TYPE_VESA2X_DUAL , +IFBC_TYPE_VESA3X_DUAL , +IFBC_TYPE_VESA3_75X_DUAL , + +IFBC_TYPE_MAX +}; + +/* IFBC compress mode */ +enum IFBC_COMP_MODE { +IFBC_COMP_MODE_0 =0 , +IFBC_COMP_MODE_1 , +IFBC_COMP_MODE_2 , +IFBC_COMP_MODE_3 , +IFBC_COMP_MODE_4 , +IFBC_COMP_MODE_5 , +IFBC_COMP_MODE_6 , +}; + +/* xres_div */ +enum XRES_DIV { +XRES_DIV_1 =1 , +XRES_DIV_2 , +XRES_DIV_3 , +XRES_DIV_4 , +XRES_DIV_5 , +XRES_DIV_6 , +}; + +/* yres_div */ +enum YRES_DIV { +YRES_DIV_1 =1 , +YRES_DIV_2 , +YRES_DIV_3 , +YRES_DIV_4 , +YRES_DIV_5 , +YRES_DIV_6 , +}; + +/* pxl0_divxcfg */ +enum PXL0_DIVCFG { +PXL0_DIVCFG_0 =0 , +PXL0_DIVCFG_1 , +PXL0_DIVCFG_2 , +PXL0_DIVCFG_3 , +PXL0_DIVCFG_4 , +PXL0_DIVCFG_5 , +PXL0_DIVCFG_6 , +PXL0_DIVCFG_7 , +}; + +/* pxl0_div2_gt_en */ +enum PXL0_DIV2_GT_EN { +PXL0_DIV2_GT_EN_CLOSE =0 , +PXL0_DIV2_GT_EN_OPEN , +}; + +/* pxl0_div4_gt_en */ +enum PXL0_DIV4_GT_EN { +PXL0_DIV4_GT_EN_CLOSE =0 , +PXL0_DIV4_GT_EN_OPEN , +}; + +/* pxl0_dsi_gt_en */ +enum PXL0_DSI_GT_EN { +PXL0_DSI_GT_EN_0 =0 , +PXL0_DSI_GT_EN_1 , +PXL0_DSI_GT_EN_2 , +PXL0_DSI_GT_EN_3 , +}; + +/*****************************************************************************/ + +#ifndef ALIGN_DOWN +#define ALIGN_DOWN (val, al) ((val) & ~((al) - 1)) +#endif + +#ifndef ALIGN_UP +#define ALIGN_UP (val, al) (((val) + ((al) - 1)) & ~((al) - 1)) +#endif + +#define to_dss_crtc (crtc) container_of(crtc, struct dss_crtc, base) +#define to_dss_plane (plane) container_of(plane, struct dss_plane, base) + +#endif
drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h +12 -2990
589 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h +18 -3026
3,044 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c +6 -16
Lines of this file are not shown. View the raw message.
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.h +193 -6
199 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_drm_overlay_utils.c +6 -0
Lines of this file are not shown. View the raw message.
drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c +1 -11
Lines of this file are not shown. View the raw message.
drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c +6 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.26.2
Part of the diff is not shown here. View the raw message.
PATCH 5/49 staging: hikey9xx/gpu: add support to hikey970 HDMI and panel
In reply to Mauro Carvalho ChehabFrom: Xiubin Zhang <[email protected]>
Add a driver for adv7535 and change the driver for it to work with HDMI and panel displays.
[[email protected]: for now, don't touch Kconfig/Makefile,
and don't add the actual display driver here]
--- drivers/staging/hikey9xx/gpu/Makefile | 4 + drivers/staging/hikey9xx/gpu/dw_drm_dsi.c | 454 +- drivers/staging/hikey9xx/gpu/hdmi/adv7535.c | 1653 +++++++ drivers/staging/hikey9xx/gpu/hdmi/adv7535.h | 351 ++ .../staging/hikey9xx/gpu/hdmi/adv7535_audio.c | 313 ++ .../staging/hikey9xx/gpu/kirin970_dpe_reg.h | 4267 +++++++++++++++++ drivers/staging/hikey9xx/gpu/kirin_dpe_reg.h | 144 +- .../hikey9xx/gpu/kirin_drm_dpe_utils.c | 368 +- .../hikey9xx/gpu/kirin_drm_dpe_utils.h | 16 +- drivers/staging/hikey9xx/gpu/kirin_drm_drv.c | 27 +- drivers/staging/hikey9xx/gpu/kirin_drm_drv.h | 2 +- drivers/staging/hikey9xx/gpu/kirin_drm_dss.c | 369 +- .../hikey9xx/gpu/kirin_drm_overlay_utils.c | 487 +- drivers/staging/hikey9xx/gpu/kirin_fb.c | 2 +- drivers/staging/hikey9xx/gpu/kirin_fb_panel.h | 197 + drivers/staging/hikey9xx/gpu/kirin_fbdev.c | 36 +- drivers/staging/hikey9xx/gpu/kirin_pwm.c | 400 ++ 17 files changed, 8938 insertions(+), 152 deletions(-) create mode 100644 drivers/staging/hikey9xx/gpu/hdmi/adv7535.c create mode 100644 drivers/staging/hikey9xx/gpu/hdmi/adv7535.h create mode 100644 drivers/staging/hikey9xx/gpu/hdmi/adv7535_audio.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin_fb_panel.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin_pwm.c
drivers/staging/hikey9xx/gpu/Makefile +4 -0
@@ -7,6 +7,10 @@ kirin-drm-y := kirin_fbdev.o \ kirin_drm_dss.o \ kirin_drm_dpe_utils.o \ kirin_drm_overlay_utils.o \ + kirin_pwm.o \ + hdmi/adv7535.o \ + +obj-$(CONFIG_HDMI_ADV7511_AUDIO) += hdmi/adv7535_audio.o obj-$(CONFIG_DRM_KIRIN_960) += kirin-drm.o obj-$(CONFIG_HISI_KIRIN_DW_DSI) += dw_drm_dsi.o
drivers/staging/hikey9xx/gpu/dw_drm_dsi.c +445 -9
576 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/hdmi/adv7535.c new file +1653 -0
1,653 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/hdmi/adv7535.h new file +351 -0
351 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/hdmi/adv7535_audio.c new file +313 -0
313 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h new file +4267 -0
97 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_dpe_reg.h +139 -5
144 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_drm_dpe_utils.c +349 -19
368 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_drm_dpe_utils.h +13 -3
Lines of this file are not shown. View the raw message.
drivers/staging/hikey9xx/gpu/kirin_drm_drv.c +24 -3
Lines of this file are not shown. View the raw message.
drivers/staging/hikey9xx/gpu/kirin_drm_drv.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/staging/hikey9xx/gpu/kirin_drm_dss.c +306 -63
369 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_drm_overlay_utils.c +448 -39
487 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_fb.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/staging/hikey9xx/gpu/kirin_fb_panel.h new file +197 -0
197 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin_fbdev.c +27 -9
Lines of this file are not shown. View the raw message.
drivers/staging/hikey9xx/gpu/kirin_pwm.c new file +400 -0
400 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.26.2
Part of the diff is not shown here. View the raw message.
Hi Mauro.
Quoted 54 lines · Mauro Carvalho Chehab
This patch series port the out-of-tree driver for Hikey 970 (which should also support Hikey 960) from the official 96boards tree:
https://github.com/96boards-hikey/linux/tree/hikey970-v4.9Based on his history, this driver seems to be originally written for Kernel 4.4, and was later ported to Kernel 4.9. The original driver used to depend on ION (from Kernel 4.4) and had its own implementation for FB dev API.
As I need to preserve the original history (with has patches from both HiSilicon and from Linaro), I'm starting from the original patch applied there. The remaining patches are incremental, and port this driver to work with upstream Kernel.
This driver doesn't depend on any firmware or on any special userspace code. It works as-is with both X11 and Wayland.
Yet, I'm submitting it via staging due to the following reasons:
- It depends on the LDO3 power supply, which is provided by a regulator driver that it is currently on staging;
- Due to legal reasons, I need to preserve the authorship of each one responsbile for each patch. So, I need to start from the original patch from Kernel 4.4;
- There are still some problems I need to figure out how to solve:
- The adv7535 can't get EDID data. Maybe it is a timing issue,but it requires more research to be sure about how to solve it;- The driver only accept resolutions on a defined list, as there's a known bug that this driver may have troubles with random resolutions. Probably due to a bug at the pixel clock settings;
- Sometimes (at least with 1080p), it generates LDI underflow errors, which in turn causes the DRM to stop working. That happens for example when using gdm on Wayland and gnome on X11;
- Probably related to the previous issue, when the monitor suspends due to DPMS, it doesn't return back to life.So, IMO, the best is to keep it on staging for a while, until those remaining bugs gets solved.
I added this series, together with the regulator driver and a few other patches (including a hack to fix a Kernel 5.8 regression at WiFi ) at:
https://gitlab.freedesktop.org/mchehab_kernel/hikey-970/-/commits/master
Chen Feng (1):
staging: hikey9xx: Add hisilicon DRM driver for hikey960/970John Stultz (1):
staging: hikey9xx/gpu: port it to work with Kernel v4.9
Quoted 7 lines
Liwei Cai (2):
staging: hikey9xx/gpu: solve tearing issue of display
staging: hikey9xx/gpu: resolve the performance issue by interrupt
mechanismMauro Carvalho Chehab (38):
staging: hikey9xx/gpu: get rid of adv7535 fork
Very good - I was in my mind starting a rant why we needed a fork of this driver, but I see it gets deleted again.
I do acknowledge you need to preserve history and all - but this patchset is not easy to review.
Could you follow-up with a review-able set of patches as a follow-up for this?
I spotted some wrong bridge handling in one patch but I do not know if this got changed in a later patch. And I lost the motivation to go looking for it.
Quoted 69 lines
staging: hikey9xx/gpu: rename the Kirin9xx namespace
staging: hikey9xx/gpu: get rid ofkirin9xx_fbdev.c
staging: hikey9xx/gpu: get rid of some ifdefs
staging: hikey9xx/gpu: rename the config option for Kirin970
staging: hikey9xx/gpu: change the includes to reflect upstream
staging: hikey9xx/gpu: port driver to upstream kAPIs
staging: hikey9xx/gpu: add a copy ofset_reg()function there
staging: hikey9xx/gpu: get rid of ION headers
staging: hikey9xx/gpu: add support for using a reserved CMA memory
staging: hikey9xx/gpu: cleanup encoder attach logic
staging: hikey9xx/gpu: Change the logic which sets the burst mode
staging: hikey9xx/gpu: fix the DRM setting logic
staging: hikey9xx/gpu: do some code cleanups
staging: hikey9xx/gpu: use defaultGEM_CMAfops
staging: hikey9xx/gpu: place vblank enable/disable at the right place
staging: hikey9xx/gpu: remove an uneeded hack
staging: hikey9xx/gpu: add a possible implementation for
atomic_disable
staging: hikey9xx/gpu: register connector
staging: hikey9xx/gpu: fix driver name
staging: hikey9xx/gpu: get rid ofiommu_format
staging: hikey9xx/gpu: re-work the mode validation code
staging: hikey9xx/gpu: add support for enable/disable ldo3 regulator
staging: hikey9xx/gpu: add SPMI headers
staging: hikey9xx/gpu: solve most coding style issues
staging: hikey9xx/gpu: don't use iommu code
staging: hikey9xx/gpu: add kirin9xx driver to the building system
staging: hikey9xx/gpu: get rid of typedefs
staging: hikey9xx/gpu: get rid of input/output macros
staging: hikey9xx/gpu: get rid of some unused data
staging: hikey9xx/gpu: place common definitions atkirin9xx_dpe.h
staging: hikey9xx/gpu: get rid ofDRM_HISI_KIRIN970
dts: hisilicon:hi3670.dtsi: add I2C settings
dts:hikey970-pinctrl.dtsi: add missing pinctrl settings
dt: hisilicon: add support for the PMIC found on Hikey 970
dts: add support for Hikey 970 DRM
staging: hikey9xx/gpu: dropkirin9xx_pwm
dt: display: Add binds for the DPE and DSI controller for Kirin960/970Xiubin Zhang (7):
staging: hikey9xx/gpu: add support to hikey970 HDMI and panel
staging: hikey9xx/gpu: Solve SR Cannot Display Problems.
staging: hikey9xx/gpu: Solve HDMI compatibility Problem.
staging: hikey9xx/gpu: Support MIPI DSI 3 lanes for hikey970.
staging: hikey9xx/gpu: Solve SR test reset problem for hikey970.
staging: hikey9xx/gpu: add debug prints for this driver
staging: hikey9xx/gpu: Add support 10.1 inch special HDMI displays..../display/hisilicon,hi3660-dpe.yaml | 99 + .../display/hisilicon,hi3660-dsi.yaml | 102 + .../boot/dts/hisilicon/hi3670-hikey970.dts | 56 +- arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 77 + .../boot/dts/hisilicon/hikey970-drm.dtsi | 93 + .../boot/dts/hisilicon/hikey970-pinctrl.dtsi | 548 +++- .../boot/dts/hisilicon/hikey970-pmic.dtsi | 197 ++ drivers/staging/hikey9xx/Kconfig | 3 + drivers/staging/hikey9xx/Makefile | 1 + drivers/staging/hikey9xx/gpu/Kconfig | 22 + drivers/staging/hikey9xx/gpu/Makefile | 9 + drivers/staging/hikey9xx/gpu/kirin960_defs.c | 378 +++ .../staging/hikey9xx/gpu/kirin960_dpe_reg.h | 233 ++ drivers/staging/hikey9xx/gpu/kirin970_defs.c | 381 +++ .../staging/hikey9xx/gpu/kirin970_dpe_reg.h | 1188 ++++++++ drivers/staging/hikey9xx/gpu/kirin9xx_dpe.h | 2437 +++++++++++++++++ .../hikey9xx/gpu/kirin9xx_drm_dpe_utils.c | 1178 ++++++++ .../hikey9xx/gpu/kirin9xx_drm_dpe_utils.h | 286 ++ .../staging/hikey9xx/gpu/kirin9xx_drm_drv.c | 368 +++ .../staging/hikey9xx/gpu/kirin9xx_drm_drv.h | 57 +
Quoted 8 lines
.../staging/hikey9xx/gpu/kirin9xx_drm_dss.c | 1063 +++++++ .../hikey9xx/gpu/kirin9xx_drm_overlay_utils.c | 1005 +++++++ .../hikey9xx/gpu/kirin9xx_dw_drm_dsi.c | 2132 ++++++++++++++ .../hikey9xx/gpu/kirin9xx_dw_dsi_reg.h | 146 + .../staging/hikey9xx/gpu/kirin9xx_fb_panel.h | 191 ++ 25 files changed, 12229 insertions(+), 21 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/hisilicon,hi3660-dpe.yaml create mode 100644 Documentation/devicetree/bindings/display/hisilicon,hi3660-dsi.yaml
Patch that intropduce new bindings must following the submitting patches guidelines for bindings. For once the subject is "dt-bindings: bla bla".
Sam
Quoted 10 lines
create mode 100644 arch/arm64/boot/dts/hisilicon/hikey970-drm.dtsi create mode 100644 arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi create mode 100644 drivers/staging/hikey9xx/gpu/Kconfig create mode 100644 drivers/staging/hikey9xx/gpu/Makefile create mode 100644 drivers/staging/hikey9xx/gpu/kirin960_defs.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin970_defs.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_dpe.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c
Quoted 17 lines
create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_drm_overlay_utils.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_dw_dsi_reg.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_fb_panel.hSignature · 7 lines
2.26.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 38/49] staging: hikey9xx/gpu: add kirin9xx driver to the building system
In reply to Mauro Carvalho ChehabQuoted 4 lines · Mauro Carvalho Chehab
Now that everything is in place, add the driver to the building system.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
Hi Mauro,
In this patch and in patch 01/49, please be consistent in capitalization on HiSilicon.
more below:
Quoted 24 lines
--- drivers/staging/hikey9xx/Kconfig | 3 ++ drivers/staging/hikey9xx/Makefile | 1 + drivers/staging/hikey9xx/gpu/Kconfig | 52 ++++++--------------------- drivers/staging/hikey9xx/gpu/Makefile | 21 ++++------- 4 files changed, 22 insertions(+), 55 deletions(-)drivers/staging/hikey9xx/Kconfig +3
-0@@ -36,3 +36,6 @@ config REGULATOR_HI6421V600 This driver provides support for the voltage regulators on HiSilicon Hi6421v600 PMU / Codec IC. This is used on Kirin 3670 boards, like HiKey 970. + +# DRM/KMS driver +source "drivers/staging/hikey9xx/gpu/Kconfig"drivers/staging/hikey9xx/gpu/Kconfig +0
-0
drivers/staging/hikey9xx/gpu/Kconfig line 1
Quoted 3 lines
drivers/staging/hikey9xx/gpu/Kconfig +1
-2@@ -1,52 +1,22 @@ -config DRM_HISI_KIRIN - tristate "DRM Support for Hisilicon Kirin series SoCs Platform"> +config DRM_HISI_KIRIN9XX + tristate "DRM Support for Hisilicon Kirin9xx series SoCs Platform"
HiSilicon
Quoted 21 lines
drivers/staging/hikey9xx/gpu/Kconfig +0
-17depends on DRM && OF && ARM64 select DRM_KMS_HELPER select DRM_GEM_CMA_HELPER select DRM_KMS_CMA_HELPER - select HISI_KIRIN_DW_DSI - help - Choose this option if you have a hisilicon Kirin chipsets(hi6220). - If M is selected the module will be called kirin-drm. - -config DRM_KIRIN_960 - tristate "DRM Support for Hisilicon Kirin960 series SoCs Platform" - depends on DRM && OF && ARM64 - select DRM_KMS_HELPER - select DRM_GEM_CMA_HELPER - select DRM_KMS_CMA_HELPER - select HISI_KIRIN_DW_DSI - help - Choose this option if you have a hisilicon Kirin chipsets(kirin960). - If M is selected the module will be called kirin-drm. - -config HISI_KIRIN_DW_DSI
drivers/staging/hikey9xx/gpu/Kconfig line 10
Quoted 10 lines
drivers/staging/hikey9xx/gpu/Kconfig +2
-6- tristate "HiSilicon Kirin specific extensions for Synopsys DW MIPI DSI" - depends on DRM_HISI_KIRIN || DRM_KIRIN_960 select DRM_MIPI_DSI - select DRM_PANEL help - This selects support for HiSilicon Kirin SoC specific extensions for - the Synopsys DesignWare DSI driver. If you want to enable MIPI DSI on - hi6220 based SoC, you should selet this option. + Choose this option if you have a HiSilicon Kirin960 or Kirin970. + If M is selected the module will be called kirin9xx-drm.
Indent with 1 tab + 2 spaces.
Quoted 4 lines
drivers/staging/hikey9xx/gpu/Kconfig +0
-3-config DRM_PANEL_HIKEY960_NTE300NTS - tristate "Hikey960 NTE300NTS video mode panel" - depends on OF
drivers/staging/hikey9xx/gpu/Kconfig line 13
Quoted 10 lines
drivers/staging/hikey9xx/gpu/Kconfig +2
-8- depends on DRM_MIPI_DSI - help - Say Y here if you want to enable LCD panel driver for Hikey960 boadr. - Current support panel: NTE300NTS(1920X1200) - -config HISI_FB_970 - tristate "DRM Support for Hisilicon Kirin970 series SoCs Platform" - depends on DRM && OF && ARM64 +config DRM_HISI_KIRIN970 + bool "Enable support for Hisilicon Kirin970"
HiSilicon
drivers/staging/hikey9xx/gpu/Kconfig line 17
Quoted 4 lines
drivers/staging/hikey9xx/gpu/Kconfig +1
-0depends on DRM_MIPI_DSI + depends on DRM_HISI_KIRIN9XX help Choose this option if you have a hisilicon Kirin chipsets(kirin970).
HiSilicon
drivers/staging/hikey9xx/gpu/Kconfig line 22
Quoted 10 lines
drivers/staging/hikey9xx/gpu/Kconfig +4
-5- If M is selected the module will be called kirin-drm. -config HDMI_ADV7511_AUDIO - tristate "HDMI Support ADV7511 audio" - help - Choose this option to support HDMI ADV7511 audio. +config DRM_HISI_KIRIN9XX_DSI + tristate + depends on DRM_HISI_KIRIN9XX + default y
thanks.
Signature · 1 line
~Randy
Laurent Pinchart
reviewerQuoted 62 lines · Sam Ravnborg
Hi Mauro.
Quoted 59 lines · Mauro Carvalho Chehab
This patch series port the out-of-tree driver for Hikey 970 (which should also support Hikey 960) from the official 96boards tree:
https://github.com/96boards-hikey/linux/tree/hikey970-v4.9Based on his history, this driver seems to be originally written for Kernel 4.4, and was later ported to Kernel 4.9. The original driver used to depend on ION (from Kernel 4.4) and had its own implementation for FB dev API.
As I need to preserve the original history (with has patches from both HiSilicon and from Linaro), I'm starting from the original patch applied there. The remaining patches are incremental, and port this driver to work with upstream Kernel.
This driver doesn't depend on any firmware or on any special userspace code. It works as-is with both X11 and Wayland.
Yet, I'm submitting it via staging due to the following reasons:
- It depends on the LDO3 power supply, which is provided by a regulator driver that it is currently on staging;
- Due to legal reasons, I need to preserve the authorship of each one responsbile for each patch. So, I need to start from the original patch from Kernel 4.4;
- There are still some problems I need to figure out how to solve:
- The adv7535 can't get EDID data. Maybe it is a timing issue,but it requires more research to be sure about how to solve it;- The driver only accept resolutions on a defined list, as there's a known bug that this driver may have troubles with random resolutions. Probably due to a bug at the pixel clock settings;
- Sometimes (at least with 1080p), it generates LDI underflow errors, which in turn causes the DRM to stop working. That happens for example when using gdm on Wayland and gnome on X11;
- Probably related to the previous issue, when the monitor suspends due to DPMS, it doesn't return back to life.So, IMO, the best is to keep it on staging for a while, until those remaining bugs gets solved.
I added this series, together with the regulator driver and a few other patches (including a hack to fix a Kernel 5.8 regression at WiFi ) at:
https://gitlab.freedesktop.org/mchehab_kernel/hikey-970/-/commits/master
Chen Feng (1):
staging: hikey9xx: Add hisilicon DRM driver for hikey960/970John Stultz (1):
staging: hikey9xx/gpu: port it to work with Kernel v4.9Liwei Cai (2):
staging: hikey9xx/gpu: solve tearing issue of display
staging: hikey9xx/gpu: resolve the performance issue by interrupt
mechanism
Quoted 7 lines
Quoted 2 lines
Mauro Carvalho Chehab (38):
staging: hikey9xx/gpu: get rid of adv7535 forkVery good - I was in my mind starting a rant why we needed a fork of this driver, but I see it gets deleted again.
I do acknowledge you need to preserve history and all - but this patchset is not easy to review.
Why do we need to preserve history ? Adding relevant Signed-off-by and Co-developed-by should be enough, shouldn't it ? Having a public branch that contains the history is useful if anyone is interested, but I don't think it's required in mainline.
Quoted 105 lines
Could you follow-up with a review-able set of patches as a follow-up for this?
I spotted some wrong bridge handling in one patch but I do not know if this got changed in a later patch. And I lost the motivation to go looking for it.Quoted 69 lines
staging: hikey9xx/gpu: rename the Kirin9xx namespace
staging: hikey9xx/gpu: get rid ofkirin9xx_fbdev.c
staging: hikey9xx/gpu: get rid of some ifdefs
staging: hikey9xx/gpu: rename the config option for Kirin970
staging: hikey9xx/gpu: change the includes to reflect upstream
staging: hikey9xx/gpu: port driver to upstream kAPIs
staging: hikey9xx/gpu: add a copy ofset_reg()function there
staging: hikey9xx/gpu: get rid of ION headers
staging: hikey9xx/gpu: add support for using a reserved CMA memory
staging: hikey9xx/gpu: cleanup encoder attach logic
staging: hikey9xx/gpu: Change the logic which sets the burst mode
staging: hikey9xx/gpu: fix the DRM setting logic
staging: hikey9xx/gpu: do some code cleanups
staging: hikey9xx/gpu: use defaultGEM_CMAfops
staging: hikey9xx/gpu: place vblank enable/disable at the right place
staging: hikey9xx/gpu: remove an uneeded hack
staging: hikey9xx/gpu: add a possible implementation for
atomic_disable
staging: hikey9xx/gpu: register connector
staging: hikey9xx/gpu: fix driver name
staging: hikey9xx/gpu: get rid ofiommu_format
staging: hikey9xx/gpu: re-work the mode validation code
staging: hikey9xx/gpu: add support for enable/disable ldo3 regulator
staging: hikey9xx/gpu: add SPMI headers
staging: hikey9xx/gpu: solve most coding style issues
staging: hikey9xx/gpu: don't use iommu code
staging: hikey9xx/gpu: add kirin9xx driver to the building system
staging: hikey9xx/gpu: get rid of typedefs
staging: hikey9xx/gpu: get rid of input/output macros
staging: hikey9xx/gpu: get rid of some unused data
staging: hikey9xx/gpu: place common definitions atkirin9xx_dpe.h
staging: hikey9xx/gpu: get rid ofDRM_HISI_KIRIN970
dts: hisilicon:hi3670.dtsi: add I2C settings
dts:hikey970-pinctrl.dtsi: add missing pinctrl settings
dt: hisilicon: add support for the PMIC found on Hikey 970
dts: add support for Hikey 970 DRM
staging: hikey9xx/gpu: dropkirin9xx_pwm
dt: display: Add binds for the DPE and DSI controller for Kirin960/970Xiubin Zhang (7):
staging: hikey9xx/gpu: add support to hikey970 HDMI and panel
staging: hikey9xx/gpu: Solve SR Cannot Display Problems.
staging: hikey9xx/gpu: Solve HDMI compatibility Problem.
staging: hikey9xx/gpu: Support MIPI DSI 3 lanes for hikey970.
staging: hikey9xx/gpu: Solve SR test reset problem for hikey970.
staging: hikey9xx/gpu: add debug prints for this driver
staging: hikey9xx/gpu: Add support 10.1 inch special HDMI displays..../display/hisilicon,hi3660-dpe.yaml | 99 + .../display/hisilicon,hi3660-dsi.yaml | 102 + .../boot/dts/hisilicon/hi3670-hikey970.dts | 56 +- arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 77 + .../boot/dts/hisilicon/hikey970-drm.dtsi | 93 + .../boot/dts/hisilicon/hikey970-pinctrl.dtsi | 548 +++- .../boot/dts/hisilicon/hikey970-pmic.dtsi | 197 ++ drivers/staging/hikey9xx/Kconfig | 3 + drivers/staging/hikey9xx/Makefile | 1 + drivers/staging/hikey9xx/gpu/Kconfig | 22 + drivers/staging/hikey9xx/gpu/Makefile | 9 + drivers/staging/hikey9xx/gpu/kirin960_defs.c | 378 +++ .../staging/hikey9xx/gpu/kirin960_dpe_reg.h | 233 ++ drivers/staging/hikey9xx/gpu/kirin970_defs.c | 381 +++ .../staging/hikey9xx/gpu/kirin970_dpe_reg.h | 1188 ++++++++ drivers/staging/hikey9xx/gpu/kirin9xx_dpe.h | 2437 +++++++++++++++++ .../hikey9xx/gpu/kirin9xx_drm_dpe_utils.c | 1178 ++++++++ .../hikey9xx/gpu/kirin9xx_drm_dpe_utils.h | 286 ++ .../staging/hikey9xx/gpu/kirin9xx_drm_drv.c | 368 +++ .../staging/hikey9xx/gpu/kirin9xx_drm_drv.h | 57 +Quoted 8 lines
.../staging/hikey9xx/gpu/kirin9xx_drm_dss.c | 1063 +++++++ .../hikey9xx/gpu/kirin9xx_drm_overlay_utils.c | 1005 +++++++ .../hikey9xx/gpu/kirin9xx_dw_drm_dsi.c | 2132 ++++++++++++++ .../hikey9xx/gpu/kirin9xx_dw_dsi_reg.h | 146 + .../staging/hikey9xx/gpu/kirin9xx_fb_panel.h | 191 ++ 25 files changed, 12229 insertions(+), 21 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/hisilicon,hi3660-dpe.yaml create mode 100644 Documentation/devicetree/bindings/display/hisilicon,hi3660-dsi.yamlPatch that intropduce new bindings must following the submitting patches guidelines for bindings. For once the subject is "dt-bindings: bla bla".
Quoted 18 lines
create mode 100644 arch/arm64/boot/dts/hisilicon/hikey970-drm.dtsi create mode 100644 arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi create mode 100644 drivers/staging/hikey9xx/gpu/Kconfig create mode 100644 drivers/staging/hikey9xx/gpu/Makefile create mode 100644 drivers/staging/hikey9xx/gpu/kirin960_defs.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin970_defs.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_dpe.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_drm_overlay_utils.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_dw_dsi_reg.h create mode 100644 drivers/staging/hikey9xx/gpu/kirin9xx_fb_panel.h
Signature · 3 lines
Regards, Laurent Pinchart
Hi Sam,
Em Wed, 19 Aug 2020 17:21:20 +0200
Sam Ravnborg <[email protected]> escreveu:
Quoted 62 lines
Hi Mauro.
Quoted 59 lines · Mauro Carvalho Chehab
This patch series port the out-of-tree driver for Hikey 970 (which should also support Hikey 960) from the official 96boards tree:
https://github.com/96boards-hikey/linux/tree/hikey970-v4.9Based on his history, this driver seems to be originally written for Kernel 4.4, and was later ported to Kernel 4.9. The original driver used to depend on ION (from Kernel 4.4) and had its own implementation for FB dev API.
As I need to preserve the original history (with has patches from both HiSilicon and from Linaro), I'm starting from the original patch applied there. The remaining patches are incremental, and port this driver to work with upstream Kernel.
This driver doesn't depend on any firmware or on any special userspace code. It works as-is with both X11 and Wayland.
Yet, I'm submitting it via staging due to the following reasons:
- It depends on the LDO3 power supply, which is provided by a regulator driver that it is currently on staging;
- Due to legal reasons, I need to preserve the authorship of each one responsbile for each patch. So, I need to start from the original patch from Kernel 4.4;
- There are still some problems I need to figure out how to solve:
- The adv7535 can't get EDID data. Maybe it is a timing issue,but it requires more research to be sure about how to solve it;- The driver only accept resolutions on a defined list, as there's a known bug that this driver may have troubles with random resolutions. Probably due to a bug at the pixel clock settings;
- Sometimes (at least with 1080p), it generates LDI underflow errors, which in turn causes the DRM to stop working. That happens for example when using gdm on Wayland and gnome on X11;
- Probably related to the previous issue, when the monitor suspends due to DPMS, it doesn't return back to life.So, IMO, the best is to keep it on staging for a while, until those remaining bugs gets solved.
I added this series, together with the regulator driver and a few other patches (including a hack to fix a Kernel 5.8 regression at WiFi ) at:
https://gitlab.freedesktop.org/mchehab_kernel/hikey-970/-/commits/master
Chen Feng (1):
staging: hikey9xx: Add hisilicon DRM driver for hikey960/970John Stultz (1):
staging: hikey9xx/gpu: port it to work with Kernel v4.9Liwei Cai (2):
staging: hikey9xx/gpu: solve tearing issue of display
staging: hikey9xx/gpu: resolve the performance issue by interrupt
mechanism
Quoted 4 lines
Quoted 2 lines
Mauro Carvalho Chehab (38):
staging: hikey9xx/gpu: get rid of adv7535 forkVery good - I was in my mind starting a rant why we needed a fork of this driver, but I see it gets deleted again.
Yep. the adv7535 fork is there at the beginning mainly because the original patch do some other I2C inits for a different group, which the upstream driver doesn't (plus there is a hack there). Those are not essential for DRM to work, but it could give some clues about the EDID issue. So, I opted to maintain this file at the original patch, as having the history can help debug some things in the future.
Quoted 2 lines
I do acknowledge you need to preserve history and all - but this patchset is not easy to review.
Yeah, sorry for that.
Quoted 2 lines
Could you follow-up with a review-able set of patches as a follow-up for this?
Sure. I'm enclosing here a diffstat for the driver part (excluding DT bindings, as those are already self-contained).
Quoted 3 lines
I spotted some wrong bridge handling in one patch but I do not know if this got changed in a later patch. And I lost the motivation to go looking for it.
I did some changes at the bridge handling code, but not sure if those are 100%. It would be nice to get some review about that, as this is my first incursion at the DRM subsystem ;-)
Thanks,
Mauro
-
The following diff merges patch from:
[PATCH 01/49] staging: hikey9xx: Add hisilicon DRM driver for hikey960/970
to:
[PATCH 43/49] staging: hikey9xx/gpu: get rid of DRM_HISI_KIRIN970
drivers/staging/hikey9xx/Kconfig +3 -0
@@ -36,3 +36,6 @@ config REGULATOR_HI6421V600 This driver provides support for the voltage regulators on HiSilicon Hi6421v600 PMU / Codec IC. This is used on Kirin 3670 boards, like HiKey 970. + +# DRM/KMS driver +source "drivers/staging/hikey9xx/gpu/Kconfig"
drivers/staging/hikey9xx/Makefile +1 -0
@@ -3,3 +3,4 @@ obj-$(CONFIG_SPMI_HISI3670) += hisi-spmi-controller.o obj-$(CONFIG_MFD_HI6421_SPMI) += hi6421-spmi-pmic.o obj-$(CONFIG_REGULATOR_HI6421V600) += hi6421v600-regulator.o +obj-y += gpu/
drivers/staging/hikey9xx/gpu/Kconfig new file +22 -0
@@ -0,0 +1,22 @@ +config DRM_HISI_KIRIN9XX + tristate "DRM Support for Hisilicon Kirin9xx series SoCs Platform" + depends on DRM && OF && ARM64 + select DRM_KMS_HELPER + select DRM_GEM_CMA_HELPER + select DRM_KMS_CMA_HELPER + select DRM_MIPI_DSI + help + Choose this option if you have a HiSilicon Kirin960 or Kirin970. + If M is selected the module will be called kirin9xx-drm. + +config DRM_HISI_KIRIN970 + bool "Enable support for Hisilicon Kirin970" + depends on DRM_MIPI_DSI + depends on DRM_HISI_KIRIN9XX + help + Choose this option if you have a hisilicon Kirin chipsets(kirin970). + +config DRM_HISI_KIRIN9XX_DSI + tristate + depends on DRM_HISI_KIRIN9XX + default y
drivers/staging/hikey9xx/gpu/Makefile new file +9 -0
@@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-only +kirin9xx-drm-y := kirin9xx_drm_drv.o \ + kirin9xx_drm_dss.o \ + kirin9xx_drm_dpe_utils.o \ + kirin970_defs.o kirin960_defs.o \ + kirin9xx_drm_overlay_utils.o + +obj-$(CONFIG_DRM_HISI_KIRIN9XX) += kirin9xx-drm.o kirin9xx_pwm.o +obj-$(CONFIG_DRM_HISI_KIRIN9XX_DSI) += kirin9xx_dw_drm_dsi.o
drivers/staging/hikey9xx/gpu/kirin960_defs.c new file +378 -0
378 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin960_dpe_reg.h new file +233 -0
233 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin970_defs.c new file +381 -0
381 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin970_dpe_reg.h new file +1188 -0
1,188 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_dpe.h new file +2437 -0
779 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.c new file +1178 -0
1,178 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dpe_utils.h new file +286 -0
286 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.c new file +368 -0
368 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_drm_drv.h new file +57 -0
57 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_drm_dss.c new file +1063 -0
1,063 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_drm_overlay_utils.c new file +1005 -0
1,005 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_dw_drm_dsi.c new file +2132 -0
2,132 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_dw_dsi_reg.h new file +146 -0
146 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_fb_panel.h new file +191 -0
191 lines not on this page · raw message
drivers/staging/hikey9xx/gpu/kirin9xx_pwm.c new file +404 -0
404 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.