Added AYUV format support
v8 cover Added AYUV format support
sna/gen9+: Added AYUV format support for textured and sprite video adapters. Split out wm_kernel from the sna_composite_op flags
Stanislav Lisovskiy (2):
sna/gen9+: Split out wm_kernel from the sna_composite_op flags
sna: Added AYUV format support for textured and sprite video adapters.
src/render_program/Makefile.am | 2 + .../exa_wm_src_sample_argb_ayuv.g8a | 76 +++++++++++++++++++ .../exa_wm_src_sample_argb_ayuv.g8b | 8 ++ src/sna/gen9_render.c | 59 ++++++++++---- src/sna/sna_render.h | 4 + src/sna/sna_video.c | 72 +++++++++++++++++- src/sna/sna_video.h | 20 +++++ src/sna/sna_video_sprite.c | 20 ++++- src/sna/sna_video_textured.c | 19 +++++ 9 files changed, 262 insertions(+), 18 deletions(-) create mode 100644 src/render_program/exa_wm_src_sample_argb_ayuv.g8a create mode 100644 src/render_program/exa_wm_src_sample_argb_ayuv.g8b
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v8 1/2 sna/gen9+: Split out wm_kernel from the sna_composite_op flags
With the extra video kernels we already ran out of bits in the flags. To tackle that let's just split out the wm_kernel to its own thing.
--- src/sna/gen9_render.c | 35 ++++++++++++++++++++++------------- src/sna/sna_render.h | 1 + 2 files changed, 23 insertions(+), 13 deletions(-)
src/sna/gen9_render.c +22 -13
@@ -226,19 +226,18 @@ static const struct blendinfo {#define COPY_SAMPLER 0#define COPY_VERTEX VERTEX_2s2s -#define COPY_FLAGS (a) GEN9_SET_FLAGS(COPY_SAMPLER, (a) == GXcopy ? NO_BLEND : CLEAR, GEN9_WM_KERNEL_NOMASK, COPY_VERTEX) +#define COPY_FLAGS (a) GEN9_SET_FLAGS(COPY_SAMPLER, (a) == GXcopy ? NO_BLEND : CLEAR, COPY_VERTEX)#define FILL_SAMPLER 1#define FILL_VERTEX VERTEX_2s2s -#define FILL_FLAGS (op, format) GEN9_SET_FLAGS(FILL_SAMPLER, gen9_get_blend((op), false, (format)), GEN9_WM_KERNEL_NOMASK, FILL_VERTEX) -#define FILL_FLAGS_NOBLEND GEN9_SET_FLAGS(FILL_SAMPLER, NO_BLEND, GEN9_WM_KERNEL_NOMASK, FILL_VERTEX) +#define FILL_FLAGS (op, format) GEN9_SET_FLAGS(FILL_SAMPLER, gen9_get_blend((op), false, (format)), FILL_VERTEX) +#define FILL_FLAGS_NOBLEND GEN9_SET_FLAGS(FILL_SAMPLER, NO_BLEND, FILL_VERTEX)#define GEN9_SAMPLER (f) (((f) >> 20) & 0xfff)#define GEN9_BLEND (f) (((f) >> 4) & 0x7ff)#define GEN9_READS_DST (f) (((f) >> 15) & 1) -#define GEN9_KERNEL (f) (((f) >> 16) & 0xf)#define GEN9_VERTEX (f) (((f) >> 0) & 0xf) -#define GEN9_SET_FLAGS (S ,B ,K ,V ) ((S) << 20 | (K) << 16 | (B) | (V)) +#define GEN9_SET_FLAGS (S ,B ,V ) ((S) << 20 | (B) | (V))#define OUT_BATCH (v) batch_emit(sna, v)#define OUT_BATCH64 (v) batch_emit64(sna, v)
@@ -1349,7 +1348,7 @@ gen9_emit_state(struct sna *sna,gen9_emit_cc (sna,GEN9_BLEND (op->u.gen9.flags));gen9_emit_sampler (sna,GEN9_SAMPLER (op->u.gen9.flags));gen9_emit_sf (sna,GEN9_VERTEX (op->u.gen9.flags) >>2 ); -gen9_emit_wm (sna,GEN9_KERNEL (op->u.gen9.flags)); +gen9_emit_wm (sna, op->u.gen9.wm_kernel);gen9_emit_vertex_elements (sna, op);gen9_emit_binding_table (sna, wm_binding_table);
@@ -1618,7 +1617,7 @@ static int gen9_get_rectangles__flush(struct sna *sna,if (gen9_magic_ca_pass (sna, op)) {gen9_emit_pipe_invalidate (sna);gen9_emit_cc (sna,GEN9_BLEND (op->u.gen9.flags)); -gen9_emit_wm (sna,GEN9_KERNEL (op->u.gen9.flags)); +gen9_emit_wm (sna, op->u.gen9.wm_kernel); } }
@@ -2548,11 +2547,11 @@ gen9_render_composite(struct sna *sna,gen9_get_blend (tmp->op, tmp->has_component_alpha, tmp->dst.format), -gen9_choose_composite_kernel (tmp->op, - tmp->mask.bo !=NULL , - tmp->has_component_alpha, - tmp->is_affine), gen4_choose_composite_emitter(sna, tmp)); + tmp->u.gen9.wm_kernel =gen9_choose_composite_kernel (tmp->op, + tmp->mask.bo !=NULL , + tmp->has_component_alpha, + tmp->is_affine); tmp->blt = gen9_render_composite_blt; tmp->box = gen9_render_composite_box;
@@ -2781,8 +2780,9 @@ gen9_render_composite_spans(struct sna *sna, SAMPLER_FILTER_NEAREST, SAMPLER_EXTEND_PAD),gen9_get_blend (tmp->base.op, false, tmp->base.dst.format), -GEN9_WM_KERNEL_OPACITY | !tmp->base.is_affine, gen4_choose_spans_emitter(sna, tmp)); + tmp->base.u.gen9.wm_kernel = +GEN9_WM_KERNEL_OPACITY | !tmp->base.is_affine; tmp->box = gen9_render_composite_spans_box; tmp->boxes = gen9_render_composite_spans_boxes;
@@ -3045,6 +3045,7 @@ fallback_blt: tmp.need_magic_ca_pass =0 ; tmp.u.gen9.flags =COPY_FLAGS (alu); + tmp.u.gen9.wm_kernel =GEN9_WM_KERNEL_NOMASK ;kgem_set_mode (&sna->kgem,KGEM_RENDER , tmp.dst.bo);if (!kgem_check_bo (&sna->kgem, tmp.dst.bo, tmp.src.bo,NULL )) {
@@ -3214,6 +3215,7 @@ fallback: op->base.floats_per_rect =6 ; op->base.u.gen9.flags =COPY_FLAGS (alu); + op->base.u.gen9.wm_kernel =GEN9_WM_KERNEL_NOMASK ;kgem_set_mode (&sna->kgem,KGEM_RENDER , dst_bo);if (!kgem_check_bo (&sna->kgem, dst_bo, src_bo,NULL )) {
@@ -3366,6 +3368,7 @@ gen9_render_fill_boxes(struct sna *sna, tmp.need_magic_ca_pass = false; tmp.u.gen9.flags =FILL_FLAGS (op, format); + tmp.u.gen9.wm_kernel =GEN9_WM_KERNEL_NOMASK ;kgem_set_mode (&sna->kgem,KGEM_RENDER , dst_bo);if (!kgem_check_bo (&sna->kgem, dst_bo,NULL )) {
@@ -3552,6 +3555,7 @@ gen9_render_fill(struct sna *sna, uint8_t alu, op->base.floats_per_rect =6 ; op->base.u.gen9.flags =FILL_FLAGS_NOBLEND ; + op->base.u.gen9.wm_kernel =GEN9_WM_KERNEL_NOMASK ;kgem_set_mode (&sna->kgem,KGEM_RENDER , dst_bo);if (!kgem_check_bo (&sna->kgem, dst_bo,NULL )) {
@@ -3637,6 +3641,7 @@ gen9_render_fill_one(struct sna *sna, PixmapPtr dst, struct kgem_bo *bo, tmp.need_magic_ca_pass = false; tmp.u.gen9.flags =FILL_FLAGS_NOBLEND ; + tmp.u.gen9.wm_kernel =GEN9_WM_KERNEL_NOMASK ;kgem_set_mode (&sna->kgem,KGEM_RENDER , bo);if (!kgem_check_bo (&sna->kgem, bo,NULL )) {
@@ -3723,6 +3728,7 @@ gen9_render_clear(struct sna *sna, PixmapPtr dst, struct kgem_bo *bo) tmp.need_magic_ca_pass = false; tmp.u.gen9.flags =FILL_FLAGS_NOBLEND ; + tmp.u.gen9.wm_kernel =GEN9_WM_KERNEL_NOMASK ;kgem_set_mode (&sna->kgem,KGEM_RENDER , bo);if (!kgem_check_bo (&sna->kgem, bo,NULL )) {
@@ -3964,8 +3970,8 @@ gen9_render_video(struct sna *sna,GEN9_SET_FLAGS (SAMPLER_OFFSET (filter,SAMPLER_EXTEND_PAD ,SAMPLER_FILTER_NEAREST ,SAMPLER_EXTEND_NONE ),NO_BLEND , -select_video_kernel (video, frame),2 ); + tmp.u.gen9.wm_kernel =select_video_kernel (video, frame); tmp.priv = frame;kgem_set_mode (&sna->kgem,KGEM_RENDER , tmp.dst.bo);
@@ -4135,6 +4141,9 @@ static bool gen9_render_setup(struct sna *sna)assert (state->wm_kernel[m][0 ]|state->wm_kernel[m][1 ]|state->wm_kernel[m][2 ]); } +COMPILE_TIME_ASSERT (GEN9_WM_KERNEL_COUNT <= +1 << (sizeof (((struct sna_composite_op *)NULL )->u.gen9.wm_kernel) *8 )); +COMPILE_TIME_ASSERT (SAMPLER_OFFSET (FILTER_COUNT ,EXTEND_COUNT ,FILTER_COUNT ,EXTEND_COUNT ) <=0x7ff ); ss = sna_static_stream_map(&general, 2 * sizeof(*ss) *
src/sna/sna_render.h +1 -0
@@ -151,6 +151,7 @@ struct sna_composite_op {struct {uint32_t flags; +uint8_t wm_kernel; } gen9; } u;
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v8 2/2 sna: Added AYUV format support for textured and sprite video adapters.
In reply to Stanislav Lisovskiyv2: Renamed DRM_FORMAT_XYUV to DRM_FORMAT_XYUV8888.
Added comment about AYUV byte ordering in Gstreamer.
v3: Removed sna_composite_op flags related change to the separate patch.
v4: Fixed review comments, done code refactoring
v5: Fixed following review comments:
- Fixed comment in shader code for ayuv kernel.
- Fixed naming to VIDEO_AYUV_BT601/BT709 for ayuv kernels.
- Removed duplicate gen9_kernel parameter, left from previous patches
- Added colorspace handling for new AYUV kernel
- Fixed naming of sna_copy_packed_data_ayuv to sna_copy_ayuv_data
- Started using standard bswap_32 function for byte swapping in sna_copy_ayuv_data
- Removed redundant code in sna_copy_ayuv_data so that it looks more neat
- Fixed XVIMAGE_AYUV structure initialization to contain proper byte sequence for GST
- Fixed bogus comment about subsampling for DRM_FORMAT_XYUV8888
- Fixed AYUV advertisement for all platforms
- Removed unnecessary RGB888 declaration.
v6:
- Fixed surface format not to use alpha as supposed
- Now doing byte swapping always during copy
- Changed hack, required for GST to work to be at one place
- Fixed invalid sampling values for XVIMAGE_AYUV
- Fixed sprite format checking order and images_ayuv definition.
v7:
- Removed reverse_bytes bool parameter, now swapping bytes for XYUV unconditionally both for textured and sprite modes.
v8:
- Added gen9_images structure, in order to expose AYUV format to proper platforms.
--- src/render_program/Makefile.am | 2 + .../exa_wm_src_sample_argb_ayuv.g8a | 76 +++++++++++++++++++ .../exa_wm_src_sample_argb_ayuv.g8b | 8 ++ src/sna/gen9_render.c | 24 +++++- src/sna/sna_render.h | 3 + src/sna/sna_video.c | 72 +++++++++++++++++- src/sna/sna_video.h | 20 +++++ src/sna/sna_video_sprite.c | 20 ++++- src/sna/sna_video_textured.c | 19 +++++ 9 files changed, 239 insertions(+), 5 deletions(-) create mode 100644 src/render_program/exa_wm_src_sample_argb_ayuv.g8a create mode 100644 src/render_program/exa_wm_src_sample_argb_ayuv.g8b
src/render_program/Makefile.am +2 -0
@@ -196,6 +196,7 @@ INTEL_G7B = \ INTEL_G8A = \ exa_wm_src_affine.g8a \ exa_wm_src_sample_argb.g8a \ + exa_wm_src_sample_argb_ayuv.g8a \ exa_wm_src_sample_nv12.g8a \ exa_wm_src_sample_planar.g8a \ exa_wm_write.g8a \
@@ -205,6 +206,7 @@ INTEL_G8A = \ INTEL_G8B = \ exa_wm_src_affine.g8b \ + exa_wm_src_sample_argb_ayuv.g8b \ exa_wm_src_sample_argb.g8b \ exa_wm_src_sample_nv12.g8b \ exa_wm_src_sample_planar.g8b \
src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +76 -0
76 lines not on this page · raw message
src/render_program/exa_wm_src_sample_argb_ayuv.g8b new file +8 -0
@@ -0,0 +1,8 @@ + { 0x00000001, 0x2008060c, 0x00000000, 0x00000000 }, + { 0x00600001, 0x28200208, 0x008d0000, 0x00000000 }, + { 0x02800031, 0x21c00a48, 0x06000820, 0x0a8c0001 }, + { 0x00800001, 0x22800208, 0x00200240, 0x00000000 }, + { 0x00800001, 0x22400208, 0x00200200, 0x00000000 }, + { 0x00800001, 0x22000208, 0x002001c0, 0x00000000 }, + { 0x00800001, 0x21c00208, 0x00200280, 0x00000000 }, + { 0x00800001, 0x22803ee8, 0x38000000, 0x3f800000 },
src/sna/gen9_render.c +23 -1
@@ -129,6 +129,20 @@ static const uint32_t ps_kernel_planar_bt709[][4] = {#include "exa_wm_write.g8b" }; +static const uint32_t ps_kernel_ayuv_bt601[][4 ] = { +#include "exa_wm_src_affine.g8b" +#include "exa_wm_src_sample_argb_ayuv.g8b" +#include "exa_wm_yuv_rgb_bt601.g8b" +#include "exa_wm_write.g8b" +}; + +static const uint32_t ps_kernel_ayuv_bt709[][4 ] = { +#include "exa_wm_src_affine.g8b" +#include "exa_wm_src_sample_argb_ayuv.g8b" +#include "exa_wm_yuv_rgb_bt709.g8b" +#include "exa_wm_write.g8b" +}; +static const uint32_t ps_kernel_nv12_bt709[][4 ] = { #include "exa_wm_src_affine.g8b" #include "exa_wm_src_sample_nv12.g8b"
@@ -177,6 +191,8 @@ static const struct wm_kernel_info {KERNEL (VIDEO_PLANAR_BT709 , ps_kernel_planar_bt709,7 ),KERNEL (VIDEO_NV12_BT709 , ps_kernel_nv12_bt709,7 ),KERNEL (VIDEO_PACKED_BT709 , ps_kernel_packed_bt709,2 ), +KERNEL (VIDEO_AYUV_BT601 , ps_kernel_ayuv_bt601,2 ), +KERNEL (VIDEO_AYUV_BT709 , ps_kernel_ayuv_bt709,2 ), KERNEL(VIDEO_RGB, ps_kernel_rgb, 2), #endif };
@@ -2552,7 +2568,6 @@ gen9_render_composite(struct sna *sna, tmp->mask.bo !=NULL , tmp->has_component_alpha, tmp->is_affine); - tmp->blt = gen9_render_composite_blt; tmp->box = gen9_render_composite_box; tmp->boxes = gen9_render_composite_boxes__blt;
@@ -3853,6 +3868,8 @@ static void gen9_emit_video_state(struct sna *sna, src_surf_format[0 ] =SURFACEFORMAT_B8G8R8X8_UNORM ; else if (frame->id == FOURCC_UYVY) src_surf_format[0 ] =SURFACEFORMAT_YCRCB_SWAPY ; + else if (is_ayuv_fourcc(frame->id)) + src_surf_format[0 ] =SURFACEFORMAT_B8G8R8X8_UNORM ; else src_surf_format[0 ] =SURFACEFORMAT_YCRCB_NORMAL ;
@@ -3903,6 +3920,11 @@ static unsigned select_video_kernel(const struct sna_video *video,case FOURCC_RGB565 :return GEN9_WM_KERNEL_VIDEO_RGB ; +case FOURCC_AYUV : +return video->colorspace ? +GEN9_WM_KERNEL_VIDEO_AYUV_BT709 : +GEN9_WM_KERNEL_VIDEO_AYUV_BT601 ; +default :return video->colorspace ? GEN9_WM_KERNEL_VIDEO_PACKED_BT709 :
src/sna/sna_render.h +3 -0
@@ -617,6 +617,9 @@ enum {GEN9_WM_KERNEL_VIDEO_NV12_BT709 ,GEN9_WM_KERNEL_VIDEO_PACKED_BT709 , +GEN9_WM_KERNEL_VIDEO_AYUV_BT601 , +GEN9_WM_KERNEL_VIDEO_AYUV_BT709 , +GEN9_WM_KERNEL_VIDEO_RGB , GEN9_WM_KERNEL_COUNT };
src/sna/sna_video.c +71 -1
102 lines not on this page · raw message
src/sna/sna_video.h +20 -0
@@ -39,6 +39,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.#define FOURCC_RGB565 ((16 << 24) + ('B' << 16) + ('G' << 8) + 'R')#define FOURCC_RGB888 ((24 << 24) + ('B' << 16) + ('G' << 8) + 'R')#define FOURCC_NV12 (('2' << 24) + ('1' << 16) + ('V' << 8) + 'N') +#define FOURCC_AYUV (('V' << 24) + ('U' << 16) + ('Y' << 8) + 'A')/* * Below, a dummy picture type that is used in XvPutImage
@@ -79,6 +80,15 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. XvTopToBottom \ } +#define XVIMAGE_AYUV { \ + FOURCC_AYUV, XvYUV, LSBFirst, \ + {'A', 'Y', 'U', 'V', 0x00, 0x00, 0x00, 0x10, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71}, \ + 32, XvPacked, 1, 0, 0, 0, 0, 8, 8, 8, 1, 1, 1, 1, 1, 1, \ + {'A', 'Y', 'U', 'V', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, \ + XvTopToBottom \ +} + +struct sna_video {struct sna *sna;
@@ -189,6 +199,16 @@ static inline int is_nv12_fourcc(int id) } } +static inline int is_ayuv_fourcc (int id) +{ +switch (id) { +case FOURCC_AYUV : +return 1 ; +default : +return 0 ; + } +} + bool sna_video_clip_helper(struct sna_video *video, struct sna_video_frame *frame,
src/sna/sna_video_sprite.c +17 -3
@@ -47,7 +47,7 @@#define DRM_FORMAT_YUYV fourcc_code('Y', 'U', 'Y', 'V')/* [31:0] Cr0:Y1:Cb0:Y0 8:8:8:8 little endian */ #define DRM_FORMAT_UYVY fourcc_code('U', 'Y', 'V', 'Y')/* [31:0] Y1:Cr0:Y0:Cb0 8:8:8:8 little endian */ #define DRM_FORMAT_NV12 fourcc_code('N', 'V', '1', '2')/* 2x2 subsampled Cr:Cb plane */ - +#define DRM_FORMAT_XYUV8888 fourcc_code('X', 'Y', 'U', 'V')/* [31:0] x:Y:U:V 8:8:8:8 little endian */ #define has_hw_scaling (sna, video) ((sna)->kgem.gen < 071 || \ (sna)->kgem.gen >= 0110)
@@ -79,6 +79,8 @@ static const XvImageRec images_rgb565[] = { XVIMAGE_YUY2, XVIMAGE_UYVY, XVMC_RGB888, XVMC_RGB565 };static const XvImageRec images_nv12[] = {XVIMAGE_YUY2 ,XVIMAGE_UYVY ,XVIMAGE_NV12 ,XVMC_RGB888 ,XVMC_RGB565 }; +static const XvImageRec images_ayuv[] = {XVIMAGE_AYUV ,XVIMAGE_YUY2 ,XVIMAGE_UYVY , +XVIMAGE_NV12 ,XVMC_RGB888 ,XVMC_RGB565 };static const XvAttributeRec attribs[] = { { XvSettable | XvGettable,0 ,1 , (char *)"XV_COLORSPACE" },/* BT.601, BT.709 */ { XvSettable | XvGettable,0 ,0xffffff , (char *)"XV_COLORKEY" },
@@ -364,6 +366,10 @@ sna_video_sprite_show(struct sna *sna,case FOURCC_UYVY : f.pixel_format =DRM_FORMAT_UYVY ;break ; +case FOURCC_AYUV : +/* i915 doesn't support alpha, so we use XYUV */ + f.pixel_format =DRM_FORMAT_XYUV8888 ; +break ;case FOURCC_YUY2 :default : f.pixel_format =DRM_FORMAT_YUYV ;
@@ -705,7 +711,12 @@ static int sna_video_sprite_query(ddQueryImageAttributes_ARGS) tmp *= (*h >>1 ); size += tmp;break ; - +case FOURCC_AYUV : + tmp = *w <<2 ; +if (pitches) + pitches[0 ] = tmp; + size = *h * tmp; +break ;default : *w = (*w +1 ) & ~1 ; *h = (*h +1 ) & ~1 ;
@@ -805,7 +816,10 @@ void sna_video_sprite_setup(struct sna *sna, ScreenPtr screen) adaptor->nAttributes =ARRAY_SIZE (attribs); adaptor->pAttributes = (XvAttributeRec *)attribs; -if (sna_has_sprite_format (sna,DRM_FORMAT_NV12 )) { +if (sna_has_sprite_format (sna,DRM_FORMAT_XYUV8888 )) { + adaptor->pImages = (XvImageRec *)images_ayuv; + adaptor->nImages =ARRAY_SIZE (images_ayuv); + }else if (sna_has_sprite_format (sna,DRM_FORMAT_NV12 )) { adaptor->pImages = (XvImageRec *)images_nv12; adaptor->nImages =ARRAY_SIZE (images_nv12); }else if (sna_has_sprite_format (sna,DRM_FORMAT_RGB565 )) {
src/sna/sna_video_textured.c +19 -0
@@ -71,6 +71,16 @@ static const XvImageRec gen4_Images[] = { XVMC_YUV, }; +static const XvImageRec gen9_Images[] = { +XVIMAGE_YUY2 , +XVIMAGE_YV12 , +XVIMAGE_I420 , +XVIMAGE_NV12 , +XVIMAGE_UYVY , +XVIMAGE_AYUV , +XVMC_YUV , +}; +static int sna_video_textured_stop (ddStopVideo_ARGS ) {struct sna_video *video = port->devPriv.ptr;
@@ -337,6 +347,12 @@ sna_video_textured_query(ddQueryImageAttributes_ARGS) pitches[0 ] = size; size *= *h;break ; +case FOURCC_AYUV : + size = *w <<2 ; +if (pitches) + pitches[0 ] = size; + size *= *h; +break ;case FOURCC_XVMC : *h = (*h +1 ) & ~1 ; size =sizeof (uint32_t );
@@ -408,6 +424,9 @@ void sna_video_textured_setup(struct sna *sna, ScreenPtr screen) }else if (sna->kgem.gen <040 ) { adaptor->nImages =ARRAY_SIZE (gen3_Images); adaptor->pImages = (XvImageRec *)gen3_Images; + }else if (sna->kgem.gen >=0110 ) { + adaptor->nImages =ARRAY_SIZE (gen9_Images); + adaptor->pImages = (XvImageRec *)gen9_Images; }else { adaptor->nImages =ARRAY_SIZE (gen4_Images); adaptor->pImages = (XvImageRec *)gen4_Images;
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH xf86-video-intel v8 2/2] sna: Added AYUV format support for textured and sprite video adapters.
Quoting Stanislav Lisovskiy (2018-11-13 07:45:02)
src/sna/sna_video_textured.c void sna_video_textured_setup(struct sna *sna, ScreenPtr screen) · line 432
Quoted 10 lines
src/sna/sna_video_textured.c +3
-0@@ -408,6 +424,9 @@ void sna_video_textured_setup(struct sna *sna, ScreenPtr screen) }else if (sna->kgem.gen <040 ) { adaptor->nImages =ARRAY_SIZE (gen3_Images); adaptor->pImages = (XvImageRec *)gen3_Images; + }else if (sna->kgem.gen >=0110 ) { + adaptor->nImages =ARRAY_SIZE (gen9_Images); + adaptor->pImages = (XvImageRec *)gen9_Images; }else { adaptor->nImages =ARRAY_SIZE (gen4_Images); adaptor->pImages = (XvImageRec *)gen4_Images;
Grr. Aside from the minor nits, ok. Ville?
-Chris
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Ville Syrjälä
Reviewed-byRe: [PATCH xf86-video-intel v8 2/2] sna: Added AYUV format support for textured and sprite video adapters.
Quoted 13 lines · Chris Wilson
Quoting Stanislav Lisovskiy (2018-11-13 07:45:02)
src/sna/sna_video_textured.c void sna_video_textured_setup(struct sna *sna, ScreenPtr screen) · line 432
Quoted 10 lines
src/sna/sna_video_textured.c +3
-0@@ -408,6 +424,9 @@ void sna_video_textured_setup(struct sna *sna, ScreenPtr screen) }else if (sna->kgem.gen <040 ) { adaptor->nImages =ARRAY_SIZE (gen3_Images); adaptor->pImages = (XvImageRec *)gen3_Images; + }else if (sna->kgem.gen >=0110 ) { + adaptor->nImages =ARRAY_SIZE (gen9_Images); + adaptor->pImages = (XvImageRec *)gen9_Images; }else { adaptor->nImages =ARRAY_SIZE (gen4_Images); adaptor->pImages = (XvImageRec *)gen4_Images;Grr. Aside from the minor nits, ok. Ville?
Yeah. Seems good enough. For both
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH xf86-video-intel v8 2/2] sna: Added AYUV format support for textured and sprite video adapters.
Quoting Ville Syrjälä (2018-11-13 19:13:40)
Quoted 15 lines · Chris Wilson
Quoted 13 lines
Quoting Stanislav Lisovskiy (2018-11-13 07:45:02)
src/sna/sna_video_textured.c void sna_video_textured_setup(struct sna *sna, ScreenPtr screen) · line 432
Quoted 10 lines
src/sna/sna_video_textured.c +3
-0@@ -408,6 +424,9 @@ void sna_video_textured_setup(struct sna *sna, ScreenPtr screen) }else if (sna->kgem.gen <040 ) { adaptor->nImages =ARRAY_SIZE (gen3_Images); adaptor->pImages = (XvImageRec *)gen3_Images; + }else if (sna->kgem.gen >=0110 ) { + adaptor->nImages =ARRAY_SIZE (gen9_Images); + adaptor->pImages = (XvImageRec *)gen9_Images; }else { adaptor->nImages =ARRAY_SIZE (gen4_Images); adaptor->pImages = (XvImageRec *)gen4_Images;Grr. Aside from the minor nits, ok. Ville?
Quoted 2 lines
Yeah. Seems good enough. For both
Reviewed-by Ville Syrjälä <[email protected]>
Ta, thanks for the patches.
To gitlab.freedesktop.org:xorg/driver/xf86-video-intel.git
0932a6b3..746ab3bb master -> master
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx