← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/gpu/drm/radeon/radeon_ring.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2013-07-11 18:35:20 UTC
  • Revision ID: package-import@ubuntu.com-20130711183520-htnf1x4y5r11hndr
Tags: 3.5.0-229.42
https://launchpad.net/bugs/1199276
* Release Tracking Bug
  - LP: #1199276

[ Paolo Pisati ]

* [Config] CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/gpu/drm/radeon/radeon_ring.c
224
224
                return -ENOMEM;
225
225
        /* Align requested size with padding so unlock_commit can
226
226
         * pad safely */
 
227
        radeon_ring_free_size(rdev, ring);
 
228
        if (ring->ring_free_dw == (ring->ring_size / 4)) {
 
229
                /* This is an empty ring update lockup info to avoid
 
230
                 * false positive.
 
231
                 */
 
232
                radeon_ring_lockup_update(ring);
 
233
        }
227
234
        ndw = (ndw + ring->align_mask) & ~ring->align_mask;
228
235
        while (ndw > (ring->ring_free_dw - 1)) {
229
236
                radeon_ring_free_size(rdev, ring);