Skip to content

Commit 9a3072f

Browse files
sandy-huangrkhuangtao
authored andcommitted
drm/rockchip: vop2: use fb->format->is_yuv to instead of is_yuv_support()
Signed-off-by: Sandy Huang <[email protected]> Change-Id: I89d13b160cf9fb11ef0af449dc09288f4a920f39
1 parent 792d53f commit 9a3072f

File tree

1 file changed

+4
-26
lines changed

1 file changed

+4
-26
lines changed

drivers/gpu/drm/rockchip/rockchip_drm_vop2.c

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1878,28 +1878,6 @@ static bool vop2_output_yc_swap(uint32_t bus_format)
18781878
}
18791879
}
18801880

1881-
static bool is_yuv_support(uint32_t format)
1882-
{
1883-
switch (format) {
1884-
case DRM_FORMAT_NV12:
1885-
case DRM_FORMAT_NV15:
1886-
case DRM_FORMAT_NV16:
1887-
case DRM_FORMAT_NV20:
1888-
case DRM_FORMAT_NV24:
1889-
case DRM_FORMAT_NV30:
1890-
case DRM_FORMAT_YUYV:
1891-
case DRM_FORMAT_YVYU:
1892-
case DRM_FORMAT_UYVY:
1893-
case DRM_FORMAT_VYUY:
1894-
case DRM_FORMAT_YUV420_8BIT:
1895-
case DRM_FORMAT_YUV420_10BIT:
1896-
case DRM_FORMAT_Y210:
1897-
return true;
1898-
default:
1899-
return false;
1900-
}
1901-
}
1902-
19031881
static bool is_yuv_output(uint32_t bus_format)
19041882
{
19051883
switch (bus_format) {
@@ -2392,7 +2370,7 @@ static void vop2_setup_csc_mode(struct vop2_video_port *vp,
23922370
{
23932371
struct drm_plane_state *pstate = &vpstate->base;
23942372
struct rockchip_crtc_state *vcstate = to_rockchip_crtc_state(vp->rockchip_crtc.crtc.state);
2395-
int is_input_yuv = is_yuv_support(pstate->fb->format->format);
2373+
int is_input_yuv = pstate->fb->format->is_yuv;
23962374
int is_output_yuv = vcstate->yuv_overlay;
23972375
int input_csc = vpstate->color_space;
23982376
int output_csc = vcstate->color_space;
@@ -2696,7 +2674,7 @@ static int vop2_wb_encoder_atomic_check(struct drm_encoder *encoder,
26962674
fb = conn_state->writeback_job->fb;
26972675
DRM_DEV_DEBUG(vp->vop2->dev, "%d x % d\n", fb->width, fb->height);
26982676

2699-
if (!is_yuv_support(fb->format->format) && is_yuv_output(vcstate->bus_format)) {
2677+
if (!fb->format->is_yuv && is_yuv_output(vcstate->bus_format)) {
27002678
DRM_ERROR("YUV2RGB is not supported by writeback\n");
27012679
return -EINVAL;
27022680
}
@@ -2839,7 +2817,7 @@ static void vop2_wb_commit(struct drm_crtc *crtc)
28392817
fifo_throd = fb->pitches[0] >> 4;
28402818
if (fifo_throd >= vop2->data->wb->fifo_depth)
28412819
fifo_throd = vop2->data->wb->fifo_depth;
2842-
r2y = is_yuv_support(fb->format->format) && (!is_yuv_output(vcstate->bus_format));
2820+
r2y = fb->format->is_yuv && (!is_yuv_output(vcstate->bus_format));
28432821

28442822
/*
28452823
* the vp_id register config done immediately
@@ -4618,7 +4596,7 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, struct drm_plane_s
46184596
planlist->dump_info.AFBC_flag = AFBC_flag;
46194597
planlist->dump_info.area_id = win->area_id;
46204598
planlist->dump_info.win_id = win->win_id;
4621-
planlist->dump_info.yuv_format = is_yuv_support(fb->format->format);
4599+
planlist->dump_info.yuv_format = fb->format->is_yuv;
46224600
planlist->dump_info.num_pages = num_pages;
46234601
planlist->dump_info.pages = pages;
46244602
planlist->dump_info.offset = vpstate->offset;

0 commit comments

Comments
 (0)