UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/drivers/gpu/drm/gma500
History
Linus Torvalds bd22dc17e4 Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 
Pull drm updates from Dave Airlie:
 "One of the smaller drm -next pulls in ages!

  Ben (nouveau) has a rewrite in progress but we decided to leave it
  stew for another cycle, so just some fixes from him.

   - radeon: lots of documentation work, fixes, more ring and locking
     changes, pcie gen2, more dp fixes.
   - i915: haswell features, gpu reset fixes, /dev/agpgart removal on
     machines that we never used it on, more VGA/HDP fix., more DP fixes
   - drm core: cleanups from Daniel, sis 64-bit fixes, range allocator
     colouring.

  but yeah fairly quiet merge this time, probably because I missed half
  of it!"

Trivial add-add conflict in include/linux/pci_regs.h

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (255 commits)
  drm/nouveau: init vblank requests list
  drm/nv50: extend vblank semaphore to generic dmaobj + offset pair
  drm/nouveau: mark most of our ioctls as deprecated, move to compat layer
  drm/nouveau: move current gpuobj code out of nouveau_object.c
  drm/nouveau/gem: fix object reference leak in a failure path
  drm/nv50: rename INVALID_QUERY_OR_TEXTURE error to INVALID_OPERATION
  drm/nv84: decode PCRYPT errors
  drm/nouveau: dcb table quirk for fdo#50830
  nouveau: Fix alignment requirements on src and dst addresses
  drm/i915: unbreak lastclose for failed driver init
  drm/i915: Set the context before setting up regs for the context.
  drm/i915: constify mode in crtc_mode_fixup
  drm/i915/lvds: ditch ->prepare special case
  drm/i915: dereferencing an error pointer
  drm/i915: fix invalid reference handling of the default ctx obj
  drm/i915: Add -EIO to the list of known errors for __wait_seqno
  drm/i915: Flush the context object from the CPU caches upon switching
  drm/radeon: fix dpms on/off on trinity/aruba v2
  drm/radeon: on hotplug force link training to happen (v2)
  drm/radeon: fix hotplug of DP to DVI|HDMI passive adapters (v2)
  ...
 		2012-07-26 14:18:18 -07:00
