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

fffddfd6 · Linus Torvalds <[email protected]> · 2013-02-25 16:46:44 -08:00

Pull drm merge from Dave Airlie:
 "Highlights:

   - TI LCD controller KMS driver

   - TI OMAP KMS driver merged from staging

   - drop gma500 stub driver

   - the fbcon locking fixes

   - the vgacon dirty like zebra fix.

   - open firmware videomode and hdmi common code helpers

   - major locking rework for kms object handling - pageflip/cursor
     won't block on polling anymore!

   - fbcon helper and prime helper cleanups

   - i915: all over the map, haswell power well enhancements, valleyview
     macro horrors cleaned up, killing lots of legacy GTT code,

   - radeon: CS ioctl unification, deprecated UMS support, gpu reset
     rework, VM fixes

   - nouveau: reworked thermal code, external dp/tmds encoder support
     (anx9805), fences sleep instead of polling,

   - exynos: all over the driver fixes."

Lovely conflict in radeon/evergreen_cs.c between commit de0babd60d8d
("drm/radeon: enforce use of radeon_get_ib_value when reading user cmd")
and the new changes that modified that evergreen_dma_cs_parse()
function.

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (508 commits)
  drm/tilcdc: only build on arm
  drm/i915: Revert hdmi HDP pin checks
  drm/tegra: Add list of framebuffers to debugfs
  drm/tegra: Fix color expansion
  drm/tegra: Split DC_CMD_STATE_CONTROL register write
  drm/tegra: Implement page-flipping support
  drm/tegra: Implement VBLANK support
  drm/tegra: Implement .mode_set_base()
  drm/tegra: Add plane support
  drm/tegra: Remove bogus tegra_framebuffer structure
  drm: Add consistency check for page-flipping
  drm/radeon: Use generic HDMI infoframe helpers
  drm/tegra: Use generic HDMI infoframe helpers
  drm: Add EDID helper documentation
  drm: Add HDMI infoframe helpers
  video: Add generic HDMI infoframe helpers
  drm: Add some missing forward declarations
  drm: Move mode tables to drm_edid.c
  drm: Remove duplicate drm_mode_cea_vic()
  gma500: Fix n, m1 and m2 clock limits for sdvo and lvds
  ...

Commit: fffddfd6c8e0c10c42c6e2cc54ba880fcc36ebbb
Parents: 69086a78 · be88298b

Merge commit. Changes below are compared with the first parent: 69086a78.

Changes

398 files changed · +23479 −11509

