Skip to contentSkip to conversation

topic/drm-misc

GIT PULL Daniel Vetter 1 participant 1 message Aug 13, 2015

lore
Share & tools
lore
#0 lore raw

Hi Dave,

Final drm-misc pull for 4.3:
- fbdev emulation Kconfig option for everyone thanks to Archit. It's not everything yet bit this is fairly tricky since it spawns all drivers.
- vgaarb & vgaswitcheroo polish from Thierry
- some drm_irq.c cleanups (Thierry)
- struct_mutex crusade from me
- more fbdev panic handling removal
- various things all over in drm core&helpers

Note that this pull is relative to my earlier drm-misc pull that's still outstanding, so please take them both.

Eric, this contains the patch to make encoder->mode_fixup optional I talked about in my vc4 review. You can base vc4 on this tag here, it'll stay stable.

Cheers, Daniel

The following changes since commit 8c10342cb48f3140d9abeadcfd2fa6625d447282:

drm/atomic: Update legacy DPMS state during modesets, v3. (2015-07-27 16:23:29 +0200)

are available in the git repository at:

git://anongit.freedesktop.org/drm-intel tags/topic/drm-misc-2015-08-13

for you to fetch changes up to d4853630b334017cab9a4602f5e9677e3b792c8a:

drm/atomic: Use KMS VBLANK API (2015-08-12 17:41:30 +0200)

----------------------------------------------------------------
Archit Taneja (25):
drm/fb_helper: Add drm_fb_helper functions to manage fb_info creation drm/fb_helper: Create a wrapper for unlink_framebuffer drm/fb_helper: Create wrappers for fb_sys_read/write funcs drm/fb_helper: Create wrappers for blit, copyarea and fillrect funcs drm/fb_helper: Create a wrapper for fb_set_suspend drm/rockchip: Use new drm_fb_helper functions
drm/armada: Use new drm_fb_helper functions
drm/ast: Use new drm_fb_helper functions
drm/tegra: Use new drm_fb_helper functions
drm/msm: Use new drm_fb_helper functions
drm/exynos: Use new drm_fb_helper functions
drm/gma500: Use new drm_fb_helper functions
drm/qxl: Use new drm_fb_helper functions
drm/udl: Use new drm_fb_helper functions drm/fb_cma_helper: Use new drm_fb_helper functions drm/cirrus: Use new drm_fb_helper functions
drm/omap: Use new drm_fb_helper functions
drm/mgag200: Use new drm_fb_helper functions
drm/radeon: Use new drm_fb_helper functions
drm/i915: Use new drm_fb_helper functions
drm/nouveau: Use new drm_fb_helper functions
drm/bochs: Use new drm_fb_helper functions
drm/amdgpu: Use new drm_fb_helper functions
drm/virtio: Use new drm_fb_helper functions
drm: Add top level Kconfig option for DRM fbdev emulation

Daniel Vetter (19):
drm/omap: Fixup compile fail
drm/fbdev: Return -EBUSY when oopsing
drm/fb-helper: Stop using trylocks in force_restore
drm: Remove __drm_modeset_lock_all
drm: Fixup locking WARNINGs in drm_mode_config_reset drm/gem: Be more friendly with locking checks
drm/ast: Don't grab dev->struct_mutex for in mmap offset ioctl drm/bochs: Don't grab dev->struct_mutex for in mmap offset ioctl drm/mga200g: Don't grab dev->struct_mutex for in mmap offset ioctl drm/mga200g: Hold a proper reference for cursor_set drm/cirrus: Don't grab dev->struct_mutex for in mmap offset ioctl drm/cma-helper: Don't grab dev->struct_mutex for in mmap offset ioctl drm/rockchip: Don't grab dev->struct_mutex for in mmap offset ioctl drm/nouveau: Don't take dev->struct_mutex in ttm_fini drm/qxl: Don't take dev->struct_mutex in bo_force_delete drm/edid: Use ARRAY_SIZE in drm_add_modes_noedid drm/atomic: Paper over locking WARN in default_state_clear drm/atomic: Call ww_acquire_done after check phase is complete drm/i915: Use CONFIG_DRM_FBDEV_EMULATION

Geert Uytterhoeven (2):
drm/fb-helper: Clarify drm_fb_helper_restore_fbdev_mode*() drm/fb-helper: Move drm_fb_helper_force_kernel_mode() inside #ifdef

Inki Dae (1):
drm/atomic: fix null pointer access to mode_fixup callback

Maarten Lankhorst (1):
drm/core: Set mode to NULL when connectors in a set drops to 0.

Thierry Reding (16):
drm: Remove two-level menu in Kconfig
vgaarb: Stop complaining about absent devices
vgaarb: Use vgaarb: prefix consistently in messages
vgaarb: Fix a few checkpatch errors and warnings
vga_switcheroo: Use pr_*() instead of printk()
vga_switcheroo: Cleanup header comment
vga_switcheroo: Use pr_fmt()
vga_switcheroo: Wrap overly long lines
vga_switcheroo: Remove unnecessary checks drm/plane: Use consistent data types for format count drm/plane: Remove redundant extern
drm/irq: Remove negative CRTC index special-case drm/irq: Check for valid VBLANK before dereference drm/irq: Make pipe unsigned and name consistent drm/irq: Document return values more consistently drm/atomic: Use KMS VBLANK API