..
Kconfig gma500: initial medfield merge 2012-03-10 13:05:48 +00:00
Makefile gma500: Fix build without ACPI 2012-05-11 17:35:46 +01:00
accel_2d.c drm: Replace pitch with pitches[] in drm_framebuffer 2011-12-20 10:06:27 +00:00
backlight.c gma500: Add device framework 2011-11-16 11:25:08 +00:00
cdv_device.c gma500,cdv: Fix the brightness base 2012-07-16 09:20:33 -07:00
cdv_device.h gma500: fix cdv_intel_wait_for_vblank() prototype 2012-03-10 13:06:15 +00:00
cdv_intel_crt.c drm: Make the .mode_fixup() operations mode argument a const pointer 2012-07-19 21:52:38 -04:00
cdv_intel_display.c drm: Make the .mode_fixup() operations mode argument a const pointer 2012-07-19 21:52:38 -04:00
cdv_intel_hdmi.c drm: Make the .mode_fixup() operations mode argument a const pointer 2012-07-19 21:52:38 -04:00
cdv_intel_lvds.c drm: Make the .mode_fixup() operations mode argument a const pointer 2012-07-19 21:52:38 -04:00
framebuffer.c drm: Constify drm_mode_config_funcs pointer 2012-05-22 10:35:07 +01:00
framebuffer.h gma500: kill virtual mapping support 2011-12-06 09:55:29 +00:00
gem.c gma500: Set the mapping mask 2012-04-27 09:24:36 +01:00
gem_glue.c gma500: gem_glue: add missing include 2012-03-10 13:05:56 +00:00
gem_glue.h gma500: GEM and GEM glue 2011-11-16 11:22:36 +00:00
gtt.c gma500: Clean up some of the noise 2012-05-11 17:35:52 +01:00
gtt.h gma500: gtt based hardware scrolling console 2011-12-06 09:55:39 +00:00
intel_bios.c drm/i915/bios: cleanup return type of intel_parse_bios() 2012-06-27 10:17:51 +01:00
intel_bios.h drm/i915/bios: cleanup return type of intel_parse_bios() 2012-06-27 10:17:51 +01:00
intel_gmbus.c drm: Fix kcalloc parameters swapped 2012-02-13 12:07:36 +00:00
intel_i2c.c gma500: fixup build versus latest header changes. 2011-11-16 12:14:04 +00:00
mdfld_device.c gma500: handle poulsbo cursor restriction 2012-05-22 10:15:34 +01:00
mdfld_dsi_dpi.c drm: Make the .mode_fixup() operations mode argument a const pointer 2012-07-19 21:52:38 -04:00
mdfld_dsi_dpi.h drm: Make the .mode_fixup() operations mode argument a const pointer 2012-07-19 21:52:38 -04:00
mdfld_dsi_output.c gma500: medfield: fix build without CONFIG_BACKLIGHT_CLASS_DEVICE 2012-03-26 09:33:24 +01:00
mdfld_dsi_output.h drivers: gpu: drm: gma500: mdfld_dsi_output.h: Remove not unneeded include of version.h 2012-04-19 14:38:02 +01:00
mdfld_dsi_pkg_sender.c gma500: use the register map to clean up 2012-05-11 17:35:51 +01:00
mdfld_dsi_pkg_sender.h gma500: initial medfield merge 2012-03-10 13:05:48 +00:00
mdfld_intel_display.c drm: Make the .mode_fixup() operations mode argument a const pointer 2012-07-19 21:52:38 -04:00
mdfld_output.c gma500: mdfld_dsi_output_init() drop unused parameter 2012-03-10 13:05:51 +00:00
mdfld_output.h gma500: initial medfield merge 2012-03-10 13:05:48 +00:00
mdfld_tmd_vid.c gma500: initial medfield merge 2012-03-10 13:05:48 +00:00
mdfld_tpo_vid.c gma500: initial medfield merge 2012-03-10 13:05:48 +00:00
mid_bios.c gma500: mid-bios: rewrite VBT/GCT handling in a cleaner way 2012-05-07 10:58:58 +01:00
mid_bios.h gma500: Add the glue to the various BIOS and firmware interfaces 2011-11-16 11:25:28 +00:00
mmu.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2012-03-22 13:08:22 -07:00
oaktrail.h gma500: mid-bios: rewrite VBT/GCT handling in a cleaner way 2012-05-07 10:58:58 +01:00
oaktrail_crtc.c drm: Make the .mode_fixup() operations mode argument a const pointer 2012-07-19 21:52:38 -04:00
oaktrail_device.c gma500: handle poulsbo cursor restriction 2012-05-22 10:15:34 +01:00
oaktrail_hdmi.c drm: Make the .mode_fixup() operations mode argument a const pointer 2012-07-19 21:52:38 -04:00
oaktrail_hdmi_i2c.c gma500: oaktrail_hdmi_i2c_handler(): base should be __iomem 2012-05-07 10:58:55 +01:00
oaktrail_lvds.c gma500: mid-bios: rewrite VBT/GCT handling in a cleaner way 2012-05-07 10:58:58 +01:00
opregion.c gma500: move the ASLE enable 2012-07-16 09:20:33 -07:00
opregion.h gma500: move the ASLE enable 2012-07-16 09:20:33 -07:00
power.c gma500: suspend/resume support for Cedartrail 2012-03-15 09:46:22 +00:00
power.h gma500: Add device framework 2011-11-16 11:25:08 +00:00
psb_device.c gma500: Fix lid related crash 2012-07-16 09:20:33 -07:00
psb_drv.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2012-07-26 14:18:18 -07:00
psb_drv.h gma500: handle poulsbo cursor restriction 2012-05-22 10:15:34 +01:00
psb_intel_display.c drm: Make the .mode_fixup() operations mode argument a const pointer 2012-07-19 21:52:38 -04:00
psb_intel_display.h gma500: Add Poulsbo support 2011-11-16 11:26:55 +00:00
psb_intel_drv.h drm: Make the .mode_fixup() operations mode argument a const pointer 2012-07-19 21:52:38 -04:00
psb_intel_lvds.c drm: Make the .mode_fixup() operations mode argument a const pointer 2012-07-19 21:52:38 -04:00
psb_intel_modes.c gma500: Remove psb_intel_output from ddc_probe and ddc_get_modes 2011-12-20 10:23:06 +00:00
psb_intel_reg.h gma500: opregion and ACPI 2012-05-07 10:58:20 +01:00
psb_intel_sdvo.c drm: Make the .mode_fixup() operations mode argument a const pointer 2012-07-19 21:52:38 -04:00
psb_intel_sdvo_regs.h gma500: Replace SDVO code with slightly modified version from i915 2011-12-20 10:23:14 +00:00
psb_irq.c gma500: psb_irq_turn_off_dpst() fix bit operation 2012-05-07 10:58:53 +01:00
psb_irq.h gma500: initial medfield merge 2012-03-10 13:05:48 +00:00
psb_lid.c gma500: Prevent endless loop in panel power up sequence 2012-05-22 10:15:29 +01:00
psb_reg.h gma500: Add the core DRM files and headers 2011-11-16 11:26:35 +00:00
tc35876x-dsi-lvds.c gma500: initial medfield merge 2012-03-10 13:05:48 +00:00
tc35876x-dsi-lvds.h gma500: initial medfield merge 2012-03-10 13:05:48 +00:00