[PULL] topic/drm-misc

Daniel Vetter daniel.vetter at ffwll.ch
Tue Aug 23 19:53:51 UTC 2016


Hi Dave,

A few bigger things:
- start of splitting drm_crtc.c into more manageable and better documneted
  chunks
- DRM_DEV_* logging (Sean)

But besides those it's really all one-off misc patches all over this time
around, trying to summarize them further would just end up in copying the
shortlog ;-)

Once you pulled this in can you pls apply

https://patchwork.freedesktop.org/patch/106979/

on top? I think this patch would benefit from your direct sob, and it has
some trivial conflicts with the doc polish in this pull.

I also have a pile in drm-intel-next, but the io-mapping.h change in there
blew up on some really interesting places because some folks thought this
is the generic iomapping header, without realizing that it's _only_ for
per-page io_mapping (only used by i915, nouveau and some random network
driver, which looks a bit fishy). We need to undo that silliness first
before I can send you that pull (gpiolib and some infiniband files include
linux/io-mapping.h), so probably will take a few days.

Cheers, Daniel


The following changes since commit fc93ff608b15ae32cde3006b7af860b59cac20ec:

  Merge tag 'drm-intel-next-2016-08-08' of git://anongit.freedesktop.org/drm-intel into drm-next (2016-08-15 16:53:57 +1000)

are available in the git repository at:

  git://anongit.freedesktop.org/drm-intel tags/topic/drm-misc-2016-08-23

for you to fetch changes up to 28579f37467cd1a9130a6287cf8322986e0b56f9:

  drm/fb-helper: Make docs for fb_set_suspend wrappers consistent (2016-08-23 21:12:56 +0200)

----------------------------------------------------------------
Chris Wilson (4):
      dma-buf: Wait on the reservation object when sync'ing before CPU access
      drm: Allow drivers to modify plane_state in prepare_fb/cleanup_fb
      drm: Avoid calling dev_printk(.dev = NULL)
      drm/fb-helper: Fix the dummy remove_conflicting_framebuffers

Clint Taylor (1):
      drm/edid: CEA mode 64 1080p100 vsync pulse width incorrect

Daniel Vetter (23):
      drm/doc: Fix more kerneldoc/sphinx warnings
      drm/doc: Light drm-kms-helper.rst cleanup
      drm/kms-helpers: Extract drm_modeset_helper.[hc]
      drm/doc: Reorg drm-mm.rst
      drm/doc: Reorg for drm-kms.rst
      drm/etnaviv: Don't set drm_device->platformdev
      drm/hisilicon: Don't set drm_device->platformdev
      drm/doc: Remove outdated FIXME for the page_flip callback
      drm/kms: Nuke dirty_info property
      drm/doc: Include drm_atomic.h
      drm: Extract drm_framebuffer.[hc]
      drm/doc: Update drm_framebuffer docs
      drm: Export drm_property_replace_global_blob
      drm: Extract drm_connector.[hc]
      drm/doc: Include new drm_blend.c
      drm: Don't export dp-aux devnode functions
      drm: Update connector documentation
      drm: Remove display_info->min/max_(h|v)max
      drm: document drm_display_info
      vgaarbiter: rst-ifiy and polish kerneldoc
      drm: Fix kerneldoc in drm_plane_helper.c
      Revert "drm/hisilicon: Don't set drm_device->platformdev"
      drm/fb-helper: Make docs for fb_set_suspend wrappers consistent

Eric Engestrom (2):
      drm: make drm_get_format_name thread-safe
      drm: remove `const` attribute to hint at caller that they now own the memory

Heinrich Schuchardt (1):
      drm: avoid exposing kernel stack in compat_drm_getstats

Jamie Lentin (1):
      drm/udl: Ensure channel is selected before using the device.

Laurent Pinchart (1):
      drm: Don't implement empty prepare_fb()/cleanup_fb()

Lothar Waßmann (1):
      drm: update kerneldoc for changes introduced by commits "16fadc2568e9" and "9671e228fb78"