Viresh Kumar (1):
drivers: gpu: Drop unlikely before IS_ERR(_OR_NULL)

 drivers/gpu/drm/Kconfig                       |  20 ++
 drivers/gpu/drm/Makefile                      |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c        |  45 ++--
 drivers/gpu/drm/armada/armada_fbdev.c         |  33 +--
 drivers/gpu/drm/ast/ast_fb.c                  |  48 ++--
 drivers/gpu/drm/ast/ast_main.c                |  16 +-
 drivers/gpu/drm/bochs/bochs_drv.c             |   4 +-
 drivers/gpu/drm/bochs/bochs_fbdev.c           |  36 +--
 drivers/gpu/drm/bochs/bochs_mm.c              |  16 +-
 drivers/gpu/drm/cirrus/cirrus_drv.c           |   4 +-
 drivers/gpu/drm/cirrus/cirrus_fbdev.c         |  41 +---
 drivers/gpu/drm/cirrus/cirrus_main.c          |  15 +-
 drivers/gpu/drm/drm_atomic.c                  |  15 +-
 drivers/gpu/drm/drm_atomic_helper.c           |   6 +-
 drivers/gpu/drm/drm_crtc.c                    |   6 +-
 drivers/gpu/drm/drm_edid.c                    |   2 +-
 drivers/gpu/drm/drm_fb_cma_helper.c           |  45 +---
 drivers/gpu/drm/drm_fb_helper.c               | 336 +++++++++++++++++++++-----
 drivers/gpu/drm/drm_gem.c                     |   2 +-
 drivers/gpu/drm/drm_gem_cma_helper.c          |   7 +-
 drivers/gpu/drm/drm_irq.c                     | 330 +++++++++++++------------
 drivers/gpu/drm/drm_modeset_lock.c            |  52 +---
 drivers/gpu/drm/exynos/exynos_drm_fbdev.c     |  47 +---
 drivers/gpu/drm/gma500/accel_2d.c             |   6 +-
 drivers/gpu/drm/gma500/framebuffer.c          |  48 ++--
 drivers/gpu/drm/i915/Kconfig                  |  15 --
 drivers/gpu/drm/i915/Makefile                 |   2 +-
 drivers/gpu/drm/i915/i915_debugfs.c           |   2 +-
 drivers/gpu/drm/i915/i915_drv.h               |   2 +-
 drivers/gpu/drm/i915/intel_display.c          |   6 +-
 drivers/gpu/drm/i915/intel_dp_mst.c           |   4 +-
 drivers/gpu/drm/i915/intel_drv.h              |   2 +-
 drivers/gpu/drm/i915/intel_fbdev.c            |  61 +----
 drivers/gpu/drm/mgag200/mgag200_cursor.c      |  22 +-
 drivers/gpu/drm/mgag200/mgag200_fb.c          |  39 +--
 drivers/gpu/drm/mgag200/mgag200_main.c        |  16 +-
 drivers/gpu/drm/msm/msm_fbdev.c               |  34 +--
 drivers/gpu/drm/nouveau/dispnv04/overlay.c    |   2 +-
 drivers/gpu/drm/nouveau/nouveau_fbcon.c       |  39 +--
 drivers/gpu/drm/nouveau/nouveau_ttm.c         |   2 -
 drivers/gpu/drm/omapdrm/omap_crtc.c           |   6 +-
 drivers/gpu/drm/omapdrm/omap_fbdev.c          |  38 +--
 drivers/gpu/drm/qxl/qxl_fb.c                  |  40 +--
 drivers/gpu/drm/qxl/qxl_object.c              |   4 +-
 drivers/gpu/drm/radeon/radeon_fb.c            |  42 +---
 drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c |  47 +---
 drivers/gpu/drm/rockchip/rockchip_drm_gem.c   |  12 +-
 drivers/gpu/drm/tegra/fb.c                    |  35 +--
 drivers/gpu/drm/ttm/ttm_tt.c                  |   4 +-
 drivers/gpu/drm/udl/udl_fb.c                  |  41 +---
 drivers/gpu/drm/virtio/virtgpu_fb.c           |  32 +--
 drivers/gpu/drm/vmwgfx/vmwgfx_context.c       |   2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c           |   2 +-
 drivers/gpu/vga/vga_switcheroo.c              |  95 +++++---
 drivers/gpu/vga/vgaarb.c                      | 142 ++++++-----
 drivers/video/Kconfig                         |   2 -
 include/drm/drmP.h                            |  32 +--
 include/drm/drm_crtc.h                        |   6 +-
 include/drm/drm_fb_helper.h                   | 212 ++++++++++++++++
 include/drm/drm_modeset_lock.h                |   1 -
 include/drm/drm_plane_helper.h                |  45 ++--
 61 files changed, 1163 insertions(+), 1107 deletions(-)
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx