Skip to content

L
linux
Commit 63aa581c authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Stefan Agner
Browse files
Options

drm: mxsfb: Support the alpha plane 

The LCDIF in the i.MX6SX and i.MX7 have a second plane called the alpha
plane. Support it.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: default avatarStefan Agner <stefan@agner.ch>
Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20200727020654.8231-23-laurent.pinchart@ideasonboard.com
parent b963ad95
Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 16 deletions
drivers/gpu/drm/mxsfb/mxsfb_drv.c
View file @ 63aa581c
...@@ -49,6 +49,7 @@ static const struct mxsfb_devdata mxsfb_devdata[] = { ...@@ -49,6 +49,7 @@ static const struct mxsfb_devdata mxsfb_devdata[] = {
.next_buf = LCDC_V3_NEXT_BUF, .next_buf = LCDC_V3_NEXT_BUF,
.hs_wdth_mask = 0xff, .hs_wdth_mask = 0xff,
.hs_wdth_shift = 24, .hs_wdth_shift = 24,
.has_overlay = false,
}, },
[MXSFB_V4] = { [MXSFB_V4] = {
.transfer_count = LCDC_V4_TRANSFER_COUNT, .transfer_count = LCDC_V4_TRANSFER_COUNT,
...@@ -56,6 +57,7 @@ static const struct mxsfb_devdata mxsfb_devdata[] = { ...@@ -56,6 +57,7 @@ static const struct mxsfb_devdata mxsfb_devdata[] = {
.next_buf = LCDC_V4_NEXT_BUF, .next_buf = LCDC_V4_NEXT_BUF,
.hs_wdth_mask = 0x3fff, .hs_wdth_mask = 0x3fff,
.hs_wdth_shift = 18, .hs_wdth_shift = 18,
.has_overlay = false,
}, },
[MXSFB_V6] = { [MXSFB_V6] = {
.transfer_count = LCDC_V4_TRANSFER_COUNT, .transfer_count = LCDC_V4_TRANSFER_COUNT,
...@@ -63,6 +65,7 @@ static const struct mxsfb_devdata mxsfb_devdata[] = { ...@@ -63,6 +65,7 @@ static const struct mxsfb_devdata mxsfb_devdata[] = {
.next_buf = LCDC_V4_NEXT_BUF, .next_buf = LCDC_V4_NEXT_BUF,
.hs_wdth_mask = 0x3fff, .hs_wdth_mask = 0x3fff,
.hs_wdth_shift = 18, .hs_wdth_shift = 18,
.has_overlay = true,
}, },
}; };
......
drivers/gpu/drm/mxsfb/mxsfb_drv.h
View file @ 63aa581c
...@@ -21,6 +21,7 @@ struct mxsfb_devdata { ...@@ -21,6 +21,7 @@ struct mxsfb_devdata {
unsigned int next_buf; unsigned int next_buf;
unsigned int hs_wdth_mask; unsigned int hs_wdth_mask;
unsigned int hs_wdth_shift; unsigned int hs_wdth_shift;
bool has_overlay;
}; };
struct mxsfb_drm_private { struct mxsfb_drm_private {
...@@ -32,7 +33,10 @@ struct mxsfb_drm_private { ...@@ -32,7 +33,10 @@ struct mxsfb_drm_private {
struct clk *clk_disp_axi; struct clk *clk_disp_axi;
struct drm_device *drm; struct drm_device *drm;
struct drm_plane plane; struct {
struct drm_plane primary;
struct drm_plane overlay;
} planes;
struct drm_crtc crtc; struct drm_crtc crtc;
struct drm_encoder encoder; struct drm_encoder encoder;
struct drm_connector *connector; struct drm_connector *connector;
......
drivers/gpu/drm/mxsfb/mxsfb_kms.c
View file @ 63aa581c
...@@ -169,9 +169,9 @@ static int mxsfb_reset_block(struct mxsfb_drm_private *mxsfb) ...@@ -169,9 +169,9 @@ static int mxsfb_reset_block(struct mxsfb_drm_private *mxsfb)
return clear_poll_bit(mxsfb->base + LCDC_CTRL, CTRL_CLKGATE); return clear_poll_bit(mxsfb->base + LCDC_CTRL, CTRL_CLKGATE);
} }
static dma_addr_t mxsfb_get_fb_paddr(struct mxsfb_drm_private *mxsfb) static dma_addr_t mxsfb_get_fb_paddr(struct drm_plane *plane)
{ {
struct drm_framebuffer *fb = mxsfb->plane.state->fb; struct drm_framebuffer *fb = plane->state->fb;
struct drm_gem_cma_object *gem; struct drm_gem_cma_object *gem;
if (!fb) if (!fb)
...@@ -206,6 +206,9 @@ static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb) ...@@ -206,6 +206,9 @@ static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb)
/* Clear the FIFOs */ /* Clear the FIFOs */
writel(CTRL1_FIFO_CLEAR, mxsfb->base + LCDC_CTRL1 + REG_SET); writel(CTRL1_FIFO_CLEAR, mxsfb->base + LCDC_CTRL1 + REG_SET);
if (mxsfb->devdata->has_overlay)
writel(0, mxsfb->base + LCDC_AS_CTRL);
mxsfb_set_formats(mxsfb); mxsfb_set_formats(mxsfb);
clk_set_rate(mxsfb->clk, m->crtc_clock * 1000); clk_set_rate(mxsfb->clk, m->crtc_clock * 1000);
...@@ -313,7 +316,7 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc, ...@@ -313,7 +316,7 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc,
mxsfb_crtc_mode_set_nofb(mxsfb); mxsfb_crtc_mode_set_nofb(mxsfb);
/* Write cur_buf as well to avoid an initial corrupt frame */ /* Write cur_buf as well to avoid an initial corrupt frame */
paddr = mxsfb_get_fb_paddr(mxsfb); paddr = mxsfb_get_fb_paddr(crtc->primary);
if (paddr) { if (paddr) {
writel(paddr, mxsfb->base + mxsfb->devdata->cur_buf); writel(paddr, mxsfb->base + mxsfb->devdata->cur_buf);
writel(paddr, mxsfb->base + mxsfb->devdata->next_buf); writel(paddr, mxsfb->base + mxsfb->devdata->next_buf);
...@@ -410,20 +413,85 @@ static int mxsfb_plane_atomic_check(struct drm_plane *plane, ...@@ -410,20 +413,85 @@ static int mxsfb_plane_atomic_check(struct drm_plane *plane,
false, true); false, true);
} }
static void mxsfb_plane_atomic_update(struct drm_plane *plane, static void mxsfb_plane_primary_atomic_update(struct drm_plane *plane,
struct drm_plane_state *old_pstate) struct drm_plane_state *old_pstate)
{ {
struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(plane->dev); struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(plane->dev);
dma_addr_t paddr; dma_addr_t paddr;
paddr = mxsfb_get_fb_paddr(mxsfb); paddr = mxsfb_get_fb_paddr(plane);
if (paddr) if (paddr)
writel(paddr, mxsfb->base + mxsfb->devdata->next_buf); writel(paddr, mxsfb->base + mxsfb->devdata->next_buf);
} }
static const struct drm_plane_helper_funcs mxsfb_plane_helper_funcs = { static void mxsfb_plane_overlay_atomic_update(struct drm_plane *plane,
struct drm_plane_state *old_pstate)
{
struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(plane->dev);
struct drm_plane_state *state = plane->state;
dma_addr_t paddr;
u32 ctrl;
paddr = mxsfb_get_fb_paddr(plane);
if (!paddr) {
writel(0, mxsfb->base + LCDC_AS_CTRL);
return;
}
/*
* HACK: The hardware seems to output 64 bytes of data of unknown
* origin, and then to proceed with the framebuffer. Until the reason
* is understood, live with the 16 initial invalid pixels on the first
* line and start 64 bytes within the framebuffer.
*/
paddr += 64;
writel(paddr, mxsfb->base + LCDC_AS_NEXT_BUF);
/*
* If the plane was previously disabled, write LCDC_AS_BUF as well to
* provide the first buffer.
*/
if (!old_pstate->fb)
writel(paddr, mxsfb->base + LCDC_AS_BUF);
ctrl = AS_CTRL_AS_ENABLE | AS_CTRL_ALPHA(255);
switch (state->fb->format->format) {
case DRM_FORMAT_XRGB4444:
ctrl |= AS_CTRL_FORMAT_RGB444 | AS_CTRL_ALPHA_CTRL_OVERRIDE;
break;
case DRM_FORMAT_ARGB4444:
ctrl |= AS_CTRL_FORMAT_ARGB4444 | AS_CTRL_ALPHA_CTRL_EMBEDDED;
break;
case DRM_FORMAT_XRGB1555:
ctrl |= AS_CTRL_FORMAT_RGB555 | AS_CTRL_ALPHA_CTRL_OVERRIDE;
break;
case DRM_FORMAT_ARGB1555:
ctrl |= AS_CTRL_FORMAT_ARGB1555 | AS_CTRL_ALPHA_CTRL_EMBEDDED;
break;
case DRM_FORMAT_RGB565:
ctrl |= AS_CTRL_FORMAT_RGB565 | AS_CTRL_ALPHA_CTRL_OVERRIDE;
break;
case DRM_FORMAT_XRGB8888:
ctrl |= AS_CTRL_FORMAT_RGB888 | AS_CTRL_ALPHA_CTRL_OVERRIDE;
break;
case DRM_FORMAT_ARGB8888:
ctrl |= AS_CTRL_FORMAT_ARGB8888 | AS_CTRL_ALPHA_CTRL_EMBEDDED;
break;
}
writel(ctrl, mxsfb->base + LCDC_AS_CTRL);
}
static const struct drm_plane_helper_funcs mxsfb_plane_primary_helper_funcs = {
.atomic_check = mxsfb_plane_atomic_check,
.atomic_update = mxsfb_plane_primary_atomic_update,
};
static const struct drm_plane_helper_funcs mxsfb_plane_overlay_helper_funcs = {
.atomic_check = mxsfb_plane_atomic_check, .atomic_check = mxsfb_plane_atomic_check,
.atomic_update = mxsfb_plane_atomic_update, .atomic_update = mxsfb_plane_overlay_atomic_update,
}; };
static const struct drm_plane_funcs mxsfb_plane_funcs = { static const struct drm_plane_funcs mxsfb_plane_funcs = {
...@@ -435,9 +503,19 @@ static const struct drm_plane_funcs mxsfb_plane_funcs = { ...@@ -435,9 +503,19 @@ static const struct drm_plane_funcs mxsfb_plane_funcs = {
.atomic_destroy_state = drm_atomic_helper_plane_destroy_state, .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
}; };
static const uint32_t mxsfb_formats[] = { static const uint32_t mxsfb_primary_plane_formats[] = {
DRM_FORMAT_RGB565,
DRM_FORMAT_XRGB8888,
};
static const uint32_t mxsfb_overlay_plane_formats[] = {
DRM_FORMAT_XRGB4444,
DRM_FORMAT_ARGB4444,
DRM_FORMAT_XRGB1555,
DRM_FORMAT_ARGB1555,
DRM_FORMAT_RGB565,
DRM_FORMAT_XRGB8888, DRM_FORMAT_XRGB8888,
DRM_FORMAT_RGB565 DRM_FORMAT_ARGB8888,
}; };
static const uint64_t mxsfb_modifiers[] = { static const uint64_t mxsfb_modifiers[] = {
...@@ -445,23 +523,44 @@ static const uint64_t mxsfb_modifiers[] = { ...@@ -445,23 +523,44 @@ static const uint64_t mxsfb_modifiers[] = {
DRM_FORMAT_MOD_INVALID DRM_FORMAT_MOD_INVALID
}; };
/* -----------------------------------------------------------------------------
* Initialization
*/
int mxsfb_kms_init(struct mxsfb_drm_private *mxsfb) int mxsfb_kms_init(struct mxsfb_drm_private *mxsfb)
{ {
struct drm_encoder *encoder = &mxsfb->encoder; struct drm_encoder *encoder = &mxsfb->encoder;
struct drm_plane *plane = &mxsfb->plane;
struct drm_crtc *crtc = &mxsfb->crtc; struct drm_crtc *crtc = &mxsfb->crtc;
int ret; int ret;
drm_plane_helper_add(plane, &mxsfb_plane_helper_funcs); drm_plane_helper_add(&mxsfb->planes.primary,
ret = drm_universal_plane_init(mxsfb->drm, plane, 0, &mxsfb_plane_funcs, &mxsfb_plane_primary_helper_funcs);
mxsfb_formats, ARRAY_SIZE(mxsfb_formats), ret = drm_universal_plane_init(mxsfb->drm, &mxsfb->planes.primary, 1,
&mxsfb_plane_funcs,
mxsfb_primary_plane_formats,
ARRAY_SIZE(mxsfb_primary_plane_formats),
mxsfb_modifiers, DRM_PLANE_TYPE_PRIMARY, mxsfb_modifiers, DRM_PLANE_TYPE_PRIMARY,
NULL); NULL);
if (ret) if (ret)
return ret; return ret;
if (mxsfb->devdata->has_overlay) {
drm_plane_helper_add(&mxsfb->planes.overlay,
&mxsfb_plane_overlay_helper_funcs);
ret = drm_universal_plane_init(mxsfb->drm,
&mxsfb->planes.overlay, 1,
&mxsfb_plane_funcs,
mxsfb_overlay_plane_formats,
ARRAY_SIZE(mxsfb_overlay_plane_formats),
mxsfb_modifiers, DRM_PLANE_TYPE_OVERLAY,
NULL);
if (ret)
return ret;
}
drm_crtc_helper_add(crtc, &mxsfb_crtc_helper_funcs); drm_crtc_helper_add(crtc, &mxsfb_crtc_helper_funcs);
ret = drm_crtc_init_with_planes(mxsfb->drm, crtc, plane, NULL, ret = drm_crtc_init_with_planes(mxsfb->drm, crtc,
&mxsfb->planes.primary, NULL,
&mxsfb_crtc_funcs, NULL); &mxsfb_crtc_funcs, NULL);
if (ret) if (ret)
return ret; return ret;
......
drivers/gpu/drm/mxsfb/mxsfb_regs.h
View file @ 63aa581c
...@@ -27,6 +27,11 @@ ...@@ -27,6 +27,11 @@
#define LCDC_VDCTRL4 0xb0 #define LCDC_VDCTRL4 0xb0
#define LCDC_V4_DEBUG0 0x1d0 #define LCDC_V4_DEBUG0 0x1d0
#define LCDC_V3_DEBUG0 0x1f0 #define LCDC_V3_DEBUG0 0x1f0
#define LCDC_AS_CTRL 0x210
#define LCDC_AS_BUF 0x220
#define LCDC_AS_NEXT_BUF 0x230
#define LCDC_AS_CLRKEYLOW 0x240
#define LCDC_AS_CLRKEYHIGH 0x250
#define CTRL_SFTRST BIT(31) #define CTRL_SFTRST BIT(31)
#define CTRL_CLKGATE BIT(30) #define CTRL_CLKGATE BIT(30)
...@@ -90,6 +95,23 @@ ...@@ -90,6 +95,23 @@
#define DEBUG0_HSYNC BIT(26) #define DEBUG0_HSYNC BIT(26)
#define DEBUG0_VSYNC BIT(25) #define DEBUG0_VSYNC BIT(25)
#define AS_CTRL_PS_DISABLE BIT(23)
#define AS_CTRL_ALPHA_INVERT BIT(20)
#define AS_CTRL_ALPHA(a) (((a) & 0xff) << 8)
#define AS_CTRL_FORMAT_RGB565 (0xe << 4)
#define AS_CTRL_FORMAT_RGB444 (0xd << 4)
#define AS_CTRL_FORMAT_RGB555 (0xc << 4)
#define AS_CTRL_FORMAT_ARGB4444 (0x9 << 4)
#define AS_CTRL_FORMAT_ARGB1555 (0x8 << 4)
#define AS_CTRL_FORMAT_RGB888 (0x4 << 4)
#define AS_CTRL_FORMAT_ARGB8888 (0x0 << 4)
#define AS_CTRL_ENABLE_COLORKEY BIT(3)
#define AS_CTRL_ALPHA_CTRL_ROP (3 << 1)
#define AS_CTRL_ALPHA_CTRL_MULTIPLY (2 << 1)
#define AS_CTRL_ALPHA_CTRL_OVERRIDE (1 << 1)
#define AS_CTRL_ALPHA_CTRL_EMBEDDED (0 << 1)
#define AS_CTRL_AS_ENABLE BIT(0)
#define MXSFB_MIN_XRES 120 #define MXSFB_MIN_XRES 120
#define MXSFB_MIN_YRES 120 #define MXSFB_MIN_YRES 120
#define MXSFB_MAX_XRES 0xffff #define MXSFB_MAX_XRES 0xffff
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7