Markus Elfring (4):
      GPU-DRM-Savage: Use memdup_user() rather than duplicating
      virtio-gpu: Use memdup_user() rather than duplicating its implementation
      drm/bridge: dw-hdmi: Delete unnecessary assignment for the field "owner"
      drm/rockchip: Delete unnecessary assignment for the field "owner"

Noralf Trønnes (1):
      drm/fb-helper: Add drm_fb_helper_set_suspend_unlocked()

Randy Dunlap (1):
      dma-buf: fix kernel-doc warning and typos

Rob Clark (1):
      reservation: fix small comment typo

Sean Paul (3):
      drm: Introduce DRM_DEV_* log messages
      drm/rockchip: Use DRM_DEV_ERROR in vop
      drm/rockchip: Don't continue trying to enable crtc on failure

Shawn Guo (1):
      drm: drop DRIVER_HAVE_IRQ flag for some drivers

Wei Yongjun (1):
      drm/mgag200: fix error return code in mgag200fb_create()

 Documentation/gpu/drm-kms-helpers.rst              |  211 +-
 Documentation/gpu/drm-kms.rst                      |  270 +--
 Documentation/gpu/drm-mm.rst                       |   58 +-
 Documentation/gpu/drm-uapi.rst                     |    3 +
 Documentation/gpu/index.rst                        |    1 +
 Documentation/gpu/vga-switcheroo.rst               |    2 -
 .../{vgaarbiter.txt => gpu/vgaarbiter.rst}         |  161 +-
 drivers/dma-buf/dma-buf.c                          |   23 +
 drivers/dma-buf/fence-array.c                      |    6 +-
 drivers/dma-buf/reservation.c                      |    2 +-
 drivers/gpu/drm/Makefile                           |    5 +-
 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c             |    6 +-
 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c             |    6 +-
 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c              |    6 +-
 drivers/gpu/drm/arc/arcpgu_crtc.c                  |    2 -
 drivers/gpu/drm/armada/armada_drv.c                |    2 +-
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c    |    4 +-
 drivers/gpu/drm/bridge/dw-hdmi-ahb-audio.c         |    1 -
 drivers/gpu/drm/drm_atomic.c                       |    5 +-
 drivers/gpu/drm/drm_atomic_helper.c                |    2 +-
 drivers/gpu/drm/drm_blend.c                        |    8 +-
 drivers/gpu/drm/drm_connector.c                    | 1123 +++++++++
 drivers/gpu/drm/drm_crtc.c                         | 2396 ++------------------
 drivers/gpu/drm/drm_crtc_helper.c                  |   56 -
 .../gpu/drm/drm_crtc_helper_internal.h             |   36 +-
 drivers/gpu/drm/drm_crtc_internal.h                |   70 +-
 drivers/gpu/drm/drm_dp_aux_dev.c                   |   19 +-
 drivers/gpu/drm/drm_dp_helper.c                    |    3 +-
 drivers/gpu/drm/drm_drv.c                          |   30 +-
 drivers/gpu/drm/drm_edid.c                         |   25 +-
 drivers/gpu/drm/drm_fb_helper.c                    |   70 +-
 drivers/gpu/drm/drm_fourcc.c                       |   19 +-
 drivers/gpu/drm/drm_framebuffer.c                  |  831 +++++++
 drivers/gpu/drm/drm_ioc32.c                        |    1 +
 drivers/gpu/drm/drm_irq.c                          |    8 +-
 drivers/gpu/drm/drm_kms_helper_common.c            |    3 +-
 drivers/gpu/drm/drm_modes.c                        |   10 +
 drivers/gpu/drm/drm_modeset_helper.c               |  153 ++
 drivers/gpu/drm/drm_plane_helper.c                 |   68 +-
 drivers/gpu/drm/drm_simple_kms_helper.c            |    2 +-
 drivers/gpu/drm/etnaviv/etnaviv_drv.c              |    5 +-
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c        |   15 -
 drivers/gpu/drm/gma500/cdv_intel_lvds.c            |    8 -
 drivers/gpu/drm/gma500/mdfld_dsi_output.c          |    5 -
 drivers/gpu/drm/gma500/psb_intel_lvds.c            |    9 -
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c    |   21 +-
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c    |    2 +-
 drivers/gpu/drm/i915/i915_debugfs.c                |   11 +-
 drivers/gpu/drm/i915/i915_vgpu.c                   |   42 +-
 drivers/gpu/drm/i915/intel_atomic_plane.c          |    6 +-
 drivers/gpu/drm/i915/intel_audio.c                 |    6 +-
 drivers/gpu/drm/i915/intel_display.c               |   43 +-
 drivers/gpu/drm/i915/intel_drv.h                   |    4 +-
 drivers/gpu/drm/i915/intel_guc_fwif.h              |    5 +-
 drivers/gpu/drm/i915/intel_lvds.c                  |   11 -
 drivers/gpu/drm/mgag200/mgag200_fb.c               |    4 +-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c          |    4 +-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c          |    4 +-
 drivers/gpu/drm/omapdrm/omap_plane.c               |    4 +-
 drivers/gpu/drm/radeon/atombios_crtc.c             |   12 +-
 drivers/gpu/drm/rockchip/analogix_dp-rockchip.c    |    1 -
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c        |   59 +-
 drivers/gpu/drm/rockchip/rockchip_vop_reg.c        |    1 -
 drivers/gpu/drm/savage/savage_state.c              |   12 +-
 drivers/gpu/drm/sti/sti_drv.c                      |    2 +-
 drivers/gpu/drm/tegra/dc.c                         |   17 -
 drivers/gpu/drm/udl/udl_connector.c                |    3 -
 drivers/gpu/drm/udl/udl_main.c                     |   25 +
 drivers/gpu/drm/udl/udl_modeset.c                  |    2 -
 drivers/gpu/drm/vc4/vc4_plane.c                    |    2 -
 drivers/gpu/drm/virtio/virtgpu_ioctl.c             |   13 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c                |    9 -
 drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c               |   11 -
 drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c               |    7 -
 drivers/gpu/vga/vgaarb.c                           |  110 +-
 include/drm/drmP.h                                 |  140 +-
 include/drm/drm_atomic_helper.h                    |    2 +
 include/drm/drm_connector.h                        |  747 ++++++
 include/drm/drm_crtc.h                             |  792 +------
 include/drm/drm_crtc_helper.h                      |    6 +-
 include/drm/drm_fb_helper.h                        |   28 +-
 include/drm/drm_fourcc.h                           |    2 +-
 include/drm/drm_framebuffer.h                      |  250 ++
 include/drm/drm_gem.h                              |    4 +-
 include/drm/drm_modes.h                            |   18 +-
 include/drm/drm_modeset.h                          |   70 +
 include/drm/drm_modeset_helper.h                   |   36 +
 include/drm/drm_modeset_helper_vtables.h           |    4 +-
 include/drm/drm_plane_helper.h                     |    4 +-
 include/linux/vgaarb.h                             |  128 +-
 90 files changed, 4378 insertions(+), 4055 deletions(-)
 rename Documentation/{vgaarbiter.txt => gpu/vgaarbiter.rst} (65%)
 create mode 100644 drivers/gpu/drm/drm_connector.c
 rename include/drm/drm_dp_aux_dev.h => drivers/gpu/drm/drm_crtc_helper_internal.h (63%)
 create mode 100644 drivers/gpu/drm/drm_framebuffer.c
 create mode 100644 drivers/gpu/drm/drm_modeset_helper.c
 create mode 100644 include/drm/drm_connector.h
 create mode 100644 include/drm/drm_framebuffer.h
 create mode 100644 include/drm/drm_modeset.h
 create mode 100644 include/drm/drm_modeset_helper.h

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list