iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/ingenic: Add support for JZ4780 and HDMI output

Browse Source 
Add support for the LCD controller present on JZ4780 SoCs.
This SoC uses 8-byte descriptors which extend the current
4-byte descriptors used for other Ingenic SoCs.

Tested on MIPS Creator CI20 board.

Signed-off-by: Paul Boddie <paul@boddie.org.uk>
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Link: https://patchwork.freedesktop.org/patch/msgid/caf9e56b64b0717563e03172b30fa03736e92e15.1638470392.git.hns@goldelico.com
This commit is contained in:
Paul Boddie 2021-12-02 19:39:47 +01:00 committed by Paul Cercueil
parent ef2f5d0aa1
commit b807fd2c43
No known key found for this signature in database
GPG Key ID: 73EE6BD2274ABD41
2 changed files with 91 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/gpu/drm/ingenic/ingenic-drm-drv.c
View File

@ -6,6 +6,7 @@
#include "ingenic-drm.h" #include "ingenic-drm.h"
#include <linux/bitfield.h>
#include <linux/component.h> #include <linux/component.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
@ -49,6 +50,11 @@ struct ingenic_dma_hwdesc {
u32 addr; u32 addr;
u32 id; u32 id;
u32 cmd; u32 cmd;
/* extended hw descriptor for jz4780 */
u32 offsize;
u32 pagewidth;
u32 cpos;
u32 dessize;
} __aligned(16); } __aligned(16);
struct ingenic_dma_hwdescs { struct ingenic_dma_hwdescs {
@ -60,6 +66,7 @@ struct jz_soc_info {
bool needs_dev_clk; bool needs_dev_clk;
bool has_osd; bool has_osd;
bool map_noncoherent; bool map_noncoherent;
bool use_extended_hwdesc;
unsigned int max_width, max_height; unsigned int max_width, max_height;
const u32 *formats_f0, *formats_f1; const u32 *formats_f0, *formats_f1;
unsigned int num_formats_f0, num_formats_f1; unsigned int num_formats_f0, num_formats_f1;
@ -446,6 +453,9 @@ static int ingenic_drm_plane_atomic_check(struct drm_plane *plane,
if (!crtc) if (!crtc)
return 0; return 0;
if (plane == &priv->f0)
return -EINVAL;
crtc_state = drm_atomic_get_existing_crtc_state(state, crtc_state = drm_atomic_get_existing_crtc_state(state,
crtc); crtc);
if (WARN_ON(!crtc_state)) if (WARN_ON(!crtc_state))
@ -662,6 +672,33 @@ static void ingenic_drm_plane_atomic_update(struct drm_plane *plane,
hwdesc->cmd = JZ_LCD_CMD_EOF_IRQ | (width * height * cpp / 4); hwdesc->cmd = JZ_LCD_CMD_EOF_IRQ | (width * height * cpp / 4);
hwdesc->next = dma_hwdesc_addr(priv, next_id); hwdesc->next = dma_hwdesc_addr(priv, next_id);
if (priv->soc_info->use_extended_hwdesc) {
hwdesc->cmd |= JZ_LCD_CMD_FRM_ENABLE;
/* Extended 8-byte descriptor */
hwdesc->cpos = 0;
hwdesc->offsize = 0;
hwdesc->pagewidth = 0;
switch (newstate->fb->format->format) {
case DRM_FORMAT_XRGB1555:
hwdesc->cpos |= JZ_LCD_CPOS_RGB555;
fallthrough;
case DRM_FORMAT_RGB565:
hwdesc->cpos |= JZ_LCD_CPOS_BPP_15_16;
break;
case DRM_FORMAT_XRGB8888:
hwdesc->cpos |= JZ_LCD_CPOS_BPP_18_24;
break;
}
hwdesc->cpos |= (JZ_LCD_CPOS_COEFFICIENT_1 <<
JZ_LCD_CPOS_COEFFICIENT_OFFSET);
hwdesc->dessize =
(0xff << JZ_LCD_DESSIZE_ALPHA_OFFSET) |
FIELD_PREP(JZ_LCD_DESSIZE_HEIGHT_MASK, height - 1) |
FIELD_PREP(JZ_LCD_DESSIZE_WIDTH_MASK, width - 1);
}
if (drm_atomic_crtc_needs_modeset(crtc_state)) { if (drm_atomic_crtc_needs_modeset(crtc_state)) {
fourcc = newstate->fb->format->format; fourcc = newstate->fb->format->format;
@ -693,6 +730,9 @@ static void ingenic_drm_encoder_atomic_mode_set(struct drm_encoder *encoder,
| JZ_LCD_CFG_SPL_DISABLE | JZ_LCD_CFG_REV_DISABLE; | JZ_LCD_CFG_SPL_DISABLE | JZ_LCD_CFG_REV_DISABLE;
} }
if (priv->soc_info->use_extended_hwdesc)
cfg |= JZ_LCD_CFG_DESCRIPTOR_8;
if (mode->flags & DRM_MODE_FLAG_NHSYNC) if (mode->flags & DRM_MODE_FLAG_NHSYNC)
cfg |= JZ_LCD_CFG_HSYNC_ACTIVE_LOW; cfg |= JZ_LCD_CFG_HSYNC_ACTIVE_LOW;
if (mode->flags & DRM_MODE_FLAG_NVSYNC) if (mode->flags & DRM_MODE_FLAG_NVSYNC)
@ -1468,10 +1508,23 @@ static const struct jz_soc_info jz4770_soc_info = {
.num_formats_f0 = ARRAY_SIZE(jz4770_formats_f0), .num_formats_f0 = ARRAY_SIZE(jz4770_formats_f0),
}; };
static const struct jz_soc_info jz4780_soc_info = {
.needs_dev_clk = true,
.has_osd = true,
.use_extended_hwdesc = true,
.max_width = 4096,
.max_height = 2048,
.formats_f1 = jz4770_formats_f1,
.num_formats_f1 = ARRAY_SIZE(jz4770_formats_f1),
.formats_f0 = jz4770_formats_f0,
.num_formats_f0 = ARRAY_SIZE(jz4770_formats_f0),
};
static const struct of_device_id ingenic_drm_of_match[] = { static const struct of_device_id ingenic_drm_of_match[] = {
{ .compatible = "ingenic,jz4740-lcd", .data = &jz4740_soc_info }, { .compatible = "ingenic,jz4740-lcd", .data = &jz4740_soc_info },
{ .compatible = "ingenic,jz4725b-lcd", .data = &jz4725b_soc_info }, { .compatible = "ingenic,jz4725b-lcd", .data = &jz4725b_soc_info },
{ .compatible = "ingenic,jz4770-lcd", .data = &jz4770_soc_info }, { .compatible = "ingenic,jz4770-lcd", .data = &jz4770_soc_info },
{ .compatible = "ingenic,jz4780-lcd", .data = &jz4780_soc_info },
{ /* sentinel */ }, { /* sentinel */ },
}; };
MODULE_DEVICE_TABLE(of, ingenic_drm_of_match); MODULE_DEVICE_TABLE(of, ingenic_drm_of_match);

38
drivers/gpu/drm/ingenic/ingenic-drm.h
View File

@ -44,8 +44,11 @@
#define JZ_REG_LCD_XYP1 0x124 #define JZ_REG_LCD_XYP1 0x124
#define JZ_REG_LCD_SIZE0 0x128 #define JZ_REG_LCD_SIZE0 0x128
#define JZ_REG_LCD_SIZE1 0x12c #define JZ_REG_LCD_SIZE1 0x12c
#define JZ_REG_LCD_PCFG 0x2c0
#define JZ_LCD_CFG_SLCD BIT(31) #define JZ_LCD_CFG_SLCD BIT(31)
#define JZ_LCD_CFG_DESCRIPTOR_8 BIT(28)
#define JZ_LCD_CFG_RECOVER_FIFO_UNDERRUN BIT(25)
#define JZ_LCD_CFG_PS_DISABLE BIT(23) #define JZ_LCD_CFG_PS_DISABLE BIT(23)
#define JZ_LCD_CFG_CLS_DISABLE BIT(22) #define JZ_LCD_CFG_CLS_DISABLE BIT(22)
#define JZ_LCD_CFG_SPL_DISABLE BIT(21) #define JZ_LCD_CFG_SPL_DISABLE BIT(21)
@ -63,6 +66,7 @@
#define JZ_LCD_CFG_DE_ACTIVE_LOW BIT(9) #define JZ_LCD_CFG_DE_ACTIVE_LOW BIT(9)
#define JZ_LCD_CFG_VSYNC_ACTIVE_LOW BIT(8) #define JZ_LCD_CFG_VSYNC_ACTIVE_LOW BIT(8)
#define JZ_LCD_CFG_18_BIT BIT(7) #define JZ_LCD_CFG_18_BIT BIT(7)
#define JZ_LCD_CFG_24_BIT BIT(6)
#define JZ_LCD_CFG_PDW (BIT(5) | BIT(4)) #define JZ_LCD_CFG_PDW (BIT(5) | BIT(4))
#define JZ_LCD_CFG_MODE_GENERIC_16BIT 0 #define JZ_LCD_CFG_MODE_GENERIC_16BIT 0
@ -132,6 +136,7 @@
#define JZ_LCD_CMD_SOF_IRQ BIT(31) #define JZ_LCD_CMD_SOF_IRQ BIT(31)
#define JZ_LCD_CMD_EOF_IRQ BIT(30) #define JZ_LCD_CMD_EOF_IRQ BIT(30)
#define JZ_LCD_CMD_ENABLE_PAL BIT(28) #define JZ_LCD_CMD_ENABLE_PAL BIT(28)
#define JZ_LCD_CMD_FRM_ENABLE BIT(26)
#define JZ_LCD_SYNC_MASK 0x3ff #define JZ_LCD_SYNC_MASK 0x3ff
@ -153,6 +158,7 @@
#define JZ_LCD_RGBC_EVEN_BGR (0x5 << 0) #define JZ_LCD_RGBC_EVEN_BGR (0x5 << 0)
#define JZ_LCD_OSDC_OSDEN BIT(0) #define JZ_LCD_OSDC_OSDEN BIT(0)
#define JZ_LCD_OSDC_ALPHAEN BIT(2)
#define JZ_LCD_OSDC_F0EN BIT(3) #define JZ_LCD_OSDC_F0EN BIT(3)
#define JZ_LCD_OSDC_F1EN BIT(4) #define JZ_LCD_OSDC_F1EN BIT(4)
@ -176,6 +182,38 @@
#define JZ_LCD_SIZE01_WIDTH_LSB 0 #define JZ_LCD_SIZE01_WIDTH_LSB 0
#define JZ_LCD_SIZE01_HEIGHT_LSB 16 #define JZ_LCD_SIZE01_HEIGHT_LSB 16
#define JZ_LCD_DESSIZE_ALPHA_OFFSET 24
#define JZ_LCD_DESSIZE_HEIGHT_MASK GENMASK(23, 12)
#define JZ_LCD_DESSIZE_WIDTH_MASK GENMASK(11, 0)
#define JZ_LCD_CPOS_BPP_15_16 (4 << 27)
#define JZ_LCD_CPOS_BPP_18_24 (5 << 27)
#define JZ_LCD_CPOS_BPP_30 (7 << 27)
#define JZ_LCD_CPOS_RGB555 BIT(30)
#define JZ_LCD_CPOS_PREMULTIPLY_LCD BIT(26)
#define JZ_LCD_CPOS_COEFFICIENT_OFFSET 24
#define JZ_LCD_CPOS_COEFFICIENT_0 0
#define JZ_LCD_CPOS_COEFFICIENT_1 1
#define JZ_LCD_CPOS_COEFFICIENT_ALPHA1 2
#define JZ_LCD_CPOS_COEFFICIENT_1_ALPHA1 3
#define JZ_LCD_RGBC_RGB_PADDING BIT(15)
#define JZ_LCD_RGBC_RGB_PADDING_FIRST BIT(14)
#define JZ_LCD_RGBC_422 BIT(8)
#define JZ_LCD_RGBC_RGB_FORMAT_ENABLE BIT(7)
#define JZ_LCD_PCFG_PRI_MODE BIT(31)
#define JZ_LCD_PCFG_HP_BST_4 (0 << 28)
#define JZ_LCD_PCFG_HP_BST_8 (1 << 28)
#define JZ_LCD_PCFG_HP_BST_16 (2 << 28)
#define JZ_LCD_PCFG_HP_BST_32 (3 << 28)
#define JZ_LCD_PCFG_HP_BST_64 (4 << 28)
#define JZ_LCD_PCFG_HP_BST_16_CONT (5 << 28)
#define JZ_LCD_PCFG_HP_BST_DISABLE (7 << 28)
#define JZ_LCD_PCFG_THRESHOLD2_OFFSET 18
#define JZ_LCD_PCFG_THRESHOLD1_OFFSET 9
#define JZ_LCD_PCFG_THRESHOLD0_OFFSET 0
struct device; struct device;
struct drm_plane; struct drm_plane;
struct drm_plane_state; struct drm_plane_state;