aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu
AgeCommit message (Collapse)AuthorFilesLines
2010-05-18radeon: Use fences to gate entry to reclocking on <r600Matthew Garrett1-0/+8
GUI idle interrupts don't seem to work terribly well on r500 and earlier, so let's use a fence instead. Signed-off-by: Matthew Garrett <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18radeon: Split out ring locking and allocationMatthew Garrett2-6/+23
We need to handle the ring while we've already locked it, so split out the allocation and commit functions in order to allow them to be used. Signed-off-by: Matthew Garrett <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms: enable misc pm power state features on r1xx-r4xxAlex Deucher1-2/+0
voltage drop, dynamic voltage, dynamic sclk, pcie lane adjust, etc, Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms: enable misc pm power state features on r5xx, rs6xxAlex Deucher2-4/+12
voltage drop, dynamic voltage, dynamic sclk, pcie lane adjust, etc, Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms: re-enable gui idle interrupts on r6xx+Alex Deucher1-11/+13
Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms: take vram mutex pointer before derefing object.Dave Airlie1-2/+4
since derefing the object might free it. Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms: more pm fixesAlex Deucher4-63/+45
- disable gui idle interrupt use Seems to hang some r5xx chips - move vbl range check into existing vbl check function in radeon_pm.c - disable crtc mc acccess for the whole reclocking process Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm: move radeon_fixed.h to shared drm_fixed.h headerBen Skeggs9-447/+380
Will be used by nouveau driver also in the near future. Signed-off-by: Ben Skeggs <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18radeon: Enable memory reclocking on r100-500Matthew Garrett1-4/+5
This seems to be relatively stable now, so enable it for these chipsets too. Signed-off-by: Matthew Garrett <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18radeon: Try harder to ensure we reclock in vblankMatthew Garrett4-1/+39
The vblank interrupt on r600 doesn't seem to be especially reliable, so perform some sanity checks before the actual reclock. Signed-off-by: Matthew Garrett <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18radeon: Fix locking in power management pathsMatthew Garrett1-14/+4
The ttm code could take vram_mutex followed by cp_mutex, while the reclocking code would do the reverse. Hilarity could ensue. Signed-off-by: Matthew Garrett <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18radeon: Make sure that we determine the correct PM state before transitionMatthew Garrett1-0/+3
We need to choose the correct PM state to transition into before starting the actual change. Call radeon_get_power_state() at the top of the clock setting to do so. Signed-off-by: Matthew Garrett <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18radeon: Enable memory reclockong on r600Matthew Garrett1-9/+7
With luck, dynamic memory reclocking on r600 should be stable with the previous patches. Enable it. Signed-off-by: Matthew Garrett <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18radeon: Stop the ttm workqueue while reclockingMatthew Garrett1-0/+3
The ttm bo workqueue may touch objects while we're reclocking, so make sure it's blocked until we're done. Signed-off-by: Matthew Garrett <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18ttm: Provide an API for starting and stopping the delayed workqueueMatthew Garrett1-0/+14
We want to be able to prevent the delayed workqueue from changing state while we're reclocking, so add an API to block and unblock it. Signed-off-by: Matthew Garrett <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18radeon: Take drm struct_mutex over reclockingMatthew Garrett1-0/+10
We need to block the drm core from doing anything that may touch our vram during reclock, so take the drm mutex for the duration. Signed-off-by: Matthew Garrett <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18radeon: Unmap vram pages when reclockingMatthew Garrett5-1/+39
Touching vram while the card is reclocking can lead to lockups. Unmap any pages that could be touched by the CPU and block any accesses to vram until the reclocking is complete. Signed-off-by: Matthew Garrett <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18radeon: Unify PM entry pathsMatthew Garrett1-58/+32
There's a moderate amount of effort involved in setting the card up for clock transitions, so unify the codepaths to make it easier to implement. Signed-off-by: Matthew Garrett <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms/pm: rework power managementAlex Deucher5-56/+229
Add two new sysfs attributes: - dynpm - power_state Echoing 0/1 to dynpm disables/enables dynamic power management. The driver scales the sclk dynamically based on the number of queued fences. dynpm only scales sclk dynamically in single head mode. Echoing x.y to power_state selects a static power state (x) and clock mode (y). This allows you to statically select a power state and clock mode. Selecting a static clock mode will disable dynpm. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms/pm: add additional asic callbacksAlex Deucher12-0/+441
- pm_misc() - handles voltage, pcie lanes, and other non clock related power mode settings. Currently disabled. Needs further debugging - pm_prepare() - disables crtc mem requests right now. All memory clients need to be disabled when changing memory clocks. This function can be expanded to include disabling fb access as well. - pm_finish() - enable active memory clients. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms/pm: restore default power state on exitAlex Deucher4-1/+25
Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms: minor pm cleanupsAlex Deucher6-32/+24
- remove non_clock_info struct - track power state misc flags Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms/pm: clean power state printingAlex Deucher1-1/+1
Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms/pm: don't enable pm if there is only on power stateAlex Deucher1-1/+1
Just adds overhead when the power state will never change. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms/atom: load hwmon driversAlex Deucher1-26/+43
Hook the atom table parsing up to module loading, so we can automatically load the appropriate hwmon drivers. Based on initial patch for r6xx from Matthew Garrett Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms/pm: update display watermarks with power state changesAlex Deucher1-0/+5
Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms/pm: add asic specific callbacks for getting power state (v2)Alex Deucher10-246/+413
This also simplifies the code and enables reclocking with multiple heads active by tracking whether the power states are single or multi-head capable. Eventually, we will want to select a power state based on external factors (AC/DC state, user selection, etc.). (v2) Update for evergreen Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms/pm: add asic specific callbacks for setting power state (v2)Alex Deucher8-49/+148
(v2) Add evergreen vbl checks Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms/pm: move pm state update to crtc functionsAlex Deucher4-20/+18
crtcs are what we ultimately care about wrt to pm. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms/pm: interate across crtcs for vblankAlex Deucher1-14/+12
Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms/atom/pm: rework power mode parsingAlex Deucher1-4/+19
On pre-r6xx, the power mode array is usually ordered: low ... high default On r6xx+: default low ... high Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms: wait for gpu idle before changing power modeAlex Deucher1-0/+10
set proper wait condition as noted by Rafał Miłecki. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms: add support for gui idle interrupts (v4)Alex Deucher9-1/+74
Useful for certain power management operations. You need to wait for the GUI engine (2D, 3D, CP, etc.) to be idle before changing clocks or adjusting engine parameters. (v2) Fix gui idle enable on pre-r6xx asics (v3) The gui idle interrrupt status bit is permanently asserted on pre-r6xx chips, but the interrrupt is still generated. workaround it in the driver. (v4) Add support for evergreen Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms: add gui_idle callbackAlex Deucher5-0/+34
Check to see if the GUI engine and related blocks (2D, 3D, CP, etc) are idle or not. There are a number of cases when we need to know if the drawing engine is busy. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/fbdev: fix cloning on fbconDave Airlie2-13/+94
Simple cloning rules compared to server: (a) single crtc (b) > 1 connector active (c) check command line mode (d) try and find 1024x768 DMT mode if no command line. (e) fail to clone Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/fbdev: rework output polling to be back in the core. (v4)Dave Airlie23-146/+189
After thinking it over a lot it made more sense for the core to deal with the output polling especially so it can notify X. v2: drop plans for fake connector - per Michel's comments - fix X patch sent to xorg-devel, add intel polled/hpd setting, add initial nouveau polled/hpd settings. v3: add config lock take inside polling, add intel/nouveau poll init/fini calls v4: config lock was a bit agressive, only needed around connector list reading. otherwise it could re-enter. glisse: discard drm_helper_hpd_irq_event v3: Reviewed-by: Michel Dänzer <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm: off by one in drm_edid.cDan Carpenter1-1/+1
m == num_est3_modes is one past the end of the est3_modes[]. Signed-off-by: Dan Carpenter <[email protected]> Reviewed-by: Adam Jackson <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18vga16fb, drm: vga16fb->drm handoffMarcin Slusarz1-1/+6
let vga16fb claim 0xA0000+0x10000 region as its aperture; drm drivers don't use it, so we have to detect it and kick vga16fb manually - but only if drm is driving the primary card Signed-off-by: Marcin Slusarz <[email protected]> Cc: James Simmons <[email protected]> Cc: Dave Airlie <[email protected]> Cc: Ben Skeggs <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18fbmem, drm/nouveau: kick firmware framebuffers as soon as possibleMarcin Slusarz3-18/+45
Currently vesafb/efifb/... is kicked when hardware driver is registering framebuffer. To do it hardware must be fully functional, so there's a short window between start of initialisation and framebuffer registration when two drivers touch the hardware. Unfortunately sometimes it breaks nouveau initialisation. Fix it by kicking firmware driver(s) before we start touching the hardware. Reported-by: Didier Spaier <[email protected]> Tested-by: Didier Spaier <[email protected]> Signed-off-by: Marcin Slusarz <[email protected]> Cc: Ben Skeggs <[email protected]> Cc: Peter Jones <[email protected]> Cc: Andrew Morton <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18fbdev: allow passing more than one aperture for handoffMarcin Slusarz4-66/+48
It removes a hack from nouveau code which had to detect which region to pass to kick vesafb/efifb. Signed-off-by: Marcin Slusarz <[email protected]> Cc: Eric Anholt <[email protected]> Cc: Ben Skeggs <[email protected]> Cc: Thomas Hellstrom <[email protected]> Cc: Dave Airlie <[email protected]> Cc: Peter Jones <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm: Prefix info printk about registering panic notifier with 'drm'Kirill Smelkov1-2/+2
Recently I've studied my system dmesg and seen this: <lots of stuff before> 1 [ 0.478416] ACPI: Battery Slot [C1B4] (battery present) 2 [ 0.478648] ACPI: Battery Slot [C1B3] (battery absent) 3 [ 0.906678] [drm] initialized overlay support 4 [ 1.762304] Console: switching to colour frame buffer device 128x48 5 [ 1.765211] fb0: inteldrmfb frame buffer device 6 [ 1.765242] registered panic notifier 7 [ 1.765272] [drm] Initialized i915 1.6.0 20080730 for 0000:00:02.0 on minor 0 8 [ 1.765372] Serial: 8250/16550 driver, 4 ports, IRQ sharing enabled <lots of stuff after> and it was not evident who registered that panic notifier on line 6. I'd bought it as some low-level stuff needed by kernel itself, but the time was inappropriate -- too late for such things. So I had to study sources to see it was drm who was registering switch-to-fb on panic. Let's avoid possible confusion and mark this message as going from drm subsystem. (I'm a bit unsure whether to use '[drm]:' or 'drm:' -- the rest of the kernel just uses 'topic:', and even in drm_fb_helper.c we use 'fb%d:' without [] brackets. Either way is ok with me.) Signed-off-by: Kirill Smelkov <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms: add query for crtc hw id from crtc id to get info V2Jerome Glisse2-1/+20
Userspace need to know the hw crtc id (0, 1, 2, ...) from the drm crtc id. Bump the minor version so userspace can enable conditionaly features depend on this. V2 use num_crtc and avoid DRM_ERROR Signed-off-by: Jerome Glisse <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/edid: Fix 1024x768@85HzAdam Jackson1-1/+1
Having hsync both start and end on pixel 1072 ain't gonna work very well. Matches the X server's list. Signed-off-by: Adam Jackson <[email protected]> Tested-By: Michael Tokarev <[email protected]> Cc: [email protected] Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drivers/gpu/drm: Use kzallocJulia Lawall4-9/+4
Use kzalloc rather than the combination of kmalloc and memset. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression x,size,flags; statement S; @@ -x = kmalloc(size,flags); +x = kzalloc(size,flags); if (x == NULL) S -memset(x, 0, size); // </smpl> Signed-off-by: Julia Lawall <[email protected]> Reviewed-by: Corbin Simpson <[email protected]> Reviewed-by: Matt Turner <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drivers/gpu/drm: Use kmemdupJulia Lawall2-6/+3
Use kmemdup when some other buffer is immediately copied into the allocated region. A simplified version of the semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression from,to,size,flag; statement S; @@ - to = \(kmalloc\|kzalloc\)(size,flag); + to = kmemdup(from,size,flag); if (to==NULL || ...) S - memcpy(to, from, size); // </smpl> Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18vga: fix kconfig text typosRandy Dunlap1-3/+3
Fix typos in vga/Kconfig file and use GPU (upper case) consistently. Signed-off-by: Randy Dunlap <[email protected]> Cc: [email protected] Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/edid: remove an unneeded variableDan Carpenter1-2/+0
We don't use timing_level any more after: 9cf00977da0 "drm/edid: Unify detailed block parsing between base and extension blocks". Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms/combios: match lvds panel info parsing to ddxAlex Deucher1-12/+14
Should work better on some panels. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-05-18drm/radeon/kms/atom: fix typo in LVDS panel info parsingAlex Deucher1-1/+1
Fixes LVDS issues on some laptops; notably laptops with 2048x1536 panels. Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected] Signed-off-by: Dave Airlie <[email protected]>
2010-05-11drivers/gpu/drm/i915/i915_irq.c:i915_error_object_create(): use correct ↵Andrew Morton1-2/+6
kmap-atomic slot i915_error_object_create() is called from the timer interrupt and hence can corrupt the KM_USER0 slot. Use KM_IRQ0 instead. Reported-by: Jaswinder Singh Rajput <[email protected]> Tested-by: Jaswinder Singh Rajput <[email protected]> Acked-by: Chris Wilson <[email protected]> Cc: Dave Airlie <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.