Does it work with 0033 or 0035 gfx? Peter
> -----Original Message----- > From: [email protected] > [mailto:[email protected]] On Behalf Of Kangkai Yin > Sent: Friday, January 14, 2011 4:26 PM > To: [email protected] > Subject: [meego-commits] 12000: Changes to > Trunk:Testing/kernel-adaptation-oaktrail > > Hi, > I have made the following changes to kernel-adaptation-oaktrail in project > Trunk:Testing. Please review and accept ASAP. > > Thank You, > Kangkai Yin > > [This message was auto-generated] > > --- > > Request #12000: > > submit: devel:kernel/kernel-adaptation-oaktrail(r7)(update) -> > Trunk:Testing/kernel-adaptation-oaktrail > > > Message: > Merge devel:kernel/kernel changes from Arjan: > - go to 2.6.37 final (BMC#11626) to match the reference kernel > - various config changes (BMC#8110, BMC#11479) to make the policy > framework work > - add linux-2.6.37-rc3-vfs-dirty-inode.patch > - update ac patch to 20110104, and remove several N/A patches > - remove several reduntant-runtime-eanble patches > - add linux-2.6.37-mipi.patch > > State: new 2011-01-14T00:22:55 kai > Comment: None > > > > changes files: > -------------- > --- kernel.changes > +++ kernel.changes > @@ -0,0 +1,9 @@ > +* Mon Jan 10 2011 - Yin Kangkai <[email protected]> - 2.6.37 > +- Merge devel:kernel/kernel changes from Arjan: > + - go to 2.6.37 final (BMC#11626) to match the reference kernel > + - various config changes (BMC#8110, BMC#11479) to make the policy > framework work > + - add linux-2.6.37-rc3-vfs-dirty-inode.patch > + - update ac patch to 20110104, and remove several N/A patches > + - remove several reduntant-runtime-eanble patches > + - add linux-2.6.37-mipi.patch > + > > old: > ---- > linux-2.6.36.tar.bz2 > linux-2.6.37-dma-redundant-runtime-enable.patch > linux-2.6.37-i2c-proc-name.patch > linux-2.6.37-i2c-redundant-runtime-enable.patch > linux-2.6.37-rc1-vfs-tracepoints.patch > linux-2.6.37-rc5-20101208-ac.patch > linux-2.6.37-rc5-20101213-ac.patch > linux-2.6.37-sst-redundant-runtime-enable.patch > patch-2.6.37-rc5.bz2 > > new: > ---- > linux-2.6.37-mipi.patch > linux-2.6.37-rc3-vfs-dirty-inode.patch > linux-2.6.37-rc8-20110104-ac.patch > linux-2.6.37.tar.bz2 > > spec files: > ----------- > --- kernel-adaptation-oaktrail.spec > +++ kernel-adaptation-oaktrail.spec > @@ -8,7 +8,7 @@ > # For a stable, released kernel, released_kernel should be 1. For rawhide > # and/or a kernel built from an rc snapshot, released_kernel should > # be 0. > -%define released_kernel 0 > +%define released_kernel 1 > > # Versions of various parts > > @@ -16,13 +16,13 @@ > # on top of -- for example, 2.6.22-rc7 starts with a 2.6.21 base, > # which yields a base_sublevel of 21. > > -%define base_sublevel 36 > +%define base_sublevel 37 > > > ## If this is a released kernel ## > %if 0%{?released_kernel} > # Do we have a 2.6.21.y update to apply? > -%define stable_update 3 > +%define stable_update 0 > # Set rpm version accordingly > %if 0%{?stable_update} > %define stablerev .%{stable_update} > @@ -193,26 +193,20 @@ > # The main consolidated MRST/MFLD tree from > # git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref > # > -Patch200: linux-2.6.37-rc5-20101213-ac.patch > +Patch200: linux-2.6.37-rc8-20110104-ac.patch > > Patch201: linux-2.6.37-drm-forwardport.patch > Patch202: linux-2.6.37-drm-forward-1.patch > Patch203: linux-2.6.37-drm-forward-2.patch > Patch204: linux-2.6.37-drm-no-video.patch > Patch205: linux-2.6.37-drm-kmap-api.patch > -Patch206: linux-2.6.37-gma600.patch > -Patch207: linux-2.6.37-gma600-include.patch > -Patch208: linux-3.6.37-gma600-Fixed-HSD-bug-3741489-MIPI1-blacko.patch > -Patch209: linux-3.6.37-gma600-Fix-for-Bugzilla-10748-REG-Gfx-dri.patch > -Patch210: linux-2.6.37-gma600-fix-MSI-enable.patch > - > -# fix warning at boot > -Patch211: linux-2.6.37-i2c-proc-name.patch > - > -# redundant runtime-enable's > -Patch212: linux-2.6.37-i2c-redundant-runtime-enable.patch > -Patch213: linux-2.6.37-sst-redundant-runtime-enable.patch > -Patch214: linux-2.6.37-dma-redundant-runtime-enable.patch > +Patch206: linux-2.6.37-mipi.patch > +Patch207: linux-2.6.37-gma600.patch > +Patch208: linux-2.6.37-gma600-include.patch > +Patch209: linux-3.6.37-gma600-Fixed-HSD-bug-3741489-MIPI1-blacko.patch > +Patch210: linux-3.6.37-gma600-Fix-for-Bugzilla-10748-REG-Gfx-dri.patch > +Patch211: linux-2.6.37-gma600-fix-MSI-enable.patch > + > # > # End of the Moorsetown architecture patches > # > @@ -228,7 +222,7 @@ > # > # Patches to help PowerTOP > # > -Patch300: linux-2.6.37-rc1-vfs-tracepoints.patch > +Patch300: linux-2.6.37-rc3-vfs-dirty-inode.patch > Patch301: linux-2.6.37-rc1-ahci-alpm-accounting.patch > > # > @@ -399,7 +393,7 @@ > # The main consolidated MRST/MFLD tree from > # git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref > # > -# linux-2.6.37-rc5-20101213-ac.patch > +# linux-2.6.37-rc8-20110104-ac.patch > %patch200 -p1 > > # linux-2.6.37-drm-forwardport.patch > @@ -412,28 +406,19 @@ > %patch204 -p1 > # linux-2.6.37-drm-kmap-api.patch > %patch205 -p1 > -# linux-2.6.37-gma600.patch > +# linux-2.6.37-mipi.patch > %patch206 -p1 > -# linux-2.6.37-gma600-include.patch > +# linux-2.6.37-gma600.patch > %patch207 -p1 > -# linux-3.6.37-gma600-Fixed-HSD-bug-3741489-MIPI1-blacko.patch > +# linux-2.6.37-gma600-include.patch > %patch208 -p1 > -# linux-3.6.37-gma600-Fix-for-Bugzilla-10748-REG-Gfx-dri.patch > +# linux-3.6.37-gma600-Fixed-HSD-bug-3741489-MIPI1-blacko.patch > %patch209 -p1 > -# linux-2.6.37-gma600-fix-MSI-enable.patch > +# linux-3.6.37-gma600-Fix-for-Bugzilla-10748-REG-Gfx-dri.patch > %patch210 -p1 > - > -# fix warning at boot > -# linux-2.6.37-i2c-proc-name.patch > +# linux-2.6.37-gma600-fix-MSI-enable.patch > %patch211 -p1 > > -# redundant runtime-enable's > -# linux-2.6.37-i2c-redundant-runtime-enable.patch > -%patch212 -p1 > -# linux-2.6.37-sst-redundant-runtime-enable.patch > -%patch213 -p1 > -# linux-2.6.37-dma-redundant-runtime-enable.patch > -%patch214 -p1 > # > # End of the Moorsetown architecture patches > # > @@ -449,7 +434,7 @@ > # > # Patches to help PowerTOP > # > -# linux-2.6.37-rc1-vfs-tracepoints.patch > +# linux-2.6.37-rc3-vfs-dirty-inode.patch > %patch300 -p1 > # linux-2.6.37-rc1-ahci-alpm-accounting.patch > %patch301 -p1 > > other changes: > -------------- > > ++++++ config-generic > --- config-generic > +++ config-generic > @@ -73,7 +73,7 @@ > # CONFIG_AUDIT is not set > # CONFIG_IKCONFIG is not set > CONFIG_LOG_BUF_SHIFT=17 > -# CONFIG_CGROUPS is not set > +CONFIG_CGROUPS=y > CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y > # CONFIG_GROUP_SCHED is not set > # CONFIG_SYSFS_DEPRECATED_V2 is not set > @@ -807,7 +807,7 @@ > # CONFIG_DEBUG_DRIVER is not set > CONFIG_DEBUG_DEVRES=y > # CONFIG_SYS_HYPERVISOR is not set > -# CONFIG_CONNECTOR is not set > +CONFIG_CONNECTOR=y > # CONFIG_MTD is not set > # CONFIG_PARPORT is not set > CONFIG_PNP=y > @@ -3709,3 +3709,22 @@ > CONFIG_AR600x_BT_RESET_PIN=2 > # CONFIG_MDFD_GL3 is not set > # CONFIG_INTEL_MID_OCD is not set > + > +# CONFIG_CGROUP_DEBUG is not set > +CONFIG_CGROUP_NS=y > +CONFIG_CGROUP_FREEZER=y > +CONFIG_CGROUP_DEVICE=y > +CONFIG_CPUSETS=y > +CONFIG_CGROUP_CPUACCT=y > +CONFIG_RESOURCE_COUNTERS=y > +CONFIG_CGROUP_SCHED=y > +CONFIG_BLK_DEV_THROTTLING=y > +CONFIG_PROC_EVENTS=y > +# CONFIG_BLK_DEV_DRBD is not set > +# CONFIG_FB_UVESA is not set > + > +CONFIG_PROC_PID_CPUSET=y > +CONFIG_CGROUP_MEM_RES_CTLR=y > +CONFIG_FAIR_GROUP_SCHED=y > +CONFIG_RT_GROUP_SCHED=y > +# CONFIG_CGROUP_MEM_RES_CTLR_SWAP is not set > > ++++++ kernel.spec.in > --- kernel.spec.in > +++ kernel.spec.in > @@ -8,7 +8,7 @@ > # For a stable, released kernel, released_kernel should be 1. For rawhide > # and/or a kernel built from an rc snapshot, released_kernel should > # be 0. > -%define released_kernel 0 > +%define released_kernel 1 > > # Versions of various parts > > @@ -16,13 +16,13 @@ > # on top of -- for example, 2.6.22-rc7 starts with a 2.6.21 base, > # which yields a base_sublevel of 21. > > -%define base_sublevel 36 > +%define base_sublevel 37 > > > ## If this is a released kernel ## > %if 0%{?released_kernel} > # Do we have a 2.6.21.y update to apply? > -%define stable_update 3 > +%define stable_update 0 > # Set rpm version accordingly > %if 0%{?stable_update} > %define stablerev .%{stable_update} > > ++++++ linux-2.6.37-drm-forwardport.patch > --- linux-2.6.37-drm-forwardport.patch > +++ linux-2.6.37-drm-forwardport.patch > @@ -1,6 +1,7 @@ > -diff -purN linux.trees.git/drivers/char/agp/Kconfig > linux-2.6.35/drivers/char/agp/Kconfig > ---- linux.trees.git/drivers/char/agp/Kconfig 2010-10-29 18:38:21.952000419 > -0400 > -+++ linux-2.6.35/drivers/char/agp/Kconfig 2010-08-01 18:11:14.000000000 > -0400 > +diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig > +index fcd867d..4b66c69 100644 > +--- a/drivers/char/agp/Kconfig > ++++ b/drivers/char/agp/Kconfig > @@ -34,7 +34,7 @@ config AGP_ALI > X on the following ALi chipsets. The supported chipsets > include M1541, M1621, M1631, M1632, M1641,M1647,and M1651. > @@ -19,9 +20,10 @@ > help > This option gives you AGP support for the GLX component of > X using the on-CPU northbridge of the AMD Athlon64/Opteron CPUs. > -diff -purN linux.trees.git/drivers/char/agp/Makefile > linux-2.6.35/drivers/char/agp/Makefile > ---- linux.trees.git/drivers/char/agp/Makefile 2010-10-21 > 01:44:10.403000084 -0400 > -+++ linux-2.6.35/drivers/char/agp/Makefile 2010-08-01 18:11:14.000000000 > -0400 > +diff --git a/drivers/char/agp/Makefile b/drivers/char/agp/Makefile > +index 8eb56e2..627f542 100644 > +--- a/drivers/char/agp/Makefile > ++++ b/drivers/char/agp/Makefile > @@ -13,7 +13,6 @@ obj-$(CONFIG_AGP_HP_ZX1) += hp-agp.o > obj-$(CONFIG_AGP_PARISC) += parisc-agp.o > obj-$(CONFIG_AGP_I460) += i460-agp.o > @@ -30,9 +32,10 @@ > obj-$(CONFIG_AGP_NVIDIA) += nvidia-agp.o > obj-$(CONFIG_AGP_SGI_TIOCA) += sgi-agp.o > obj-$(CONFIG_AGP_SIS) += sis-agp.o > -diff -purN linux.trees.git/drivers/char/agp/agp.h > linux-2.6.35/drivers/char/agp/agp.h > ---- linux.trees.git/drivers/char/agp/agp.h 2010-10-21 01:44:10.403000084 > -0400 > -+++ linux-2.6.35/drivers/char/agp/agp.h 2010-08-01 18:11:14.000000000 > -0400 > +diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h > +index 5259065..1204909 100644 > +--- a/drivers/char/agp/agp.h > ++++ b/drivers/char/agp/agp.h > @@ -121,6 +121,11 @@ struct agp_bridge_driver { > void (*agp_destroy_pages)(struct agp_memory *); > int (*agp_type_to_mask_type) (struct agp_bridge_data *, int); > @@ -45,10 +48,11 @@ > }; > > struct agp_bridge_data { > -diff -purN linux.trees.git/drivers/char/agp/amd-k7-agp.c > linux-2.6.35/drivers/char/agp/amd-k7-agp.c > ---- linux.trees.git/drivers/char/agp/amd-k7-agp.c 2010-10-21 > 01:44:10.404000084 -0400 > -+++ linux-2.6.35/drivers/char/agp/amd-k7-agp.c 2010-08-01 > 18:11:14.000000000 -0400 > -@@ -309,8 +309,7 @@ static int amd_insert_memory(struct agp_ > +diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c > +index b1b4362..b6b1568 100644 > +--- a/drivers/char/agp/amd-k7-agp.c > ++++ b/drivers/char/agp/amd-k7-agp.c > +@@ -309,8 +309,7 @@ static int amd_insert_memory(struct agp_memory > *mem, off_t pg_start, int type) > > num_entries = A_SIZE_LVL2(agp_bridge->current_size)->num_entries; > > @@ -58,7 +62,7 @@ > return -EINVAL; > > if ((pg_start + mem->page_count) > num_entries) > -@@ -349,8 +348,7 @@ static int amd_remove_memory(struct agp_ > +@@ -349,8 +348,7 @@ static int amd_remove_memory(struct agp_memory > *mem, off_t pg_start, int type) > unsigned long __iomem *cur_gatt; > unsigned long addr; > > @@ -68,9 +72,10 @@ > return -EINVAL; > > for (i = pg_start; i < (mem->page_count + pg_start); i++) { > -diff -purN linux.trees.git/drivers/char/agp/amd64-agp.c > linux-2.6.35/drivers/char/agp/amd64-agp.c > ---- linux.trees.git/drivers/char/agp/amd64-agp.c 2010-10-21 > 01:44:10.405000084 -0400 > -+++ linux-2.6.35/drivers/char/agp/amd64-agp.c 2010-08-01 > 18:11:14.000000000 -0400 > +diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c > +index 42396df..70312da 100644 > +--- a/drivers/char/agp/amd64-agp.c > ++++ b/drivers/char/agp/amd64-agp.c > @@ -15,7 +15,7 @@ > #include <linux/mmzone.h> > #include <asm/page.h> /* PAGE_SIZE */ > @@ -125,7 +130,7 @@ > pci_write_config_dword(dev, AMD64_GARTAPERTURECTL, tmp); > } > } > -@@ -321,25 +313,22 @@ static __devinit int fix_northbridge(str > +@@ -321,25 +313,22 @@ static __devinit int fix_northbridge(struct pci_dev > *nb, struct pci_dev *agp, > if (order < 0 || !agp_aperture_valid(aper, (32*1024*1024)<<order)) > return -1; > > @@ -155,7 +160,7 @@ > if (fix_northbridge(dev, pdev, cap_ptr) < 0) { > dev_err(&dev->dev, "no usable aperture found\n"); > #ifdef __x86_64__ > -@@ -416,8 +405,7 @@ static int __devinit uli_agp_init(struct > +@@ -416,8 +405,7 @@ static int __devinit uli_agp_init(struct pci_dev *pdev) > } > > /* shadow x86-64 registers into ULi registers */ > @@ -165,7 +170,7 @@ > > /* if x86-64 aperture base is beyond 4G, exit here */ > if ((httfea & 0x7fff) >> (32 - 25)) { > -@@ -484,8 +472,7 @@ static int nforce3_agp_init(struct pci_d > +@@ -484,8 +472,7 @@ static int nforce3_agp_init(struct pci_dev *pdev) > pci_write_config_dword(dev1, NVIDIA_X86_64_1_APSIZE, tmp); > > /* shadow x86-64 registers into NVIDIA registers */ > @@ -175,10 +180,11 @@ > > /* if x86-64 aperture base is beyond 4G, exit here */ > if ( (apbase & 0x7fff) >> (32 - 25) ) { > -diff -purN linux.trees.git/drivers/char/agp/backend.c > linux-2.6.35/drivers/char/agp/backend.c > ---- linux.trees.git/drivers/char/agp/backend.c 2010-10-21 > 01:44:10.405000084 -0400 > -+++ linux-2.6.35/drivers/char/agp/backend.c 2010-08-01 > 18:11:14.000000000 -0400 > -@@ -151,7 +151,17 @@ static int agp_backend_initialize(struct > +diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c > +index f27d0d0..ee4f855 100644 > +--- a/drivers/char/agp/backend.c > ++++ b/drivers/char/agp/backend.c > +@@ -151,7 +151,17 @@ static int agp_backend_initialize(struct > agp_bridge_data *bridge) > } > > bridge->scratch_page_page = page; > @@ -197,7 +203,7 @@ > > bridge->scratch_page = bridge->driver->mask_memory(bridge, > bridge->scratch_page_dma, 0); > -@@ -194,6 +204,12 @@ static int agp_backend_initialize(struct > +@@ -194,6 +204,12 @@ static int agp_backend_initialize(struct > agp_bridge_data *bridge) > return 0; > > err_out: > @@ -210,7 +216,7 @@ > if (bridge->driver->needs_scratch_page) { > void *va = page_address(bridge->scratch_page_page); > > -@@ -224,6 +240,10 @@ static void agp_backend_cleanup(struct a > +@@ -224,6 +240,10 @@ static void agp_backend_cleanup(struct > agp_bridge_data *bridge) > bridge->driver->needs_scratch_page) { > void *va = page_address(bridge->scratch_page_page); > > @@ -221,10 +227,11 @@ > bridge->driver->agp_destroy_page(va, > AGP_PAGE_DESTROY_UNMAP); > bridge->driver->agp_destroy_page(va, AGP_PAGE_DESTROY_FREE); > } > -diff -purN linux.trees.git/drivers/char/agp/efficeon-agp.c > linux-2.6.35/drivers/char/agp/efficeon-agp.c > ---- linux.trees.git/drivers/char/agp/efficeon-agp.c 2010-08-18 > 13:45:21.314000330 -0400 > -+++ linux-2.6.35/drivers/char/agp/efficeon-agp.c 2010-08-01 > 18:11:14.000000000 -0400 > -@@ -372,17 +372,6 @@ static int __devinit agp_efficeon_probe( > +diff --git a/drivers/char/agp/efficeon-agp.c > b/drivers/char/agp/efficeon-agp.c > +index d607f53..aa109cb 100644 > +--- a/drivers/char/agp/efficeon-agp.c > ++++ b/drivers/char/agp/efficeon-agp.c > +@@ -372,17 +372,6 @@ static int __devinit agp_efficeon_probe(struct > pci_dev *pdev, > bridge->capndx = cap_ptr; > > /* > @@ -242,7 +249,7 @@ > * The following fixes the case where the BIOS has "forgotten" to > * provide an address range for the GART. > * 20030610 - [email protected] > -@@ -396,6 +385,17 @@ static int __devinit agp_efficeon_probe( > +@@ -396,6 +385,17 @@ static int __devinit agp_efficeon_probe(struct > pci_dev *pdev, > } > } > > @@ -260,9 +267,10 @@ > /* Fill in the mode register */ > if (cap_ptr) { > pci_read_config_dword(pdev, > -diff -purN linux.trees.git/drivers/char/agp/frontend.c > linux-2.6.35/drivers/char/agp/frontend.c > ---- linux.trees.git/drivers/char/agp/frontend.c 2010-11-23 > 18:21:58.169000013 -0500 > -+++ linux-2.6.35/drivers/char/agp/frontend.c 2010-08-01 > 18:11:14.000000000 -0400 > +diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c > +index 3cb4539..43412c0 100644 > +--- a/drivers/char/agp/frontend.c > ++++ b/drivers/char/agp/frontend.c > @@ -39,6 +39,7 @@ > #include <linux/mm.h> > #include <linux/fs.h> > @@ -271,10 +279,11 @@ > #include <asm/uaccess.h> > #include <asm/pgtable.h> > #include "agp.h" > -diff -purN linux.trees.git/drivers/char/agp/generic.c > linux-2.6.35/drivers/char/agp/generic.c > ---- linux.trees.git/drivers/char/agp/generic.c 2010-10-21 > 01:44:10.406000084 -0400 > -+++ linux-2.6.35/drivers/char/agp/generic.c 2010-08-01 > 18:11:14.000000000 -0400 > -@@ -437,6 +437,11 @@ int agp_bind_memory(struct agp_memory *c > +diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c > +index 4956f1c..d2abf51 100644 > +--- a/drivers/char/agp/generic.c > ++++ b/drivers/char/agp/generic.c > +@@ -437,6 +437,11 @@ int agp_bind_memory(struct agp_memory *curr, > off_t pg_start) > curr->is_flushed = true; > } > > @@ -286,7 +295,7 @@ > ret_val = curr->bridge->driver->insert_memory(curr, pg_start, > curr->type); > > if (ret_val != 0) > (77958 more lines skipped) > > ++++++ linux-2.6.37-mipi.patch (new) > --- linux-2.6.37-mipi.patch > +++ linux-2.6.37-mipi.patch > +--- a/drivers/gpu/drm/drm_crtc.c > ++++ b/drivers/gpu/drm/drm_crtc.c > +@@ -161,6 +161,7 @@ > + { DRM_MODE_CONNECTOR_HDMIB, "HDMI Type B", 0 }, > + { DRM_MODE_CONNECTOR_TV, "TV", 0 }, > + { DRM_MODE_CONNECTOR_eDP, "Embedded DisplayPort", 0 }, > ++ { DRM_MODE_CONNECTOR_MIPI, "MIPI", 0}, > + }; > + > + static struct drm_prop_enum_list drm_encoder_enum_list[] = > +@@ -169,6 +170,7 @@ > + { DRM_MODE_ENCODER_TMDS, "TMDS" }, > + { DRM_MODE_ENCODER_LVDS, "LVDS" }, > + { DRM_MODE_ENCODER_TVDAC, "TV" }, > ++ { DRM_MODE_ENCODER_MIPI, "MIPI"}, > + }; > + > + char *drm_get_encoder_name(struct drm_encoder *encoder) > +--- a/include/drm/drm_mode.h > ++++ b/include/drm/drm_mode.h > +@@ -124,6 +124,7 @@ > + #define DRM_MODE_ENCODER_TMDS 2 > + #define DRM_MODE_ENCODER_LVDS 3 > + #define DRM_MODE_ENCODER_TVDAC 4 > ++#define DRM_MODE_ENCODER_MIPI 5 > + > + struct drm_mode_get_encoder { > + __u32 encoder_id; > +@@ -161,6 +162,7 @@ > + #define DRM_MODE_CONNECTOR_HDMIB 12 > + #define DRM_MODE_CONNECTOR_TV 13 > + #define DRM_MODE_CONNECTOR_eDP 14 > ++#define DRM_MODE_CONNECTOR_MIPI 15 > + > + struct drm_mode_get_connector { > + > > ++++++ linux-2.6.37-platform-driver-x86-ACPI-EC-Extra-driver-for-Oaktrai.patch > --- linux-2.6.37-platform-driver-x86-ACPI-EC-Extra-driver-for-Oaktrai.patch > +++ linux-2.6.37-platform-driver-x86-ACPI-EC-Extra-driver-for-Oaktrai.patch > @@ -1,4 +1,4 @@ > -From c100dc6e2e4a4998da1ac114130b22d72720083a Mon Sep 17 00:00:00 > 2001 > +From 577525d556f992eb774185d738532d26082b2300 Mon Sep 17 00:00:00 > 2001 > From: Yin Kangkai <[email protected]> > Date: Wed, 22 Dec 2010 10:53:36 +0800 > Subject: [PATCH] platform-driver-x86: ACPI EC Extra driver for Oaktrail > > ++++++ linux-2.6.37-rc3-vfs-dirty-inode.patch (new) > --- linux-2.6.37-rc3-vfs-dirty-inode.patch > +++ linux-2.6.37-rc3-vfs-dirty-inode.patch > +From 3950d3c04a6bf8ccf9ff912a49bdd242a2fe9e47 Mon Sep 17 00:00:00 > 2001 > +From: Arjan van de Ven <[email protected]> > +Date: Fri, 26 Nov 2010 12:18:03 -0800 > +Subject: [PATCH] vfs: Add a trace point in the mark_inode_dirty function > + > +PowerTOP would like to be able to show who is keeping the disk > +busy by dirtying data. The most logical spot for this is in the vfs > +in the mark_inode_dirty() function, doing this on the block level > +is not possible because by the time the IO hits the block layer the > +guilty party can no longer be found ("kjournald" and "pdflush" are not > +useful answers to "who caused this file to be dirty). > + > +The trace point follows the same logic/style as the block_dump code > +and pretty much dumps the same data, just not to dmesg (and thus to > +/var/log/messages) but via the trace events streams. > + > +Eventually we should be able to phase out the block dump code, but that's > +for later on after a transition time. > + > +Signed-of-by: Arjan van de Ven <[email protected]> > +--- > + fs/fs-writeback.c | 3 +++ > + include/linux/fs.h | 12 ++++++++++++ > + include/trace/events/writeback.h | 28 ++++++++++++++++++++++++++++ > + 3 files changed, 43 insertions(+), 0 deletions(-) > + > +diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c > +index 3d06ccc..62e33cc 100644 > +--- a/fs/fs-writeback.c > ++++ b/fs/fs-writeback.c > +@@ -952,6 +952,9 @@ void __mark_inode_dirty(struct inode *inode, int > flags) > + if ((inode->i_state & flags) == flags) > + return; > + > ++ if (flags & (I_DIRTY_SYNC | I_DIRTY_DATASYNC | I_DIRTY_PAGES)) > ++ trace_writeback_inode_dirty(inode, flags); > ++ > + if (unlikely(block_dump)) > + block_dump___mark_inode_dirty(inode); > + > +diff --git a/include/linux/fs.h b/include/linux/fs.h > +index c9e06cc..25935e1 100644 > +--- a/include/linux/fs.h > ++++ b/include/linux/fs.h > +@@ -1676,6 +1676,18 @@ struct super_operations { > + > + #define I_DIRTY (I_DIRTY_SYNC | I_DIRTY_DATASYNC | I_DIRTY_PAGES) > + > ++#define INODE_DIRTY_FLAGS \ > ++ { I_DIRTY_SYNC, "DIRTY-SYNC" }, \ > ++ { I_DIRTY_DATASYNC, "DIRTY-DATASYNC" }, \ > ++ { I_DIRTY_PAGES, "DIRTY-PAGES" }, \ > ++ { I_NEW, "NEW" }, \ > ++ { I_WILL_FREE, "WILL-FREE" }, \ > ++ { I_FREEING, "FREEING" }, \ > ++ { I_CLEAR, "CLEAR" }, \ > ++ { I_SYNC, "SYNC" }, \ > ++ { I_REFERENCED, "REFERENCED" } > ++ > ++ > + extern void __mark_inode_dirty(struct inode *, int); > + static inline void mark_inode_dirty(struct inode *inode) > + { > +diff --git a/include/trace/events/writeback.h > b/include/trace/events/writeback.h > +index 89a2b2d..5c80875 100644 > +--- a/include/trace/events/writeback.h > ++++ b/include/trace/events/writeback.h > +@@ -186,6 +186,34 @@ > DEFINE_EVENT(writeback_congest_waited_template, > writeback_wait_iff_congested, > + TP_ARGS(usec_timeout, usec_delayed) > + ); > + > ++/* > ++ * Tracepoint for dirtying an inode; used by PowerTOP > ++ */ > ++TRACE_EVENT(writeback_inode_dirty, > ++ > ++ TP_PROTO(struct inode *inode, int flags), > ++ > ++ TP_ARGS(inode, flags), > ++ > ++ TP_STRUCT__entry( > ++ __field( __kernel_dev_t, dev ) > ++ __field( ino_t, ino ) > ++ __field( u32, flags ) > ++ ), > ++ > ++ TP_fast_assign( > ++ __entry->dev = inode->i_sb->s_dev; > ++ __entry->ino = inode->i_ino; > ++ __entry->flags = flags; > ++ ), > ++ > ++ TP_printk("dev %d:%d ino %lu flags %d %s", MAJOR(__entry->dev), > MINOR(__entry->dev), > ++ (unsigned long) __entry->ino, > ++ __entry->flags, > ++ __print_flags(__entry->flags, "|", INODE_DIRTY_FLAGS) > ++ ) > ++); > ++ > + #endif /* _TRACE_WRITEBACK_H */ > + > + /* This part must be outside protection */ > +-- > +1.7.2.3 > + > > ++++++ linux-2.6.37-rc8-20110104-ac.patch (new) > --- linux-2.6.37-rc8-20110104-ac.patch > +++ linux-2.6.37-rc8-20110104-ac.patch > +diff --git a/Documentation/hwmon/intel_over_current_detector > b/Documentation/hwmon/intel_over_current_detector > +new file mode 100644 > +index 0000000..d9483b0 > +--- /dev/null > ++++ b/Documentation/hwmon/intel_over_current_detector > +@@ -0,0 +1,86 @@ > ++Kernel driver over current detection driver > ++=========================================== > ++ > ++Supported systems: > ++ * Intel Medfield Platform > ++ > ++Author: Durgadoss R > ++ > ++Description > ++----------- > ++ > ++This driver monitors the current drawn by the platform, and detects the > ++peak current conditions. When the current drawn is more than the > ++configured limit for a period of time (which is specified by a timer), an > ++interrupt is generated. The current limit and the timer value can be > ++configured at run time. > ++ > ++The current thresholds aka BATTCURRENTLIMITS(BC) are of two types: > ++ 1.warning threshold(BC1) > ++ at which the system should take actions to bring the > ++ current consumption down. > ++ 2.shutdown threshold(BC2) > ++ at which the hardware does a COLDOFF. > ++ > ++The timer thresholds are of three types: > ++ 1.warning threshold(T1) > ++ This corresponds to the first flag for time that the battery > ++ current has been above BC1. An interrupt is generated to allow > ++ software to correct the situation based on use-case. > ++ 2.hardware action threshold(T2) > ++ This corresponds to the second flag for time that the battery > ++ current has been above BC1. It signifies that the system > ++ should control high current subsystems through hardware. > ++ Besides a general interrupt, audio_volume_crush, vibra_disable > ++ signals are sent. > ++ 3.shutdown threshold(T3) > ++ This final flag signifies that when the system current exceeds > ++ the threshold for more than T3, system should shutdown. > ++ > ++Following table summarizes the exported sysfs files: > ++ > ++bcu_status(RW) - To enable/disable burst control unit. > ++ 0 - enables bcu, 1 - disables bcu. > ++accumulation_time(RW)- Time since last clearing/overflow of > warning_count > ++ in milli seconds. Writing 0 resets the acc_time and > ++ also clears both the warning counters. > ++warning_count(RO) - Two space seperated values that indicate the > number > ++ of times the current thresholds have been crossed. > ++action_mask(RW) - A hex value to enable/disable specific > ++ actions taken when current violation happens. > ++ bits [b4 b3 b2 b1 b0] control [a4 a3 a2 a1 a0] actions > ++ respectively. a4 - camera output, a3 - sys burst, > ++ a2 - SOC burst enable, a1 - vibra, a0 - audio output. > ++ bits [b7 b6 b5] - Reserved. > ++ Default value:08 (sys burst output is enabled). > ++action_status(RO) - A hex value showing the status of actions taken > ++ since the __last__ interrupt. > ++ b7 - T3 violation > ++ b6 - T2 violation > ++ b5 - T1 violation > ++ b4 - camera action taken status > ++ b3 - sys burst disable action taken status > ++ b2 - SOC burst disable action taken status > ++ b1 - vibra disable > ++ b0 - audio volume crush > ++ A '1' in a bit position indicates that particular > ++ action has been taken. > ++current_warning(RW) - This gives the current(in mA) at which a warning > is > ++ generated. Range: 1400 to 4800. Default:3000 > ++current_shutdown(RW) - This gives the current(in mA) at which system > shutdown > ++ is initiated. Range:1800 to 5800. Default:3800 > ++timer_warning(RW) - Time above current_warning limit at which > interrupts > ++ are trigerred(so that software can bring the current > ++ consumption down). Values are in micro seconds. > ++ Range:200 to 7700 in steps of 500 > ++timer_hw_action(RW) - Time above current_warning limit at which the > system > ++ is trigerred into hardware control to bring down the > ++ current consumption. Values are in micro seconds. > ++ Range:200 to 7700 in steps of 500 > ++timer_shutdown(RW) - Time above current_warning limit at which a > hardware > ++ shutdown event is trigerred. The timer values are in > ++ micro seconds. > ++ Range:1000 to 15000 in steps of 1000 > ++For all timer interfaces, tolerance shall be 5% maximum. > ++All timers start running concurrently once > current_warning/current_shutdown > ++is crossed. > +diff --git a/Documentation/kernel-parameters.txt > b/Documentation/kernel-parameters.txt > +index 8b61c93..a4d6611 100644 > +--- a/Documentation/kernel-parameters.txt > ++++ b/Documentation/kernel-parameters.txt > +@@ -43,11 +43,12 @@ parameter is applicable: > + AVR32 AVR32 architecture is enabled. > + AX25 Appropriate AX.25 support is enabled. > + BLACKFIN Blackfin architecture is enabled. > ++ DMI Desktop Management Interface is enabled > ++ DRM Direct Rendering Management support is enabled. > ++ DYNAMIC_DEBUG Build in debug messages and enable them at runtime > + EDD BIOS Enhanced Disk Drive Services (EDD) is enabled > + EFI EFI Partitioning (GPT) is enabled > + EIDE EIDE/ATAPI support is enabled. > +- DRM Direct Rendering Management support is enabled. > +- DYNAMIC_DEBUG Build in debug messages and enable them at runtime > + FB The frame buffer device is enabled. > + GCOV GCOV profiling is enabled. > + HW Appropriate hardware is enabled. > +@@ -390,6 +391,21 @@ and is between 256 and 4096 characters. It is > defined in the file > + Format: <io>,<irq>,<mode> > + See header of drivers/net/hamradio/baycom_ser_hdx.c. > + > ++ board_name= [DMI] > ++ Override reported name in firmware DMI data. Used > ++ for testing and for checking board specific > ++ workarounds > ++ > ++ board_vendor= [DMI] > ++ Override reported vendor in firmware DMI data. Used > ++ for testing and for checking board specific > ++ workarounds > ++ > ++ board_version= [DMI] > ++ Override reported version in firmware DMI data. Used > ++ for testing and for checking board specific > ++ workarounds > ++ > + boot_delay= Milliseconds to delay each printk during boot. > + Values larger than 10 seconds (10000) are changed to > + no delay (0). > +diff --git a/Documentation/pti/pti_intel_mid.txt > b/Documentation/pti/pti_intel_mid.txt > +new file mode 100644 > +index 0000000..651fcf5 > +--- /dev/null > ++++ b/Documentation/pti/pti_intel_mid.txt > +@@ -0,0 +1,89 @@ > ++The Intel MID PTI project is HW implemented in Intel Atom > ++system-on-a-chip designs based on the Parallel Trace > ++Interface for MIPI P1149.7 cJTAG standard. The kernel solution > ++for this platform involves the following files: > ++ > ++./include/linux/pti.h > ++./include/linux/n_tracesink.h > ++./drivers/.../n_tracerouter.c > ++./drivers/.../n_tracesink.c > ++./drivers/.../pti.c > ++ > ++pti.c is the driver that enables various debugging features > ++popular on certain mobile manufacturers. n_tracerouter.c > ++and n_tracesink.c allow extra system information to be > ++collected and routed to the pti driver, such as trace > ++debugging data from a modem. Altough n_tracerouter > ++and n_tracesink are a part of the complete PTI solution, > ++these two line disciplines can work separate from > ++pti.c and route any data stream from one /dev/tty node > ++to another /dev/tty node via kernel-space. This provides > ++a stable, reliable connection that will not break unless > ++the user-space application shuts down (plus avoids > ++kernel->user->kernel context switch overheads of routing > ++data). > ++ > ++An example debugging usage for this driver system: > ++ *Hook /dev/ttyPTI0 to syslogd. Opening this port will also start > ++ a console device to further capture debugging messages to PTI. > ++ *Hook /dev/ttyPTI1 to modem debugging data to write to PTI HW. > ++ This is where n_tracerouter and n_tracesink are used. > ++ *Hook /dev/pti to a user-level debugging application for writing > ++ to PTI HW. > ++ *Use mipi_* Kernel Driver API in other device drivers for > ++ debugging to PTI by first requesting a PTI write address via > ++ mipi_request_masterchannel(1). > ++ > ++Example 'privileged' (normal user privileges are not enough) > ++user-space code on how to setup the n_tracerouter and n_tracesink > ++ldisc drivers (note: n_tracerouter depends on n_tracesink): > ++ > ++/////////// To hook up n_tracerouter and n_tracesink ///////// > ++ > ++#include <errno.h> > ++#define ONE_TTY "/dev/ttyOne" > ++#define TWO_TTY "/dev/ttyTwo" > ++ > ++// needed global to hand onto ldisc connection > ++static int g_fd_source = -1; > ++static int g_fd_sink = -1; > ++ > ++// grab LDISC values from loaded ldisc drivers from /proc/tty/ldiscs > ++int source_ldisc_num, sink_ldisc_num = -1; > ++int retval; > ++ > ++g_fd_source = open(ONE_TTY, O_RDWR); // must be R/W > ++g_fd_sink = open(TWO_TTY, O_RDWR); // must be R/W > ++ > ++if (g_fd_source <= 0) || (g_fd_sink <= 0) { > ++ // doubt you'll want to use these exact error lines of code > (87479 more lines skipped) > > ++++++ linux-2.6.36.tar.bz2 -> linux-2.6.37.tar.bz2 > 2084749 lines of diff (skipped) > > ++++++ series > --- series > +++ series > @@ -43,26 +43,20 @@ > # The main consolidated MRST/MFLD tree from > # git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref > # > -linux-2.6.37-rc5-20101213-ac.patch > +linux-2.6.37-rc8-20110104-ac.patch > > linux-2.6.37-drm-forwardport.patch > linux-2.6.37-drm-forward-1.patch > linux-2.6.37-drm-forward-2.patch > linux-2.6.37-drm-no-video.patch > linux-2.6.37-drm-kmap-api.patch > +linux-2.6.37-mipi.patch > linux-2.6.37-gma600.patch > linux-2.6.37-gma600-include.patch > linux-3.6.37-gma600-Fixed-HSD-bug-3741489-MIPI1-blacko.patch > linux-3.6.37-gma600-Fix-for-Bugzilla-10748-REG-Gfx-dri.patch > linux-2.6.37-gma600-fix-MSI-enable.patch > > -# fix warning at boot > -linux-2.6.37-i2c-proc-name.patch > - > -# redundant runtime-enable's > -linux-2.6.37-i2c-redundant-runtime-enable.patch > -linux-2.6.37-sst-redundant-runtime-enable.patch > -linux-2.6.37-dma-redundant-runtime-enable.patch > # > # End of the Moorsetown architecture patches > # > @@ -78,7 +72,7 @@ > # > # Patches to help PowerTOP > # > -linux-2.6.37-rc1-vfs-tracepoints.patch > +linux-2.6.37-rc3-vfs-dirty-inode.patch > linux-2.6.37-rc1-ahci-alpm-accounting.patch > > # > > ++++++ deleted files: > --- linux-2.6.37-dma-redundant-runtime-enable.patch > --- linux-2.6.37-i2c-proc-name.patch > --- linux-2.6.37-i2c-redundant-runtime-enable.patch > --- linux-2.6.37-rc1-vfs-tracepoints.patch > --- linux-2.6.37-rc5-20101208-ac.patch > --- linux-2.6.37-rc5-20101213-ac.patch > --- linux-2.6.37-sst-redundant-runtime-enable.patch > --- patch-2.6.37-rc5.bz2 > > _______________________________________________ > MeeGo-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
