summaryrefslogtreecommitdiff
path: root/linux-core
AgeCommit message (Collapse)Author
2007-11-22Merge branch 'origin' into modesetting-101Dave Airlie
Conflicts: linux-core/drmP.h shared-core/i915_dma.c shared-core/i915_drm.h shared-core/radeon_drv.h
2007-11-22drm: major whitespace/coding style realignment with kernelDave Airlie
2007-11-22drm: cleanup drm_regman.c coding styleDave Airlie
2007-11-21drm: don't reset to 0 irq_enabled when client open file descriptorJerome Glisse
2007-11-21drm: don't reset to 0 irq_enabled when client open file descriptorJerome Glisse
2007-11-19drm: fix dead lock in drm_buffer_object_transferJerome Glisse
2007-11-19drm: fix dead lock in drm_buffer_object_transferJerome Glisse
2007-11-16Fix connection status ABIJesse Barnes
Userspace expects a 1 based enum for connection status so fix up the kernel definition.
2007-11-16Fix typo in copy_to_user callsJesse Barnes
We want to copy to card_res->modes + copied, not &card_res->modes + copied.
2007-11-15nouveau: renameJeremy Kolb
2007-11-15nouveau: flip buffer into gart.Jeremy Kolb
2007-11-15Use user copy routines for writing modes & ids back to userspaceJesse Barnes
Since the drm_mode_card_res structure contains user pointers, we have to use put_user and copy_to_user to write stuff out. The DRM ioctl wrapper will only take care of copying the base drm_mode_card_res struct, not the included arrays.
2007-11-15Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into ↵Thomas Hellstrom
modesetting-101
2007-11-15mm fixups.Thomas Hellstrom
2007-11-15drm: send correct fb id to userspaceDave Airlie
2007-11-15modes: pass type to userspace for preferred showingDave Airlie
2007-11-15drm: don't remove mappings added by the driverDave Airlie
2007-11-15intel: fixup || vs |Dave Airlie
2007-11-15Merge branch 'master' into modesetting-101Dave Airlie
Conflicts: shared-core/i915_dma.c tests/ttmtest/src/ttmtest.c
2007-11-15i915: remove excess debug outputDave Airlie
2007-11-15intel: add flushing for i8xx chipsets.Dave Airlie
Add a nut vs hammer style chipset flush for the i8xx chipsets - reenable TTM code paths
2007-11-14Add new shared header file drm_internal.h.Kristian Høgsberg
This header file is shared across linux and bsd, but is not installed for user space to access. It's the place to put prototypes and data types that aren't platform or chipset specific, but still internal to the drm.
2007-11-14Revert "nouveau: stub superioctl"Ben Skeggs
This reverts commit 2370ded79b4176d76cda1ec5f495fd33c2d566ed. Err.. didn't mean for that to slip in :)
2007-11-14Merge branch 'fifo-cleanup' into upstream-masterBen Skeggs
2007-11-14nouveau: store user control reg offsets in channel structBen Skeggs
2007-11-14nouveau: stub superioctlBen Skeggs
2007-11-10Make sure PLLs are enabled before writing pipe configuration regsJesse Barnes
Fix from the X driver. Make sure the PLLs are enabled and not in VGA mode before writing PIPE(A|B)CONF regs to avoid hangs or crashes.
2007-11-09suspend() and resume() need kernel 2.6.22 or laterPatrice Mandin
2007-11-09drm: check edid data, so we deal well with broken driver.Jerome Glisse
2007-11-09drm: split edid handling in get_edid & add_edid_modeJerome Glisse
This way driver can get_edid in output status detection (using all workaround which are in get_edid) and then provide this edid data in get_mode callback of output.
2007-11-07Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into ↵Thomas Hellstrom
modesetting-101 Conflicts: shared-core/i915_dma.c
2007-11-07Don't overwrite TTM page flags.Thomas Hellstrom
2007-11-06Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into ↵Thomas Hellstrom
modesetting-101 Conflicts: linux-core/Makefile.kernel shared-core/i915_dma.c shared-core/i915_drv.h shared-core/i915_irq.c
2007-11-06Avoid buffers not ending up on a list in some cases.Thomas Hellstrom
2007-11-06Add missing drm_regman.c file.Thomas Hellstrom
2007-11-06i915: compat code doesn't work in i8xx hw.Dave Airlie
2007-11-06drm/agp: kernel style fixesDave Airlie
2007-11-06i915: cleanup most of the whitespaceDave Airlie
2007-11-05Merge branch 'master' into modesetting-101Thomas Hellstrom
Conflicts: linux-core/drm_bufs.c shared-core/i915_dma.c shared-core/i915_drv.h shared-core/i915_irq.c
2007-11-05Export a symbol.Thomas Hellstrom
2007-11-05Fix a user-buffer check.Thomas Hellstrom
2007-11-05remove unused defineAlan Hourihane
2007-11-05remove duplicate and obsolete ioctl statementsAlan Hourihane
2007-11-05add missing lockAlan Hourihane
2007-11-05Use _sizeAlan Hourihane
2007-11-05drm: more kernel coding style cleanupsDave Airlie
2007-11-05drm/ttm: apply linux kernel coding style to bo_lock/move/object/ttm.cDave Airlie
2007-11-05drm/ttm: kernel coding style for bo.c and objects.hDave Airlie
2007-11-05drm: fix the the typoDave Airlie
2007-11-05drm: fix memset size errorLi Zefan
The size passing to memset is wrong. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>