OpenCloudOS-Kernel/drivers/staging/gma500
Linus Torvalds 1a464cbb3d Merge branch 'drm-core-next' of git://people.freedesktop.org/~airlied/linux
* 'drm-core-next' of git://people.freedesktop.org/~airlied/linux: (307 commits)
  drm/nouveau/pm: fix build with HWMON off
  gma500: silence gcc warnings in mid_get_vbt_data()
  drm/ttm: fix condition (and vs or)
  drm/radeon: double lock typo in radeon_vm_bo_rmv()
  drm/radeon: use after free in radeon_vm_bo_add()
  drm/sis|via: don't return stack garbage from free_mem ioctl
  drm/radeon/kms: remove pointless CS flags priority struct
  drm/radeon/kms: check if vm is supported in VA ioctl
  drm: introduce drm_can_sleep and use in intel/radeon drivers. (v2)
  radeon: Fix disabling PCI bus mastering on big endian hosts.
  ttm: fix agp since ttm tt rework
  agp: Fix multi-line warning message whitespace
  drm/ttm/dma: Fix accounting error when calling ttm_mem_global_free_page and don't try to free freed pages.
  drm/ttm/dma: Only call set_pages_array_wb when the page is not in WB pool.
  drm/radeon/kms: sync across multiple rings when doing bo moves v3
  drm/radeon/kms: Add support for multi-ring sync in CS ioctl (v2)
  drm/radeon: GPU virtual memory support v22
  drm: make DRM_UNLOCKED ioctls with their own mutex
  drm: no need to hold global mutex for static data
  drm/radeon/benchmark: common modes sweep ignores 640x480@32
  ...

