linux_dsm_epyc7002/drivers/gpu/drm/gma500
Linus Torvalds 612a9aab56 Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
Pull drm merge (part 1) from Dave Airlie:
 "So first of all my tree and uapi stuff has a conflict mess, its my
  fault as the nouveau stuff didn't hit -next as were trying to rebase
  regressions out of it before we merged.

  Highlights:
   - SH mobile modesetting driver and associated helpers
   - some DRM core documentation
   - i915 modesetting rework, haswell hdmi, haswell and vlv fixes, write
     combined pte writing, ilk rc6 support,
   - nouveau: major driver rework into a hw core driver, makes features
     like SLI a lot saner to implement,
   - psb: add eDP/DP support for Cedarview
   - radeon: 2 layer page tables, async VM pte updates, better PLL
     selection for > 2 screens, better ACPI interactions

  The rest is general grab bag of fixes.

  So why part 1? well I have the exynos pull req which came in a bit
  late but was waiting for me to do something they shouldn't have and it
  looks fairly safe, and David Howells has some more header cleanups
  he'd like me to pull, that seem like a good idea, but I'd like to get
  this merge out of the way so -next dosen't get blocked."

Tons of conflicts mostly due to silly include line changes, but mostly
mindless.  A few other small semantic conflicts too, noted from Dave's
pre-merged branch.

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (447 commits)
  drm/nv98/crypt: fix fuc build with latest envyas
  drm/nouveau/devinit: fixup various issues with subdev ctor/init ordering
  drm/nv41/vm: fix and enable use of "real" pciegart
  drm/nv44/vm: fix and enable use of "real" pciegart
  drm/nv04/dmaobj: fixup vm target handling in preparation for nv4x pcie
  drm/nouveau: store supported dma mask in vmmgr
  drm/nvc0/ibus: initial implementation of subdev
  drm/nouveau/therm: add support for fan-control modes
  drm/nouveau/hwmon: rename pwm0* to pmw1* to follow hwmon's rules
  drm/nouveau/therm: calculate the pwm divisor on nv50+
  drm/nouveau/fan: rewrite the fan tachometer driver to get more precision, faster
  drm/nouveau/therm: move thermal-related functions to the therm subdev
  drm/nouveau/bios: parse the pwm divisor from the perf table
  drm/nouveau/therm: use the EXTDEV table to detect i2c monitoring devices
  drm/nouveau/therm: rework thermal table parsing
  drm/nouveau/gpio: expose the PWM/TOGGLE parameter found in the gpio vbios table
  drm/nouveau: fix pm initialization order
  drm/nouveau/bios: check that fixed tvdac gpio data is valid before using it
  drm/nouveau: log channel debug/error messages from client object rather than drm client
  drm/nouveau: have drm debugging macros build on top of core macros
  ...
2012-10-03 23:29:23 -07:00
..
accel_2d.c drm: Replace pitch with pitches[] in drm_framebuffer 2011-12-20 10:06:27 +00:00
backlight.c gma500/cdv: Add eDP support 2012-08-24 09:29:25 +10:00
cdv_device.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2012-10-03 23:29:23 -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 gma500: psb_intel_crtc: Drop crtc_enable flag. 2012-08-24 09:43:27 +10:00
cdv_intel_dp.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2012-10-03 23:29:23 -07:00
cdv_intel_hdmi.c gma500: Remove unused variable 2012-09-13 11:40:05 +10:00
cdv_intel_lvds.c gma500/cdv: Add eDP support 2012-08-24 09:29:25 +10:00
framebuffer.c gma500/cdv: Add eDP support 2012-08-24 09:29:25 +10:00
framebuffer.h gma500: kill virtual mapping support 2011-12-06 09:55:29 +00:00
gem.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2012-10-03 23:29:23 -07: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 Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2012-10-03 23:29:23 -07:00
intel_bios.h gma500/cdv: Add eDP support 2012-08-24 09:29:25 +10:00
intel_gmbus.c UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/ 2012-10-02 18:01:07 +01:00
intel_i2c.c gma500: fixup build versus latest header changes. 2011-11-16 12:14:04 +00:00
Kconfig gma500: initial medfield merge 2012-03-10 13:05:48 +00:00
Makefile drm: gma500: Kill the GEM glue layer 2012-08-24 09:30:02 +10: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/cdv: Add eDP support 2012-08-24 09:29:25 +10: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 Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2012-10-03 23:29:23 -07: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_crtc.c drm: Make the .mode_fixup() operations mode argument a const pointer 2012-07-19 21:52:38 -04:00
oaktrail_device.c UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/ 2012-10-02 18:01:07 +01:00
oaktrail_hdmi_i2c.c gma500: oaktrail_hdmi_i2c_handler(): base should be __iomem 2012-05-07 10:58:55 +01:00
oaktrail_hdmi.c drm: remove the raw_edid field from struct drm_display_info 2012-08-24 09:37:36 +10:00
oaktrail_lvds.c gma500: mid-bios: rewrite VBT/GCT handling in a cleaner way 2012-05-07 10:58:58 +01:00
oaktrail.h gma500: mid-bios: rewrite VBT/GCT handling in a cleaner way 2012-05-07 10:58:58 +01:00
opregion.c gma500/cdv: Add eDP support 2012-08-24 09:29:25 +10: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 Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2012-10-03 23:29:23 -07:00
psb_drv.c UAPI: (Scripted) Convert #include "..." to #include <path/...> in drivers/gpu/ 2012-10-02 18:01:07 +01:00
psb_drv.h Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2012-10-03 23:29:23 -07:00
psb_intel_display.c gma500: Consider CRTC initially active. 2012-08-30 10:33:53 +10:00
psb_intel_display.h gma500: Add Poulsbo support 2011-11-16 11:26:55 +00:00
psb_intel_drv.h gma500: fix incorrect declaration. 2012-08-24 13:53:49 +10:00
psb_intel_lvds.c gma500/cdv: Add eDP support 2012-08-24 09:29:25 +10: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: Disable the clock gating of display controller to make DP/eDP work well 2012-08-24 09:29:31 +10: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_intel_sdvo.c Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux 2012-10-03 23:29:23 -07: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