frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

present: fix compile warning with debug traces 

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
(cherry picked from commit a425eee6dc)
This commit is contained in:
Lionel Landwerlin 2018-11-09 12:34:59 +00:00 committed by Adam Jackson
parent 4e12cba656
commit f5a77233b9
5 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
present/present.c
View File

@ -108,7 +108,7 @@ present_pixmap_idle(PixmapPtr pixmap, WindowPtr window, CARD32 serial, struct pr
if (present_fence) if (present_fence)
present_fence_set_triggered(present_fence); present_fence_set_triggered(present_fence);
if (window) { if (window) {
DebugPresent(("\ti %08lx\n", pixmap ? pixmap->drawable.id : 0)); DebugPresent(("\ti %08" PRIx32 "\n", pixmap ? pixmap->drawable.id : 0));
present_send_idle_notify(window, serial, pixmap, present_fence); present_send_idle_notify(window, serial, pixmap, present_fence);
} }
} }

1
present/present_priv.h
View File

@ -34,6 +34,7 @@
#include <syncsrv.h> #include <syncsrv.h>
#include <xfixes.h> #include <xfixes.h>
#include <randrstr.h> #include <randrstr.h>
#include <inttypes.h>
#if 0 #if 0
#define DebugPresent(x) ErrorF x #define DebugPresent(x) ErrorF x

21
present/present_scmd.c
View File

