Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline

1 files changed, 24 insertions, 0 deletions

diff --git a/shared-core/nv04_fb.c b/shared-core/nv04_fb.c
new file mode 100644
index 00000000..06b1c994
--- /dev/null
+++ b/shared-core/nv04_fb.c
@@ -0,0 +1,24 @@
+#include "drmP.h"
+#include "drm.h"
+#include "nouveau_drv.h"
+#include "nouveau_drm.h"
+
+int
+nv04_fb_init(drm_device_t *dev)
+{
+	drm_nouveau_private_t *dev_priv = dev->dev_private;
+
+	/* This is what the DDX did for NV_ARCH_04, but a mmio-trace shows
+	 * nvidia reading PFB_CFG_0, then writing back its original value.
+	 * (which was 0x701114 in this case)
+	 */
+	NV_WRITE(NV04_PFB_CFG0, 0x1114);
+
+	return 0;
+}
+
+void
+nv04_fb_takedown(drm_device_t *dev)
+{
+}
+