Mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/ https://git.shady.money/linux/atom?h=v2.6.34 2010-05-12T00:33:42Z 2010-05-12T00:33:42Z Andrew Morton akpm@linux-foundation.org 2010-05-11T21:07:05Z urn:sha1:788885ae7a298dec73ba999c2fc5d46d42072ddf 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 <jaswinderlinux@gmail.com> Tested-by: Jaswinder Singh Rajput <jaswinderlinux@gmail.com> Acked-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Dave Airlie <airlied@linux.ie> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 2010-05-11T17:12:18Z Linus Torvalds torvalds@linux-foundation.org 2010-05-11T17:12:18Z urn:sha1:fc2a093e7ad23e935aa29e349bc27173c92f1a95 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon: Fix 3 regressions - since buffer rework 2010-05-11T04:01:48Z Jean Delvare khali@linux-fr.org 2010-05-11T04:01:45Z urn:sha1:c9ff04c941d2cd87d27496d7fee8923238bb2ebb Commit b4fe945405e477cded91772b4fec854705443dd5 introduced 3 bugs, fix them: * Use the right command dword for second packet offset in RADEON_CNTL_PAINT/BITBLT_MULTI. * Don't leak memory if drm_buffer_copy_from_user() fails. * Don't call drm_buffer_unprocessed() unless drm_buffer_alloc() and drm_buffer_copy_from_user() have been called successfully first. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Pauli Nieminen <suokkos@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com> 2010-05-07T21:02:01Z Linus Torvalds torvalds@linux-foundation.org 2010-05-07T21:02:01Z urn:sha1:e33b3e7567f8636c61e79ff1da5ff9a6cf6562c7 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/ttm: Remove the ttm_bo_block_reservation() function. drm/ttm: Remove some leftover debug messages. drm/radeon: async event synchronization for drmWaitVblank 2010-05-06T23:21:28Z Thomas Hellstrom thellstrom@vmware.com 2010-04-28T09:33:25Z urn:sha1:8cfe92d683a0041ac8e016a0b0a487c99a78f6c1 It's unused and buggy in its current form, since it can place a bo in the reserved state without removing it from lru lists. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com> 2010-05-06T23:20:56Z Thomas Hellstrom thellstrom@vmware.com 2010-04-28T09:33:24Z urn:sha1:5be6eff965aee22181d7f6210c2c463420e94e03 Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com> 2010-05-06T23:16:56Z Jerome Glisse jglisse@redhat.com 2010-05-06T16:52:14Z urn:sha1:4fa07bf146aaee1e8409d35ab08624041c2e3867 Bring radeon up to speed with the async event synchronization for drmWaitVblank. See c9a9c5e02aedc1a2815877b0268f886d2640b771 for more information. Without this patch event never get delivered to userspace client. Signed-off-by: Jerome Glisse <jglisse@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com> 2010-05-05T02:08:12Z Linus Torvalds torvalds@linux-foundation.org 2010-05-05T02:08:12Z urn:sha1:7ebd467551ed6ae200d7835a84bbda0dcadaa511 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon/kms/legacy: only enable load detection property on DVI-I drm/radeon/kms: fix panel scaling adjusted mode setup drivers/gpu/drm/drm_sysfs.c: sysfs files error handling drivers/gpu/drm/radeon/radeon_atombios.c: range check issues gpu: vga_switcheroo, fix lock imbalance drivers/gpu/drm/drm_memory.c: fix check for end of loop drivers/gpu/drm/via/via_video.c: fix off by one issue drm/radeon/kms/agp The wrong AGP chipset can cause a NULL pointer dereference drm/radeon/kms: r300 fix CS checker to allow zbuffer-only fastfill 2010-05-05T01:28:11Z Alex Deucher alexdeucher@gmail.com 2010-04-30T16:37:31Z urn:sha1:68b3adb429e0abf5c0a3deb75d71671436b3af10 DVI-D doesn't have analog. This matches the avivo behavior. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com> 2010-05-05T01:27:59Z Alex Deucher alexdeucher@gmail.com 2010-04-30T16:00:44Z urn:sha1:3515387ba90ef2c38602f4d52c4d5ec5fc95ae5c This should duplicate exactly what the ddx does for both legacy and avivo. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>