File	Status	Add	Del	Content
Documentation/DocBook/drm.tmpl	modified	+64	−14	View file
Documentation/EDID/HOWTO.txt	modified	+23	−4	View file
Documentation/devicetree/bindings/drm/tilcdc/panel.txt	added	+59	−0	View file
Documentation/devicetree/bindings/drm/tilcdc/slave.txt	added	+18	−0	View file
Documentation/devicetree/bindings/drm/tilcdc/tfp410.txt	added	+21	−0	View file
Documentation/devicetree/bindings/drm/tilcdc/tilcdc.txt	added	+21	−0	View file
Documentation/devicetree/bindings/video/display-timing.txt	added	+109	−0	View file
Documentation/thermal/nouveau_thermal	added	+81	−0	View file
drivers/char/agp/intel-gtt.c	modified	+73	−55	View file
drivers/gpu/Makefile	modified	+1	−1	View file
drivers/gpu/drm/Kconfig	modified	+8	−0	View file
drivers/gpu/drm/Makefile	modified	+2	−0	View file
drivers/gpu/drm/ast/ast_drv.c	modified	+2	−2	View file
drivers/gpu/drm/ast/ast_drv.h	modified	+2	−0	View file
drivers/gpu/drm/ast/ast_fb.c	modified	+9	−18	View file
drivers/gpu/drm/ast/ast_main.c	modified	+2	−10	View file
drivers/gpu/drm/cirrus/cirrus_fbdev.c	modified	+8	−19	View file
drivers/gpu/drm/cirrus/cirrus_main.c	modified	+2	−10	View file
drivers/gpu/drm/drm_crtc.c	modified	+496	−320	View file
drivers/gpu/drm/drm_edid.c	modified	+817	−26	View file
drivers/gpu/drm/drm_edid_modes.h	deleted	+0	−774	View before deletion
drivers/gpu/drm/drm_encoder_slave.c	modified	+63	−0	View file
drivers/gpu/drm/drm_fb_cma_helper.c	modified	+72	−23	View file
drivers/gpu/drm/drm_fb_helper.c	modified	+237	−73	View file
drivers/gpu/drm/drm_fops.c	modified	+1	−0	View file
drivers/gpu/drm/drm_gem_cma_helper.c	modified	+21	−0	View file
drivers/gpu/drm/drm_irq.c	modified	+9	−3	View file
drivers/gpu/drm/drm_mm.c	modified	+63	−33	View file
drivers/gpu/drm/drm_modes.c	modified	+70	−0	View file
drivers/gpu/drm/drm_pci.c	modified	+35	−46	View file
drivers/gpu/drm/drm_prime.c	modified	+185	−1	View file
drivers/gpu/drm/drm_usb.c	modified	+1	−1	View file
drivers/gpu/drm/exynos/exynos_drm_fb.c	modified	+31	−24	View file
drivers/gpu/drm/exynos/exynos_drm_fbdev.c	modified	+9	−30	View file
drivers/gpu/drm/exynos/exynos_drm_g2d.c	modified	+11	−1	View file
drivers/gpu/drm/exynos/exynos_drm_gem.c	modified	+21	−12	View file
drivers/gpu/drm/exynos/exynos_drm_hdmi.c	modified	+12	−0	View file
drivers/gpu/drm/exynos/exynos_drm_hdmi.h	modified	+4	−1	View file
drivers/gpu/drm/exynos/exynos_drm_iommu.h	modified	+1	−1	View file
drivers/gpu/drm/exynos/exynos_hdmi.c	modified	+380	−655	View file
drivers/gpu/drm/exynos/exynos_mixer.c	modified	+30	−4	View file
drivers/gpu/drm/gma500/framebuffer.c	modified	+8	−35	View file
drivers/gpu/drm/gma500/psb_device.c	modified	+4	−4	View file
drivers/gpu/drm/gma500/psb_drv.c	modified	+12	−2	View file
drivers/gpu/drm/gma500/psb_intel_display.c	modified	+6	−6	View file
drivers/gpu/drm/i2c/Kconfig	added	+28	−0	View file
drivers/gpu/drm/i2c/Makefile	modified	+3	−0	View file
drivers/gpu/drm/i2c/ch7006_drv.c	modified	+1	−1	View file
drivers/gpu/drm/i2c/tda998x_drv.c	added	+906	−0	View file
drivers/gpu/drm/i915/Makefile	modified	+1	−0	View file
drivers/gpu/drm/i915/i915_debugfs.c	modified	+228	−26	View file
drivers/gpu/drm/i915/i915_dma.c	modified	+59	−35	View file
drivers/gpu/drm/i915/i915_drv.c	modified	+19	−112	View file
drivers/gpu/drm/i915/i915_drv.h	modified	+315	−160	View file
drivers/gpu/drm/i915/i915_gem.c	modified	+260	−256	View file
drivers/gpu/drm/i915/i915_gem_context.c	modified	+2	−10	View file
drivers/gpu/drm/i915/i915_gem_dmabuf.c	modified	+2	−3	View file
drivers/gpu/drm/i915/i915_gem_evict.c	modified	+1	−1	View file
drivers/gpu/drm/i915/i915_gem_execbuffer.c	modified	+163	−170	View file
drivers/gpu/drm/i915/i915_gem_gtt.c	modified	+393	−252	View file
drivers/gpu/drm/i915/i915_gem_stolen.c	modified	+213	−92	View file
drivers/gpu/drm/i915/i915_gem_tiling.c	modified	+17	−16	View file
drivers/gpu/drm/i915/i915_irq.c	modified	+239	−131	View file
drivers/gpu/drm/i915/i915_reg.h	modified	+237	−199	View file
drivers/gpu/drm/i915/i915_suspend.c	modified	+29	−511	View file
drivers/gpu/drm/i915/i915_ums.c	added	+503	−0	View file
drivers/gpu/drm/i915/intel_crt.c	modified	+25	−21	View file
drivers/gpu/drm/i915/intel_ddi.c	modified	+59	−20	View file
drivers/gpu/drm/i915/intel_display.c	modified	+412	−563	View file
drivers/gpu/drm/i915/intel_dp.c	modified	+222	−152	View file
drivers/gpu/drm/i915/intel_drv.h	modified	+32	−9	View file
drivers/gpu/drm/i915/intel_dvo.c	modified	+0	−1	View file
drivers/gpu/drm/i915/intel_fb.c	modified	+29	−26	View file
drivers/gpu/drm/i915/intel_hdmi.c	modified	+60	−48	View file
drivers/gpu/drm/i915/intel_i2c.c	modified	+78	−25	View file
drivers/gpu/drm/i915/intel_lvds.c	modified	+191	−59	View file
drivers/gpu/drm/i915/intel_modes.c	modified	+3	−3	View file
drivers/gpu/drm/i915/intel_opregion.c	modified	+1	−1	View file
drivers/gpu/drm/i915/intel_overlay.c	modified	+13	−11	View file
drivers/gpu/drm/i915/intel_panel.c	modified	+8	−5	View file
drivers/gpu/drm/i915/intel_pm.c	modified	+70	−25	View file
drivers/gpu/drm/i915/intel_ringbuffer.c	modified	+90	−23	View file
drivers/gpu/drm/i915/intel_ringbuffer.h	modified	+10	−1	View file
drivers/gpu/drm/i915/intel_sdvo.c	modified	+51	−16	View file
drivers/gpu/drm/i915/intel_sprite.c	modified	+27	−19	View file
drivers/gpu/drm/i915/intel_tv.c	modified	+1	−3	View file
drivers/gpu/drm/mgag200/mgag200_fb.c	modified	+9	−19	View file
drivers/gpu/drm/mgag200/mgag200_main.c	modified	+5	−11	View file
drivers/gpu/drm/nouveau/Kconfig	modified	+3	−25	View file
drivers/gpu/drm/nouveau/Makefile	modified	+27	−2	View file
drivers/gpu/drm/nouveau/core/core/client.c	modified	+10	−0	View file
drivers/gpu/drm/nouveau/core/core/enum.c	modified	+6	−5	View file
drivers/gpu/drm/nouveau/core/core/event.c	added	+106	−0	View file
drivers/gpu/drm/nouveau/core/engine/copy/nva3.c	modified	+4	−2	View file
drivers/gpu/drm/nouveau/core/engine/crypt/nv84.c	modified	+5	−3	View file
drivers/gpu/drm/nouveau/core/engine/crypt/nv98.c	modified	+4	−2	View file
drivers/gpu/drm/nouveau/core/engine/disp/base.c	added	+52	−0	View file
drivers/gpu/drm/nouveau/core/engine/disp/dport.c	added	+346	−0	View file
drivers/gpu/drm/nouveau/core/engine/disp/dport.h	added	+78	−0	View file
drivers/gpu/drm/nouveau/core/engine/disp/nv04.c	modified	+24	−9	View file
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c	modified	+217	−154	View file
drivers/gpu/drm/nouveau/core/engine/disp/nv50.h	modified	+21	−16	View file
drivers/gpu/drm/nouveau/core/engine/disp/nv84.c	modified	+8	−4	View file
drivers/gpu/drm/nouveau/core/engine/disp/nv94.c	modified	+9	−15	View file
drivers/gpu/drm/nouveau/core/engine/disp/nva0.c	modified	+5	−4	View file
drivers/gpu/drm/nouveau/core/engine/disp/nva3.c	modified	+9	−15	View file
drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c	modified	+163	−146	View file
drivers/gpu/drm/nouveau/core/engine/disp/nve0.c	modified	+6	−11	View file
drivers/gpu/drm/nouveau/core/engine/disp/piornv50.c	added	+140	−0	View file
drivers/gpu/drm/nouveau/core/engine/disp/sornv50.c	modified	+0	−25	View file
drivers/gpu/drm/nouveau/core/engine/disp/sornv94.c	modified	+45	−108	View file
drivers/gpu/drm/nouveau/core/engine/disp/sornvd0.c	modified	+44	−46	View file
drivers/gpu/drm/nouveau/core/engine/fifo/base.c	modified	+21	−0	View file
drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c	modified	+101	−86	View file
drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c	modified	+3	−2	View file
drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c	modified	+21	−1	View file
drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c	modified	+88	−21	View file
drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c	modified	+53	−11	View file
drivers/gpu/drm/nouveau/core/engine/graph/nv04.c	modified	+9	−7	View file
drivers/gpu/drm/nouveau/core/engine/graph/nv10.c	modified	+9	−7	View file
drivers/gpu/drm/nouveau/core/engine/graph/nv20.c	modified	+9	−6	View file
drivers/gpu/drm/nouveau/core/engine/graph/nv40.c	modified	+9	−7	View file
drivers/gpu/drm/nouveau/core/engine/graph/nv50.c	modified	+27	−26	View file
drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c	modified	+16	−17	View file
drivers/gpu/drm/nouveau/core/engine/graph/nve0.c	modified	+24	−20	View file
drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c	modified	+5	−2	View file
drivers/gpu/drm/nouveau/core/engine/software/nv50.c	modified	+30	−10	View file
drivers/gpu/drm/nouveau/core/engine/software/nvc0.c	modified	+22	−7	View file
drivers/gpu/drm/nouveau/core/include/core/class.h	modified	+25	−19	View file
drivers/gpu/drm/nouveau/core/include/core/client.h	modified	+2	−1	View file
drivers/gpu/drm/nouveau/core/include/core/device.h	modified	+1	−0	View file
drivers/gpu/drm/nouveau/core/include/core/enum.h	modified	+2	−1	View file
drivers/gpu/drm/nouveau/core/include/core/event.h	added	+36	−0	View file
drivers/gpu/drm/nouveau/core/include/core/object.h	modified	+6	−6	View file
drivers/gpu/drm/nouveau/core/include/core/printk.h	modified	+2	−1	View file
drivers/gpu/drm/nouveau/core/include/engine/disp.h	modified	+13	−14	View file
drivers/gpu/drm/nouveau/core/include/engine/fifo.h	modified	+4	−0	View file
drivers/gpu/drm/nouveau/core/include/engine/software.h	modified	+2	−2	View file
drivers/gpu/drm/nouveau/core/include/subdev/bios/dcb.h	modified	+3	−0	View file
drivers/gpu/drm/nouveau/core/include/subdev/bios/gpio.h	modified	+8	−3	View file
drivers/gpu/drm/nouveau/core/include/subdev/bios/i2c.h	modified	+1	−1	View file
drivers/gpu/drm/nouveau/core/include/subdev/bios/therm.h	modified	+16	−0	View file
drivers/gpu/drm/nouveau/core/include/subdev/bios/xpio.h	added	+19	−0	View file
drivers/gpu/drm/nouveau/core/include/subdev/bus.h	added	+41	−0	View file
drivers/gpu/drm/nouveau/core/include/subdev/gpio.h	modified	+14	−25	View file
drivers/gpu/drm/nouveau/core/include/subdev/i2c.h	modified	+109	−18	View file
drivers/gpu/drm/nouveau/core/include/subdev/therm.h	modified	+29	−8	View file
drivers/gpu/drm/nouveau/core/include/subdev/timer.h	modified	+8	−0	View file
drivers/gpu/drm/nouveau/core/os.h	modified	+1	−0	View file
drivers/gpu/drm/nouveau/core/subdev/bios/base.c	modified	+1	−1	View file
drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c	modified	+19	−13	View file
drivers/gpu/drm/nouveau/core/subdev/bios/extdev.c	modified	+1	−1	View file
drivers/gpu/drm/nouveau/core/subdev/bios/gpio.c	modified	+9	−2	View file
drivers/gpu/drm/nouveau/core/subdev/bios/i2c.c	modified	+10	−5	View file
drivers/gpu/drm/nouveau/core/subdev/bios/init.c	modified	+10	−5	View file
drivers/gpu/drm/nouveau/core/subdev/bios/therm.c	modified	+27	−1	View file
drivers/gpu/drm/nouveau/core/subdev/bios/xpio.c	added	+76	−0	View file
drivers/gpu/drm/nouveau/core/subdev/bus/nv04.c	added	+95	−0	View file
drivers/gpu/drm/nouveau/core/subdev/bus/nv31.c	added	+112	−0	View file
drivers/gpu/drm/nouveau/core/subdev/bus/nv50.c	added	+105	−0	View file
drivers/gpu/drm/nouveau/core/subdev/bus/nvc0.c	added	+101	−0	View file
drivers/gpu/drm/nouveau/core/subdev/device/base.c	modified	+3	−2	View file
drivers/gpu/drm/nouveau/core/subdev/device/nv04.c	modified	+5	−2	View file
drivers/gpu/drm/nouveau/core/subdev/device/nv10.c	modified	+17	−8	View file
drivers/gpu/drm/nouveau/core/subdev/device/nv20.c	modified	+9	−4	View file
drivers/gpu/drm/nouveau/core/subdev/device/nv30.c	modified	+11	−5	View file
drivers/gpu/drm/nouveau/core/subdev/device/nv40.c	modified	+34	−16	View file
drivers/gpu/drm/nouveau/core/subdev/device/nv50.c	modified	+33	−18	View file
drivers/gpu/drm/nouveau/core/subdev/device/nvc0.c	modified	+26	−17	View file
drivers/gpu/drm/nouveau/core/subdev/device/nve0.c	modified	+13	−9	View file
drivers/gpu/drm/nouveau/core/subdev/devinit/nv50.c	modified	+8	−6	View file
drivers/gpu/drm/nouveau/core/subdev/fb/nv50.c	modified	+44	−20	View file
drivers/gpu/drm/nouveau/core/subdev/gpio/base.c	modified	+11	−129	View file
drivers/gpu/drm/nouveau/core/subdev/gpio/nv10.c	modified	+24	−16	View file
drivers/gpu/drm/nouveau/core/subdev/gpio/nv50.c	modified	+31	−14	View file
drivers/gpu/drm/nouveau/core/subdev/gpio/nvd0.c	modified	+8	−6	View file
drivers/gpu/drm/nouveau/core/subdev/gpio/nve0.c	added	+131	−0	View file
drivers/gpu/drm/nouveau/core/subdev/gpio/priv.h	added	+17	−0	View file
drivers/gpu/drm/nouveau/core/subdev/i2c/anx9805.c	added	+279	−0	View file
drivers/gpu/drm/nouveau/core/subdev/i2c/aux.c	modified	+21	−133	View file
drivers/gpu/drm/nouveau/core/subdev/i2c/base.c	modified	+221	−260	View file
drivers/gpu/drm/nouveau/core/subdev/i2c/bit.c	modified	+10	−8	View file
drivers/gpu/drm/nouveau/core/subdev/i2c/nv04.c	added	+143	−0	View file
drivers/gpu/drm/nouveau/core/subdev/i2c/nv4e.c	added	+135	−0	View file
drivers/gpu/drm/nouveau/core/subdev/i2c/nv50.c	added	+149	−0	View file
drivers/gpu/drm/nouveau/core/subdev/i2c/nv50.h	added	+32	−0	View file
drivers/gpu/drm/nouveau/core/subdev/i2c/nv94.c	added	+285	−0	View file
drivers/gpu/drm/nouveau/core/subdev/i2c/nvd0.c	added	+124	−0	View file
drivers/gpu/drm/nouveau/core/subdev/mc/nv04.c	modified	+1	−1	View file
drivers/gpu/drm/nouveau/core/subdev/mc/nv50.c	modified	+1	−0	View file
drivers/gpu/drm/nouveau/core/subdev/mc/nv98.c	modified	+2	−0	View file
drivers/gpu/drm/nouveau/core/subdev/mc/nvc0.c	modified	+2	−0	View file
drivers/gpu/drm/nouveau/core/subdev/mxm/mxms.c	modified	+4	−4	View file
drivers/gpu/drm/nouveau/core/subdev/therm/base.c	modified	+202	−16	View file
drivers/gpu/drm/nouveau/core/subdev/therm/fan.c	modified	+132	−112	View file
drivers/gpu/drm/nouveau/core/subdev/therm/fannil.c	added	+54	−0	View file
drivers/gpu/drm/nouveau/core/subdev/therm/fanpwm.c	added	+107	−0	View file
drivers/gpu/drm/nouveau/core/subdev/therm/fantog.c	added	+115	−0	View file
drivers/gpu/drm/nouveau/core/subdev/therm/ic.c	modified	+28	−26	View file
drivers/gpu/drm/nouveau/core/subdev/therm/nv40.c	modified	+57	−25	View file
drivers/gpu/drm/nouveau/core/subdev/therm/nv50.c	modified	+176	−23	View file
drivers/gpu/drm/nouveau/core/subdev/therm/nva3.c	added	+99	−0	View file
drivers/gpu/drm/nouveau/core/subdev/therm/nvd0.c	added	+153	−0	View file
drivers/gpu/drm/nouveau/core/subdev/therm/priv.h	modified	+89	−14	View file
drivers/gpu/drm/nouveau/core/subdev/therm/temp.c	modified	+162	−0	View file
drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c	modified	+1	−1	View file
drivers/gpu/drm/nouveau/nouveau_acpi.h	modified	+1	−1	View file
drivers/gpu/drm/nouveau/nouveau_backlight.c	modified	+2	−0	View file
drivers/gpu/drm/nouveau/nouveau_bios.c	modified	+30	−100	View file
drivers/gpu/drm/nouveau/nouveau_bios.h	modified	+1	−11	View file
drivers/gpu/drm/nouveau/nouveau_bo.c	modified	+12	−12	View file
drivers/gpu/drm/nouveau/nouveau_bo.h	modified	+2	−1	View file
drivers/gpu/drm/nouveau/nouveau_chan.c	modified	+3	−2	View file
drivers/gpu/drm/nouveau/nouveau_connector.c	modified	+45	−51	View file
drivers/gpu/drm/nouveau/nouveau_connector.h	modified	+9	−1	View file
drivers/gpu/drm/nouveau/nouveau_debugfs.c	added	+64	−0	View file
drivers/gpu/drm/nouveau/nouveau_debugfs.h	added	+22	−0	View file
drivers/gpu/drm/nouveau/nouveau_display.c	modified	+20	−75	View file
drivers/gpu/drm/nouveau/nouveau_display.h	modified	+0	−3	View file
drivers/gpu/drm/nouveau/nouveau_dma.h	modified	+1	−1	View file
drivers/gpu/drm/nouveau/nouveau_dp.c	modified	+1	−296	View file
drivers/gpu/drm/nouveau/nouveau_drm.c	modified	+51	−9	View file
drivers/gpu/drm/nouveau/nouveau_drm.h	modified	+2	−0	View file
drivers/gpu/drm/nouveau/nouveau_encoder.h	modified	+1	−8	View file
drivers/gpu/drm/nouveau/nouveau_fbcon.c	modified	+7	−19	View file
drivers/gpu/drm/nouveau/nouveau_fence.c	modified	+87	−16	View file
drivers/gpu/drm/nouveau/nouveau_fence.h	modified	+33	−9	View file
drivers/gpu/drm/nouveau/nouveau_gem.c	modified	+58	−45	View file
drivers/gpu/drm/nouveau/nouveau_gem.h	modified	+6	−4	View file
drivers/gpu/drm/nouveau/nouveau_pm.c	modified	+224	−9	View file
drivers/gpu/drm/nouveau/nouveau_prime.c	modified	+21	−152	View file
drivers/gpu/drm/nouveau/nv04_dfp.c	modified	+2	−2	View file
drivers/gpu/drm/nouveau/nv04_display.c	modified	+17	−1	View file
drivers/gpu/drm/nouveau/nv04_display.h	modified	+1	−0	View file
drivers/gpu/drm/nouveau/nv04_fence.c	modified	+3	−3	View file
drivers/gpu/drm/nouveau/nv04_tv.c	modified	+13	−26	View file
drivers/gpu/drm/nouveau/nv10_fence.c	modified	+7	−111	View file
drivers/gpu/drm/nouveau/nv10_fence.h	added	+19	−0	View file
drivers/gpu/drm/nouveau/nv17_fence.c	added	+149	−0	View file
drivers/gpu/drm/nouveau/nv17_tv.c	modified	+1	−1	View file
drivers/gpu/drm/nouveau/nv50_display.c	modified	+257	−50	View file
drivers/gpu/drm/nouveau/nv50_fence.c	modified	+12	−24	View file
drivers/gpu/drm/nouveau/nv84_fence.c	modified	+154	−60	View file
drivers/gpu/drm/nouveau/nvc0_fence.c	modified	+20	−166	View file
drivers/staging/omapdrm/Kconfig → drivers/gpu/drm/omapdrm/Kconfig	renamed	+0	−0	View file
drivers/staging/omapdrm/Makefile → drivers/gpu/drm/omapdrm/Makefile	renamed	+0	−0	View file
drivers/gpu/drm/omapdrm/TODO	added	+23	−0	View file
drivers/staging/omapdrm/omap_connector.c → drivers/gpu/drm/omapdrm/omap_connector.c	renamed	+1	−1	View file
drivers/staging/omapdrm/omap_crtc.c → drivers/gpu/drm/omapdrm/omap_crtc.c	renamed	+6	−8	View file
drivers/staging/omapdrm/omap_debugfs.c → drivers/gpu/drm/omapdrm/omap_debugfs.c	renamed	+3	−15	View file
drivers/staging/omapdrm/omap_dmm_priv.h → drivers/gpu/drm/omapdrm/omap_dmm_priv.h	renamed	+0	−0	View file
drivers/staging/omapdrm/omap_dmm_tiler.c → drivers/gpu/drm/omapdrm/omap_dmm_tiler.c	renamed	+0	−0	View file
drivers/staging/omapdrm/omap_dmm_tiler.h → drivers/gpu/drm/omapdrm/omap_dmm_tiler.h	renamed	+0	−0	View file
drivers/staging/omapdrm/omap_drv.c → drivers/gpu/drm/omapdrm/omap_drv.c	renamed	+3	−3	View file
drivers/staging/omapdrm/omap_drv.h → drivers/gpu/drm/omapdrm/omap_drv.h	renamed	+2	−2	View file
drivers/staging/omapdrm/omap_encoder.c → drivers/gpu/drm/omapdrm/omap_encoder.c	renamed	+1	−1	View file
drivers/staging/omapdrm/omap_fb.c → drivers/gpu/drm/omapdrm/omap_fb.c	renamed	+9	−9	View file
drivers/staging/omapdrm/omap_fbdev.c → drivers/gpu/drm/omapdrm/omap_fbdev.c	renamed	+12	−22	View file
drivers/staging/omapdrm/omap_gem.c → drivers/gpu/drm/omapdrm/omap_gem.c	renamed	+1	−1	View file
drivers/staging/omapdrm/omap_gem_dmabuf.c → drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c	renamed	+1	−1	View file
drivers/staging/omapdrm/omap_gem_helpers.c → drivers/gpu/drm/omapdrm/omap_gem_helpers.c	renamed	+1	−1	View file
drivers/staging/omapdrm/omap_irq.c → drivers/gpu/drm/omapdrm/omap_irq.c	renamed	+1	−1	View file
drivers/staging/omapdrm/omap_plane.c → drivers/gpu/drm/omapdrm/omap_plane.c	renamed	+1	−1	View file
drivers/staging/omapdrm/tcm-sita.c → drivers/gpu/drm/omapdrm/tcm-sita.c	renamed	+0	−0	View file
drivers/staging/omapdrm/tcm-sita.h → drivers/gpu/drm/omapdrm/tcm-sita.h	renamed	+0	−0	View file
drivers/staging/omapdrm/tcm.h → drivers/gpu/drm/omapdrm/tcm.h	renamed	+0	−0	View file
drivers/gpu/drm/radeon/Kconfig	modified	+5	−28	View file
drivers/gpu/drm/radeon/Makefile	modified	+7	−3	View file
drivers/gpu/drm/radeon/atom.c	modified	+7	−2	View file
drivers/gpu/drm/radeon/atombios_crtc.c	modified	+2	−4	View file
drivers/gpu/drm/radeon/evergreen.c	modified	+264	−102	View file
drivers/gpu/drm/radeon/evergreen_cs.c	modified	+470	−679	View file
drivers/gpu/drm/radeon/evergreen_hdmi.c	modified	+19	−66	View file
drivers/gpu/drm/radeon/evergreen_reg.h	modified	+1	−0	View file
drivers/gpu/drm/radeon/evergreend.h	modified	+30	−24	View file
drivers/gpu/drm/radeon/ni.c	modified	+223	−116	View file
drivers/gpu/drm/radeon/nid.h	modified	+16	−11	View file
drivers/gpu/drm/radeon/r100.c	modified	+57	−167	View file
drivers/gpu/drm/radeon/r100_track.h	modified	+0	−4	View file
drivers/gpu/drm/radeon/r100d.h	modified	+0	−11	View file
drivers/gpu/drm/radeon/r200.c	modified	+13	−13	View file
drivers/gpu/drm/radeon/r300.c	modified	+21	−21	View file
drivers/gpu/drm/radeon/r300_cmdbuf.c	modified	+2	−0	View file
drivers/gpu/drm/radeon/r300d.h	modified	+0	−11	View file
drivers/gpu/drm/radeon/r500_reg.h	modified	+1	−0	View file
drivers/gpu/drm/radeon/r600.c	modified	+272	−129	View file
drivers/gpu/drm/radeon/r600_blit.c	modified	+2	−31	View file
drivers/gpu/drm/radeon/r600_blit_kms.c	modified	+31	−0	View file
drivers/gpu/drm/radeon/r600_cp.c	modified	+2	−0	View file
drivers/gpu/drm/radeon/r600_cs.c	modified	+100	−232	View file
drivers/gpu/drm/radeon/r600_hdmi.c	modified	+39	−96	View file
drivers/gpu/drm/radeon/r600d.h	modified	+6	−11	View file
drivers/gpu/drm/radeon/radeon.h	modified	+35	−3	View file
drivers/gpu/drm/radeon/radeon_asic.c	modified	+46	−24	View file
drivers/gpu/drm/radeon/radeon_asic.h	modified	+17	−7	View file
drivers/gpu/drm/radeon/radeon_atpx_handler.c	modified	+71	−2	View file
drivers/gpu/drm/radeon/radeon_cp.c	modified	+2	−0	View file
drivers/gpu/drm/radeon/radeon_cs.c	modified	+154	−22	View file
drivers/gpu/drm/radeon/radeon_cursor.c	modified	+7	−1	View file
drivers/gpu/drm/radeon/radeon_device.c	modified	+9	−1	View file
drivers/gpu/drm/radeon/radeon_display.c	modified	+1	−1	View file
drivers/gpu/drm/radeon/radeon_drv.c	modified	+51	−40	View file
drivers/gpu/drm/radeon/radeon_drv.h	modified	+5	−11	View file
drivers/gpu/drm/radeon/radeon_family.h	modified	+1	−0	View file
drivers/gpu/drm/radeon/radeon_fb.c	modified	+9	−18	View file
drivers/gpu/drm/radeon/radeon_gart.c	modified	+24	−36	View file
drivers/gpu/drm/radeon/radeon_irq.c	modified	+2	−0	View file
drivers/gpu/drm/radeon/radeon_kms.c	modified	+5	−6	View file
drivers/gpu/drm/radeon/radeon_mem.c	modified	+2	−0	View file
drivers/gpu/drm/radeon/radeon_pm.c	modified	+1	−1	View file
drivers/gpu/drm/radeon/radeon_prime.c	modified	+21	−149	View file
drivers/gpu/drm/radeon/radeon_reg.h	modified	+15	−0	View file
drivers/gpu/drm/radeon/radeon_ring.c	modified	+19	−0	View file
drivers/gpu/drm/radeon/radeon_state.c	modified	+2	−0	View file
drivers/gpu/drm/radeon/rv515d.h	modified	+0	−11	View file
drivers/gpu/drm/radeon/rv770.c	modified	+25	−0	View file
drivers/gpu/drm/radeon/rv770d.h	modified	+4	−0	View file
drivers/gpu/drm/radeon/si.c	modified	+370	−139	View file
drivers/gpu/drm/radeon/sid.h	modified	+19	−11	View file
drivers/gpu/drm/shmobile/shmob_drm_drv.c	modified	+2	−2	View file
drivers/gpu/drm/tegra/Kconfig	modified	+1	−0	View file
drivers/gpu/drm/tegra/dc.c	modified	+474	−111	View file
drivers/gpu/drm/tegra/dc.h	modified	+13	−1	View file
drivers/gpu/drm/tegra/drm.c	modified	+103	−0	View file
drivers/gpu/drm/tegra/drm.h	modified	+32	−11	View file
drivers/gpu/drm/tegra/fb.c	modified	+0	−4	View file
drivers/gpu/drm/tegra/hdmi.c	modified	+109	−117	View file
drivers/gpu/drm/tegra/hdmi.h	modified	+0	−189	View file
drivers/gpu/drm/tilcdc/Kconfig	added	+13	−0	View file
drivers/gpu/drm/tilcdc/Makefile	added	+10	−0	View file
drivers/gpu/drm/tilcdc/tilcdc_crtc.c	added	+602	−0	View file
drivers/gpu/drm/tilcdc/tilcdc_drv.c	added	+611	−0	View file
drivers/gpu/drm/tilcdc/tilcdc_drv.h	added	+150	−0	View file
drivers/gpu/drm/tilcdc/tilcdc_panel.c	added	+436	−0	View file
drivers/gpu/drm/tilcdc/tilcdc_panel.h	added	+26	−0	View file
drivers/gpu/drm/tilcdc/tilcdc_regs.h	added	+154	−0	View file
drivers/gpu/drm/tilcdc/tilcdc_slave.c	added	+376	−0	View file
drivers/gpu/drm/tilcdc/tilcdc_slave.h	added	+26	−0	View file
drivers/gpu/drm/tilcdc/tilcdc_tfp410.c	added	+419	−0	View file
drivers/gpu/drm/tilcdc/tilcdc_tfp410.h	added	+26	−0	View file
drivers/gpu/drm/ttm/ttm_bo.c	modified	+83	−20	View file
drivers/gpu/drm/ttm/ttm_execbuf_util.c	modified	+43	−35	View file
drivers/gpu/drm/udl/udl_drv.h	modified	+2	−0	View file
drivers/gpu/drm/udl/udl_fb.c	modified	+51	−27	View file
drivers/gpu/drm/udl/udl_transfer.c	modified	+28	−18	View file
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c	modified	+1	−1	View file
drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c	modified	+15	−23	View file
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c	modified	+55	−32	View file
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c	modified	+2	−2	View file
drivers/gpu/stub/Kconfig	deleted	+0	−18	View before deletion
drivers/gpu/stub/Makefile	deleted	+0	−1	View before deletion
drivers/gpu/stub/poulsbo.c	deleted	+0	−64	View before deletion
drivers/gpu/vga/vga_switcheroo.c	modified	+3	−0	View file
drivers/iommu/intel-iommu.c	modified	+7	−1	View file
drivers/staging/Kconfig	modified	+0	−2	View file
drivers/staging/Makefile	modified	+0	−1	View file
drivers/staging/omapdrm/TODO	deleted	+0	−32	View before deletion
drivers/tty/vt/vt.c	modified	+98	−38	View file
drivers/video/Kconfig	modified	+24	−2	View file
drivers/video/Makefile	modified	+5	−0	View file
drivers/video/console/fbcon.c	modified	+48	−10	View file
drivers/video/console/vgacon.c	modified	+15	−7	View file
drivers/video/display_timing.c	added	+24	−0	View file
drivers/video/fbmem.c	modified	+8	−3	View file
drivers/video/fbmon.c	modified	+94	−0	View file
drivers/video/fbsysfs.c	modified	+3	−0	View file
drivers/video/hdmi.c	added	+308	−0	View file
drivers/video/of_display_timing.c	added	+239	−0	View file
drivers/video/of_videomode.c	added	+54	−0	View file
drivers/video/via/hw.c	modified	+3	−3	View file
drivers/video/via/hw.h	modified	+1	−1	View file
drivers/video/via/lcd.c	modified	+1	−1	View file
drivers/video/via/share.h	modified	+1	−1	View file
drivers/video/via/via_modesetting.c	modified	+4	−4	View file
drivers/video/via/via_modesetting.h	modified	+3	−3	View file
drivers/video/videomode.c	added	+39	−0	View file
include/drm/drmP.h	modified	+34	−0	View file
include/drm/drm_crtc.h	modified	+35	−3	View file
include/drm/drm_edid.h	modified	+6	−0	View file
include/drm/drm_encoder_slave.h	modified	+20	−0	View file
include/drm/drm_fb_cma_helper.h	modified	+5	−0	View file
include/drm/drm_fb_helper.h	modified	+12	−6	View file
include/drm/drm_gem_cma_helper.h	modified	+4	−0	View file
include/drm/drm_mm.h	modified	+40	−0	View file
include/drm/drm_pciids.h	modified	+13	−0	View file
include/drm/intel-gtt.h	modified	+2	−20	View file
include/drm/ttm/ttm_bo_driver.h	modified	+34	−27	View file
include/linux/console.h	modified	+2	−0	View file
include/linux/fb.h	modified	+8	−0	View file
include/linux/hdmi.h	added	+231	−0	View file
include/linux/vt_kern.h	modified	+3	−0	View file
include/uapi/drm/i915_drm.h	modified	+20	−0	View file
drivers/staging/omapdrm/omap_drm.h → include/uapi/drm/omap_drm.h	renamed	+1	−1	View file
include/video/display_timing.h	added	+124	−0	View file
include/video/of_display_timing.h	added	+20	−0	View file
include/video/of_videomode.h	added	+18	−0	View file
include/video/videomode.h	added	+48	−0	View file
kernel/printk.c	modified	+9	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/DocBook/drm.tmpl

