linux-stable.git/drivers/staging/omapdrm, branch linux-3.5.y

staging: omapdrm: fix crash when freeing bad fb

2012-06-11T15:42:09+00:00

During unload, don't cleanup the framebuffer if it is not valid.

Signed-off-by: Andy Gross 
Reviewed-by: Rob Clark 
Signed-off-by: Greg Kroah-Hartman

Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux

2012-05-24T19:42:54+00:00

Pull main drm updates from Dave Airlie:
 "This is the main merge window request for the drm.

  It's big, but jam packed will lots of features and of course 0
  regressions.  (okay maybe there'll be one).

  Highlights:

   - new KMS drivers for server GPU chipsets: ast, mgag200 and cirrus
     (qemu only).  These drivers use the generic modesetting drivers.

   - initial prime/dma-buf support for i915, nouveau, radeon, udl and
     exynos

   - switcheroo audio support: so GPUs with HDMI can turn off the sound
     driver without crashing stuff.

   - There are some patches drifting outside drivers/gpu into x86 and
     EFI for better handling of multiple video adapters in Apple Macs,
     they've got correct acks except one trivial fixup.

   - Core:
	edid parser has better DMT and reduced blanking support,
	crtc properties,
	plane properties,

   - Drivers:
	exynos: add 2D core accel support, prime support, hdmi features
	intel: more Haswell support, initial Valleyview support, more
	    hdmi infoframe fixes, update MAINTAINERS for Daniel, lots of
	    cleanups and fixes
	radeon: more HDMI audio support, improved GPU lockup recovery
	    support, remove nested mutexes, less memory copying on PCIE, fix
	    bus master enable race (kexec), improved fence handling
	gma500: cleanups, 1080p support, acpi fixes
	nouveau: better nva3 memory reclocking, kepler accel (needs
	    external firmware rip), async buffer moves on nv84+ hw.

  I've some more dma-buf patches that rely on the dma-buf merge for vmap
  stuff, and I've a few fixes building up, but I'd decided I'd better
  get rid of the main pull sooner rather than later, so the audio guys
  are also unblocked."

Fix up trivial conflict due to some duplicated changes in
drivers/gpu/drm/i915/intel_ringbuffer.c

* 'drm-core-next' of git://people.freedesktop.org/~airlied/linux: (605 commits)
  drm/nouveau/nvd9: Fix GPIO initialisation sequence.
  drm/nouveau: Unregister switcheroo client on exit
  drm/nouveau: Check dsm on switcheroo unregister
  drm/nouveau: fix a minor annoyance in an output string
  drm/nouveau: turn a BUG into a WARN
  drm/nv50: decode PGRAPH DATA_ERROR = 0x24
  drm/nouveau/disp: fix dithering not being enabled on some eDP macbooks
  drm/nvd9/copy: initialise copy engine, seems to work like nvc0
  drm/nvc0/ttm: use copy engines for async buffer moves
  drm/nva3/ttm: use copy engine for async buffer moves
  drm/nv98/ttm: add in a (disabled) crypto engine buffer copy method
  drm/nv84/ttm: use crypto engine for async buffer copies
  drm/nouveau/ttm: untangle code to support accelerated buffer moves
  drm/nouveau/fbcon: use fence for sync, rather than notifier
  drm/nv98/crypt: non-stub implementation of the engine hooks
  drm/nouveau/fifo: turn all fifo modules into engine modules
  drm/nv50/graph: remove ability to do interrupt-driven context switching
  drm/nv50: remove manual context unload on context destruction
  drm/nv50: remove execution engine context saves on suspend
  drm/nv50/fifo: use hardware channel kickoff functionality
  ...

drm: Make the CRTC gamma_set operation optional

2012-05-22T09:35:15+00:00

Drivers for hardware without gamma support should not be forced to
implement a no-op gamma set operation.

Signed-off-by: Laurent Pinchart 
Cc: Rob Clark 
Signed-off-by: Dave Airlie

drm: Constify drm_mode_config_funcs pointer

2012-05-22T09:35:07+00:00

The DRM mode config functions structure declared by drivers and pointed
to by the drm_mode_config funcs field is never modified. Make it a const
pointer.

Signed-off-by: Laurent Pinchart 
Cc: Inki Dae 
Cc: Alan Cox 
Cc: Daniel Vetter 
Cc: Ben Skeggs 
Cc: Thomas Hellstrom 
Cc: Rob Clark 
Reviwed-by: Alex Deucher 
Signed-off-by: Dave Airlie

drm: Constify gem_vm_ops pointer

2012-05-22T09:34:53+00:00

The GEM vm operations structure is passed to the VM core that stores it
in a const field. There vm operations structures can thus be const in
DRM as well.

Signed-off-by: Laurent Pinchart 
Cc: Inki Dae 
Cc: Alan Cox 
Cc: Daniel Vetter 
Cc: Rob Clark 
Reviewed-by: Alex Deucher 
Signed-off-by: Dave Airlie

staging: drm/omap: initial dmabuf/prime import support

2012-05-17T15:54:09+00:00

This adds support to re-import omapdrm's own buffers.  Importing buffers
allocated by other drivers can be added later, but for now is not needed
(we don't yet have any other exportering drivers to test with).

Signed-off-by: Rob Clark 
Signed-off-by: Greg Kroah-Hartman

staging: drm/omap: dmabuf/prime mmap support

2012-05-17T15:54:08+00:00

Add support for mmap'ing buffers via dmabuf.  For handling mmap of
cached buffers correctly, fault handling and PTE shootdown are used
to track dirty pages and automagically handle cache flushes before
dma access to the buffer.

Signed-off-by: Rob Clark 
Signed-off-by: Greg Kroah-Hartman

Merge 3.4-rc5 into staging-next

2012-05-02T18:48:07+00:00

This resolves the conflict in:
	drivers/staging/vt6656/ioctl.c

Signed-off-by: Greg Kroah-Hartman

staging: drm/omap: dmabuf/prime support

2012-04-10T18:25:59+00:00

For now just implementing the exporting APIs, not yet importing.  And
kmap is rejected on tiled buffers (although the usefulness of that seems
questionable, but could be added later if needed).

Signed-off-by: Rob Clark 
Signed-off-by: Greg Kroah-Hartman

staging:omapdrm Fix typos in drivers:omapdrm

2012-04-10T17:31:01+00:00

The below patch fixes some typos that I found while reading.  Note: I
was told to hold off sending anything until *rc1 so hopefully now its
alright.(wasnt sure what kernel *rc*)

Signed-off-by: Justin P. Mattock 
Reviewed-by: Rob Clark 
Signed-off-by: Greg Kroah-Hartman