aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* drm/nouveau: have ttm's fault handler called directlyBen Skeggs2010-01-10
| | | | | | | There's no good reason for us to have our own anymore, this is left over from an early port to these TTM interfaces. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
* drm/nv50: restore correct cache1 get/put address on fifoctx loadBen Skeggs2010-01-10
| | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
* drm/nouveau: create function for "dealing" with gpu lockupMarcin Slusarz2010-01-10
| | | | | | | | It's mostly a cleanup, but in nv50_fbcon_accel_init gpu lockup message was printed, but HWACCEL_DISBALED flag was not set. Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
* drm/nouveau: remove unused nouveau_channel_idle() functionBen Skeggs2010-01-10
| | | | Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
* drm/nouveau: fix handling of fbcon colours in 8bppBen Skeggs2010-01-10
| | | | | | | Depending on the visual, the colours handed to us in fillrect() can either be an actual colour, or an index into the pseudo-palette. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
* drm/nv04: Context switching fixes.Francisco Jerez2010-01-10
| | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
* drm/nouveau: Use the software object for fencing.Francisco Jerez2010-01-10
| | | | | | | | | | | | | This should avoid a race condition on nv0x, if we're doing it with actual PGRAPH objects and a there's a fence within the FIFO DMA fetch area when a context switch kicks in. In that case we get an ILLEGAL_MTHD interrupt as expected, but the values in PGRAPH_TRAPPED_ADDR aren't calculated correctly and they're almost useless (e.g. you can see ILLEGAL_MTHDs for the now inactive channel, with a wrong offset/data pair). Signed-off-by: Francisco Jerez <currojerez@riseup.net>
* drm/nouveau: Allocate a per-channel instance of NV_SW.Francisco Jerez2010-01-10
| | | | | | | | It will be useful for various synchronization purposes, mostly stolen from "[PATCH] drm/nv50: synchronize user channel after buffer object move on kernel channel" by Maarten Maathuis. Signed-off-by: Francisco Jerez <currojerez@riseup.net>
* drm/nv50: make the blocksize depend on vram sizeMaarten Maathuis2010-01-10
| | | | | | | - This should be better than what we have now. - I'm less sure about the non power of two path. Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
* drm/nouveau: better alignment of bo sizes and use roundup instead of ALIGNMaarten Maathuis2010-01-10
| | | | | | | - Aligning to block size should ensure that the extra size is enough. - Using roundup, because not all sizes are powers of two. Signed-off-by: Maarten Maathuis <madman2003@gmail.com>
* drm/nouveau: Don't skip card take down on nv0x.Francisco Jerez2010-01-10
| | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
* drm/nouveau: Implement nv42-nv43 TV load detection.Francisco Jerez2010-01-10
| | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
* drm/nouveau: Clean up the nv17-nv4x load detection code a bit.Francisco Jerez2010-01-10
| | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
* drm/nv50: fix fillrect colorMarcin Slusarz2010-01-10
| | | | | | | | struct fb_fillrect->color is not a color, but index into pseudo_palette array Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
* drm/nv50: ignore vbios table's claim to the contrary if EDID says >8bpcBen Skeggs2010-01-10
| | | | | | Should fix dim panel issues reported on Dell M6400/M6500. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
* drm/nouveau: Drop redundant placement initialization.Francisco Jerez2010-01-10
| | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
* drm/nouveau: No need to force evict=true when swapping evicted BOs back in.Francisco Jerez2010-01-10
| | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
* drm/nouveau: Fix "general protection fault" in the flipd/flips eviction path.Francisco Jerez2010-01-10
| | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
* drm/i2c/ch7006: Drop build time dependency to nouveau.Francisco Jerez2010-01-10
| | | | | | | | This partially reverts e4b41066, as this driver is intended to be useful with any KMS driver for suitable hardware. The missing build dependency that commit workarounded was DRM_KMS_HELPER. Signed-off-by: Francisco Jerez <currojerez@riseup.net>
* drm/nouveau: Make the MM aware of pre-G80 tiling.Francisco Jerez2010-01-10
| | | | | | | | | | | This commit has also the following 3 bugfix commits squashed into it from the nouveau git tree: drm/nouveau: Fix up the tiling alignment restrictions for nv1x. drm/nouveau: Fix up the nv2x tiling alignment restrictions. drm/nv50: fix align typo for g9x Signed-off-by: Francisco Jerez <currojerez@riseup.net>
* drm/nouveau: Pre-G80 tiling support.Francisco Jerez2010-01-10
| | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
* drm/nouveau: Add cache_flush/pull fifo engine functions.Francisco Jerez2010-01-10
| | | | Signed-off-by: Francisco Jerez <currojerez@riseup.net>
* drm: reduce WARN_ON to a printk.Dave Airlie2010-01-10
| | | | | | | Lots of ppl keep thinking this is an oops, it was just a warning for me to see, just make it a printk now. Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm/kms/fb: check for depth changes from userspace for resizing.Dave Airlie2010-01-10
| | | | | | | | | | If userspace (plymouth in this case) asks for a deeper depth, refuse it as well due to lack of resizing. This fixes an issue since < 32MB cards went to 8bpp and plymouth crashes on startup. Signed-off-by: Dave Airlie <airlied@redhat.com>
* drm: Keep disabled outputs disabled after suspend / resumeDavid John2010-01-10
| | | | | | | | | | | | | With the current DRM code, an output that has been powered off from userspace will automatically power back on when resuming from suspend. This patch fixes this behaviour. Tested only with the Intel i915 driver on an Intel GM45 Express chipset. Signed-off-by: David John <davidjon@xenontk.org> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
* Merge remote branch 'korg/drm-radeon-next' into drm-linusDave Airlie2010-01-06
|\ | | | | | | | | | | | | | | | | | | | | | | | | * korg/drm-radeon-next: drm/radeon/kms: rs600: use correct mask for SW interrupt gpu/drm/radeon/radeon_irq.c: move a dereference below a NULL test drm/radeon/radeon_device.c: move a dereference below a NULL test drm/radeon/radeon_fence.c: move a dereference below the NULL test drm/radeon/radeon_connectors.c: add a NULL test before dereference drm/radeon/kms: fix memory leak drm/radeon/kms: add missing breaks in i2c and ss lookups drm/radeon/kms: add primary dac adj values table drm/radeon/kms: fallback to default connector table
| * drm/radeon/kms: rs600: use correct mask for SW interruptLuca Tettamanti2010-01-06
| | | | | | | | | | | | | | | | The mask happens to be the same, but the IH is reading the status, not the not the control register. Signed-off-by: Luca Tettamanti <kronos.it@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * gpu/drm/radeon/radeon_irq.c: move a dereference below a NULL testDarren Jenkins2010-01-06
| | | | | | | | | | | | | | | | | | | | If a NULL value is possible, the dereference should only occur after the NULL test. Coverity CID: 13338 Signed-off-by: Darren Jenkins <darrenrjenkins@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * drm/radeon/radeon_device.c: move a dereference below a NULL testDarren Jenkins2010-01-06
| | | | | | | | | | | | | | | | | | | | If a NULL value is possible, the dereference should only occur after the NULL test. Coverity CID: 13335 Signed-off-by: Darren Jenkins <darrenrjenkins@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * drm/radeon/radeon_fence.c: move a dereference below the NULL testDarren Jenkins2010-01-06
| | | | | | | | | | | | | | | | | | | | If a NULL value is possible, the dereference should only occur after the NULL test. Coverity CID: 13334 Signed-off-by: Darren Jenkins <darrenrjenkins@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * drm/radeon/radeon_connectors.c: add a NULL test before dereferenceDarren Jenkins2010-01-06
| | | | | | | | | | | | | | | | | | | | | | | | The encoder variable can be NULL in this function so I believe it should be checked before dereference. Coverity CID: 13253 [airlied: extremely unlikely to happen] Signed-off-by: Darren Jenkins <darrenrjenkins@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * drm/radeon/kms: fix memory leakJiri Slaby2010-01-06
| | | | | | | | | | | | | | | | Stanse found a memory leak in radeon_master_create. master_priv is not freed/assigned on all paths. Fix that. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * drm/radeon/kms: add missing breaks in i2c and ss lookupsAlex Deucher2010-01-05
| | | | | | | | | | | | | | Should fix fdo bug 25741 Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * drm/radeon/kms: add primary dac adj values tableAlex Deucher2010-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | Look up primary dac adj values from the table if there is no bios or bios dac table to reference. The lookup table may need to be adjusted for certain families. Should fix kernel bug 14945. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * drm/radeon/kms: fallback to default connector tableAlex Deucher2010-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | if necessary for combios Some early combios radeon cards don't have a connector table or dac table in the bios, if they do not, fallback to the default tables. Should fix kernel bug 14963. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* | Merge branch 'drm-core-next' into drm-linusDave Airlie2010-01-06
|\ \ | | | | | | | | | | | | | | | | | | | | | * drm-core-next: drm/kms: Fix &&/|| confusion in drm_fb_helper_connector_parse_command_line() drm/edid: Fix CVT width/height decode drm/edid: Skip empty CVT codepoints drm: remove address mask param for drm_pci_alloc()
| * | drm/kms: Fix &&/|| confusion in drm_fb_helper_connector_parse_command_line()Roel Kluin2010-01-06
| | | | | | | | | | | | | | | | | | | | | This always evaluates to true. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | drm/edid: Fix CVT width/height decodeAdam Jackson2010-01-06
| | | | | | | | | | | | | | | Signed-off-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | drm/edid: Skip empty CVT codepointsAdam Jackson2010-01-06
| | | | | | | | | | | | | | | Signed-off-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | drm: remove address mask param for drm_pci_alloc()Zhenyu Wang2010-01-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drm_pci_alloc() has input of address mask for setting pci dma mask on the device, which should be properly setup by drm driver. And leave it as a param for drm_pci_alloc() would cause confusion or mistake would corrupt the correct dma mask setting, as seen on intel hw which set wrong dma mask for hw status page. So remove it from drm_pci_alloc() function. Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
* | | Merge remote branch 'korg/drm-radeon-next' into drm-linusDave Airlie2009-12-22
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * korg/drm-radeon-next: drm/radeon/kms: add definitions for v4 power tables drm/radeon/kms: never combine LVDS with another encoder drm/radeon/kms: Check module arguments to be valid V2 drm/radeon/kms: Avoid crash when trying to cleanup uninitialized structure drm/radeon/kms: add cvt mode if we only have lvds w/h and no edid (v4) drm/radeon/kms: add 3DC compression support drm/radeon/kms: allow rendering while no colorbuffer is set on r300 drm/radeon/kms: enable memory clock reading on legacy (V2) drm/radeon/kms: prevent parallel AtomBIOS calls drm/radeon/kms: set proper default tv standard drm/radeon/kms: fix legacy rmx drm/radeon/kms/atom: fill in proper defines for digital setup
| * | drm/radeon/kms: add definitions for v4 power tablesAlex Deucher2009-12-22
| | | | | | | | | | | | | | | | | | | | | [airlied: just adding this for completeness to avoid drift between public atombios.h files] Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | drm/radeon/kms: never combine LVDS with another encoderAlex Deucher2009-12-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | When linking multiple encoders to a connector, make sure to not link LVDS with another connector. Some bioses have the same i2c line for LVDS and VGA. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | drm/radeon/kms: Check module arguments to be valid V2Jerome Glisse2009-12-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch add a function which check module argument to be valid. On invalid argument it prints a warning and setback the default value. V2: Allow 0 for vram limit & agp mode which are the default value Signed-off-by: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | drm/radeon/kms: Avoid crash when trying to cleanup uninitialized structureJerome Glisse2009-12-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add boolean to record if some part of the driver are initialized or not this allow to avoid a crash when trying to cleanup uninitialized structure members. Signed-off-by: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | drm/radeon/kms: add cvt mode if we only have lvds w/h and no edid (v4)Alex Deucher2009-12-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes LVDS on some mac laptops without a panel edid. v2 - Set proper mode type flags v3 - Note that this is not neceesarily the exact panel mode, but an approximation based on the cvt formula. For these systems we should ideally read the mode info out of the registers or add a mode table, but this works and is much simpler. v4 - Update comments and debug message. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | drm/radeon/kms: add 3DC compression supportMarek Olšák2009-12-22
| | | | | | | | | | | | | | | | | | | | | | | | There are 2 formats: ATI1N: 64 bits per 4x4 block, one-channel format ATI2N: 128 bits per 4x4 block, two-channel format Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | drm/radeon/kms: allow rendering while no colorbuffer is set on r300Marek Olšák2009-12-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because hardware cannot disable all colorbuffers directly to do depth-only rendering, a user should: - disable reading from a colorbuffer in blending - disable fastfill - set the color channel mask to 0 to prevent writing to a colorbuffer Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | drm/radeon/kms: enable memory clock reading on legacy (V2)Rafał Miłecki2009-12-22
| | | | | | | | | | | | | | | | | | | | | | | | V2: detect IGP cards (which don't have own memory) Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Acked-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
| * | drm/radeon/kms: prevent parallel AtomBIOS callsRafał Miłecki2009-12-22
| | | | | | | | | | | | | | | | | | | | | | | | This just adds a mutex around the atombios table execution so we don't call it from two contexts at once. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-09 23:11:01 -0500