aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-04-01microblaze: move noMMU __range_ok function to uaccess.hMichal Simek2-9/+6
The same noMMU and MMU functions should be placed in one file. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Move exception_table_entry upwardMichal Simek1-16/+15
Just sort to be able remove whole block. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Remove segment.hMichal Simek5-52/+34
I would like to use asm-generic uaccess.h where are segment macros defined. This is just first step. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Remove memset in free_init_pagesMichal Simek1-1/+0
We don't need to do it. Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Makefile cleanupsArun Bhanu1-4/+0
If CONFIG_INITRAMFS_SOURCE is set, "scripts/gen_initramfs_list.sh" checks if the cpio image exists. Remove the duplicate check from the Makefile. Remove the "clean-kernel" variable which is unused in the Makefile and is not used by the Kbuild. Signed-off-by: Arun Bhanu <[email protected]> Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Fix Makefile to delete build generated filesArun Bhanu2-1/+3
'make clean' does not to delete the following build generated file: arch/microblaze/boot/linux.bin.ub 'make mrproper' does not to delete the following build generated files: arch/microblaze/boot/simpleImage.* Fix the Makefile to delete these build generated files. See [1] for a discussion on why simpleImage.* files are deleted with 'make mrproper' and not with 'make clean'. [1] http://lkml.org/lkml/2010/3/12/96 Signed-off-by: Arun Bhanu <[email protected]> Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Add a missing single quote to make 'make help' happyArun Bhanu1-1/+1
'make ARCH=microblaze help' fails with the following error due to a missing single quote. /bin/sh: -c: line 0: unexpected EOF while looking for matching `'' /bin/sh: -c: line 1: syntax error: unexpected end of file make: *** [help] Error 2 Signed-off-by: Arun Bhanu <[email protected]> Signed-off-by: Michal Simek <[email protected]>
2010-04-01microblaze: Fix "kstack=" parsingSteven J. Magnani1-4/+2
The "kstack=" command line parameter is not parsed correctly. All proper values are interpreted as zero. Signed-off-by: Steven J. Magnani <[email protected]> Signed-off-by: Michal Simek <[email protected]>
2010-04-01drm/radeon/kms: enable ACPI powermanagement mode on radeon gpus.Dave Airlie2-0/+8
Some GPUs have an APM/ACPI PM mode selection switch and some BIOSes set this to APM. We really want this in ACPI mode for Linux. Signed-off-by: Dave Airlie <[email protected]>
2010-04-01drm/radeon/kms: rs400/480 should set common registers.Dave Airlie1-0/+2
These GPUs should be setting these registers up also. Signed-off-by: Dave Airlie <[email protected]>
2010-04-01drm/radeon/kms: add sanity check to wptr.Dave Airlie1-0/+2
If we resume in a bad way, we'll get 0xffffffff in wptr, and then oops with no console. This just adds a sanity check so that we can avoid the oops and hopefully get more details out of people's systems. Signed-off-by: Dave Airlie <[email protected]>
2010-04-01drm/radeon/kms/evergreen: get DP workingAlex Deucher1-3/+12
Need to enable the VID stream after link training Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31eeepc-wmi: new driver for WMI based hotkeys on Eee PC laptopsYong Wang3-0/+168
Add a WMI driver for Eee PC laptops. Currently it only supports hotkeys. Signed-off-by: Yong Wang <[email protected]> Signed-off-by: Matthew Garrett <[email protected]> Acked-by: Dmitry Torokhov <[email protected]>
2010-03-31asus-laptop: fix warning in asus_handle_initCorentin Chary1-2/+2
In function 'asus_laptop_get_info': warning: passing argument 3 of 'asus_handle_init' from incompatible pointer type note: expected 'char **' but argument is of type 'const char **' Introduced by commit c21085108a02e1b838c34f3650c8cc9fbd178615 ("asus-laptop: fix style problems reported by checkpath.pl"). Signed-off-by: Corentin Chary <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2010-03-31fat: fix buffer overflow in vfat_create_shortname()Nikolaus Schulz1-3/+3
When using the string representation of a random counter as part of the base name, ensure that it is no longer than 4 bytes. Since we are repeatedly decrementing the counter in a loop until we have found a unique base name, the counter may wrap around zero; therefore, it is not enough to mask its higher bits before entering the loop, this must be done inside the loop. [[email protected]: use snprintf()] Signed-off-by: Nikolaus Schulz <[email protected]> Cc: [email protected] Signed-off-by: OGAWA Hirofumi <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-03-31drm/radeon/kms: add hw_i2c module optionAlex Deucher3-3/+10
Turn off hw i2c by default except for mm i2c which is hw only until we sort out the remaining prescale issues on older chips. hw i2c can be enabled with hw_i2c=1. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms: use new pre/post_xfer i2c bit algo hooksAlex Deucher3-79/+64
This allows us to remove the internal bit algo bus used by the radeon i2c algo. We now register a radeon algo adapter if the gpio line is hw capable and the hw inplementation is available, otherwise we register a bit algo adapter. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31Merge branch 'v2.6.34-rc2' into drm-linusDave Airlie7925-222275/+511802
2010-03-31drm/radeon/kms: disable MSI on IGP chipsAlex Deucher1-5/+3
Doesn't seem to work reliably and the pci quirks don't always work. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms: display watermark updates (v2)Alex Deucher9-21/+155
- Add module option to force the display priority 0 = auto, 1 = normal, 2 = high - Default to high on r3xx/r4xx/rv515 chips Fixes flickering problems during heavy acceleration due to underflow to the display controllers - Fill in minimal support for RS600 v2 - update display priority when bandwidth is updated so the user can change the parameter at runtime and it will take affect on the next modeset. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms/dp: disable training pattern on the sink at the end of link ↵Alex Deucher1-0/+3
training Seems to have gotten lost in the evergreen merge. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms: minor fixes for eDP with LCD* device tags (v2)Alex Deucher2-5/+10
Some systems have LCD* rather than DFP* device tags in the bios for eDP connectors; notably the new apple iMac. This fixes things up so eDP connectors with either tag will work. v2: fix typo Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms/dp: remove extraneous training complete callAlex Deucher1-3/+0
Looks like a copy/paste typo from when evergreen support was added. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms/atom: minor fixes to transmitter setupAlex Deucher1-33/+21
- 8 lane links are not valid for DP - remove unused num var Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms: Only restrict BO to visible VRAM size when pinning to VRAM.Michel Dänzer1-2/+4
This prevented radeon.test=1 from testing transfers from/to GTT beyond the visible VRAM size. Signed-off-by: Michel Dänzer <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm: fix build error when SYSRQ is disabledRandy Dunlap1-0/+2
Fix build error when CONFIG_MAGIC_SYSRQ is not enabled: drivers/gpu/drm/drm_fb_helper.c:915: error: 'sysrq_drm_fb_helper_restore_op' undeclared (first use in this function) drivers/gpu/drm/drm_fb_helper.c:929: error: 'sysrq_drm_fb_helper_restore_op' undeclared (first use in this function) Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms: fix macbookpro connector quirkAlex Deucher1-0/+2
Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/r6xx/r7xx: further safe reg clean upAlex Deucher1-19/+0
- remove a few more drm only regs - remove sampler, alu, bool, loop constant regs. They are set via separate packet3's already Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon: bump the UMS driver version for r6xx/r7xx const buffer supportAlex Deucher1-1/+2
Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms: bump the version for r6xx/r7xx const buffer supportAlex Deucher1-1/+2
Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/r6xx/r7xx: CS parser fixesAlex Deucher3-60/+112
- Drop some more safe regs taht userspace shouldn't hit - Constant base regs need relocs. This allows us to use constant buffers rather than the constant register file. Also we don't want userspace to be able to set arbitrary mc base values for the const caches. - Track SQ_CONFIG so we know whether userspace is using the cfile or constant buffers. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms: fix some typos in r6xx/r7xx hpd setupAlex Deucher1-7/+7
Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/r600: remove some regs are not safe regs for command buffersAlex Deucher1-3/+0
Only the drm should be touching them. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm: Return ENODEV if the inode mapping changesChris Wilson1-7/+9
Replace a BUG_ON with an error code in the event that the inode mapping changes between calls to drm_open. This may happen for instance if udev is loaded subsequent to the original opening of the device: [ 644.291870] kernel BUG at drivers/gpu/drm/drm_fops.c:146! [ 644.291876] invalid opcode: 0000 [#1] SMP [ 644.291882] last sysfs file: /sys/kernel/uevent_seqnum [ 644.291888] [ 644.291895] Pid: 7276, comm: lt-cairo-test-s Not tainted 2.6.34-rc1 #2 N150/N210/N220 /N150/N210/N220 [ 644.291903] EIP: 0060:[<c11c70e3>] EFLAGS: 00210283 CPU: 0 [ 644.291912] EIP is at drm_open+0x4b1/0x4e2 [ 644.291918] EAX: f72d8d18 EBX: f790a400 ECX: f73176b8 EDX: 00000000 [ 644.291923] ESI: f790a414 EDI: f790a414 EBP: f647ae20 ESP: f647adfc [ 644.291929] DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 [ 644.291937] Process lt-cairo-test-s (pid: 7276, ti=f647a000 task=f73f5c80 task.ti=f647a000) [ 644.291941] Stack: [ 644.291945] 00000000 f7bb7400 00000080 f6451100 f73176b8 f6479214 f6451100 f73176b8 [ 644.291957] <0> c1297ce0 f647ae34 c11c6c04 f73176b8 f7949800 00000000 f647ae54 c1080ac5 [ 644.291969] <0> f7949800 f6451100 00000000 f6451100 f73176b8 f6452780 f647ae70 c107d1e6 [ 644.291982] Call Trace: [ 644.291991] [<c11c6c04>] ? drm_stub_open+0x8a/0xb8 [ 644.292000] [<c1080ac5>] ? chrdev_open+0xef/0x106 [ 644.292008] [<c107d1e6>] ? __dentry_open+0xd4/0x1a6 [ 644.292015] [<c107d35b>] ? nameidata_to_filp+0x31/0x45 [ 644.292022] [<c10809d6>] ? chrdev_open+0x0/0x106 [ 644.292030] [<c10864e2>] ? do_last+0x346/0x423 [ 644.292037] [<c108789f>] ? do_filp_open+0x190/0x415 [ 644.292046] [<c1071eb5>] ? handle_mm_fault+0x214/0x710 [ 644.292053] [<c107d008>] ? do_sys_open+0x4d/0xe9 [ 644.292061] [<c1016462>] ? do_page_fault+0x211/0x23f [ 644.292068] [<c107d0f0>] ? sys_open+0x23/0x2b [ 644.292075] [<c1002650>] ? sysenter_do_call+0x12/0x26 [ 644.292079] Code: 89 f0 89 55 dc e8 8d 96 0a 00 8b 45 e0 8b 55 dc 83 78 04 01 75 28 8b 83 18 02 00 00 85 c0 74 0f 8b 4d ec 3b 81 ac 00 00 00 74 13 <0f> 0b eb fe 8b 4d ec 8b 81 ac 00 00 00 89 83 18 02 00 00 89 f0 [ 644.292143] EIP: [<c11c70e3>] drm_open+0x4b1/0x4e2 SS:ESP 0068:f647adfc [ 644.292175] ---[ end trace 2ddd476af89a60fa ]--- Signed-off-by: Chris Wilson <[email protected]> Cc: [email protected] Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms: Fix NULL pointer dereference if memory allocation failed.Pauli Nieminen1-3/+5
When there is allocation failure in radeon_cs_parser_relocs parser->nrelocs is not cleaned. This causes NULL pointer defeference in radeon_cs_parser_fini when clean up code is trying to loop over the relocation array and free the objects. Fix adds a check for a possible NULL pointer in clean up code. Signed-off-by: Pauli Nieminen <[email protected]> Cc: [email protected] Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms: avoid possible oops (call gart_fini before gart_disable)Jerome Glisse6-6/+6
radeon_gart_fini might call GART unbind callback function which might try to access GART table but if gart_disable is call first the GART table will be unmapped so any access to it will oops. Signed-off-by: Jerome Glisse <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms: don't print error on -ERESTARTSYS.Dave Airlie1-1/+2
We can get this if the user moves the mouse when we are waiting to move some stuff around in the validate. Don't fail. Cc: [email protected] Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms/atom: make sure tables are valid (v2)Alex Deucher7-242/+272
Check that atom cmd and data tables are valid before using them. (v2) - fix some whitespace errors noticed by Rafał Miłecki - check a few more cases Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms: remove lvds quirksAlex Deucher2-33/+0
- no longer needed with the latest new pll algo fixes. - also don't use lcd pll limits. They don't seem to work well for all systems. If we have a case where they are useful, we can set the flag for that case. fixes fdo bug 27083 Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms: fix display bandwidth setup on rs4xxAlex Deucher1-0/+1
I missed rs4xx in 7f1e613daf0fdd0884316ab25a749db3c671329e Fixes fdo bug 27219. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms: never treat rs4xx as AGPAlex Deucher1-0/+8
RS4xx+ IGP chips use an internal gart, however, some of them have the agp cap bits set in their pci configs. Make sure to clear the AGP flag as AGP will not work with them. Should fix fdo bug 27225 Signed-off-by: Alex Deucher <[email protected]> cc: [email protected] Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms: display watermark fixesAlex Deucher12-51/+87
- rs780/880 were using the wrong bandwidth functions - convert r1xx-r4xx to use the same pm sclk/mclk structs as r5xx+ - move bandwidth setup to a common function Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms: init rdev->num_crtc at asic initAlex Deucher3-17/+16
Replace hardcoded numbers with rdev->num_crtc. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms/pm: fix typo in power table parsingAlex Deucher1-1/+1
Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms: gfx init fixes for r6xx/r7xxAlex Deucher3-0/+7
This fixes some issues with the last gfx init patch. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-03-31drm/radeon/kms/pm: fix segfault in clock codeAlex Deucher1-1/+2
Make sure we have a crtc assigned to the encoder before dereferencing it. Signed-off-by: Alex Deucher <[email protected]>
2010-03-31drm/radeon/kms: expose thermal/fan i2c busesAlex Deucher13-0/+69
Look up i2c bus in the power table and expose it. You'll need to load a hwmon driver for any chips on the bus, this patch just exposes the bus. Signed-off-by: Alex Deucher <[email protected]>
2010-03-30reiserfs: Fix locking BUG during mount failureJeff Mahoney1-6/+4
Commit 8ebc423238341b52912c7295b045a32477b33f09 (reiserfs: kill-the-BKL) introduced a bug in the mount failure case. The error label releases the lock before calling journal_release_error, but it requires that the lock be held. do_journal_release unlocks and retakes it. When it releases it without it held, we trigger a BUG(). The error_alloc label skips the unlock since the lock isn't held yet but none of the other conditions that are clean up exist yet either. This patch returns immediately after the kzalloc failure and moves the reiserfs_write_unlock after the journal_release_error call. This was reported in https://bugzilla.novell.com/show_bug.cgi?id=591807 Reported-by: Thomas Siedentopf <[email protected]> Signed-off-by: Jeff Mahoney <[email protected]> Cc: Thomas Siedentopf <[email protected]> Cc: Andrew Morton <[email protected]> Cc: 2.6.33.x <[email protected]> Signed-off-by: Frederic Weisbecker <[email protected]>
2010-03-30Linux 2.6.34-rc3Linus Torvalds1-1/+1
2010-03-30KEYS: Add MAINTAINERS recordDavid Howells1-0/+10
Add a MAINTAINERS record for the key management facility. Signed-off-by: David Howells <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>