← Back to branch summary

~ubuntu-branches/ubuntu/precise/xserver-xorg-video-intel/precise

« back to all changes in this revision

Viewing changes to src/xvmc/intel_xvmc.c

  • Committer: Bazaar Package Importer
  • Author(s): Christopher James Halse Rogers, Timo Aaltonen, Christopher James Halse Rogers
  • Date: 2011-06-02 18:27:35 UTC
  • mfrom: (1.5.20 sid)
  • Revision ID: james.westby@ubuntu.com-20110602182735-ettcix23ikesyg79
Tags: 2:2.15.0-3ubuntu1
[ Timo Aaltonen ]
* Merge from Debian unstable, remaining changes:
  - 101_copy-fb.patch
    + Plymouth integration patch
  - 120_check_privates.patch
    + Check for null privates pointer on render_dest_picture.
  - debian/xserver-xorg-video-intel.preinst.in:
  - debian/xserver-xorg-video-intel.postinst.in:
    + Remove obsolete /etc/modprobe.d/i915-kms.conf file on upgrades.  
      KMS is the kernel default.
* Dropped patches:
  102_gen6_invalidate_texture_cache.patch
  107_solid_nullptr_check.patch
  108_undo_dmg_trans_before_append.patch
  109_dont_reconstruct_glyph_cache_on_rotate.patch
  111_fix_clipped_window_plane_offset.patch
  112_fix_error_in_4c4ad555.patch
  113_remove_broken_max_base_addresses.patch
  114_warnings_cleanup_part_2.patch
  115_quell_vblank_counter_failed.patch
  117_946gz_isreally_965g.patch
  119_disable_relaxed_fencing.path
  - all upstream.
[ Christopher James Halse Rogers ]
* debian/patches/101_copy-fb.patch
  - Refresh for new upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/xvmc/intel_xvmc.c
105
105
 
106
106
void LOCK_HARDWARE(drm_context_t ctx)
107
107
{
108
 
        char __ret = 0;
109
 
 
110
108
        PPTHREAD_MUTEX_LOCK();
111
109
        assert(!xvmc_driver->locked);
112
110
 
218
216
        int error_base;
219
217
        int event_base;
220
218
        int priv_count;
221
 
        int isCapable;
222
 
        int screen = DefaultScreen(display);
223
 
        intel_xvmc_context_ptr intel_ctx;
224
 
        int fd;
225
 
        char *driverName = NULL, *deviceName = NULL;
226
219
 
227
220
        /* Verify Obvious things first */
228
221
        if (!display || !context)
482
475
                                  unsigned int num_blocks,
483
476
                                  XvMCBlockArray * block)
484
477
{
485
 
        Status ret;
486
478
        if (!display || !context || !num_blocks || !block)
487
479
                return BadValue;
488
480
 
505
497
 */
506
498
_X_EXPORT Status XvMCDestroyBlocks(Display * display, XvMCBlockArray * block)
507
499
{
508
 
        Status ret;
509
500
        if (!display || !block)
510
501
                return BadValue;
511
502
 
678
669
 */
679
670
_X_EXPORT Status XvMCSyncSurface(Display * display, XvMCSurface * surface)
680
671
{
681
 
        Status ret;
682
 
        int stat = 0;
683
 
 
684
672
        if (!display || !surface)
685
673
                return XvMCBadSurface;
686
674
 
687
 
        return ret;
 
675
        return Success;
688
676
}
689
677
 
690
678
/*
739
727
 */
740
728
_X_EXPORT Status XvMCHideSurface(Display * display, XvMCSurface * surface)
741
729
{
742
 
        int stat = 0;
743
 
        Status ret;
744
 
 
745
730
        if (!display || !surface)
746
731
                return XvMCBadSurface;
747
732
 
1071
1056
_X_EXPORT Status XvMCPutSlice(Display * display, XvMCContext * context,
1072
1057
                              char *slice, int nbytes)
1073
1058
{
1074
 
        if (xvmc_driver->put_slice(display, context, slice, nbytes)) {
 
1059
        if (xvmc_driver->put_slice(display, context, (unsigned char *) slice, nbytes)) {
1075
1060
                XVMC_ERR("PutSlice fail\n");
1076
1061
                return BadValue;
1077
1062
        }
1082
1067
                               char *slice, int nbytes, int slice_code)
1083
1068
{
1084
1069
        if (xvmc_driver->put_slice2
1085
 
            (display, context, slice, nbytes, slice_code)) {
 
1070
            (display, context, (unsigned char *) slice, nbytes, slice_code)) {
1086
1071
                XVMC_ERR("PutSlice2 fail\n");
1087
1072
                return BadValue;
1088
1073
        }