0002-interface-remove-faulty-assert-to-make-weston-happy-.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132333435
  1. From a126ee5a3235792abb58daffd9d4b3e1012f675b Mon Sep 17 00:00:00 2001
  2. From: "Yann E. MORIN" <yann.morin.1998@free.fr>
  3. Date: Sat, 24 Jan 2015 22:07:19 +0100
  4. Subject: [PATCH] interface: remove faulty assert() to make weston happy at
  5. runtime
  6. This was removed after a discussion on IRC with the weston guys
  7. ('daniels' on irc.freenode.net/#wayland).
  8. Upstream status: no, will be pushed by weston guys later.
  9. If not, I'll do it.
  10. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
  11. [Rebased for rpi-userland-a1b89e91f393c7134b4cdc36431f863bb3333163]
  12. Signed-off-by: Peter Seiderer <ps.report@gmx.net>
  13. ---
  14. interface/vmcs_host/vc_vchi_dispmanx.c | 1 -
  15. 1 file changed, 1 deletion(-)
  16. diff --git a/interface/vmcs_host/vc_vchi_dispmanx.c b/interface/vmcs_host/vc_vchi_dispmanx.c
  17. index 133e86d..0c7873c 100755
  18. --- a/interface/vmcs_host/vc_vchi_dispmanx.c
  19. +++ b/interface/vmcs_host/vc_vchi_dispmanx.c
  20. @@ -1306,7 +1306,6 @@ static void *dispmanx_notify_func( void *arg ) {
  21. // Decrement the use count - the corresponding "use" is in vc_dispmanx_update_submit.
  22. vchi_service_release(dispmanx_client.notify_handle[0]);
  23. if (dispmanx_client.update_callback ) {
  24. - vcos_assert( dispmanx_client.pending_update_handle == handle);
  25. dispmanx_client.update_callback(handle, dispmanx_client.update_callback_param);
  26. }
  27. } else {
  28. --
  29. 2.8.1