- update to linux-2.6.32.2
This commit is contained in:
Stephan Raue 2009-12-19 17:44:33 +01:00
parent 1f1d0af42b
commit 08785b82a7
4 changed files with 43 additions and 64265 deletions

File diff suppressed because it is too large Load Diff

View File

@ -844,26 +844,4 @@ index 1f90841..6f08a77 100644
+
#endif
diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.da linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c
--- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c.da 2009-09-08 16:07:49.000000000 +1000
+++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv04_crtc.c 2009-09-08 16:08:09.000000000 +1000
@@ -993,7 +993,7 @@ nv04_crtc_create(struct drm_device *dev,
nv_crtc->index = crtc_num;
nv_crtc->last_dpms = NV_DPMS_CLEARED;
- drm_crtc_init(dev, &nv_crtc->base, &nv04_crtc_funcs);
+ drm_crtc_init(dev, &nv_crtc->base, crtc_num, &nv04_crtc_funcs);
drm_crtc_helper_add(&nv_crtc->base, &nv04_crtc_helper_funcs);
drm_mode_crtc_set_gamma_size(&nv_crtc->base, 256);
diff -up linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.da linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c
--- linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c.da 2009-09-08 16:07:49.000000000 +1000
+++ linux-2.6.30.noarch/drivers/gpu/drm/nouveau/nv50_crtc.c 2009-09-08 16:08:09.000000000 +1000
@@ -777,7 +777,7 @@ nv50_crtc_create(struct drm_device *dev,
crtc->set_dither = nv50_crtc_set_dither;
crtc->set_scale = nv50_crtc_set_scale;
- drm_crtc_init(dev, &nv_crtc->base, &nv50_crtc_funcs);
+ drm_crtc_init(dev, &nv_crtc->base, index, &nv50_crtc_funcs);
drm_crtc_helper_add(&nv_crtc->base, &nv50_crtc_helper_funcs);
drm_mode_crtc_set_gamma_size(&nv_crtc->base, 256);

View File

@ -1,6 +1,6 @@
diff -Naur linux-2.6.32/drivers/gpu/drm/i915/i915_dma.c daniel-s-linux-stuff-linux-kernel/drivers/gpu/drm/i915/i915_dma.c
--- linux-2.6.32/drivers/gpu/drm/i915/i915_dma.c 2009-12-03 04:51:21.000000000 +0100
+++ daniel-s-linux-stuff-linux-kernel/drivers/gpu/drm/i915/i915_dma.c 2009-12-08 12:05:42.000000000 +0100
diff -Naur linux-2.6.32.2/drivers/gpu/drm/i915/i915_dma.c linux-2.6.32.2.patch/drivers/gpu/drm/i915/i915_dma.c
--- linux-2.6.32.2/drivers/gpu/drm/i915/i915_dma.c 2009-12-18 23:27:07.000000000 +0100
+++ linux-2.6.32.2.patch/drivers/gpu/drm/i915/i915_dma.c 2009-12-19 11:54:31.017126352 +0100
@@ -807,6 +807,9 @@
case I915_PARAM_NUM_FENCES_AVAIL:
value = dev_priv->num_fence_regs - dev_priv->fence_reg_start;
@ -29,9 +29,9 @@ diff -Naur linux-2.6.32/drivers/gpu/drm/i915/i915_dma.c daniel-s-linux-stuff-lin
};
int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls);
diff -Naur linux-2.6.32/drivers/gpu/drm/i915/i915_drv.h daniel-s-linux-stuff-linux-kernel/drivers/gpu/drm/i915/i915_drv.h
--- linux-2.6.32/drivers/gpu/drm/i915/i915_drv.h 2009-12-03 04:51:21.000000000 +0100
+++ daniel-s-linux-stuff-linux-kernel/drivers/gpu/drm/i915/i915_drv.h 2009-12-08 12:05:42.000000000 +0100
diff -Naur linux-2.6.32.2/drivers/gpu/drm/i915/i915_drv.h linux-2.6.32.2.patch/drivers/gpu/drm/i915/i915_drv.h
--- linux-2.6.32.2/drivers/gpu/drm/i915/i915_drv.h 2009-12-18 23:27:07.000000000 +0100
+++ linux-2.6.32.2.patch/drivers/gpu/drm/i915/i915_drv.h 2009-12-19 11:54:31.019126448 +0100
@@ -170,6 +170,8 @@
/* clock gating init */
};
@ -62,10 +62,10 @@ diff -Naur linux-2.6.32/drivers/gpu/drm/i915/i915_drv.h daniel-s-linux-stuff-lin
int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
int i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj,
int write);
diff -Naur linux-2.6.32/drivers/gpu/drm/i915/i915_gem.c daniel-s-linux-stuff-linux-kernel/drivers/gpu/drm/i915/i915_gem.c
--- linux-2.6.32/drivers/gpu/drm/i915/i915_gem.c 2009-12-03 04:51:21.000000000 +0100
+++ daniel-s-linux-stuff-linux-kernel/drivers/gpu/drm/i915/i915_gem.c 2009-12-08 12:05:42.000000000 +0100
@@ -1583,7 +1583,7 @@
diff -Naur linux-2.6.32.2/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.2.patch/drivers/gpu/drm/i915/i915_gem.c
--- linux-2.6.32.2/drivers/gpu/drm/i915/i915_gem.c 2009-12-18 23:27:07.000000000 +0100
+++ linux-2.6.32.2.patch/drivers/gpu/drm/i915/i915_gem.c 2009-12-19 11:54:31.033126624 +0100
@@ -1584,7 +1584,7 @@
*
* Returned sequence numbers are nonzero on success.
*/
@ -74,7 +74,7 @@ diff -Naur linux-2.6.32/drivers/gpu/drm/i915/i915_gem.c daniel-s-linux-stuff-lin
i915_add_request(struct drm_device *dev, struct drm_file *file_priv,
uint32_t flush_domains)
{
@@ -1820,12 +1820,8 @@
@@ -1821,12 +1821,8 @@
mutex_unlock(&dev->struct_mutex);
}
@ -89,7 +89,7 @@ diff -Naur linux-2.6.32/drivers/gpu/drm/i915/i915_gem.c daniel-s-linux-stuff-lin
{
drm_i915_private_t *dev_priv = dev->dev_private;
u32 ier;
@@ -1852,10 +1848,15 @@
@@ -1853,10 +1849,15 @@
dev_priv->mm.waiting_gem_seqno = seqno;
i915_user_irq_get(dev);
@ -109,7 +109,7 @@ diff -Naur linux-2.6.32/drivers/gpu/drm/i915/i915_gem.c daniel-s-linux-stuff-lin
i915_user_irq_put(dev);
dev_priv->mm.waiting_gem_seqno = 0;
@@ -1879,6 +1880,34 @@
@@ -1880,6 +1881,34 @@
return ret;
}
@ -144,7 +144,7 @@ diff -Naur linux-2.6.32/drivers/gpu/drm/i915/i915_gem.c daniel-s-linux-stuff-lin
static void
i915_gem_flush(struct drm_device *dev,
uint32_t invalidate_domains,
@@ -1947,7 +1976,7 @@
@@ -1948,7 +1977,7 @@
#endif
BEGIN_LP_RING(2);
OUT_RING(cmd);
@ -153,9 +153,9 @@ diff -Naur linux-2.6.32/drivers/gpu/drm/i915/i915_gem.c daniel-s-linux-stuff-lin
ADVANCE_LP_RING();
}
}
diff -Naur linux-2.6.32/drivers/gpu/drm/i915/i915_reg.h daniel-s-linux-stuff-linux-kernel/drivers/gpu/drm/i915/i915_reg.h
--- linux-2.6.32/drivers/gpu/drm/i915/i915_reg.h 2009-12-03 04:51:21.000000000 +0100
+++ daniel-s-linux-stuff-linux-kernel/drivers/gpu/drm/i915/i915_reg.h 2009-12-08 12:05:42.000000000 +0100
diff -Naur linux-2.6.32.2/drivers/gpu/drm/i915/i915_reg.h linux-2.6.32.2.patch/drivers/gpu/drm/i915/i915_reg.h
--- linux-2.6.32.2/drivers/gpu/drm/i915/i915_reg.h 2009-12-18 23:27:07.000000000 +0100
+++ linux-2.6.32.2.patch/drivers/gpu/drm/i915/i915_reg.h 2009-12-19 11:54:31.036126278 +0100
@@ -140,6 +140,7 @@
#define MI_NOOP MI_INSTR(0, 0)
#define MI_USER_INTERRUPT MI_INSTR(0x02, 0)
@ -175,10 +175,10 @@ diff -Naur linux-2.6.32/drivers/gpu/drm/i915/i915_reg.h daniel-s-linux-stuff-lin
#define MI_LOAD_SCAN_LINES_INCL MI_INSTR(0x12, 0)
#define MI_STORE_DWORD_IMM MI_INSTR(0x20, 1)
#define MI_MEM_VIRTUAL (1 << 22) /* 965+ only */
diff -Naur linux-2.6.32/drivers/gpu/drm/i915/intel_display.c daniel-s-linux-stuff-linux-kernel/drivers/gpu/drm/i915/intel_display.c
--- linux-2.6.32/drivers/gpu/drm/i915/intel_display.c 2009-12-03 04:51:21.000000000 +0100
+++ daniel-s-linux-stuff-linux-kernel/drivers/gpu/drm/i915/intel_display.c 2009-12-08 12:05:42.000000000 +0100
@@ -1781,6 +1781,22 @@
diff -Naur linux-2.6.32.2/drivers/gpu/drm/i915/intel_display.c linux-2.6.32.2.patch/drivers/gpu/drm/i915/intel_display.c
--- linux-2.6.32.2/drivers/gpu/drm/i915/intel_display.c 2009-12-18 23:27:07.000000000 +0100
+++ linux-2.6.32.2.patch/drivers/gpu/drm/i915/intel_display.c 2009-12-19 11:56:16.720124643 +0100
@@ -1803,6 +1803,22 @@
}
}
@ -201,7 +201,7 @@ diff -Naur linux-2.6.32/drivers/gpu/drm/i915/intel_display.c daniel-s-linux-stuf
static void i9xx_crtc_dpms(struct drm_crtc *crtc, int mode)
{
struct drm_device *dev = crtc->dev;
@@ -1839,12 +1855,13 @@
@@ -1861,12 +1877,12 @@
intel_update_fbc(crtc, &crtc->mode);
/* Give the overlay scaler a chance to enable if it's on this pipe */
@ -210,14 +210,13 @@ diff -Naur linux-2.6.32/drivers/gpu/drm/i915/intel_display.c daniel-s-linux-stuf
break;
case DRM_MODE_DPMS_OFF:
intel_update_watermarks(dev);
+
/* Give the overlay scaler a chance to disable if it's on this pipe */
- //intel_crtc_dpms_video(crtc, FALSE); TODO
+ intel_crtc_dpms_overlay(intel_crtc, false);
+ intel_crtc_dpms_overlay(intel_crtc, true);
drm_vblank_off(dev, pipe);
if (dev_priv->cfb_plane == plane &&
dev_priv->display.disable_fbc)
@@ -2039,7 +2056,7 @@
@@ -2062,7 +2078,7 @@
* Return the pipe currently connected to the panel fitter,
* or -1 if the panel fitter is not present or not in use
*/
@ -226,7 +225,7 @@ diff -Naur linux-2.6.32/drivers/gpu/drm/i915/intel_display.c daniel-s-linux-stuf
{
struct drm_i915_private *dev_priv = dev->dev_private;
u32 pfit_control;
@@ -4324,7 +4341,7 @@
@@ -4347,7 +4363,7 @@
}
/* Returns the core display clock speed */
@ -235,7 +234,7 @@ diff -Naur linux-2.6.32/drivers/gpu/drm/i915/intel_display.c daniel-s-linux-stuf
dev_priv->display.get_display_clock_speed =
i945_get_display_clock_speed;
else if (IS_I915G(dev))
@@ -4422,6 +4439,8 @@
@@ -4445,6 +4461,8 @@
INIT_WORK(&dev_priv->idle_work, intel_idle_update);
setup_timer(&dev_priv->idle_timer, intel_gpu_idle_timer,
(unsigned long)dev);
@ -244,9 +243,9 @@ diff -Naur linux-2.6.32/drivers/gpu/drm/i915/intel_display.c daniel-s-linux-stuf
}
void intel_modeset_cleanup(struct drm_device *dev)
diff -Naur linux-2.6.32/drivers/gpu/drm/i915/intel_drv.h daniel-s-linux-stuff-linux-kernel/drivers/gpu/drm/i915/intel_drv.h
--- linux-2.6.32/drivers/gpu/drm/i915/intel_drv.h 2009-12-03 04:51:21.000000000 +0100
+++ daniel-s-linux-stuff-linux-kernel/drivers/gpu/drm/i915/intel_drv.h 2009-12-08 12:05:42.000000000 +0100
diff -Naur linux-2.6.32.2/drivers/gpu/drm/i915/intel_drv.h linux-2.6.32.2.patch/drivers/gpu/drm/i915/intel_drv.h
--- linux-2.6.32.2/drivers/gpu/drm/i915/intel_drv.h 2009-12-18 23:27:07.000000000 +0100
+++ linux-2.6.32.2.patch/drivers/gpu/drm/i915/intel_drv.h 2009-12-19 11:54:31.044124074 +0100
@@ -110,6 +110,27 @@
int clone_mask;
};
@ -303,9 +302,9 @@ diff -Naur linux-2.6.32/drivers/gpu/drm/i915/intel_drv.h daniel-s-linux-stuff-li
+extern int intel_overlay_attrs(struct drm_device *dev, void *data,
+ struct drm_file *file_priv);
#endif /* __INTEL_DRV_H__ */
diff -Naur linux-2.6.32/drivers/gpu/drm/i915/intel_overlay.c daniel-s-linux-stuff-linux-kernel/drivers/gpu/drm/i915/intel_overlay.c
--- linux-2.6.32/drivers/gpu/drm/i915/intel_overlay.c 1970-01-01 01:00:00.000000000 +0100
+++ daniel-s-linux-stuff-linux-kernel/drivers/gpu/drm/i915/intel_overlay.c 2009-12-08 12:05:42.000000000 +0100
diff -Naur linux-2.6.32.2/drivers/gpu/drm/i915/intel_overlay.c linux-2.6.32.2.patch/drivers/gpu/drm/i915/intel_overlay.c
--- linux-2.6.32.2/drivers/gpu/drm/i915/intel_overlay.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.32.2.patch/drivers/gpu/drm/i915/intel_overlay.c 2009-12-19 11:54:31.050123801 +0100
@@ -0,0 +1,1317 @@
+/*
+ * Copyright © 2009
@ -1624,9 +1623,9 @@ diff -Naur linux-2.6.32/drivers/gpu/drm/i915/intel_overlay.c daniel-s-linux-stuf
+ kfree(dev_priv->overlay);
+ }
+}
diff -Naur linux-2.6.32/drivers/gpu/drm/i915/Makefile daniel-s-linux-stuff-linux-kernel/drivers/gpu/drm/i915/Makefile
--- linux-2.6.32/drivers/gpu/drm/i915/Makefile 2009-12-03 04:51:21.000000000 +0100
+++ daniel-s-linux-stuff-linux-kernel/drivers/gpu/drm/i915/Makefile 2009-12-08 12:05:42.000000000 +0100
diff -Naur linux-2.6.32.2/drivers/gpu/drm/i915/Makefile linux-2.6.32.2.patch/drivers/gpu/drm/i915/Makefile
--- linux-2.6.32.2/drivers/gpu/drm/i915/Makefile 2009-12-18 23:27:07.000000000 +0100
+++ linux-2.6.32.2.patch/drivers/gpu/drm/i915/Makefile 2009-12-19 11:54:31.051124826 +0100
@@ -23,6 +23,7 @@
intel_fb.o \
intel_tv.o \
@ -1635,9 +1634,9 @@ diff -Naur linux-2.6.32/drivers/gpu/drm/i915/Makefile daniel-s-linux-stuff-linux
dvo_ch7xxx.o \
dvo_ch7017.o \
dvo_ivch.o \
diff -Naur linux-2.6.32/include/drm/drm_os_linux.h daniel-s-linux-stuff-linux-kernel/include/drm/drm_os_linux.h
--- linux-2.6.32/include/drm/drm_os_linux.h 2009-12-03 04:51:21.000000000 +0100
+++ daniel-s-linux-stuff-linux-kernel/include/drm/drm_os_linux.h 2009-12-08 12:05:42.000000000 +0100
diff -Naur linux-2.6.32.2/include/drm/drm_os_linux.h linux-2.6.32.2.patch/include/drm/drm_os_linux.h
--- linux-2.6.32.2/include/drm/drm_os_linux.h 2009-12-18 23:27:07.000000000 +0100
+++ linux-2.6.32.2.patch/include/drm/drm_os_linux.h 2009-12-19 11:54:31.052124664 +0100
@@ -123,5 +123,5 @@
remove_wait_queue(&(queue), &entry); \
} while (0)
@ -1645,9 +1644,9 @@ diff -Naur linux-2.6.32/include/drm/drm_os_linux.h daniel-s-linux-stuff-linux-ke
-#define DRM_WAKEUP( queue ) wake_up_interruptible( queue )
+#define DRM_WAKEUP( queue ) wake_up( queue )
#define DRM_INIT_WAITQUEUE( queue ) init_waitqueue_head( queue )
diff -Naur linux-2.6.32/include/drm/i915_drm.h daniel-s-linux-stuff-linux-kernel/include/drm/i915_drm.h
--- linux-2.6.32/include/drm/i915_drm.h 2009-12-03 04:51:21.000000000 +0100
+++ daniel-s-linux-stuff-linux-kernel/include/drm/i915_drm.h 2009-12-08 12:05:42.000000000 +0100
diff -Naur linux-2.6.32.2/include/drm/i915_drm.h linux-2.6.32.2.patch/include/drm/i915_drm.h
--- linux-2.6.32.2/include/drm/i915_drm.h 2009-12-18 23:27:07.000000000 +0100
+++ linux-2.6.32.2.patch/include/drm/i915_drm.h 2009-12-19 11:54:31.053124642 +0100
@@ -186,6 +186,8 @@
#define DRM_I915_GEM_MMAP_GTT 0x24
#define DRM_I915_GET_PIPE_FROM_CRTC_ID 0x25

View File

@ -1 +1 @@
http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.32.1.tar.bz2
http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.32.2.tar.bz2