History

drm/sun4i: frontend: Add support for semi-planar YUV input formats

Semi-planar YUV formats use two distinct planes, one for luminance and one for chrominance. To add support for them, we need to configure the second line stride and buffer address registers to setup the second YUV plane. New definitions are introduced to configure the input format register for the YUV420 and YUV422 semi-planar formats.

Paul Kocialkowski committed 7 years ago

Commit 9afe52d1 parent 34d896e3 files · +55 −5Browse files

Unified · Split

3 files
  1. drivers/gpu/drm/sun4i/sun4i_frontend.c +45 −5
  2. drivers/gpu/drm/sun4i/sun4i_frontend.h +6 −0
  3. drivers/gpu/drm/sun4i/sun4i_layer.c +4 −0
drivers/gpu/drm/sun4i/sun4i_frontend.c+45−5
@@ -119,11 +119,23 @@ void sun4i_frontend_update_buffer(struct sun4i_frontend *frontend, · 118 unmodified lines
119 regmap_write(frontend->regs, SUN4I_FRONTEND_LINESTRD0_REG,119 regmap_write(frontend->regs, SUN4I_FRONTEND_LINESTRD0_REG,
120 fb->pitches[0]);120 fb->pitches[0]);
121 121
122 if (fb->format->num_planes > 1)
123 regmap_write(frontend->regs, SUN4I_FRONTEND_LINESTRD1_REG,
124 fb->pitches[1]);
125
122 /* Set the physical address of the buffer in memory */126 /* Set the physical address of the buffer in memory */
123 paddr = drm_fb_cma_get_gem_addr(fb, state, 0);127 paddr = drm_fb_cma_get_gem_addr(fb, state, 0);
124 paddr -= PHYS_OFFSET;128 paddr -= PHYS_OFFSET;
125 DRM_DEBUG_DRIVER("Setting buffer address to %pad\n", &paddr);129 DRM_DEBUG_DRIVER("Setting buffer #0 address to %pad\n", &paddr);
126 regmap_write(frontend->regs, SUN4I_FRONTEND_BUF_ADDR0_REG, paddr);130 regmap_write(frontend->regs, SUN4I_FRONTEND_BUF_ADDR0_REG, paddr);
131
132 if (fb->format->num_planes > 1) {
133 paddr = drm_fb_cma_get_gem_addr(fb, state, 1);
134 paddr -= PHYS_OFFSET;
135 DRM_DEBUG_DRIVER("Setting buffer #1 address to %pad\n", &paddr);
136 regmap_write(frontend->regs, SUN4I_FRONTEND_BUF_ADDR1_REG,
137 paddr);
138 }
127}139}
128EXPORT_SYMBOL(sun4i_frontend_update_buffer);140EXPORT_SYMBOL(sun4i_frontend_update_buffer);
129 141
@@ -133,6 +145,8 @@ sun4i_frontend_drm_format_to_input_fmt(const struct drm_format_info *format, · 3 unmodified lines
133{145{
134 if (!format->is_yuv)146 if (!format->is_yuv)
135 *val = SUN4I_FRONTEND_INPUT_FMT_DATA_FMT_RGB;147 *val = SUN4I_FRONTEND_INPUT_FMT_DATA_FMT_RGB;
148 else if (drm_format_info_is_yuv_sampling_420(format))
149 *val = SUN4I_FRONTEND_INPUT_FMT_DATA_FMT_YUV420;
136 else if (drm_format_info_is_yuv_sampling_422(format))150 else if (drm_format_info_is_yuv_sampling_422(format))
137 *val = SUN4I_FRONTEND_INPUT_FMT_DATA_FMT_YUV422;151 *val = SUN4I_FRONTEND_INPUT_FMT_DATA_FMT_YUV422;
138 else152 else
@@ -145,12 +159,18 @@ static int · 6 unmodified lines
145sun4i_frontend_drm_format_to_input_mode(const struct drm_format_info *format,159sun4i_frontend_drm_format_to_input_mode(const struct drm_format_info *format,
146 u32 *val)160 u32 *val)
147{161{
148 if (format->num_planes == 1)162 switch (format->num_planes) {
163 case 1:
149 *val = SUN4I_FRONTEND_INPUT_FMT_DATA_MOD_PACKED;164 *val = SUN4I_FRONTEND_INPUT_FMT_DATA_MOD_PACKED;
150 else165 return 0;
151 return -EINVAL;
152 166
153 return 0;167 case 2:
168 *val = SUN4I_FRONTEND_INPUT_FMT_DATA_MOD_SEMIPLANAR;
169 return 0;
170
171 default:
172 return -EINVAL;
173 }
154}174}
155 175
156static int176static int
@@ -162,6 +182,22 @@ sun4i_frontend_drm_format_to_input_sequence(const struct drm_format_info *format · 5 unmodified lines
162 *val = SUN4I_FRONTEND_INPUT_FMT_DATA_PS_BGRX;182 *val = SUN4I_FRONTEND_INPUT_FMT_DATA_PS_BGRX;
163 return 0;183 return 0;
164 184
185 case DRM_FORMAT_NV12:
186 *val = SUN4I_FRONTEND_INPUT_FMT_DATA_PS_UV;
187 return 0;
188
189 case DRM_FORMAT_NV16:
190 *val = SUN4I_FRONTEND_INPUT_FMT_DATA_PS_UV;
191 return 0;
192
193 case DRM_FORMAT_NV21:
194 *val = SUN4I_FRONTEND_INPUT_FMT_DATA_PS_VU;
195 return 0;
196
197 case DRM_FORMAT_NV61:
198 *val = SUN4I_FRONTEND_INPUT_FMT_DATA_PS_VU;
199 return 0;
200
165 case DRM_FORMAT_UYVY:201 case DRM_FORMAT_UYVY:
166 *val = SUN4I_FRONTEND_INPUT_FMT_DATA_PS_UYVY;202 *val = SUN4I_FRONTEND_INPUT_FMT_DATA_PS_UYVY;
167 return 0;203 return 0;
@@ -205,6 +241,10 @@ static int sun4i_frontend_drm_format_to_output_fmt(uint32_t fmt, u32 *val) · 37 unmodified lines
205 241
206static const uint32_t sun4i_frontend_formats[] = {242static const uint32_t sun4i_frontend_formats[] = {
207 DRM_FORMAT_BGRX8888,243 DRM_FORMAT_BGRX8888,
244 DRM_FORMAT_NV12,
245 DRM_FORMAT_NV16,
246 DRM_FORMAT_NV21,
247 DRM_FORMAT_NV61,
208 DRM_FORMAT_UYVY,248 DRM_FORMAT_UYVY,
209 DRM_FORMAT_VYUY,249 DRM_FORMAT_VYUY,
210 DRM_FORMAT_XRGB8888,250 DRM_FORMAT_XRGB8888,
drivers/gpu/drm/sun4i/sun4i_frontend.h+6−0
@@ -22,17 +22,23 @@ · 21 unmodified lines
22#define SUN4I_FRONTEND_BYPASS_CSC_EN BIT(1)22#define SUN4I_FRONTEND_BYPASS_CSC_EN BIT(1)
23 23
24#define SUN4I_FRONTEND_BUF_ADDR0_REG 0x02024#define SUN4I_FRONTEND_BUF_ADDR0_REG 0x020
25#define SUN4I_FRONTEND_BUF_ADDR1_REG 0x024
25 26
26#define SUN4I_FRONTEND_LINESTRD0_REG 0x04027#define SUN4I_FRONTEND_LINESTRD0_REG 0x040
28#define SUN4I_FRONTEND_LINESTRD1_REG 0x044
27 29
28#define SUN4I_FRONTEND_INPUT_FMT_REG 0x04c30#define SUN4I_FRONTEND_INPUT_FMT_REG 0x04c
29#define SUN4I_FRONTEND_INPUT_FMT_DATA_MOD_PACKED (1 << 8)31#define SUN4I_FRONTEND_INPUT_FMT_DATA_MOD_PACKED (1 << 8)
32#define SUN4I_FRONTEND_INPUT_FMT_DATA_MOD_SEMIPLANAR (2 << 8)
30#define SUN4I_FRONTEND_INPUT_FMT_DATA_FMT_YUV422 (1 << 4)33#define SUN4I_FRONTEND_INPUT_FMT_DATA_FMT_YUV422 (1 << 4)
34#define SUN4I_FRONTEND_INPUT_FMT_DATA_FMT_YUV420 (2 << 4)
31#define SUN4I_FRONTEND_INPUT_FMT_DATA_FMT_RGB (5 << 4)35#define SUN4I_FRONTEND_INPUT_FMT_DATA_FMT_RGB (5 << 4)
32#define SUN4I_FRONTEND_INPUT_FMT_DATA_PS_UYVY 036#define SUN4I_FRONTEND_INPUT_FMT_DATA_PS_UYVY 0
33#define SUN4I_FRONTEND_INPUT_FMT_DATA_PS_YUYV 137#define SUN4I_FRONTEND_INPUT_FMT_DATA_PS_YUYV 1
34#define SUN4I_FRONTEND_INPUT_FMT_DATA_PS_VYUY 238#define SUN4I_FRONTEND_INPUT_FMT_DATA_PS_VYUY 2
35#define SUN4I_FRONTEND_INPUT_FMT_DATA_PS_YVYU 339#define SUN4I_FRONTEND_INPUT_FMT_DATA_PS_YVYU 3
40#define SUN4I_FRONTEND_INPUT_FMT_DATA_PS_UV 0
41#define SUN4I_FRONTEND_INPUT_FMT_DATA_PS_VU 1
36#define SUN4I_FRONTEND_INPUT_FMT_DATA_PS_BGRX 042#define SUN4I_FRONTEND_INPUT_FMT_DATA_PS_BGRX 0
37#define SUN4I_FRONTEND_INPUT_FMT_DATA_PS_XRGB 143#define SUN4I_FRONTEND_INPUT_FMT_DATA_PS_XRGB 1
38 44
drivers/gpu/drm/sun4i/sun4i_layer.c+4−0
@@ -138,6 +138,10 @@ static const uint32_t sun4i_layer_formats[] = { · 137 unmodified lines
138 DRM_FORMAT_RGBA4444,138 DRM_FORMAT_RGBA4444,
139 DRM_FORMAT_RGB888,139 DRM_FORMAT_RGB888,
140 DRM_FORMAT_RGB565,140 DRM_FORMAT_RGB565,
141 DRM_FORMAT_NV12,
142 DRM_FORMAT_NV16,
143 DRM_FORMAT_NV21,
144 DRM_FORMAT_NV61,
141 DRM_FORMAT_UYVY,145 DRM_FORMAT_UYVY,
142 DRM_FORMAT_VYUY,146 DRM_FORMAT_VYUY,
143 DRM_FORMAT_XRGB8888,147 DRM_FORMAT_XRGB8888,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t