Subversion Repositories Kolibri OS

Rev

Rev 2342 | Rev 2351 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 2342 Rev 2344
Line 426... Line 426...
426
            return -ENOMEM;
426
            return -ENOMEM;
427
 
427
 
Line 428... Line 428...
428
        ret = i915_gem_object_pin(obj, CURSOR_WIDTH*CURSOR_HEIGHT*4, true);
428
        ret = i915_gem_object_pin(obj, CURSOR_WIDTH*CURSOR_HEIGHT*4, true);
429
        if (ret) {
429
        if (ret) {
430
//           drm_gem_object_unreference(&obj->base);
430
            drm_gem_object_unreference(&obj->base);
431
            return ret;
431
            return ret;
432
        }
432
        }
Line 433... Line 433...
433
 
433
 
434
/* You don't need to worry about fragmentation issues.
434
/* You don't need to worry about fragmentation issues.
Line 438... Line 438...
438
                    CURSOR_WIDTH*CURSOR_HEIGHT*4, PG_SW);
438
                    CURSOR_WIDTH*CURSOR_HEIGHT*4, PG_SW);
439
 
439
 
Line 440... Line 440...
440
        if (unlikely(bits == NULL))
440
        if (unlikely(bits == NULL))
441
        {
441
        {
442
//          i915_gem_object_unpin(obj);
442
            i915_gem_object_unpin(obj);
443
//           drm_gem_object_unreference(&obj->base);
443
            drm_gem_object_unreference(&obj->base);
444
            return -ENOMEM;
444
            return -ENOMEM;
445
        };
445
        };
446
        cursor->cobj = obj;
446
        cursor->cobj = obj;
447
    };
447
    };
Line 805... Line 805...
805
    b[n++] = MI_BATCH_BUFFER_END;
805
    b[n++] = MI_BATCH_BUFFER_END;
806
    if( n & 1)
806
    if( n & 1)
807
        b[n++] = MI_NOOP;
807
        b[n++] = MI_NOOP;
Line 808... Line 808...
808
 
808
 
Line 809... Line 809...
809
//    i915_gem_object_set_to_gtt_domain(obj, false);
809
    i915_gem_object_set_to_gtt_domain(bitmap->obj, false);
810
 
810
 
811
    if (HAS_BLT(main_device))
811
    if (HAS_BLT(main_device))
812
        ring = &dev_priv->ring[BCS];
812
        ring = &dev_priv->ring[BCS];
Line 813... Line 813...
813
    else
813
    else
Line -... Line 814...
-
 
814
        ring = &dev_priv->ring[RCS];
-
 
815
 
814
        ring = &dev_priv->ring[RCS];
816
    ring->dispatch_execbuffer(ring, cmd_offset, n*4);
815
 
817
 
816
    ring->dispatch_execbuffer(ring, cmd_offset, n*4);
818
    int ret;
Line 817... Line 819...
817
 
819
 
818
    intel_ring_begin(ring, 4);
820
    ret = intel_ring_begin(ring, 4);
819
//    if (ret)
821
    if (ret)
820
//        return ret;
822
        return ret;