← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/sna/kgem_debug_gen4.c

  • Committer: Package Import Robot
  • Author(s): Maarten Lankhorst
  • Date: 2012-07-30 10:10:37 UTC
  • mfrom: (1.4.19) (0.1.29 experimental)
  • Revision ID: package-import@ubuntu.com-20120730101037-13qwk6znh3v02bcg
Tags: 2:2.20.2-1ubuntu1
* New upstream release (2.20.2)
* Drop upstreamed 101_copy-fb.patch
* Merge from Debian. Remaining Ubuntu changes:
  - debian/xserver-xorg-video-intel.install:
    + Don't install unnecessary i915-kms.conf; KMS is kernel default.
  - debian/xserver-xorg-video-intel.udev
    + Add apport hook, triggered on udev GPU error event

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/sna/kgem_debug_gen4.c
256
256
 
257
257
static void
258
258
state_base_out(uint32_t *data, uint32_t offset, unsigned int index,
259
 
               char *name)
 
259
               const char *name)
260
260
{
261
261
    if (data[index] & 1)
262
262
        kgem_debug_print(data, offset, index,
270
270
 
271
271
static void
272
272
state_max_out(uint32_t *data, uint32_t offset, unsigned int index,
273
 
              char *name)
 
273
              const char *name)
274
274
{
275
275
        if (data[index] == 1)
276
276
                kgem_debug_print(data, offset, index,
460
460
        uint32_t op;
461
461
        unsigned int len;
462
462
        int i;
463
 
        char *desc1 = NULL;
 
463
        const char *desc1 = NULL;
464
464
 
465
465
        len = (data[0] & 0xff) + 2;
466
466
        op = (data[0] & 0xffff0000) >> 16;