← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/gpu/drm/radeon/r100_track.h

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/gpu/drm/radeon/r100_track.h
63
63
        unsigned                        num_arrays;
64
64
        unsigned                        max_indx;
65
65
        unsigned                        color_channel_mask;
66
 
        struct r100_cs_track_array      arrays[11];
 
66
        struct r100_cs_track_array      arrays[16];
67
67
        struct r100_cs_track_cb         cb[R300_MAX_CB];
68
68
        struct r100_cs_track_cb         zb;
69
69
        struct r100_cs_track_cb         aa;
146
146
        ib = p->ib->ptr;
147
147
        track = (struct r100_cs_track *)p->track;
148
148
        c = radeon_get_ib_value(p, idx++) & 0x1F;
 
149
        if (c > 16) {
 
150
            DRM_ERROR("Only 16 vertex buffers are allowed %d\n",
 
151
                      pkt->opcode);
 
152
            r100_cs_dump_packet(p, pkt);
 
153
            return -EINVAL;
 
154
        }
149
155
        track->num_arrays = c;
150
156
        for (i = 0; i < (c - 1); i+=2, idx+=3) {
151
157
                r = r100_cs_packet_next_reloc(p, &reloc);