View file

diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl
index 4ee2304..f9df3b8 100644
--- a/Documentation/DocBook/drm.tmpl
+++ b/Documentation/DocBook/drm.tmpl
@@ -743,6 +743,10 @@ char *date;</synopsis>
           These two operations are mandatory for GEM drivers that support DRM
           PRIME.
         </para>
+        <sect4>
+          <title>DRM PRIME Helper Functions Reference</title>
+!Pdrivers/gpu/drm/drm_prime.c PRIME Helpers
+        </sect4>
       </sect3>
       <sect3 id="drm-gem-objects-mapping">
         <title>GEM Objects Mapping</title>
@@ -978,10 +982,25 @@ int max_width, max_height;</synopsis>
         If the parameters are deemed valid, drivers then create, initialize and
         return an instance of struct <structname>drm_framebuffer</structname>.
         If desired the instance can be embedded in a larger driver-specific
-        structure. The new instance is initialized with a call to
-        <function>drm_framebuffer_init</function> which takes a pointer to DRM
-        frame buffer operations (struct
-        <structname>drm_framebuffer_funcs</structname>). Frame buffer operations are
+	structure. Drivers must fill its <structfield>width</structfield>,
+	<structfield>height</structfield>, <structfield>pitches</structfield>,
+        <structfield>offsets</structfield>, <structfield>depth</structfield>,
+        <structfield>bits_per_pixel</structfield> and
+        <structfield>pixel_format</structfield> fields from the values passed
+        through the <parameter>drm_mode_fb_cmd2</parameter> argument. They
+        should call the <function>drm_helper_mode_fill_fb_struct</function>
+        helper function to do so.
+      </para>
+
+      <para>
+	The initailization of the new framebuffer instance is finalized with a
+	call to <function>drm_framebuffer_init</function> which takes a pointer
+	to DRM frame buffer operations (struct
+	<structname>drm_framebuffer_funcs</structname>). Note that this function
+	publishes the framebuffer and so from this point on it can be accessed
+	concurrently from other threads. Hence it must be the last step in the
+	driver's framebuffer initialization sequence. Frame buffer operations
+	are
         <itemizedlist>
           <listitem>
             <synopsis>int (*create_handle)(struct drm_framebuffer *fb,
@@ -1022,16 +1041,16 @@ int max_width, max_height;</synopsis>
         </itemizedlist>
       </para>
       <para>
-        After initializing the <structname>drm_framebuffer</structname>
-        instance drivers must fill its <structfield>width</structfield>,
-        <structfield>height</structfield>, <structfield>pitches</structfield>,
-        <structfield>offsets</structfield>, <structfield>depth</structfield>,
-        <structfield>bits_per_pixel</structfield> and
-        <structfield>pixel_format</structfield> fields from the values passed
-        through the <parameter>drm_mode_fb_cmd2</parameter> argument. They
-        should call the <function>drm_helper_mode_fill_fb_struct</function>
-        helper function to do so.
-      </para>
+	The lifetime of a drm framebuffer is controlled with a reference count,
+	drivers can grab additional references with
+	<function>drm_framebuffer_reference</function> </para> and drop them
+	again with <function>drm_framebuffer_unreference</function>. For
+	driver-private framebuffers for which the last reference is never
+	dropped (e.g. for the fbdev framebuffer when the struct
+	<structname>drm_framebuffer</structname> is embedded into the fbdev
+	helper struct) drivers can manually clean up a framebuffer at module
+	unload time with
+	<function>drm_framebuffer_unregister_private</function>.
     </sect2>
     <sect2>
       <title>Output Polling</title>
@@ -1043,6 +1062,22 @@ int max_width, max_height;</synopsis>
         operation.
       </para>
     </sect2>
+    <sect2>
+      <title>Locking</title>
+      <para>
+        Beside some lookup structures with their own locking (which is hidden
+	behind the interface functions) most of the modeset state is protected
+	by the <code>dev-&lt;mode_config.lock</code> mutex and additionally
+	per-crtc locks to allow cursor updates, pageflips and similar operations
+	to occur concurrently with background tasks like output detection.
+	Operations which cross domains like a full modeset always grab all
+	locks. Drivers there need to protect resources shared between crtcs with
+	additional locking. They also need to be careful to always grab the
+	relevant crtc locks if a modset functions touches crtc state, e.g. for
+	load detection (which does only grab the <code>mode_config.lock</code>
+	to allow concurrent screen updates on live crtcs).
+      </para>
+    </sect2>
   </sect1>
 
   <!-- Internals: kms initialization and cleanup -->
@@ -1126,6 +1161,12 @@ int max_width, max_height;</synopsis>
             any new rendering to the frame buffer until the page flip completes.
           </para>
           <para>
+            If a page flip can be successfully scheduled the driver must set the
+            <code>drm_crtc-&lt;fb</code> field to the new framebuffer pointed to
+            by <code>fb</code>. This is important so that the reference counting
+            on framebuffers stays balanced.
+          </para>
+          <para>
             If a page flip is already pending, the
             <methodname>page_flip</methodname> operation must return
             -<errorname>EBUSY</errorname>.
@@ -1609,6 +1650,10 @@ void intel_crt_init(struct drm_device *dev)
         make its properties available to applications.
       </para>
     </sect2>
+    <sect2>
+      <title>KMS API Functions</title>
+!Edrivers/gpu/drm/drm_crtc.c
+    </sect2>
   </sect1>
 
   <!-- Internals: kms helper functions -->
@@ -2104,6 +2149,7 @@ void intel_crt_init(struct drm_device *dev)
       <title>fbdev Helper Functions Reference</title>
 !Pdrivers/gpu/drm/drm_fb_helper.c fbdev helpers
 !Edrivers/gpu/drm/drm_fb_helper.c
+!Iinclude/drm/drm_fb_helper.h
     </sect2>
     <sect2>
       <title>Display Port Helper Functions Reference</title>
@@ -2111,6 +2157,10 @@ void intel_crt_init(struct drm_device *dev)
 !Iinclude/drm/drm_dp_helper.h
 !Edrivers/gpu/drm/drm_dp_helper.c
     </sect2>
+    <sect2>
+      <title>EDID Helper Functions Reference</title>
+!Edrivers/gpu/drm/drm_edid.c
+    </sect2>
   </sect1>
 
   <!-- Internals: vertical blanking -->

Documentation/EDID/HOWTO.txt

View file

diff --git a/Documentation/EDID/HOWTO.txt b/Documentation/EDID/HOWTO.txt
index 75a9f2a..2d0a8f0 100644
--- a/Documentation/EDID/HOWTO.txt
+++ b/Documentation/EDID/HOWTO.txt
@@ -28,11 +28,30 @@ Makefile environment are given here.
 To create binary EDID and C source code files from the existing data
 material, simply type "make".
 
-If you want to create your own EDID file, copy the file 1024x768.S and
-replace the settings with your own data. The CRC value in the last line
+If you want to create your own EDID file, copy the file 1024x768.S,
+replace the settings with your own data and add a new target to the
+Makefile. Please note that the EDID data structure expects the timing
+values in a different way as compared to the standard X11 format.
+
+X11:
+HTimings:  hdisp hsyncstart hsyncend htotal
+VTimings:  vdisp vsyncstart vsyncend vtotal
+
+EDID:
+#define XPIX hdisp
+#define XBLANK htotal-hdisp
+#define XOFFSET hsyncstart-hdisp
+#define XPULSE hsyncend-hsyncstart
+
+#define YPIX vdisp
+#define YBLANK vtotal-vdisp
+#define YOFFSET (63+(vsyncstart-vdisp))
+#define YPULSE (63+(vsyncend-vsyncstart))
+
+The CRC value in the last line
   #define CRC 0x55
-is a bit tricky. After a first version of the binary data set is
-created, it must be be checked with the "edid-decode" utility which will
+also is a bit tricky. After a first version of the binary data set is
+created, it must be checked with the "edid-decode" utility which will
 most probably complain about a wrong CRC. Fortunately, the utility also
 displays the correct CRC which must then be inserted into the source
 file. After the make procedure is repeated, the EDID data set is ready

Documentation/devicetree/bindings/drm/tilcdc/panel.txt

View file

diff --git a/Documentation/devicetree/bindings/drm/tilcdc/panel.txt b/Documentation/devicetree/bindings/drm/tilcdc/panel.txt
new file mode 100644
index 0000000..9301c33
--- /dev/null
+++ b/Documentation/devicetree/bindings/drm/tilcdc/panel.txt
@@ -0,0 +1,59 @@
+Device-Tree bindings for tilcdc DRM generic panel output driver
+
+Required properties:
+ - compatible: value should be "ti,tilcdc,panel".
+ - panel-info: configuration info to configure LCDC correctly for the panel
+   - ac-bias: AC Bias Pin Frequency
+   - ac-bias-intrpt: AC Bias Pin Transitions per Interrupt
+   - dma-burst-sz: DMA burst size
+   - bpp: Bits per pixel
+   - fdd: FIFO DMA Request Delay
+   - sync-edge: Horizontal and Vertical Sync Edge: 0=rising 1=falling
+   - sync-ctrl: Horizontal and Vertical Sync: Control: 0=ignore
+   - raster-order: Raster Data Order Select: 1=Most-to-least 0=Least-to-most
+   - fifo-th: DMA FIFO threshold
+ - display-timings: typical videomode of lcd panel.  Multiple video modes
+   can be listed if the panel supports multiple timings, but the 'native-mode'
+   should be the preferred/default resolution.  Refer to
+   Documentation/devicetree/bindings/video/display-timing.txt for display
+   timing binding details.
+
+Recommended properties:
+ - pinctrl-names, pinctrl-0: the pincontrol settings to configure
+   muxing properly for pins that connect to TFP410 device
+
+Example:
+
+	/* Settings for CDTech_S035Q01 / LCD3 cape: */
+	lcd3 {
+		compatible = "ti,tilcdc,panel";
+		pinctrl-names = "default";
+		pinctrl-0 = <&bone_lcd3_cape_lcd_pins>;
+		panel-info {
+			ac-bias           = <255>;
+			ac-bias-intrpt    = <0>;
+			dma-burst-sz      = <16>;
+			bpp               = <16>;
+			fdd               = <0x80>;
+			sync-edge         = <0>;
+			sync-ctrl         = <1>;
+			raster-order      = <0>;
+			fifo-th           = <0>;
+		};
+		display-timings {
+			native-mode = <&timing0>;
+			timing0: 320x240 {
+				hactive         = <320>;
+				vactive         = <240>;
+				hback-porch     = <21>;
+				hfront-porch    = <58>;
+				hsync-len       = <47>;
+				vback-porch     = <11>;
+				vfront-porch    = <23>;
+				vsync-len       = <2>;
+				clock-frequency = <8000000>;
+				hsync-active    = <0>;
+				vsync-active    = <0>;
+			};
+		};
+	};

Documentation/devicetree/bindings/drm/tilcdc/slave.txt

View file

diff --git a/Documentation/devicetree/bindings/drm/tilcdc/slave.txt b/Documentation/devicetree/bindings/drm/tilcdc/slave.txt
new file mode 100644
index 0000000..3d2c524
--- /dev/null
+++ b/Documentation/devicetree/bindings/drm/tilcdc/slave.txt
@@ -0,0 +1,18 @@
+Device-Tree bindings for tilcdc DRM encoder slave output driver
+
+Required properties:
+ - compatible: value should be "ti,tilcdc,slave".
+ - i2c: the phandle for the i2c device the encoder slave is connected to
+
+Recommended properties:
+ - pinctrl-names, pinctrl-0: the pincontrol settings to configure
+   muxing properly for pins that connect to TFP410 device
+
+Example:
+
+	hdmi {
+		compatible = "ti,tilcdc,slave";
+		i2c = <&i2c0>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&nxp_hdmi_bonelt_pins>;
+	};

Documentation/devicetree/bindings/drm/tilcdc/tfp410.txt

View file

diff --git a/Documentation/devicetree/bindings/drm/tilcdc/tfp410.txt b/Documentation/devicetree/bindings/drm/tilcdc/tfp410.txt
new file mode 100644
index 0000000..a58ae77
--- /dev/null
+++ b/Documentation/devicetree/bindings/drm/tilcdc/tfp410.txt
@@ -0,0 +1,21 @@
+Device-Tree bindings for tilcdc DRM TFP410 output driver
+
+Required properties:
+ - compatible: value should be "ti,tilcdc,tfp410".
+ - i2c: the phandle for the i2c device to use for DDC
+
+Recommended properties:
+ - pinctrl-names, pinctrl-0: the pincontrol settings to configure
+   muxing properly for pins that connect to TFP410 device
+ - powerdn-gpio: the powerdown GPIO, pulled low to power down the
+   TFP410 device (for DPMS_OFF)
+
+Example:
+
+	dvicape {
+		compatible = "ti,tilcdc,tfp410";
+		i2c = <&i2c2>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&bone_dvi_cape_dvi_00A1_pins>;
+		powerdn-gpio = <&gpio2 31 0>;
+	};

Documentation/devicetree/bindings/drm/tilcdc/tilcdc.txt

View file

diff --git a/Documentation/devicetree/bindings/drm/tilcdc/tilcdc.txt b/Documentation/devicetree/bindings/drm/tilcdc/tilcdc.txt
new file mode 100644
index 0000000..e5f1301
--- /dev/null
+++ b/Documentation/devicetree/bindings/drm/tilcdc/tilcdc.txt
@@ -0,0 +1,21 @@
+Device-Tree bindings for tilcdc DRM driver
+
+Required properties:
+ - compatible: value should be "ti,am33xx-tilcdc".
+ - interrupts: the interrupt number
+ - reg: base address and size of the LCDC device
+
+Recommended properties:
+ - interrupt-parent: the phandle for the interrupt controller that
+   services interrupts for this device.
+ - ti,hwmods: Name of the hwmod associated to the LCDC
+
+Example:
+
+	fb: fb@4830e000 {
+		compatible = "ti,am33xx-tilcdc";
+		reg = <0x4830e000 0x1000>;
+		interrupt-parent = <&intc>;
+		interrupts = <36>;
+		ti,hwmods = "lcdc";
+	};

Documentation/devicetree/bindings/video/display-timing.txt

View file

diff --git a/Documentation/devicetree/bindings/video/display-timing.txt b/Documentation/devicetree/bindings/video/display-timing.txt
new file mode 100644
index 0000000..1500385
--- /dev/null
+++ b/Documentation/devicetree/bindings/video/display-timing.txt
@@ -0,0 +1,109 @@
+display-timing bindings
+=======================
+
+display-timings node
+--------------------
+
+required properties:
+ - none
+
+optional properties:
+ - native-mode: The native mode for the display, in case multiple modes are
+		provided. When omitted, assume the first node is the native.
+
+timing subnode
+--------------
+
+required properties:
+ - hactive, vactive: display resolution
+ - hfront-porch, hback-porch, hsync-len: horizontal display timing parameters
+   in pixels
+   vfront-porch, vback-porch, vsync-len: vertical display timing parameters in
+   lines
+ - clock-frequency: display clock in Hz
+
+optional properties:
+ - hsync-active: hsync pulse is active low/high/ignored
+ - vsync-active: vsync pulse is active low/high/ignored
+ - de-active: data-enable pulse is active low/high/ignored
+ - pixelclk-active: with
+			- active high = drive pixel data on rising edge/
+					sample data on falling edge
+			- active low  = drive pixel data on falling edge/
+					sample data on rising edge
+			- ignored     = ignored
+ - interlaced (bool): boolean to enable interlaced mode
+ - doublescan (bool): boolean to enable doublescan mode
+
+All the optional properties that are not bool follow the following logic:
+    <1>: high active
+    <0>: low active
+    omitted: not used on hardware
+
+There are different ways of describing the capabilities of a display. The
+devicetree representation corresponds to the one commonly found in datasheets
+for displays. If a display supports multiple signal timings, the native-mode
+can be specified.
+
+The parameters are defined as:
+
+  +----------+-------------------------------------+----------+-------+
+  |          |        ↑                            |          |       |
+  |          |        |vback_porch                 |          |       |
+  |          |        ↓                            |          |       |
+  +----------#######################################----------+-------+
+  |          #        ↑                            #          |       |
+  |          #        |                            #          |       |
+  |  hback   #        |                            #  hfront  | hsync |
+  |   porch  #        |       hactive              #  porch   |  len  |
+  |<-------->#<-------+--------------------------->#<-------->|<----->|
+  |          #        |                            #          |       |
+  |          #        |vactive                     #          |       |
+  |          #        |                            #          |       |
+  |          #        ↓                            #          |       |
+  +----------#######################################----------+-------+
+  |          |        ↑                            |          |       |
+  |          |        |vfront_porch                |          |       |
+  |          |        ↓                            |          |       |
+  +----------+-------------------------------------+----------+-------+
+  |          |        ↑                            |          |       |
+  |          |        |vsync_len                   |          |       |
+  |          |        ↓                            |          |       |
+  +----------+-------------------------------------+----------+-------+
+
+Example:
+
+	display-timings {
+		native-mode = <&timing0>;
+		timing0: 1080p24 {
+			/* 1920x1080p24 */
+			clock-frequency = <52000000>;
+			hactive = <1920>;
+			vactive = <1080>;
+			hfront-porch = <25>;
+			hback-porch = <25>;
+			hsync-len = <25>;
+			vback-porch = <2>;
+			vfront-porch = <2>;
+			vsync-len = <2>;
+			hsync-active = <1>;
+		};
+	};
+
+Every required property also supports the use of ranges, so the commonly used
+datasheet description with minimum, typical and maximum values can be used.
+
+Example:
+
+	timing1: timing {
+		/* 1920x1080p24 */
+		clock-frequency = <148500000>;
+		hactive = <1920>;
+		vactive = <1080>;
+		hsync-len = <0 44 60>;
+		hfront-porch = <80 88 95>;
+		hback-porch = <100 148 160>;
+		vfront-porch = <0 4 6>;
+		vback-porch = <0 36 50>;
+		vsync-len = <0 5 6>;
+	};

Documentation/thermal/nouveau_thermal

View file

diff --git a/Documentation/thermal/nouveau_thermal b/Documentation/thermal/nouveau_thermal
new file mode 100644
index 0000000..efceb78
--- /dev/null
+++ b/Documentation/thermal/nouveau_thermal
@@ -0,0 +1,81 @@
+Kernel driver nouveau
+===================
+
+Supported chips:
+* NV43+
+
+Authors: Martin Peres (mupuf) <[email protected]>
+
+Description
+---------
+
+This driver allows to read the GPU core temperature, drive the GPU fan and
+set temperature alarms.
+
+Currently, due to the absence of in-kernel API to access HWMON drivers, Nouveau
+cannot access any of the i2c external monitoring chips it may find. If you
+have one of those, temperature and/or fan management through Nouveau's HWMON
+interface is likely not to work. This document may then not cover your situation
+entirely.
+
+Temperature management
+--------------------
+
+Temperature is exposed under as a read-only HWMON attribute temp1_input.
+
+In order to protect the GPU from overheating, Nouveau supports 4 configurable
+temperature thresholds:
+
+ * Fan_boost: Fan speed is set to 100% when reaching this temperature;
+ * Downclock: The GPU will be downclocked to reduce its power dissipation;
+ * Critical: The GPU is put on hold to further lower power dissipation;
+ * Shutdown: Shut the computer down to protect your GPU.
+
+WARNING: Some of these thresholds may not be used by Nouveau depending
+on your chipset.
+
+The default value for these thresholds comes from the GPU's vbios. These
+thresholds can be configured thanks to the following HWMON attributes:
+
+ * Fan_boost: temp1_auto_point1_temp and temp1_auto_point1_temp_hyst;
+ * Downclock: temp1_max and temp1_max_hyst;
+ * Critical: temp1_crit and temp1_crit_hyst;
+ * Shutdown: temp1_emergency and temp1_emergency_hyst.
+
+NOTE: Remember that the values are stored as milli degrees Celcius. Don't forget
+to multiply!
+
+Fan management
+------------
+
+Not all cards have a drivable fan. If you do, then the following HWMON
+attributes should be available:
+
+ * pwm1_enable: Current fan management mode (NONE, MANUAL or AUTO);
+ * pwm1: Current PWM value (power percentage);
+ * pwm1_min: The minimum PWM speed allowed;
+ * pwm1_max: The maximum PWM speed allowed (bypassed when hitting Fan_boost);
+
+You may also have the following attribute:
+
+ * fan1_input: Speed in RPM of your fan.
+
+Your fan can be driven in different modes:
+
+ * 0: The fan is left untouched;
+ * 1: The fan can be driven in manual (use pwm1 to change the speed);
+ * 2; The fan is driven automatically depending on the temperature.
+
+NOTE: Be sure to use the manual mode if you want to drive the fan speed manually
+
+NOTE2: Not all fan management modes may be supported on all chipsets. We are
+working on it.
+
+Bug reports
+---------
+
+Thermal management on Nouveau is new and may not work on all cards. If you have
+inquiries, please ping mupuf on IRC (#nouveau, freenode).
+
+Bug reports should be filled on Freedesktop's bug tracker. Please follow
+http://nouveau.freedesktop.org/wiki/Bugs

drivers/char/agp/intel-gtt.c

View file

diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index dbd901e..b8e2014 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -60,7 +60,6 @@ struct intel_gtt_driver {
 };
 
 static struct _intel_private {
-	struct intel_gtt base;
 	const struct intel_gtt_driver *driver;
 	struct pci_dev *pcidev;	/* device one */
 	struct pci_dev *bridge_dev;
@@ -75,7 +74,18 @@ static struct _intel_private {
 	struct resource ifp_resource;
 	int resource_valid;
 	struct page *scratch_page;
+	phys_addr_t scratch_page_dma;
 	int refcount;
+	/* Whether i915 needs to use the dmar apis or not. */
+	unsigned int needs_dmar : 1;
+	phys_addr_t gma_bus_addr;
+	/*  Size of memory reserved for graphics by the BIOS */
+	unsigned int stolen_size;
+	/* Total number of gtt entries. */
+	unsigned int gtt_total_entries;
+	/* Part of the gtt that is mappable by the cpu, for those chips where
+	 * this is not the full gtt. */
+	unsigned int gtt_mappable_entries;
 } intel_private;
 
 #define INTEL_GTT_GEN	intel_private.driver->gen
@@ -291,15 +301,15 @@ static int intel_gtt_setup_scratch_page(void)
 	get_page(page);
 	set_pages_uc(page, 1);
 
-	if (intel_private.base.needs_dmar) {
+	if (intel_private.needs_dmar) {
 		dma_addr = pci_map_page(intel_private.pcidev, page, 0,
 				    PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
 		if (pci_dma_mapping_error(intel_private.pcidev, dma_addr))
 			return -EINVAL;
 
-		intel_private.base.scratch_page_dma = dma_addr;
+		intel_private.scratch_page_dma = dma_addr;
 	} else
-		intel_private.base.scratch_page_dma = page_to_phys(page);
+		intel_private.scratch_page_dma = page_to_phys(page);
 
 	intel_private.scratch_page = page;
 
@@ -506,7 +516,7 @@ static unsigned int intel_gtt_total_entries(void)
 		/* On previous hardware, the GTT size was just what was
 		 * required to map the aperture.
 		 */
-		return intel_private.base.gtt_mappable_entries;
+		return intel_private.gtt_mappable_entries;
 	}
 }
 
@@ -546,7 +556,7 @@ static unsigned int intel_gtt_mappable_entries(void)
 static void intel_gtt_teardown_scratch_page(void)
 {
 	set_pages_wb(intel_private.scratch_page, 1);
-	pci_unmap_page(intel_private.pcidev, intel_private.base.scratch_page_dma,
+	pci_unmap_page(intel_private.pcidev, intel_private.scratch_page_dma,
 		       PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
 	put_page(intel_private.scratch_page);
 	__free_page(intel_private.scratch_page);
@@ -562,6 +572,40 @@ static void intel_gtt_cleanup(void)
 	intel_gtt_teardown_scratch_page();
 }
 
+/* Certain Gen5 chipsets require require idling the GPU before
+ * unmapping anything from the GTT when VT-d is enabled.
+ */
+static inline int needs_ilk_vtd_wa(void)
+{
+#ifdef CONFIG_INTEL_IOMMU