Fix up trivial conflicts in radeon/evergreen.c and vmwgfx/vmwgfx_kms.c
2012-01-10 11:04:36 -08:00
..
displays gma500: Medfield support 2011-07-05 08:20:39 -07:00
Kconfig gma500: mark staging broken 2011-11-26 16:05:13 -08:00
Makefile gma500: Clean up the DPU config and make it runtime 2011-07-15 19:05:08 +02:00
TODO gma500: Update the TODO list 2011-07-05 19:51:49 -07:00
accel_2d.c staging/gma500: fixup staging code to build following core changes. 2011-12-20 10:22:18 +00:00
backlight.c gma500: fix compile warnings when CONFIG_BACKLIGHT_CLASS_DEVICE is not defined 2011-07-15 19:05:07 +02:00
cdv_device.c gma500: do a pass over the FIXME tags 2011-08-26 10:46:43 -07:00
cdv_device.h gma500: oops.. thou shalt stg add... 2011-07-05 19:51:50 -07:00
cdv_intel_crt.c gma500: tidy up the CDV files 2011-07-08 13:44:57 -07:00
cdv_intel_display.c staging/gma500: fixup staging code to build following core changes. 2011-12-20 10:22:18 +00:00
cdv_intel_hdmi.c gma500: Fix unused variable in cdv support 2011-07-08 13:44:58 -07:00
cdv_intel_lvds.c gma500: Fix cdv warning on unused variable 2011-07-15 19:05:07 +02:00
framebuffer.c staging/gma500: fixup staging code to build following core changes. 2011-12-20 10:22:18 +00:00
framebuffer.h gma500: strip unneeded version headers 2011-07-08 13:44:55 -07:00
gem.c gma500: do a pass over the FIXME tags 2011-08-26 10:46:43 -07:00
gem_glue.c gma500: Fix clashes with DRM updates 2011-08-09 08:34:50 -07:00
gem_glue.h gma500: Fix clashes with DRM updates 2011-08-09 08:34:50 -07:00
gtt.c staging: gma500: gtt based hardware scrolling console 2011-09-26 17:32:54 -07:00
gtt.h staging: gma500: gtt based hardware scrolling console 2011-09-26 17:32:54 -07:00
intel_bios.c gma500: Fix missing memory check 2011-07-05 08:20:45 -07:00
intel_bios.h gma500: move the BIOS header 2011-07-05 08:20:44 -07:00
intel_i2c.c staging: Add export.h for THIS_MODULE/EXPORT_SYMBOL to drivers/staging users. 2011-10-31 19:32:08 -04:00
intel_opregion.c gma500: do a pass over the FIXME tags 2011-08-26 10:46:43 -07:00
mdfld_device.c gma500: Make crtc count a property of the device 2011-07-15 19:05:07 +02:00
mdfld_dsi_dbi.c gma500: kill MIPI interface types 2011-08-16 07:22:16 -07:00
mdfld_dsi_dbi.h gma500: kill MIPI interface types 2011-08-16 07:22:16 -07:00
mdfld_dsi_dbi_dpu.c gma500: Fix DPU build 2011-07-15 19:12:15 +02:00
mdfld_dsi_dbi_dpu.h gma500: resync with Medfield progress 2011-07-15 19:05:08 +02:00
mdfld_dsi_dpi.c gma500: kill MIPI interface types 2011-08-16 07:22:16 -07:00
mdfld_dsi_dpi.h gma500: resync with Medfield progress 2011-07-15 19:05:08 +02:00
mdfld_dsi_output.c staging: Add moduleparam.h to drivers/staging files as required 2011-10-31 19:32:09 -04:00
mdfld_dsi_output.h gma500: resync with Medfield progress 2011-07-15 19:05:08 +02:00
mdfld_dsi_pkg_sender.c gma500: resync with Medfield progress 2011-07-15 19:05:08 +02:00
mdfld_dsi_pkg_sender.h gma500: resync with Medfield progress 2011-07-15 19:05:08 +02:00
mdfld_intel_display.c staging/gma500: fixup staging code to build following core changes. 2011-12-20 10:22:18 +00:00
mdfld_msic.h gma500: Medfield support 2011-07-05 08:20:39 -07:00
mdfld_output.c staging: Add moduleparam.h to drivers/staging files as required 2011-10-31 19:32:09 -04:00
mdfld_output.h gma500: Clean up the DPU config and make it runtime 2011-07-15 19:05:08 +02:00
mdfld_pyr_cmd.c gma500: Clean up the DPU config and make it runtime 2011-07-15 19:05:08 +02:00
mdfld_tmd_vid.c gma500: resync with Medfield progress 2011-07-15 19:05:08 +02:00
mdfld_tpo_cmd.c gma500: Clean up the DPU config and make it runtime 2011-07-15 19:05:08 +02:00
mdfld_tpo_vid.c gma500: Medfield support 2011-07-05 08:20:39 -07:00
medfield.h gma500: kill MIPI interface types 2011-08-16 07:22:16 -07:00
mid_bios.c staging: Add moduleparam.h to drivers/staging files as required 2011-10-31 19:32:09 -04:00
mid_bios.h gma500: the 'mrst' BIOS is actually MID generic 2011-07-05 08:20:42 -07:00
mmu.c gma500: the MMU code is also generic 2011-07-05 08:20:43 -07:00
mrst.h gma500: Add the Oaktrail HDMI support 2011-07-15 19:05:08 +02:00
mrst_crtc.c staging/gma500: fixup staging code to build following core changes. 2011-12-20 10:22:18 +00:00
mrst_device.c gma500@ Fix backlight range error 2011-07-15 19:05:08 +02:00
mrst_hdmi.c gma500: udelay(20000) it too long again 2011-07-26 11:55:14 -07:00
mrst_hdmi_i2c.c staging: Add export.h for THIS_MODULE/EXPORT_SYMBOL to drivers/staging users. 2011-10-31 19:32:08 -04:00
mrst_lvds.c gma500: wire up the mrst i2c bus from chip_info 2011-07-15 19:12:15 +02:00
power.c staging: gma500: Fix warning in power.c 2011-12-22 13:32:46 -08:00
power.h gma500: remove the legacy PM method 2011-07-15 19:05:07 +02:00
psb_device.c gma500: kill bogus code 2011-08-26 10:46:43 -07:00
psb_drm.h gma500: allow the creation of 'stolen' memory objects 2011-07-15 19:05:06 +02:00
psb_drv.c drm: Make the per-driver file_operations struct const 2011-11-11 11:14:47 +00:00
psb_drv.h staging: gma500: frame buffer locking 2011-09-26 17:32:53 -07:00
psb_intel_display.c staging/gma500: fixup staging code to build following core changes. 2011-12-20 10:22:18 +00:00
psb_intel_display.h gma500: Medfield support 2011-07-05 08:20:39 -07:00
psb_intel_drv.h gma500: Add the HDMI bits 2011-07-05 08:20:44 -07:00
psb_intel_lvds.c gma500: Fix backlight crash 2011-08-26 10:46:44 -07:00
psb_intel_modes.c
psb_intel_reg.h gma500: begin adding CDV specific code 2011-07-05 08:20:44 -07:00
psb_intel_sdvo.c gma500: CodingStyle pass 2011-07-05 08:20:39 -07:00
psb_intel_sdvo_regs.h gma500: CodingStyle pass 2011-07-05 08:20:39 -07:00
psb_irq.c gma500: Add VBLANK support for Poulsbo hardware 2011-08-26 10:46:42 -07:00
psb_irq.h gma500: polish for completion of this phase 2011-07-05 08:20:37 -07:00
psb_lid.c gma500: do a pass over the FIXME tags 2011-08-26 10:46:43 -07:00
psb_reg.h gma500: CodingStyle pass 2011-07-05 08:20:39 -07:00