Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next
The conflict in intel_drv.h tripped me up a bit since a patch in dinq
moves all the functions around, but another one in drm-next removes a
single function. So I'ev figured backing this into a backmerge would
be good.
i915_dma.c is just adjacent lines changed, nothing nefarious there.
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_drv.h
Signed-off-by: 
Daniel Vetter <daniel.vetter@ffwll.ch>
Showing
- drivers/gpu/drm/ast/ast_drv.c 0 additions, 1 deletiondrivers/gpu/drm/ast/ast_drv.c
- drivers/gpu/drm/ast/ast_drv.h 0 additions, 1 deletiondrivers/gpu/drm/ast/ast_drv.h
- drivers/gpu/drm/ast/ast_main.c 0 additions, 6 deletionsdrivers/gpu/drm/ast/ast_main.c
- drivers/gpu/drm/cirrus/cirrus_drv.c 0 additions, 1 deletiondrivers/gpu/drm/cirrus/cirrus_drv.c
- drivers/gpu/drm/cirrus/cirrus_drv.h 0 additions, 1 deletiondrivers/gpu/drm/cirrus/cirrus_drv.h
- drivers/gpu/drm/cirrus/cirrus_main.c 0 additions, 6 deletionsdrivers/gpu/drm/cirrus/cirrus_main.c
- drivers/gpu/drm/drm_context.c 0 additions, 2 deletionsdrivers/gpu/drm/drm_context.c
- drivers/gpu/drm/drm_crtc_helper.c 3 additions, 3 deletionsdrivers/gpu/drm/drm_crtc_helper.c
- drivers/gpu/drm/drm_dp_helper.c 8 additions, 8 deletionsdrivers/gpu/drm/drm_dp_helper.c
- drivers/gpu/drm/drm_drv.c 0 additions, 71 deletionsdrivers/gpu/drm/drm_drv.c
- drivers/gpu/drm/drm_edid.c 14 additions, 0 deletionsdrivers/gpu/drm/drm_edid.c
- drivers/gpu/drm/drm_edid_load.c 54 additions, 54 deletionsdrivers/gpu/drm/drm_edid_load.c
- drivers/gpu/drm/drm_fb_helper.c 2 additions, 11 deletionsdrivers/gpu/drm/drm_fb_helper.c
- drivers/gpu/drm/drm_fops.c 65 additions, 3 deletionsdrivers/gpu/drm/drm_fops.c
- drivers/gpu/drm/drm_gem.c 0 additions, 29 deletionsdrivers/gpu/drm/drm_gem.c
- drivers/gpu/drm/drm_global.c 0 additions, 2 deletionsdrivers/gpu/drm/drm_global.c
- drivers/gpu/drm/drm_info.c 3 additions, 3 deletionsdrivers/gpu/drm/drm_info.c
- drivers/gpu/drm/drm_irq.c 55 additions, 97 deletionsdrivers/gpu/drm/drm_irq.c
- drivers/gpu/drm/drm_lock.c 0 additions, 3 deletionsdrivers/gpu/drm/drm_lock.c
- drivers/gpu/drm/drm_pci.c 9 additions, 56 deletionsdrivers/gpu/drm/drm_pci.c
Loading
Please register or sign in to comment