sna/video sprite patch: support for multiple xv ports (exposes minimum Xv ports)
PATCH 1/2 sna/video sprite patch: support for multiple xv ports (exposes minimum Xv ports)
The current driver exposes a single adaptor port so that only one Xv video can be played using a single sprite at a given time. This change will allow available hardware sprites to be used. Exposes the minimum Xv sprite ports to be compatible with older X11.
v2: function sna_video_num_sprites() checks and returns the minimum number
of hardware sprites available on the adaptor for combatibility reasons.
v1: updated patch from [email protected]. removed/added
whitespace, re-formatted code, removed redundent variable allocation.
--- src/sna/sna.h | 7 +- src/sna/sna_display.c | 188 +++++++++++++++++++++++++++++++++++++++------ src/sna/sna_video_sprite.c | 139 ++++++++++++++++++--------------- 3 files changed, 249 insertions(+), 85 deletions(-)
src/sna/sna.h +5 -2
@@ -610,8 +610,11 @@ static inline void sna_present_vblank_handler(struct drm_event_vblank *event) {static inline void sna_present_cancel_flip (struct sna *sna) { }#endif -extern bool sna_crtc_set_sprite_rotation (xf86CrtcPtr crtc,uint32_t rotation); -extern uint32_t sna_crtc_to_sprite (xf86CrtcPtr crtc); +extern bool sna_crtc_set_sprite_rotation (xf86CrtcPtr crtc,uint32_t rotation,DrawablePtr draw); +extern uint32_t sna_crtc_num_sprites (xf86CrtcPtr crtc); +extern bool sna_crtc_drawable_to_sprite_id (xf86CrtcPtr crtc,DrawablePtr draw,uint32_t *id); +extern bool sna_crtc_sprite_lock (xf86CrtcPtr crtc,DrawablePtr draw); +extern void sna_crtc_sprite_unlock (xf86CrtcPtr crtc,DrawablePtr draw);extern bool sna_crtc_is_transformed (xf86CrtcPtr crtc);#define CRTC_VBLANK 0x3
src/sna/sna_display.c +165 -23
276 lines not on this page · raw message
src/sna/sna_video_sprite.c +79 -60
224 lines not on this page · raw message
Signature · 6 lines
1.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 sna/video sprite patch: exposing the maximum Xv port
This patch exposes the maximum Xv sprite ports that are available on an adaptor rather than the minimum. Not compatible with older X11 systems.
--- src/sna/sna_video_sprite.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)
src/sna/sna_video_sprite.c +5 -13
@@ -660,28 +660,20 @@ static int sna_video_sprite_color_key(struct sna *sna)static uint32_t sna_video_num_sprites (struct sna *sna) {xf86CrtcConfigPtr config =XF86_CRTC_CONFIG_PTR (sna->scrn); -int i, curr_n =0 , min_n =0 ; +int i, max_n =0 ;DBG (("%s: num_crtc=%d\n" , __FUNCTION__, sna->mode.num_real_crtc));if (sna->mode.num_real_crtc ==0 )return 0 ; -/* Loop through each real pipe and record the min number of sprites */ +/* Loop through each real pipe and record the max number of sprites */ for (i =0 ; i < sna->mode.num_real_crtc; i++) { - curr_n =sna_crtc_num_sprites (config->crtc[i]); - -if (i ==0 ) { - min_n = curr_n; -continue ; - } - -if (curr_n < min_n) - min_n = curr_n; + max_n +=sna_crtc_num_sprites (config->crtc[i]); } -DBG (("%s: %d sprites\n" , __FUNCTION__, min_n)); -return min_n; +DBG (("%s: %d sprites\n" , __FUNCTION__, max_n)); +return max_n; }void sna_video_sprite_setup (struct sna *sna,ScreenPtr screen)
Signature · 6 lines
1.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] sna/video sprite patch: exposing the maximum Xv port
Quoted 2 lines · Michael Hadley
This patch exposes the maximum Xv sprite ports that are available on an adaptor rather than the minimum. Not compatible with older X11 systems.
Not compatible with the protocol imo, as you are advertising something we can't allow any client to use.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx