Merge change 9392

* changes: don't send the GPU master fd across to client processes
2009-07-31 15:13:25 -07:00
parent 31882c14d6 50b3755b7d
commit 813af83025
1 changed files with 2 additions and 2 deletions
--- a/libcopybit/copybit.cpp
+++ b/libcopybit/copybit.cpp
@@ -122,9 +122,9 @@ static void set_image(struct mdp_img *img, const struct copybit_image_t *rhs)
    img->height     = rhs->h;
    img->format     = get_format(rhs->format);
    img->offset     = hnd->offset;
-    img->memory_id  = hnd->fd;
+    img->memory_id  = (hnd->flags & private_handle_t::PRIV_FLAGS_USES_GPU)
+        ? hnd->gpu_fd : hnd->fd;
 }
-
 /** setup rectangles */
 static void set_rects(struct copybit_context_t *dev,
                      struct mdp_blit_req *e,