Author: pebender
Date: Mon Apr 27 14:37:09 2009
New Revision: 4673
Modified:
trunk/gar-minimyth/script/kernel-2.6.29/linux/checksums
trunk/gar-minimyth/script/kernel-2.6.29/linux/files/linux-2.6.29.2-intel_2009q1.patch
Log:
- Fixed error in patch file in previous commit.
Modified: trunk/gar-minimyth/script/kernel-2.6.29/linux/checksums
==============================================================================
--- trunk/gar-minimyth/script/kernel-2.6.29/linux/checksums (original)
+++ trunk/gar-minimyth/script/kernel-2.6.29/linux/checksums Mon Apr 27
14:37:09 2009
@@ -1,6 +1,6 @@
a6839571a9e70baf821d2fb752f9c4c6 download/linux-2.6.29.2.tar.bz2
f90762bafed481330b2cda1f04714e6b download/linux-2.6.29.2-perl.patch.gar
-bae5ffabed20cb821cbe6c4da69ec138
download/linux-2.6.29.2-intel_2009q1.patch
+f0d26b1d5a148a58ff619e6cd243cae5
download/linux-2.6.29.2-intel_2009q1.patch
4478be7f3306a548aeb0d385eaa49d84 download/linux-2.6.29.2-bug_11154.patch
9e9f8be4364ba6d0ed6322eeeb74f748 download/linux-2.6.29.2-bttv_lirc.patch
c8adc549218fb6cca8f177128171d8ed
download/linux-2.6.29.2-unionfs_2.5.1.patch
Modified:
trunk/gar-minimyth/script/kernel-2.6.29/linux/files/linux-2.6.29.2-intel_2009q1.patch
==============================================================================
---
trunk/gar-minimyth/script/kernel-2.6.29/linux/files/linux-2.6.29.2-intel_2009q1.patch
(original)
+++
trunk/gar-minimyth/script/kernel-2.6.29/linux/files/linux-2.6.29.2-intel_2009q1.patch
Mon Apr 27 14:37:09 2009
@@ -1,6 +1,6 @@
diff -Naur linux-2.6.29.2-old/drivers/gpu/drm/i915/i915_drv.h
linux-2.6.29.2-new/drivers/gpu/drm/i915/i915_drv.h
---- linux-2.6.29.2-old/drivers/gpu/drm/i915/i915_drv.h 2009-04-27
13:30:12.000000000 -0700
-+++ linux-2.6.29.2-new/drivers/gpu/drm/i915/i915_drv.h 2009-04-27
13:36:08.000000000 -0700
+--- linux-2.6.29.2-old/drivers/gpu/drm/i915/i915_drv.h 2009-04-27
10:37:11.000000000 -0700
++++ linux-2.6.29.2-new/drivers/gpu/drm/i915/i915_drv.h 2009-04-27
14:19:09.000000000 -0700
@@ -404,7 +404,8 @@
/** AGP memory structure for our GTT binding. */
DRM_AGP_MEM *agp_mem;
@@ -21,8 +21,8 @@
/* i915_irq.c */
diff -Naur linux-2.6.29.2-old/drivers/gpu/drm/i915/i915_gem.c
linux-2.6.29.2-new/drivers/gpu/drm/i915/i915_gem.c
---- linux-2.6.29.2-old/drivers/gpu/drm/i915/i915_gem.c 2009-04-27
13:30:12.000000000 -0700
-+++ linux-2.6.29.2-new/drivers/gpu/drm/i915/i915_gem.c 2009-04-27
13:36:08.000000000 -0700
+--- linux-2.6.29.2-old/drivers/gpu/drm/i915/i915_gem.c 2009-04-27
10:37:11.000000000 -0700
++++ linux-2.6.29.2-new/drivers/gpu/drm/i915/i915_gem.c 2009-04-27
14:19:09.000000000 -0700
@@ -43,8 +43,8 @@
uint64_t offset,
uint64_t size);
@@ -1012,9 +1012,20 @@
char *dst = obj_priv->phys_obj->handle->vaddr + (i * PAGE_SIZE);
memcpy(dst, src, PAGE_SIZE);
+diff -Naur linux-2.6.29.2-old/drivers/gpu/drm/i915/i915_reg.h
linux-2.6.29.2-new/drivers/gpu/drm/i915/i915_reg.h
+--- linux-2.6.29.2-old/drivers/gpu/drm/i915/i915_reg.h 2009-04-27
10:37:11.000000000 -0700
++++ linux-2.6.29.2-new/drivers/gpu/drm/i915/i915_reg.h 2009-04-27
14:24:10.000000000 -0700
+@@ -1431,6 +1431,7 @@
+ #define DISPPLANE_NO_LINE_DOUBLE 0
+ #define DISPPLANE_STEREO_POLARITY_FIRST 0
+ #define DISPPLANE_STEREO_POLARITY_SECOND (1<<18)
++#define DISPPLANE_TILED (1<<10)
+ #define DSPAADDR 0x70184
+ #define DSPASTRIDE 0x70188
+ #define DSPAPOS 0x7018C /* reserved */
diff -Naur linux-2.6.29.2-old/drivers/gpu/drm/i915/intel_display.c
linux-2.6.29.2-new/drivers/gpu/drm/i915/intel_display.c
---- linux-2.6.29.2-old/drivers/gpu/drm/i915/intel_display.c 2009-04-27
13:30:12.000000000 -0700
-+++ linux-2.6.29.2-new/drivers/gpu/drm/i915/intel_display.c 2009-04-27
13:38:16.000000000 -0700
+--- linux-2.6.29.2-old/drivers/gpu/drm/i915/intel_display.c 2009-04-27
10:37:11.000000000 -0700
++++ linux-2.6.29.2-new/drivers/gpu/drm/i915/intel_display.c 2009-04-27
14:19:09.000000000 -0700
@@ -338,6 +338,7 @@
int dspbase = (pipe == 0 ? DSPAADDR : DSPBADDR);
int dspsurf = (pipe == 0 ? DSPASURF : DSPBSURF);
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
