git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 diff -p -up xserver-xorg-video-psb-0.31.0/libmm/mm_drm.c.comment_unused xserver-xorg-video-psb-0.31.0/libmm/mm_drm.c
   2 --- xserver-xorg-video-psb-0.31.0/libmm/mm_drm.c.comment_unused 2009-04-17 20:22:26.000000000 +0200
   3 +++ xserver-xorg-video-psb-0.31.0/libmm/mm_drm.c        2010-04-26 13:40:50.000000000 +0200
   4 @@ -277,6 +277,7 @@ createFence(struct _MMManager *mm,
   5      return &dFence->mf;
   6  }
   7
   8 +/*
   9  static void
  10  fenceDestroy(struct _MMFence *mf)
  11  {
  12 @@ -288,6 +289,7 @@ fenceDestroy(struct _MMFence *mf)
  13      assert(ret == 0);
  14      free(dFence);
  15  }
  16 +*/
  17
  18  static int
  19  fenceEmit(struct _MMFence *mf, unsigned fence_class,
  20 @@ -369,7 +371,7 @@ mmCreateDRM(int drmFD)
  21      mm->fenceSignaled = fenceSignaled;
  22      mm->fenceWait = fenceWait;
  23      mm->fenceError = NULL;
  24 -    mm->fenceDestroy = fenceDestroy;
  25 +    /* mm->fenceDestroy = fenceDestroy; */
  26      mm->destroy = destroy;
  27      return mm;
  28
  29 diff -p -up xserver-xorg-video-psb-0.31.0/libmm/mm_interface.h.comment_unused xserver-xorg-video-psb-0.31.0/libmm/mm_interface.h
  30 --- xserver-xorg-video-psb-0.31.0/libmm/mm_interface.h.comment_unused   2009-04-17 20:22:26.000000000 +0200
  31 +++ xserver-xorg-video-psb-0.31.0/libmm/mm_interface.h  2010-04-26 13:45:22.000000000 +0200
  32 @@ -141,7 +141,7 @@ typedef struct _MMManager
  33      int (*fenceWait) (struct _MMFence * mf, unsigned flushMask,
  34                       unsigned flags);
  35      unsigned (*fenceError) (struct _MMFence * mf);
  36 -    void (*fenceDestroy) (struct _MMFence * mf);
  37 +    /* void (*fenceDestroy) (struct _MMFence * mf); */
  38  } MMManager;
  39
  40  /*
  41 @@ -204,6 +204,7 @@ mmFenceEmit(struct _MMFence *mf, unsigne
  42      return mf->man->fenceEmit(mf, class, type, flags);
  43  }
  44
  45 +/*
  46  static inline void
  47  mmFenceUnReference(struct _MMFence **mfP)
  48  {
  49 @@ -214,6 +215,7 @@ mmFenceUnReference(struct _MMFence **mfP
  50      }
  51      *mfP = NULL;
  52  }
  53 +*/
  54
  55  static inline struct _MMFence *
  56  mmFenceReference(struct _MMFence *mf)
  57 diff -p -up xserver-xorg-video-psb-0.31.0/libmm/mm_user.c.comment_unused xserver-xorg-video-psb-0.31.0/libmm/mm_user.c
  58 --- xserver-xorg-video-psb-0.31.0/libmm/mm_user.c.comment_unused        2009-04-17 20:22:26.000000000 +0200
  59 +++ xserver-xorg-video-psb-0.31.0/libmm/mm_user.c       2010-04-26 13:05:15.000000000 +0200
  60 @@ -77,6 +77,7 @@ typedef struct _UserSignal
  61      UserManager *man;
  62  } UserSignal;
  63
  64 +/*
  65  void
  66  mmFenceSignal(struct _MMSignal *signal, unsigned class,
  67               unsigned type, unsigned sequence, unsigned error,
  68 @@ -148,6 +149,7 @@ mmFenceSignal(struct _MMSignal *signal,
  69         type |= fence->signalPrevious;
  70      }
  71  }
  72 +*/
  73
  74  static int
  75  fenceEmit(struct _MMFence *mf, unsigned class, unsigned type, unsigned flags)