← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to drivers/gpu/drm/nouveau/nvc0_graph.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/gpu/drm/nouveau/nvc0_graph.c
29
29
 
30
30
#include "nouveau_drv.h"
31
31
#include "nouveau_mm.h"
 
32
#include "nouveau_fifo.h"
32
33
 
33
34
#include "nvc0_graph.h"
34
35
#include "nvc0_grhub.fuc.h"
620
621
int
621
622
nvc0_graph_isr_chid(struct drm_device *dev, u64 inst)
622
623
{
 
624
        struct nouveau_fifo_priv *pfifo = nv_engine(dev, NVOBJ_ENGINE_FIFO);
623
625
        struct drm_nouveau_private *dev_priv = dev->dev_private;
624
626
        struct nouveau_channel *chan;
625
627
        unsigned long flags;
626
628
        int i;
627
629
 
628
630
        spin_lock_irqsave(&dev_priv->channels.lock, flags);
629
 
        for (i = 0; i < dev_priv->engine.fifo.channels; i++) {
 
631
        for (i = 0; i < pfifo->channels; i++) {
630
632
                chan = dev_priv->channels.ptr[i];
631
633
                if (!chan || !chan->ramin)
632
634
                        continue;