Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

drivers: drm: update K230 DRM, add another RGB layer #169

Merged
merged 1 commit into from
Aug 19, 2024
Merged

drivers: drm: update K230 DRM, add another RGB layer #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions drivers/gpu/drm/canaan/canaan_vo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,22 +171,32 @@ static void canaan_vo_update_osd(struct canaan_vo *vo,
dma_addr_t paddr = 0x00;
uint32_t stride = 0x00;
uint32_t disp_en = 0x00;
uint32_t rb_swap;

switch (fb->format->format) {
case DRM_FORMAT_ARGB8888:
reg_val = 0x53;
rb_swap = 0x4F;
break;
case DRM_FORMAT_ARGB4444:
reg_val = 0x54;
rb_swap = 0x4F;
break;
case DRM_FORMAT_ARGB1555:
reg_val = 0x55;
rb_swap = 0x4F;
break;
case DRM_FORMAT_RGB888:
reg_val = 0x00;
rb_swap = 0x4F;
break;
case DRM_FORMAT_BGR888:
reg_val = 0x00;
rb_swap = 0xF;
break;
case DRM_FORMAT_RGB565:
reg_val = 0x02;
rb_swap = 0x4F;
break;
default:
DRM_DEV_ERROR(vo->dev, "Invalid pixel format %d\n",
Expand Down Expand Up @@ -228,8 +238,8 @@ static void canaan_vo_update_osd(struct canaan_vo *vo,
writel(stride,
vo->reg_base + plane_offset + VO_OSD0_7_STRIDE_REG_OFFSET);

writel(0x4F,
vo->reg_base + plane_offset + VO_OSD0_7_DMA_CTRL_REG_OFFSET);
writel(rb_swap, vo->reg_base + plane_offset + VO_OSD0_7_DMA_CTRL_REG_OFFSET);

writel(0x100, vo->reg_base + plane_offset +
VO_OSD0_7_ADDR_SEL_MODE_REG_OFFSET);

Expand Down Expand Up @@ -287,7 +297,8 @@ void canaan_vo_update_plane(struct canaan_vo *vo,
struct drm_crtc_state *crtc_state = plane_state->crtc->state;
struct drm_display_mode *adj_mode = &crtc_state->adjusted_mode;

if (vo->canaan_plane[0]->id == canaan_plane->id)
if ((vo->canaan_plane[0]->id == canaan_plane->id) ||
(vo->canaan_plane[5]->id == canaan_plane->id))
canaan_vo_update_video(vo, canaan_plane, adj_mode);
else
canaan_vo_update_osd(vo, canaan_plane, adj_mode);
Expand Down Expand Up @@ -510,7 +521,7 @@ static const uint32_t video_plane_formats[] = {

static const uint32_t osd_plane_formats[] = {
DRM_FORMAT_ARGB8888, DRM_FORMAT_ARGB4444, DRM_FORMAT_ARGB1555,
DRM_FORMAT_RGB888, DRM_FORMAT_RGB565,
DRM_FORMAT_RGB888, DRM_FORMAT_RGB565, DRM_FORMAT_BGR888
};

static struct canaan_plane_config
Expand Down Expand Up @@ -570,6 +581,17 @@ static struct canaan_plane_config
.xctl_reg_offset = VO_DISP_OSD7_XCTL,
.yctl_reg_offset = VO_DISP_OSD7_YCTL,
},
{
.id = 5,
.name = "video_2",
.formats = video_plane_formats,
.num_formats = ARRAY_SIZE(video_plane_formats),
.plane_type = DRM_PLANE_TYPE_OVERLAY,
.plane_offset = VO_LAYER2_OFFSET,
.plane_enable_bit = 2,
.xctl_reg_offset = VO_DISP_LAYER2_XCTL,
.yctl_reg_offset = VO_DISP_LAYER2_YCTL,
}
};

static int canaan_vo_bind(struct device *dev, struct device *master, void *data)
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/canaan/canaan_vo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef __CANAAN_VO_H__
#define __CANAAN_VO_H__

#define CANAAN_PLANE_NUMBER 5
#define CANAAN_PLANE_NUMBER 6

struct canaan_vo {
struct device *dev;
Expand Down
2 changes: 2 additions & 0 deletions drivers/gpu/drm/canaan/canaan_vo_regs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@
#define VO_DISP_OSD7_XCTL 0x840
#define VO_DISP_OSD7_YCTL 0x844

#define VO_LAYER2_OFFSET 0x200

#define VO_LAYER3_OFFSET 0x240
#define VO_LAYER3_CTL 0x240
#define VO_LAYER3_Y_ADDR0 0x244
Expand Down