From: Dave Airlie <airlied@redhat.com>
Date: Mon, 15 Mar 2010 01:07:33 +0000 (+1000)
Subject: Merge remote branch 'nouveau/for-airlied' into drm-linus
X-Git-Tag: v2.6.34-rc4~88^2~42
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=d5e5deddf67389eabc3d9b13004c108120d397e1

Merge remote branch 'nouveau/for-airlied' into drm-linus

* nouveau/for-airlied:
  drm/nouveau: add module option to disable TV detection
  drm/nouveau: Never evict VRAM buffers to system.
  drm/nv50: fix connector table parsing for some cards
  drm/nv50: add a memory barrier to pushbuf submission
  drm/nouveau: print a message very early during suspend
  drm/nv04-nv40: Fix up the programmed horizontal sync pulse delay.
  drm/nouveau: Gigabyte NX85T connector table lies, it has DVI-I not HDMI
  drm/nouveau: add option to allow override of dcb connector table types
  drm/nv50: Improve PGRAPH interrupt handling.
  drm/nv50: Make ctxprog wait until interrupt handler is done.
  drm/nouveau: Fix fbcon corruption with font width not divisible by 8
  drm/nv50: Remove redundant/incorrect ctxvals initialisation.
---

d5e5deddf67389eabc3d9b13004c108120d397e1
diff --cc drivers/gpu/drm/nouveau/nouveau_drv.h
index 5f8d987af363,3b6bbd00d6b2..5bd8071523d2
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@@ -688,10 -690,8 +689,11 @@@ extern int nouveau_ctxfw
  extern int nouveau_ignorelid;
  extern int nouveau_nofbaccel;
  extern int nouveau_noaccel;
+ extern int nouveau_override_conntype;
  
 +extern int nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state);
 +extern int nouveau_pci_resume(struct pci_dev *pdev);
 +
  /* nouveau_state.c */
  extern void nouveau_preclose(struct drm_device *dev, struct drm_file *);
  extern int  nouveau_load(struct drm_device *, unsigned long flags);