rpms/kernel/devel drm-nouveau.patch, 1.21, 1.22 kernel.spec, 1.1402, 1.1403

[Ben Skeggs]

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19631

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Tue Mar 10 2009 Ben Skeggs <bskeggs at redhat.com>
- drm-nouveau.patch: another 8800GTX kms fix



drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- drm-nouveau.patch	10 Mar 2009 03:48:32 -0000	1.21
+++ drm-nouveau.patch	10 Mar 2009 04:50:48 -0000	1.22
@@ -1840,10 +1840,10 @@
 +#endif /* __NOUVEAU_CONNECTOR_H__ */
 diff --git a/drivers/gpu/drm/nouveau/nouveau_crtc.h b/drivers/gpu/drm/nouveau/nouveau_crtc.h
 new file mode 100644
-index 0000000..0ba9475
+index 0000000..c65994f
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nouveau_crtc.h
-@@ -0,0 +1,59 @@
+@@ -0,0 +1,64 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -1883,7 +1883,12 @@
 +	struct drm_display_mode *mode;
 +	bool use_dithering;
 +
++	struct {
++		uint32_t offset;
++	} fb;
++
 +	struct nv50_cursor *cursor;
++
 +	struct {
 +		struct mem_block *mem;
 +		uint16_t r[256];
@@ -17086,10 +17091,10 @@
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_connector.c b/drivers/gpu/drm/nouveau/nv50_connector.c
 new file mode 100644
-index 0000000..a16445a
+index 0000000..aea44cf
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_connector.c
-@@ -0,0 +1,592 @@
+@@ -0,0 +1,591 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -17477,7 +17482,6 @@
 +		return NULL;
 +
 +	list_for_each_entry(mode, &connector->base.probed_modes, head) {
-+		DRM_INFO("%d %d 0x%08x\n", mode->hdisplay, mode->vdisplay, mode->type);
 +		if (mode->type & DRM_MODE_TYPE_PREFERRED)
 +			return drm_mode_duplicate(dev, mode);
 +	}
@@ -17684,10 +17688,10 @@
 +}
 diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c
 new file mode 100644
-index 0000000..fa7376c
+index 0000000..8a10dc9
 --- /dev/null
 +++ b/drivers/gpu/drm/nouveau/nv50_crtc.c
-@@ -0,0 +1,756 @@
+@@ -0,0 +1,758 @@
 +/*
 + * Copyright (C) 2008 Maarten Maathuis.
 + * All Rights Reserved.
@@ -17789,6 +17793,7 @@
 +
 +		OUT_MODE(NV50_CRTC0_CLUT_MODE + offset,
 +			 NV50_CRTC0_CLUT_MODE_BLANK);
++		OUT_MODE(NV50_CRTC0_CLUT_OFFSET + offset, 0);
 +		if (dev_priv->chipset != 0x50)
 +			OUT_MODE(NV84_CRTC0_CLUT_DMA + offset,
 +				 NV84_CRTC0_CLUT_DMA_DISABLE);
@@ -17804,10 +17809,14 @@
 +
 +		OUT_MODE(NV50_CRTC0_CLUT_MODE + offset, crtc->lut.depth == 8 ?
 +			 NV50_CRTC0_CLUT_MODE_OFF : NV50_CRTC0_CLUT_MODE_ON);
++		OUT_MODE(NV50_CRTC0_CLUT_OFFSET + offset,
++			 crtc->lut.mem->start >> 8);
 +		if (dev_priv->chipset != 0x50)
 +			OUT_MODE(NV84_CRTC0_CLUT_DMA + offset,
 +				 NV84_CRTC0_CLUT_DMA_LOCAL);
 +
++		OUT_MODE(NV50_CRTC0_FB_OFFSET + offset, crtc->fb.offset >> 8);
++		OUT_MODE(0x864 + offset, 0);
 +		OUT_MODE(NV50_CRTC0_BLANK_CTRL + offset,
 +			 NV50_CRTC0_BLANK_CTRL_UNBLANK);
 +	}
@@ -18326,11 +18335,9 @@
 +	struct drm_framebuffer *drm_fb = crtc->base.fb;
 +	struct nouveau_framebuffer *fb = to_nouveau_framebuffer(drm_fb);
 +	struct nouveau_gem_object *ngem = nouveau_gem_object(fb->gem);
-+	uint32_t v_vram = ngem->bo->offset - dev_priv->vm_vram_base;
 +	uint32_t offset = crtc->index * 0x400;
 +
-+	OUT_MODE(NV50_CRTC0_FB_OFFSET + offset, v_vram >> 8);
-+	OUT_MODE(0x864 + offset, 0);
++	crtc->fb.offset = ngem->bo->offset - dev_priv->vm_vram_base;
 +
 +	OUT_MODE(NV50_CRTC0_FB_SIZE + offset,
 +		 drm_fb->height << 16 | drm_fb->width);
@@ -18361,7 +18368,6 @@
 +		crtc->lut.depth = fb->base.depth;
 +		nv50_crtc_lut_load(crtc);
 +	}
-+	OUT_MODE(NV50_CRTC0_CLUT_OFFSET + offset, crtc->lut.mem->start >> 8);
 +
 +	nv50_crtc_blank(crtc, false);
 +	return 0;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1402
retrieving revision 1.1403
diff -u -r1.1402 -r1.1403
--- kernel.spec	10 Mar 2009 03:48:33 -0000	1.1402
+++ kernel.spec	10 Mar 2009 04:50:51 -0000	1.1403
@@ -1811,6 +1811,9 @@
 
 %changelog
 * Tue Mar 10 2009 Ben Skeggs <bskeggs at redhat.com>
+- drm-nouveau.patch: another 8800GTX kms fix
+
+* Tue Mar 10 2009 Ben Skeggs <bskeggs at redhat.com>
 - drm-nouveau.patch: fix kms issues seen while testing original 8800gtx
 
 * Tue Mar 10 2009 Dave Airlie <airlied at redhat.com>