24 May, 2011
1 commit
-
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
b43: fix comment typo reqest -> request
Haavard Skinnemoen has left Atmel
cris: typo in mach-fs Makefile
Kconfig: fix copy/paste-ism for dell-wmi-aio driver
doc: timers-howto: fix a typo ("unsgined")
perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
treewide: fix a few typos in comments
regulator: change debug statement be consistent with the style of the rest
Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
audit: acquire creds selectively to reduce atomic op overhead
rtlwifi: don't touch with treewide double semicolon removal
treewide: cleanup continuations and remove logging message whitespace
ath9k_hw: don't touch with treewide double semicolon removal
include/linux/leds-regulator.h: fix syntax in example code
tty: fix typo in descripton of tty_termios_encode_baud_rate
xtensa: remove obsolete BKL kernel option from defconfig
m68k: fix comment typo 'occcured'
arch:Kconfig.locks Remove unused config option.
treewide: remove extra semicolons
...
16 May, 2011
3 commits
-
We need to hold the dev->mode_config.mutex whilst detecting the output
status. But we also need to drop it for the call into
drm_fb_helper_single_fb_probe(), which indirectly acquires the lock when
attaching the fbcon.Failure to do so exposes a race with normal output probing. Detected by
adding some warnings that the mutex is held to the backend detect routines:[ 17.772456] WARNING: at drivers/gpu/drm/i915/intel_crt.c:471 intel_crt_detect+0x3e/0x373 [i915]()
[ 17.772458] Hardware name: Latitude E6400
[ 17.772460] Modules linked in: ....
[ 17.772582] Pid: 11, comm: kworker/0:1 Tainted: G W 2.6.38.4-custom.2 #8
[ 17.772584] Call Trace:
[ 17.772591] [] ? warn_slowpath_common+0x78/0x8c
[ 17.772603] [] ? intel_crt_detect+0x3e/0x373 [i915]
[ 17.772612] [] ? drm_helper_probe_single_connector_modes+0xbf/0x2af [drm_kms_helper]
[ 17.772619] [] ? drm_fb_helper_probe_connector_modes+0x39/0x4d [drm_kms_helper]
[ 17.772625] [] ? drm_fb_helper_hotplug_event+0xa5/0xc3 [drm_kms_helper]
[ 17.772633] [] ? output_poll_execute+0x146/0x17c [drm_kms_helper]
[ 17.772638] [] ? cfq_init_queue+0x247/0x345
[ 17.772644] [] ? output_poll_execute+0x0/0x17c [drm_kms_helper]
[ 17.772648] [] ? process_one_work+0x193/0x28e
[ 17.772652] [] ? worker_thread+0xef/0x172
[ 17.772655] [] ? worker_thread+0x0/0x172
[ 17.772658] [] ? worker_thread+0x0/0x172
[ 17.772663] [] ? kthread+0x7a/0x82
[ 17.772668] [] ? kernel_thread_helper+0x4/0x10
[ 17.772671] [] ? kthread+0x0/0x82
[ 17.772674] [] ? kernel_thread_helper+0x0/0x10Reported-by: Frederik Himpe
References: https://bugs.freedesktop.org/show_bug.cgi?id=36394
Signed-off-by: Chris Wilson
Signed-off-by: Dave Airlie -
My Q67 / i7-2600 box has rev09 Sandy Bridge graphics. It hangs
instantly when GNOME loads and it hangs so hard the reset button
doesn't work. Setting i915.semaphore=0 fixes it.Semaphores were disabled in a1656b9090f7008d2941c314f5a64724bea2ae37
in 2.6.38 and were re-enabled bycommit 47ae63e0c2e5fdb582d471dc906eb29be94c732f
Merge: c59a333 467cffb
Author: Chris Wilson
Date: Mon Mar 7 12:32:44 2011 +0000Merge branch 'drm-intel-fixes' into drm-intel-next
Apply the trivial conflicting regression fixes, but keep GPU semaphores
enabled.Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem_execbuffer.c(It's worth noting that the offending change is i915_drv.c,
which is not a conflict.)Signed-off-by: Andy Lutomirski
Acked-by: Keith Packard
Signed-off-by: Dave Airlie -
If the requested device is already active, ignore the request.
This restores the original behaviour of the interface. The change was
probably an unintended side effect ofcommit 66b37c6777c4 vga_switcheroo: split switching into two stages
which did not take into account to duplicate the !active check in the split-off
stage2.Fix this by factoring that check out of stage1 into the debugfs_write routine.
References: https://bugzilla.kernel.org/show_bug.cgi?id=34252
Reported-by: Igor Murzov
Tested-by: Igor Murzov
Signed-off-by: Florian Mickler
Signed-off-by: Dave Airlie
13 May, 2011
4 commits
-
need to programmed from the userspace drivers.
Signed-off-by: Alex Deucher
Signed-off-by: Dave Airlie -
On rev
Reviewed-by: Jerome Glisse
Cc: stable@kernel.org
Signed-off-by: Dave Airlie -
The location of MC_ARB_RAMCFG changed on fusion.
I've diffed all the other regs in evergreend.h and this
is the only other reg that changed.Signed-off-by: Alex Deucher
Signed-off-by: Dave Airlie -
This reverts commit 49183b2818de6899383bb82bc032f9344d6791ff.
Quoth Franz Melchior:
"This patch introduces a bug on my infamous "Acer Travelmate
5735Z-452G32Mnss": when KMS takes over, the frame buffer contents get
completely garbled up on screen, with colored stripes and unreadable
text (photo on request). Only when X11 is started, the screen gets
restored again. Closing and re-opening the lid partly cures the
mess, too: it makes the font readable, though horizontally stretched."Acked-by: Keith Packard
Cc: Chris Wilson
Cc: Daniel Vetter
Cc: Jesse Barnes
Signed-off-by: Linus Torvalds
11 May, 2011
3 commits
-
The Xen changes were using DMA_ERROR_CODE which isn't defined on a few
platforms, however we reverted the Xen patch that caused use to try and
use this code path earlier in 2.6.39 cycle, so for now lets just force
the code to never take this path and allow it to build again on alpha.The proper long term answer is probably to store if the dma_addr has
been assigned to alongside the dma_addr in the higher level code,
though I think Thomas wanted to rewrite most of this anyways properly.Acked-by: Konrad Rzeszutek Wilk
Signed-off-by: Dave Airlie -
The TCC disable setup was incorrect. This
prevents the GPU from hanging when draw commands
are issued.Signed-off-by: Alex Deucher
Signed-off-by: Dave Airlie -
We are accessing totally the wrong struct in this case, and putting
uninitialised values into the GPU, which it doesn't like unsurprisingly.Signed-off-by: Dave Airlie
10 May, 2011
4 commits
-
* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
drm/i915/lvds: Only act on lid notify when the device is on
drm/i915: fix intel_crtc_clock_get pipe reads after "cleanup cleanup"
drm/i915: Only enable the plane after setting the fb base (pre-ILK)
drm/i915/dp: Be paranoid in case we disable a DP before it is attached
drm/i915: Release object along create user fb error path -
If we're using vga switcheroo, the device may be turned off
and poking it can return random state. This provokes an OOPS fixed
separately by 8ff887c847 (drm/i915/dp: Be paranoid in case we disable a
DP before it is attached). Trying to use and respond to events on a
device that has been turned off by the user is in principle a silly thing
to do.Signed-off-by: Alex Williamson
Signed-off-by: Chris Wilson
Cc: stable@kernel.org
Signed-off-by: Keith Packard -
Despite the fixes in 548f245ba6a31 (drm/i915: fix per-pipe reads after
"cleanup"), we missed one neighbouring read that was mistakenly replaced
with the reg value in 9db4a9c (drm/i915: cleanup per-pipe reg usage).
This was preventing us from correctly determining the mode the BIOS left
the panel in for machines that neither have an OpRegion nor access to
the VBT, (e.g. the EeePC 700).Signed-off-by: Chris Wilson
Cc: Jesse Barnes
Cc: stable@kernel.org
Reviewed-by: Jesse Barnes
Signed-off-by: Keith Packard -
When enabling the plane, it is helpful to have already pointed that
plane to valid memory or else we may incur the wrath of a PGTBL_ER.
This code preserved the behaviour from the bad old days for unknown
reasons...Found by assert_fb_bound_for_plane().
References: https://bugs.freedesktop.org/show_bug.cgi?id=36246
Signed-off-by: Chris Wilson
Cc: Daniel Vetter
Cc: Jesse Barnes
Signed-off-by: Keith Packard
09 May, 2011
6 commits
-
Fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=34082Reported by: Sampo Laaksonen
Signed-off-by: Alex Deucher
Cc: stable@kernel.org
Signed-off-by: Dave Airlie -
if object pin or object lookup in radeon_cursor_set fail, the function
could leave inconsistent mouse width and hight values in radeon_crtc
fixed by moving cursor width and height assignments after all
checks have passedSigned-off-by: Ilija Hadzic
Reviewed-by: Alex Deucher
Signed-off-by: Dave Airlie -
The looping helper didn't do anything due to a superficial
semicolon. Furthermore one of the two dump functions suffered
from copy&paste fail.While staring at the code I've also noticed that the replace
helper (currently unused) is a bit broken.Signed-off-by: Daniel Vetter
Signed-off-by: Dave Airlie -
* 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next:
drm/nouveau: Fix a crash at card takedown for NV40 and older cards -
When we switch the display mux, also switch
the i2c mux. Also use the start and finish
methods to let the sbios know that the switch
is happening.Should fix:
https://bugs.freedesktop.org/show_bug.cgi?id=35398Signed-off-by: Alex Deucher
Signed-off-by: Dave Airlie -
NV40 and older cards (pre NV50) reserve a vram bo for the vga memory at
card init. This bo is then freed at card shutdown. The problem is that
the ttm bo vram manager was already freed. So a crash occurs when the
vga bo is freed. The fix is to free the vga bo prior to freeing the ttm
bo vram manager. There might be other solutions but this seemed the
simplest to me.Signed-off-by: Jimmy Rentz
Signed-off-by: Ben Skeggs
05 May, 2011
2 commits
-
Given that the hardware may be left in a random condition by the BIOS,
it is conceivable that we then attempt to clear the DP_PIPEB_SELECT bit
without us ever enabling/attaching the DP encoder to a pipe. Thus
causing a NULL deference when we attempt to wait for a vblank on that
crtc.Reported-and-tested-by: Bryan Christ
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=36314
Signed-off-by: Chris Wilson
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=36456
Reported-and-tested-by: Bo Wang
Cc: stable@kernel.org
Signed-off-by: Keith Packard -
Reported-by: Alan Cox
Signed-off-by: Chris Wilson
Cc: stable@kernel.org
Signed-off-by: Keith Packard
04 May, 2011
3 commits
-
Out of the entire GART/VM subsystem, the hw designers changed
the location of 3 regs.v2: airlied: add parameter for userspace to work from.
Signed-off-by: Alex Deucher
Signed-off-by: Jerome Glisse
Cc: stable@kernel.org
Signed-off-by: Dave Airlie -
This is the least-bad behaviour. It means that we signal the
vblank event before it actually happens, but since we're disabling
vblanks there's no guarantee that it will *ever* happen otherwise.This prevents GL applications which use WaitMSC from hanging
indefinitely.Signed-off-by: Christopher James Halse Rogers
Signed-off-by: Dave Airlie -
Since fafcf94e2b5732d1e13b440291c53115d2b172e9 introduced an edid size, it seems to have broken this path.
This manifest as oops on T500 Lenovo laptops with dual graphics primarily.
Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=33812
cc: stable@kernel.org
Reviewed-by: Alex Deucher
Signed-off-by: Dave Airlie
27 Apr, 2011
4 commits
-
i915 calls the panic handler function on last close to reset the modes,
however this is a really bad idea for multi-gpu machines, esp shareable
gpus machines. So add a new entry point for the driver to just restore
its own fbcon mode.v2: move code into fb helper, fix panic code to block mode change on
powered off GPUs.[airlied: this hits drm core and I wrote it and it was reviewed on intel-gfx
so really I signed it off twice ;-).]
Signed-off-by: Chris Wilson
Signed-off-by: Dave Airlie -
needed by mesa for htile setup.
Signed-off-by: Alex Deucher
Signed-off-by: Dave Airlie -
needed for HiS in mesa.
Signed-off-by: Alex Deucher
Signed-off-by: Dave Airlie -
Multi-gpu/switcheroo relies on this option to get the console on the
correct GPU at bootup, some distros enable it but it seems some get
it wrong.cc: stable@kernel.org
Signed-off-by: Dave Airlie
26 Apr, 2011
1 commit
-
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
22 Apr, 2011
2 commits
-
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
agp: fix arbitrary kernel memory writes
agp: fix OOM and buffer overflow
drm/radeon/kms: fix IH writeback on r6xx+ on big endian machines -
* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
drm/i915: Initialise g4x watermarks for disabled pipes
drm/i915: Sanitize the output registers after resume
drm/i915/tv: Fix modeset flickering introduced in 7f58aabc3
drm/i915/tv: Only poll for TV connections
drm/i915/tv: Remember the detected TV type
20 Apr, 2011
7 commits
-
agd5f: fix commit message.
Signed-off-by: Cedric Cano
Reviewed-by: Michel Dänzer
Signed-off-by: Alex Deucher
Signed-off-by: Dave Airlie -
Prefer min m to max p only on pre-r7xx asics.
Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=36197Signed-off-by: Alex Deucher
Cc: stable@kernel.org
Signed-off-by: Dave Airlie -
Commit 73412c3854c877e5f37ad944ee8977addde4d35a ("drm/nouveau: allocate
kernel's notifier object at end of block") intended to align end of
notifier block to page boundary, but start of block was miscalculated
to be off by -16 bytes. Fix it.Signed-off-by: Marcin Slusarz
Cc: Ben Skeggs
Signed-off-by: Ben Skeggs -
nouveau_bo_wr32 expects offset to be in words, but we pass value in bytes,
so after commit 73412c3854c877e5f37ad944ee8977addde4d35a ("drm/nouveau: allocate
kernel's notifier object at end of block") we started to overwrite some memory
after notifier buffer object (previously m2mf_ntfy was always 0, so it didn't
matter it was a value in bytes).Reported-by: Dominik Brodowski
Reported-by: Nigel Cunningham
Signed-off-by: Marcin Slusarz
Cc: Ben Skeggs
Cc: Pekka Paalanen
Cc: stable@kernel.org [2.6.38]
Signed-off-by: Ben Skeggs -
Problem introduced with commit 6ba9a68317781537d6184d3fdb2d0f20c97da3a4
Reported-by: Bob Gleitsmann
Signed-off-by: Ben Skeggs -
Caught with kmemcheck on unrelated business.
Signed-off-by: Ben Skeggs
-
Wasn't aware they even existed, apparently they do! They're actually
AGP chips with a bridge as far as I can tell, which puts them in the
same boat as nv40/nv45.Signed-off-by: Ben Skeggs