@ -133,12 +133,12 @@ present_check_flip(RRCrtcPtr crtc,
/* Ask the driver for permission */ /* Ask the driver for permission */
if (screen_priv->info->version >= 1 && screen_priv->info->check_flip2) { if (screen_priv->info->version >= 1 && screen_priv->info->check_flip2) {
if (!(*screen_priv->info->check_flip2) (crtc, window, pixmap, sync_flip, reason)) { if (!(*screen_priv->info->check_flip2) (crtc, window, pixmap, sync_flip, reason)) {
DebugPresent(("\td %08lx -> %08lx\n", window->drawable.id, pixmap ? pixmap->drawable.id : 0)); DebugPresent(("\td %08" PRIx32 " -> %08" PRIx32 "\n", window->drawable.id, pixmap ? pixmap->drawable.id : 0));
return FALSE; return FALSE;
} }
} else if (screen_priv->info->check_flip) { } else if (screen_priv->info->check_flip) {
if (!(*screen_priv->info->check_flip) (crtc, window, pixmap, sync_flip)) { if (!(*screen_priv->info->check_flip) (crtc, window, pixmap, sync_flip)) {
DebugPresent(("\td %08lx -> %08lx\n", window->drawable.id, pixmap ? pixmap->drawable.id : 0)); DebugPresent(("\td %08" PRIx32 " -> %08" PRIx32 "\n", window->drawable.id, pixmap ? pixmap->drawable.id : 0));
return FALSE; return FALSE;
} }
} }
@ -351,7 +351,7 @@ present_unflip(ScreenPtr screen)
present_restore_screen_pixmap(screen); present_restore_screen_pixmap(screen);
screen_priv->unflip_event_id = ++present_event_id; screen_priv->unflip_event_id = ++present_event_id;
DebugPresent(("u %lld\n", screen_priv->unflip_event_id)); DebugPresent(("u %" PRIu64 "\n", screen_priv->unflip_event_id));
(*screen_priv->info->unflip) (screen, screen_priv->unflip_event_id); (*screen_priv->info->unflip) (screen, screen_priv->unflip_event_id);
} }
@ -361,7 +361,7 @@ present_flip_notify(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc)
ScreenPtr screen = vblank->screen; ScreenPtr screen = vblank->screen;
present_screen_priv_ptr screen_priv = present_screen_priv(screen); present_screen_priv_ptr screen_priv = present_screen_priv(screen);
DebugPresent(("\tn %lld %p %8lld: %08lx -> %08lx\n", DebugPresent(("\tn %" PRIu64 " %p %" PRIu64 ": %08" PRIx32 " -> %08" PRIx32 "\n",
vblank->event_id, vblank, vblank->target_msc, vblank->event_id, vblank, vblank->target_msc,
vblank->pixmap ? vblank->pixmap->drawable.id : 0, vblank->pixmap ? vblank->pixmap->drawable.id : 0,
vblank->window ? vblank->window->drawable.id : 0)); vblank->window ? vblank->window->drawable.id : 0));
@ -402,7 +402,7 @@ present_event_notify(uint64_t event_id, uint64_t ust, uint64_t msc)
if (!event_id) if (!event_id)
return; return;
DebugPresent(("\te %lld ust %lld msc %lld\n", event_id, ust, msc)); DebugPresent(("\te %" PRIu64 " ust %" PRIu64 " msc %" PRIu64 "\n", event_id, ust, msc));
xorg_list_for_each_entry(vblank, &present_exec_queue, event_queue) { xorg_list_for_each_entry(vblank, &present_exec_queue, event_queue) {
int64_t match = event_id - vblank->event_id; int64_t match = event_id - vblank->event_id;
if (match == 0) { if (match == 0) {
@ -425,7 +425,7 @@ present_event_notify(uint64_t event_id, uint64_t ust, uint64_t msc)
present_screen_priv_ptr screen_priv = present_screen_priv(screen); present_screen_priv_ptr screen_priv = present_screen_priv(screen);
if (event_id == screen_priv->unflip_event_id) { if (event_id == screen_priv->unflip_event_id) {
DebugPresent(("\tun %lld\n", event_id)); DebugPresent(("\tun %" PRIu64 "\n", event_id));
screen_priv->unflip_event_id = 0; screen_priv->unflip_event_id = 0;
present_flip_idle(screen); present_flip_idle(screen);
present_flip_try_ready(screen); present_flip_try_ready(screen);
@ -547,7 +547,7 @@ present_execute(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc)
if (vblank->flip && vblank->pixmap && vblank->window) { if (vblank->flip && vblank->pixmap && vblank->window) {
if (screen_priv->flip_pending || screen_priv->unflip_event_id) { if (screen_priv->flip_pending || screen_priv->unflip_event_id) {
DebugPresent(("\tr %lld %p (pending %p unflip %lld)\n", DebugPresent(("\tr %" PRIu64 " %p (pending %p unflip %" PRIu64 ")\n",
vblank->event_id, vblank, vblank->event_id, vblank,
screen_priv->flip_pending, screen_priv->unflip_event_id)); screen_priv->flip_pending, screen_priv->unflip_event_id));
xorg_list_del(&vblank->event_queue); xorg_list_del(&vblank->event_queue);
@ -565,7 +565,7 @@ present_execute(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc)
if (vblank->flip) { if (vblank->flip) {
DebugPresent(("\tf %lld %p %8lld: %08lx -> %08lx\n", DebugPresent(("\tf %" PRIu64 " %p %" PRIu64 ": %08" PRIx32 " -> %08" PRIx32 "\n",
vblank->event_id, vblank, crtc_msc, vblank->event_id, vblank, crtc_msc,
vblank->pixmap->drawable.id, vblank->window->drawable.id)); vblank->pixmap->drawable.id, vblank->window->drawable.id));
@ -609,7 +609,8 @@ present_execute(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc)
screen_priv->flip_pending = NULL; screen_priv->flip_pending = NULL;
vblank->flip = FALSE; vblank->flip = FALSE;
} }
DebugPresent(("\tc %p %8lld: %08lx -> %08lx\n", vblank, crtc_msc, vblank->pixmap->drawable.id, vblank->window->drawable.id)); DebugPresent(("\tc %p %" PRIu64 ": %08" PRIx32 " -> %08" PRIx32 "\n",
vblank, crtc_msc, vblank->pixmap->drawable.id, vblank->window->drawable.id));
if (screen_priv->flip_pending) { if (screen_priv->flip_pending) {
/* Check pending flip /* Check pending flip
@ -713,7 +714,7 @@ present_scmd_pixmap(WindowPtr window,
if (vblank->crtc != target_crtc || vblank->target_msc != target_msc) if (vblank->crtc != target_crtc || vblank->target_msc != target_msc)
continue; continue;
DebugPresent(("\tx %lld %p %8lld: %08lx -> %08lx (crtc %p)\n", DebugPresent(("\tx %" PRIu64 " %p %" PRIu64 ": %08" PRIx32 " -> %08" PRIx32 " (crtc %p)\n",
vblank->event_id, vblank, vblank->target_msc, vblank->event_id, vblank, vblank->target_msc,
vblank->pixmap->drawable.id, vblank->window->drawable.id, vblank->pixmap->drawable.id, vblank->window->drawable.id,
vblank->crtc)); vblank->crtc));

6
present/present_vblank.c
View File

@ -138,7 +138,7 @@ present_vblank_create(WindowPtr window,
} }
if (pixmap) if (pixmap)
DebugPresent(("q %lld %p %8lld: %08lx -> %08lx (crtc %p) flip %d vsync %d serial %d\n", DebugPresent(("q %" PRIu64 " %p %" PRIu64 ": %08" PRIx32 " -> %08" PRIx32 " (crtc %p) flip %d vsync %d serial %d\n",
vblank->event_id, vblank, *target_msc, vblank->event_id, vblank, *target_msc,
vblank->pixmap->drawable.id, vblank->window->drawable.id, vblank->pixmap->drawable.id, vblank->window->drawable.id,
target_crtc, vblank->flip, vblank->sync_flip, vblank->serial)); target_crtc, vblank->flip, vblank->sync_flip, vblank->serial));
@ -153,7 +153,7 @@ no_mem:
void void
present_vblank_scrap(present_vblank_ptr vblank) present_vblank_scrap(present_vblank_ptr vblank)
{ {
DebugPresent(("\tx %lld %p %8lld: %08lx -> %08lx (crtc %p)\n", DebugPresent(("\tx %" PRIu64 " %p %" PRIu64 ": %08" PRIx32 " -> %08" PRIx32 " (crtc %p)\n",
vblank->event_id, vblank, vblank->target_msc, vblank->event_id, vblank, vblank->target_msc,
vblank->pixmap->drawable.id, vblank->window->drawable.id, vblank->pixmap->drawable.id, vblank->window->drawable.id,
vblank->crtc)); vblank->crtc));
@ -175,7 +175,7 @@ present_vblank_destroy(present_vblank_ptr vblank)
/* Also make sure vblank is removed from event queue (wnmd) */ /* Also make sure vblank is removed from event queue (wnmd) */
xorg_list_del(&vblank->event_queue); xorg_list_del(&vblank->event_queue);
DebugPresent(("\td %lld %p %8lld: %08lx -> %08lx\n", DebugPresent(("\td %" PRIu64 " %p %" PRIu64 ": %08" PRIx32 " -> %08" PRIx32 "\n",
vblank->event_id, vblank, vblank->target_msc, vblank->event_id, vblank, vblank->target_msc,
vblank->pixmap ? vblank->pixmap->drawable.id : 0, vblank->pixmap ? vblank->pixmap->drawable.id : 0,
vblank->window ? vblank->window->drawable.id : 0)); vblank->window ? vblank->window->drawable.id : 0));

14
present/present_wnmd.c
View File

@ -168,7 +168,7 @@ present_wnmd_flip_notify(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_
WindowPtr window = vblank->window; WindowPtr window = vblank->window;
present_window_priv_ptr window_priv = present_window_priv(window); present_window_priv_ptr window_priv = present_window_priv(window);
DebugPresent(("\tn %lld %p %8lld: %08lx -> %08lx\n", DebugPresent(("\tn %" PRIu64 " %p %" PRIu64 ": %08" PRIx32 " -> %08" PRIx32 "\n",
vblank->event_id, vblank, vblank->target_msc, vblank->event_id, vblank, vblank->target_msc,
vblank->pixmap ? vblank->pixmap->drawable.id : 0, vblank->pixmap ? vblank->pixmap->drawable.id : 0,
vblank->window ? vblank->window->drawable.id : 0)); vblank->window ? vblank->window->drawable.id : 0));
@ -213,7 +213,7 @@ present_wnmd_event_notify(WindowPtr window, uint64_t event_id, uint64_t ust, uin
return; return;
} }
DebugPresent(("\te %lld ust %lld msc %lld\n", event_id, ust, msc)); DebugPresent(("\te %" PRIu64 " ust %" PRIu64 " msc %" PRIu64 "\n", event_id, ust, msc));
xorg_list_for_each_entry(vblank, &window_priv->exec_queue, event_queue) { xorg_list_for_each_entry(vblank, &window_priv->exec_queue, event_queue) {
if (event_id == vblank->event_id) { if (event_id == vblank->event_id) {
present_wnmd_execute(vblank, ust, msc); present_wnmd_execute(vblank, ust, msc);
@ -292,7 +292,8 @@ present_wnmd_check_flip(RRCrtcPtr crtc,
/* Ask the driver for permission */ /* Ask the driver for permission */
if (screen_priv->wnmd_info->check_flip2) { if (screen_priv->wnmd_info->check_flip2) {
if (!(*screen_priv->wnmd_info->check_flip2) (crtc, window, pixmap, sync_flip, reason)) { if (!(*screen_priv->wnmd_info->check_flip2) (crtc, window, pixmap, sync_flip, reason)) {
DebugPresent(("\td %08lx -> %08lx\n", window->drawable.id, pixmap ? pixmap->drawable.id : 0)); DebugPresent(("\td %08" PRIx32 " -> %08" PRIx32 "\n",
window->drawable.id, pixmap ? pixmap->drawable.id : 0));
return FALSE; return FALSE;
} }
} }
@ -425,7 +426,7 @@ present_wnmd_execute(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc)
if (vblank->flip && vblank->pixmap && vblank->window) { if (vblank->flip && vblank->pixmap && vblank->window) {
if (window_priv->flip_pending) { if (window_priv->flip_pending) {
DebugPresent(("\tr %lld %p (pending %p)\n", DebugPresent(("\tr %" PRIu64 " %p (pending %p)\n",
vblank->event_id, vblank, vblank->event_id, vblank,
window_priv->flip_pending)); window_priv->flip_pending));
xorg_list_del(&vblank->event_queue); xorg_list_del(&vblank->event_queue);
@ -444,7 +445,7 @@ present_wnmd_execute(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc)
if (vblank->flip) { if (vblank->flip) {
RegionPtr damage; RegionPtr damage;
DebugPresent(("\tf %lld %p %8lld: %08lx -> %08lx\n", DebugPresent(("\tf %" PRIu64 " %p %" PRIu64 ": %08" PRIx32 " -> %08" PRIx32 "\n",
vblank->event_id, vblank, crtc_msc, vblank->event_id, vblank, crtc_msc,
vblank->pixmap->drawable.id, vblank->window->drawable.id)); vblank->pixmap->drawable.id, vblank->window->drawable.id));
@ -489,7 +490,8 @@ present_wnmd_execute(present_vblank_ptr vblank, uint64_t ust, uint64_t crtc_msc)
window_priv->flip_pending = NULL; window_priv->flip_pending = NULL;
vblank->flip = FALSE; vblank->flip = FALSE;
} }
DebugPresent(("\tc %p %8lld: %08lx -> %08lx\n", vblank, crtc_msc, vblank->pixmap->drawable.id, vblank->window->drawable.id)); DebugPresent(("\tc %p %" PRIu64 ": %08" PRIx32 " -> %08" PRIx32 "\n",
vblank, crtc_msc, vblank->pixmap->drawable.id, vblank->window->drawable.id));
present_wnmd_cancel_flip(window); present_wnmd_cancel_flip(window);