dim: FAILURE: Could not merge drm-intel/drm-intel-next-queued

Noralf Trønnes noralf at tronnes.org
Sun Oct 8 23:45:16 UTC 2017


Den 08.10.2017 23.36, skrev Noralf Trønnes:
>
> Den 08.10.2017 19.49, skrev Daniel Vetter:
>> On Sun, Oct 8, 2017 at 5:00 PM, Noralf Trønnes <noralf at tronnes.org> 
>> wrote:
>>> Hi,
>>>
>>> Should I do something about this error:
>> Yes.
>>
>>> notro at agl:~/drm-linux/src$ dim push-branch drm-misc-next
>>> Counting objects: 6, done.
>>> Delta compression using up to 4 threads.
>>> Compressing objects: 100% (6/6), done.
>>> Writing objects: 100% (6/6), 1.50 KiB | 0 bytes/s, done.
>>> Total 6 (delta 5), reused 0 (delta 0)
>>> To ssh://git.freedesktop.org/git/drm-misc
>>>     2f733d6..2e187b2  drm-misc-next -> drm-misc-next
>>> Pushing drm-misc-fixes to for-linux-next-fixes... Everything up-to-date
>>> Done.
>>> Out of merge window. Pushing drm-misc-next to for-linux-next... Done.
>>> Updating rerere cache... Done.
>>> Reloading nightly.conf... Done.
>>> dim: No git remote for any of the URLs 
>>> ssh://git.freedesktop.org/git/drm-tip
>>> found in /home/notro/drm-linux/drm-tip
>>> Enter a name to auto-add this remote, leave blank to abort: drm-tip
>>> Fetching drm-tip (local remote drm-tip)... Done.
>>> Fetching sound-upstream (local remote sound)... Done.
>>> Fetching drm-intel (local remote drm-intel)... Done.
>>> Fetching drm-tip (local remote drm-tip)... Done.
>>> Fetching drm-misc (local remote drm-misc)... Done.
>>> Fetching linux-upstream (local remote origin)... Done.
>>> Fetching drm-amd (local remote drm-amd)... Done.
>>> Fetching drm-upstream (local remote airlied)... Done.
>>> Merging drm-intel (local remote drm-intel) drm-intel-fixes... Reset. 
>>> Done.
>>> Merging drm-upstream (local remote airlied) drm-fixes... 
>>> Fast-forward. Done.
>>> Merging drm-intel (local remote drm-intel) drm-intel-next-fixes...
>>> Fast-forward. Done.
>>> Merging drm-intel (local remote drm-intel) drm-intel-next-queued... 
>>> dim:
>>> dim: FAILURE: Could not merge drm-intel/drm-intel-next-queued
>>> dim: See the section "Resolving Conflicts when Rebuilding drm-tip"
>>> dim: in the drm-intel.rst documentation for how to handle this 
>>> situation.
>> Follow the above instruction and see the section of the manual, it
>> explains what's going on. If you don't do this right away the next
>> person who pushes gets to clean up your conflict, which is not too
>> nice.
>>
>>> Running dim update-branches afterwards didn't give any errors:
>> dim rebuild-tip is what failed, dim update-branches just pulls. Manual
>> should explain it all in more detail.
>

I'll be away for 12+ hours if this has to be resolved at my end.

This is what I did:

$ dim update-branches

Check that I was up to date
$ git log -1

Apply patch
[v3] drm/gem-fb-helper: Improve documentation
https://patchwork.freedesktop.org/patch/178413/

Make sure it compiles

$ dim push-branch drm-misc-next


Full session log:
https://gist.githubusercontent.com/notro/d4a4eee1ad0c957be98d2855a818d407/raw/84e43a4cf5162c67fafaece3805fd4af985bc2f0/gistfile1.txt

dim and the repo's behind it is a black box to me.
So I don't know how to verify this first step in the manual:

1. First check that drm-intel-next-queued was indeed pushed correctly 
and that
    your local and remote branches match.

That means I didn't dare run: dim rebuild-tip, as step 2 says.

Noralf.

> I have know idea how to solve this:
>
> notro at agl:~/drm-linux/src$ git status
> On branch drm-misc-next
> Your branch is up-to-date with 'drm-misc/drm-misc-next'.
>
> It took 3.99 seconds to enumerate untracked files. 'status -uno'
> may speed it up, but you have to be careful not to forget to add
> new files yourself (see 'git help status').
> nothing to commit, working directory clean
>
> notro at agl:~/drm-linux/src$ cd ..
> notro at agl:~/drm-linux$ cd drm-tip/
> notro at agl:~/drm-linux/drm-tip$ git status
> On branch drm-tip
> Your branch is behind 'tip/drm-tip' by 763 commits, and can be 
> fast-forwarded.
>   (use "git pull" to update your local branch)
> You have unmerged paths.
>   (fix conflicts and run "git commit")
>
> Changes to be committed:
>
>         modified: Documentation/admin-guide/kernel-parameters.txt
>         new file: 
> Documentation/devicetree/bindings/display/faraday,tve200.txt
>         new file: 
> Documentation/devicetree/bindings/display/panel/orisetech,otm8009a.txt
>         new file: 
> Documentation/devicetree/bindings/display/panel/samsung,s6e63j0x03.txt
>         new file: 
> Documentation/devicetree/bindings/display/panel/seiko,43wvf1g.txt
>         new file: 
> Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt
>         modified: Documentation/devicetree/bindings/vendor-prefixes.txt
>         modified:   Documentation/gpu/drm-uapi.rst
>         modified:   Documentation/gpu/index.rst
>         modified:   Documentation/gpu/todo.rst
>         new file:   Documentation/gpu/tve200.rst
>         modified:   MAINTAINERS
>         modified:   drivers/dma-buf/sw_sync.c
>         modified:   drivers/gpu/drm/Kconfig
>         modified:   drivers/gpu/drm/Makefile
>         modified:   drivers/gpu/drm/amd/amdgpu/Makefile
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu.h
>         modified: drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
>         modified: drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c
>         new file:   drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
>         renamed: drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.h -> 
> drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>         modified:   drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
>         modified:   drivers/gpu/drm/amd/amdgpu/atom.c
>         modified:   drivers/gpu/drm/amd/amdgpu/atom.h
>         modified:   drivers/gpu/drm/amd/amdgpu/ci_dpm.c
>         modified:   drivers/gpu/drm/amd/amdgpu/cik_dpm.h
>         modified:   drivers/gpu/drm/amd/amdgpu/cik_ih.c
>         modified:   drivers/gpu/drm/amd/amdgpu/cik_sdma.c
>         modified:   drivers/gpu/drm/amd/amdgpu/cz_ih.c
>         modified:   drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
>         modified:   drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
>         modified:   drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c
>         modified:   drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
>         modified:   drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
>         modified:   drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
>         modified:   drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
>         modified:   drivers/gpu/drm/amd/amdgpu/iceland_ih.c
>         modified:   drivers/gpu/drm/amd/amdgpu/kv_dpm.c
>         modified:   drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
>         modified:   drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h
>         modified:   drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h
>         modified:   drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
>         modified:   drivers/gpu/drm/amd/amdgpu/psp_v10_0.h
>         modified:   drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
>         modified:   drivers/gpu/drm/amd/amdgpu/psp_v3_1.h
>         modified:   drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
>         modified:   drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
>         modified:   drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>         modified:   drivers/gpu/drm/amd/amdgpu/si_dma.c
>         modified:   drivers/gpu/drm/amd/amdgpu/si_dpm.c
>         modified:   drivers/gpu/drm/amd/amdgpu/si_dpm.h
>         modified:   drivers/gpu/drm/amd/amdgpu/si_ih.c
>         modified:   drivers/gpu/drm/amd/amdgpu/soc15.c
>         modified:   drivers/gpu/drm/amd/amdgpu/tonga_ih.c
>         modified:   drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
>         modified:   drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
>         modified:   drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
>         modified:   drivers/gpu/drm/amd/amdgpu/vega10_ih.c
>         modified:   drivers/gpu/drm/amd/amdkfd/kfd_device.c
>         modified:   drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c
>         modified:   drivers/gpu/drm/amd/amdkfd/kfd_module.c
>         modified:   drivers/gpu/drm/amd/amdkfd/kfd_pasid.c
>         modified:   drivers/gpu/drm/amd/amdkfd/kfd_priv.h
>         modified:   drivers/gpu/drm/amd/amdkfd/kfd_process.c
>         modified:   drivers/gpu/drm/amd/include/amd_shared.h
>         modified: 
> drivers/gpu/drm/amd/include/asic_reg/smu/smu_7_0_1_sh_mask.h
>         modified:   drivers/gpu/drm/amd/include/atomfirmware.h
>         modified:   drivers/gpu/drm/amd/include/cgs_common.h
>         modified: drivers/gpu/drm/amd/include/kgd_kfd_interface.h
>         new file:   drivers/gpu/drm/amd/include/linux/chash.h
>         modified:   drivers/gpu/drm/amd/include/v9_structs.h
>         modified:   drivers/gpu/drm/amd/include/vi_structs.h
>         new file:   drivers/gpu/drm/amd/lib/Kconfig
>         new file:   drivers/gpu/drm/amd/lib/Makefile
>         new file:   drivers/gpu/drm/amd/lib/chash.c
>         modified:   drivers/gpu/drm/amd/powerplay/Makefile
>         modified:   drivers/gpu/drm/amd/powerplay/amd_powerplay.c
>         deleted: drivers/gpu/drm/amd/powerplay/eventmgr/Makefile
>         deleted: 
> drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c
>         deleted: 
> drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.h
>         deleted: drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c
>         deleted: drivers/gpu/drm/amd/powerplay/eventmgr/eventmanagement.c
>         deleted: drivers/gpu/drm/amd/powerplay/eventmgr/eventmanagement.h
>         deleted: drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c
>         deleted: drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.c
>         deleted: drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.h
>         deleted: drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c
>         deleted: drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.h
>         deleted:    drivers/gpu/drm/amd/powerplay/eventmgr/psm.c
>         modified:   drivers/gpu/drm/amd/powerplay/hwmgr/Makefile
>         modified: 
> drivers/gpu/drm/amd/powerplay/hwmgr/cz_clockpowergating.c
>         modified: 
> drivers/gpu/drm/amd/powerplay/hwmgr/cz_clockpowergating.h
>         modified:   drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c
>         deleted: drivers/gpu/drm/amd/powerplay/hwmgr/functiontables.c
>         modified: drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c
>         modified:   drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
>         new file:   drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c
>         renamed:    drivers/gpu/drm/amd/powerplay/eventmgr/psm.h -> 
> drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.h
>         modified: drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c
>         modified: drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h
>         modified: 
> drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c
>         modified: drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c
>         modified:   drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c
>         modified:   drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.h
>         modified: 
> drivers/gpu/drm/amd/powerplay/hwmgr/smu7_clockpowergating.c
>         modified: 
> drivers/gpu/drm/amd/powerplay/hwmgr/smu7_clockpowergating.h
>         modified: drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
>         modified: drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h
>         modified: drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c
>         modified: drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c
>         modified: drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h
>         modified: drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c
>         modified: drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c
>         modified: drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c
>         modified: drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h
>         modified: drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h
>         deleted: drivers/gpu/drm/amd/powerplay/inc/eventmanager.h
>         deleted:    drivers/gpu/drm/amd/powerplay/inc/eventmgr.h
>         modified: drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h
>         modified:   drivers/gpu/drm/amd/powerplay/inc/hwmgr.h
>         modified: drivers/gpu/drm/amd/powerplay/inc/pp_instance.h
>         modified:   drivers/gpu/drm/amd/powerplay/inc/smumgr.h
>         modified:   drivers/gpu/drm/amd/powerplay/smumgr/Makefile
>         new file:   drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.c
>         new file:   drivers/gpu/drm/amd/powerplay/smumgr/ci_smc.h
>         new file: drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
>         new file: drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.h
>         modified: drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c
>         modified: drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
>         modified: drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
>         modified: drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
>         modified: drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
>         modified: drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.h
>         modified: drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
>         modified: drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c
>         modified: drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c
>         modified: drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.h
>         modified: drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c
>         modified: drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h
>         modified:   drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c
>         modified: drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
>         modified: drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.h
>         modified: drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c
>         modified: drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c
>         modified: drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h
>         modified:   drivers/gpu/drm/arc/arcpgu_drv.c
>         modified:   drivers/gpu/drm/arm/hdlcd_drv.c
>         modified:   drivers/gpu/drm/arm/malidp_drv.c
>         modified:   drivers/gpu/drm/armada/Makefile
>         modified:   drivers/gpu/drm/armada/armada_drv.c
>         modified:   drivers/gpu/drm/armada/armada_gem.c
>         modified:   drivers/gpu/drm/armada/armada_gem.h
>         modified:   drivers/gpu/drm/armada/armada_trace.h
>         modified:   drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
>         modified:   drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h
>         modified:   drivers/gpu/drm/bridge/adv7511/adv7511.h
>         modified:   drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
>         modified:   drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
>         modified:   drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c
>         modified:   drivers/gpu/drm/drm_atomic.c
>         modified:   drivers/gpu/drm/drm_atomic_helper.c
>         modified:   drivers/gpu/drm/drm_bridge.c
>         modified:   drivers/gpu/drm/drm_connector.c
>         modified:   drivers/gpu/drm/drm_crtc.c
>         modified:   drivers/gpu/drm/drm_debugfs_crc.c
>         modified:   drivers/gpu/drm/drm_dp_mst_topology.c
>         modified:   drivers/gpu/drm/drm_edid.c
>         modified:   drivers/gpu/drm/drm_edid_load.c
>         modified:   drivers/gpu/drm/drm_fb_helper.c
>         modified:   drivers/gpu/drm/drm_gem.c
>         modified:   drivers/gpu/drm/drm_gem_framebuffer_helper.c
>         modified:   drivers/gpu/drm/drm_kms_helper_common.c
>         modified:   drivers/gpu/drm/drm_mode_object.c
>         modified:   drivers/gpu/drm/drm_modeset_lock.c
>         modified:   drivers/gpu/drm/drm_plane.c
>         modified:   drivers/gpu/drm/drm_probe_helper.c
>         modified:   drivers/gpu/drm/drm_scdc_helper.c
>         modified:   drivers/gpu/drm/drm_syncobj.c
>         modified:   drivers/gpu/drm/drm_trace.h
>         modified:   drivers/gpu/drm/exynos/exynos_drm_mic.c
>         modified:   drivers/gpu/drm/gma500/cdv_intel_dp.c
>         modified:   drivers/gpu/drm/gma500/mdfld_intel_display.c
>         modified:   drivers/gpu/drm/i2c/ch7006_drv.c
>         modified:   drivers/gpu/drm/i2c/sil164_drv.c
>         modified:   drivers/gpu/drm/i2c/tda998x_drv.c
>         modified:   drivers/gpu/drm/i915/Kconfig
>         modified:   drivers/gpu/drm/i915/Makefile
>         modified:   drivers/gpu/drm/i915/gvt/aperture_gm.c
>         modified:   drivers/gpu/drm/i915/gvt/cfg_space.c
>         modified:   drivers/gpu/drm/i915/gvt/cmd_parser.c
>         modified:   drivers/gpu/drm/i915/gvt/execlist.c
>         modified:   drivers/gpu/drm/i915/gvt/gtt.c
>         modified:   drivers/gpu/drm/i915/gvt/gvt.c
>         modified:   drivers/gpu/drm/i915/gvt/gvt.h
>         modified:   drivers/gpu/drm/i915/gvt/kvmgt.c
>         modified:   drivers/gpu/drm/i915/gvt/mmio.c
>         modified:   drivers/gpu/drm/i915/gvt/render.c
>         modified:   drivers/gpu/drm/i915/gvt/scheduler.c
>         modified:   drivers/gpu/drm/i915/gvt/scheduler.h
>         modified:   drivers/gpu/drm/i915/i915_debugfs.c
>         modified:   drivers/gpu/drm/i915/i915_drv.c
>         modified:   drivers/gpu/drm/i915/i915_drv.h
>         modified:   drivers/gpu/drm/i915/i915_gem.c
>         modified:   drivers/gpu/drm/i915/i915_gem_context.c
>         modified:   drivers/gpu/drm/i915/i915_gem_dmabuf.c
>         modified:   drivers/gpu/drm/i915/i915_gem_execbuffer.c
>         modified:   drivers/gpu/drm/i915/i915_gem_fence_reg.c
>         modified:   drivers/gpu/drm/i915/i915_gem_gtt.c
>         modified:   drivers/gpu/drm/i915/i915_gem_gtt.h
>         modified:   drivers/gpu/drm/i915/i915_gem_internal.c
>         modified:   drivers/gpu/drm/i915/i915_gem_object.h
>         modified:   drivers/gpu/drm/i915/i915_gem_request.c
>         modified:   drivers/gpu/drm/i915/i915_gem_request.h
>         modified:   drivers/gpu/drm/i915/i915_gem_stolen.c
>         modified:   drivers/gpu/drm/i915/i915_gem_userptr.c
>         new file:   drivers/gpu/drm/i915/i915_gemfs.c
>         new file:   drivers/gpu/drm/i915/i915_gemfs.h
>         modified:   drivers/gpu/drm/i915/i915_gpu_error.c
>         modified:   drivers/gpu/drm/i915/i915_guc_submission.c
>         new file:   drivers/gpu/drm/i915/i915_guc_submission.h
>         modified:   drivers/gpu/drm/i915/i915_irq.c
>         new file:   drivers/gpu/drm/i915/i915_oa_cflgt2.c
>         new file:   drivers/gpu/drm/i915/i915_oa_cflgt2.h
>         modified:   drivers/gpu/drm/i915/i915_params.c
>         modified:   drivers/gpu/drm/i915/i915_params.h
>         modified:   drivers/gpu/drm/i915/i915_pci.c
>         modified:   drivers/gpu/drm/i915/i915_perf.c
>         modified:   drivers/gpu/drm/i915/i915_reg.h
>         modified:   drivers/gpu/drm/i915/i915_suspend.c
>         modified:   drivers/gpu/drm/i915/i915_sw_fence.c
>         modified:   drivers/gpu/drm/i915/i915_trace.h
>         modified:   drivers/gpu/drm/i915/i915_utils.h
>         modified:   drivers/gpu/drm/i915/i915_vma.c
>         modified:   drivers/gpu/drm/i915/i915_vma.h
>         modified:   drivers/gpu/drm/i915/intel_atomic_plane.c
>         modified:   drivers/gpu/drm/i915/intel_bios.c
>         modified:   drivers/gpu/drm/i915/intel_breadcrumbs.c
>         modified:   drivers/gpu/drm/i915/intel_cdclk.c
>         modified:   drivers/gpu/drm/i915/intel_color.c
>         modified:   drivers/gpu/drm/i915/intel_crt.c
>         modified:   drivers/gpu/drm/i915/intel_csr.c
>         modified:   drivers/gpu/drm/i915/intel_ddi.c
>         modified:   drivers/gpu/drm/i915/intel_device_info.c
>         modified:   drivers/gpu/drm/i915/intel_display.c
>         modified:   drivers/gpu/drm/i915/intel_dp.c
>         modified:   drivers/gpu/drm/i915/intel_dp_aux_backlight.c
>         modified:   drivers/gpu/drm/i915/intel_dp_mst.c
>         modified:   drivers/gpu/drm/i915/intel_drv.h
>         modified:   drivers/gpu/drm/i915/intel_dsi.c
>         modified:   drivers/gpu/drm/i915/intel_dvo.c
>         modified:   drivers/gpu/drm/i915/intel_engine_cs.c
>         modified:   drivers/gpu/drm/i915/intel_fbc.c
>         modified:   drivers/gpu/drm/i915/intel_fbdev.c
>         modified:   drivers/gpu/drm/i915/intel_fifo_underrun.c
>         new file:   drivers/gpu/drm/i915/intel_guc.c
>         new file:   drivers/gpu/drm/i915/intel_guc.h
>         modified:   drivers/gpu/drm/i915/intel_guc_fwif.h
>         modified:   drivers/gpu/drm/i915/intel_guc_loader.c
>         modified:   drivers/gpu/drm/i915/intel_guc_log.c
>         new file:   drivers/gpu/drm/i915/intel_guc_log.h
>         modified:   drivers/gpu/drm/i915/intel_gvt.c
>         modified:   drivers/gpu/drm/i915/intel_hangcheck.c
>         modified:   drivers/gpu/drm/i915/intel_hdmi.c
>         modified:   drivers/gpu/drm/i915/intel_huc.c
>         new file:   drivers/gpu/drm/i915/intel_huc.h
>         modified:   drivers/gpu/drm/i915/intel_lrc.c
>         modified:   drivers/gpu/drm/i915/intel_lrc.h
>         modified:   drivers/gpu/drm/i915/intel_lvds.c
>         modified:   drivers/gpu/drm/i915/intel_opregion.c
>         modified:   drivers/gpu/drm/i915/intel_panel.c
>         modified:   drivers/gpu/drm/i915/intel_pipe_crc.c
>         modified:   drivers/gpu/drm/i915/intel_pm.c
>         modified:   drivers/gpu/drm/i915/intel_psr.c
>         modified:   drivers/gpu/drm/i915/intel_ringbuffer.c
>         modified:   drivers/gpu/drm/i915/intel_ringbuffer.h
>         modified:   drivers/gpu/drm/i915/intel_sdvo.c
>         modified:   drivers/gpu/drm/i915/intel_sprite.c
>         modified:   drivers/gpu/drm/i915/intel_tv.c
>         modified:   drivers/gpu/drm/i915/intel_uc.c
>         modified:   drivers/gpu/drm/i915/intel_uc.h
>         new file:   drivers/gpu/drm/i915/intel_uc_fw.c
>         new file:   drivers/gpu/drm/i915/intel_uc_fw.h
>         modified:   drivers/gpu/drm/i915/intel_uncore.c
>         modified:   drivers/gpu/drm/i915/intel_uncore.h
>         modified:   drivers/gpu/drm/i915/intel_vbt_defs.h
>         modified: drivers/gpu/drm/i915/selftests/huge_gem_object.c
>         new file:   drivers/gpu/drm/i915/selftests/huge_pages.c
>         modified:   drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
>         modified: drivers/gpu/drm/i915/selftests/i915_gem_request.c
>         modified: drivers/gpu/drm/i915/selftests/i915_gem_timeline.c
>         modified: drivers/gpu/drm/i915/selftests/i915_live_selftests.h
>         modified: drivers/gpu/drm/i915/selftests/i915_mock_selftests.h
>         modified:   drivers/gpu/drm/i915/selftests/i915_random.c
>         modified:   drivers/gpu/drm/i915/selftests/i915_random.h
>         modified: drivers/gpu/drm/i915/selftests/intel_hangcheck.c
>         modified: drivers/gpu/drm/i915/selftests/mock_gem_device.c
>         modified:   drivers/gpu/drm/i915/selftests/mock_gtt.c
>         modified:   drivers/gpu/drm/i915/selftests/scatterlist.c
>         modified:   drivers/gpu/drm/imx/imx-drm-core.c
>         modified:   drivers/gpu/drm/imx/ipuv3-plane.c
>         modified:   drivers/gpu/drm/mediatek/mtk_hdmi.c
>         modified:   drivers/gpu/drm/panel/Kconfig
>         modified:   drivers/gpu/drm/panel/Makefile
>         new file: drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
>         new file: drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c
>         new file:   drivers/gpu/drm/panel/panel-seiko-43wvf1g.c
>         modified:   drivers/gpu/drm/panel/panel-simple.c
>         modified:   drivers/gpu/drm/pl111/Kconfig
>         modified:   drivers/gpu/drm/pl111/Makefile
>         deleted:    drivers/gpu/drm/pl111/pl111_connector.c
>         modified:   drivers/gpu/drm/pl111/pl111_debugfs.c
>         modified:   drivers/gpu/drm/pl111/pl111_display.c
>         modified:   drivers/gpu/drm/pl111/pl111_drm.h
>         modified:   drivers/gpu/drm/pl111/pl111_drv.c
>         new file:   drivers/gpu/drm/pl111/pl111_versatile.c
>         new file:   drivers/gpu/drm/pl111/pl111_versatile.h
>         modified:   drivers/gpu/drm/radeon/Makefile
>         modified:   drivers/gpu/drm/radeon/r600_hdmi.c
>         modified:   drivers/gpu/drm/radeon/radeon_fb.c
>         modified:   drivers/gpu/drm/radeon/radeon_kfd.c
>         modified:   drivers/gpu/drm/radeon/radeon_trace.h
>         modified:   drivers/gpu/drm/radeon/radeon_ttm.c
>         modified:   drivers/gpu/drm/rockchip/Kconfig
>         modified:   drivers/gpu/drm/rockchip/Makefile
>         modified: drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
>         modified:   drivers/gpu/drm/rockchip/cdn-dp-reg.c
>         modified:   drivers/gpu/drm/rockchip/dw-mipi-dsi.c
>         modified:   drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
>         modified:   drivers/gpu/drm/rockchip/inno_hdmi.c
>         modified:   drivers/gpu/drm/rockchip/rockchip_drm_drv.c
>         modified:   drivers/gpu/drm/rockchip/rockchip_drm_drv.h
>         modified:   drivers/gpu/drm/rockchip/rockchip_drm_fb.c
>         modified:   drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c
>         modified:   drivers/gpu/drm/rockchip/rockchip_drm_vop.c
>         new file:   drivers/gpu/drm/rockchip/rockchip_lvds.c
>         new file:   drivers/gpu/drm/rockchip/rockchip_lvds.h
>         modified:   drivers/gpu/drm/rockchip/rockchip_vop_reg.c
>         modified:   drivers/gpu/drm/sti/sti_drv.c
>         modified:   drivers/gpu/drm/sti/sti_dvo.c
>         modified:   drivers/gpu/drm/stm/drv.c
>         modified:   drivers/gpu/drm/stm/dw_mipi_dsi-stm.c
>         modified:   drivers/gpu/drm/sun4i/sun4i_drv.c
>         modified:   drivers/gpu/drm/sun4i/sun4i_tcon.c
>         modified:   drivers/gpu/drm/sun4i/sun4i_tcon.h
>         modified:   drivers/gpu/drm/tilcdc/tilcdc_drv.c
>         modified:   drivers/gpu/drm/tinydrm/mi0283qt.c
>         modified:   drivers/gpu/drm/tinydrm/mipi-dbi.c
>         modified:   drivers/gpu/drm/tinydrm/repaper.c
>         modified:   drivers/gpu/drm/tinydrm/st7586.c
>         modified:   drivers/gpu/drm/ttm/ttm_bo.c
>         modified:   drivers/gpu/drm/ttm/ttm_bo_util.c
>         modified:   drivers/gpu/drm/ttm/ttm_page_alloc.c
>         modified:   drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
>         new file:   drivers/gpu/drm/tve200/Kconfig
>         new file:   drivers/gpu/drm/tve200/Makefile
>         new file:   drivers/gpu/drm/tve200/tve200_display.c
>         new file:   drivers/gpu/drm/tve200/tve200_drm.h
>         new file:   drivers/gpu/drm/tve200/tve200_drv.c
>         modified:   drivers/gpu/drm/vc4/Makefile
>         modified:   drivers/gpu/drm/vc4/vc4_hdmi.c
>         modified:   drivers/gpu/drm/vc4/vc4_trace.h
>         modified:   drivers/gpu/drm/zte/zx_drm_drv.c
>         modified:   drivers/media/v4l2-core/videobuf2-dma-contig.c
>         modified:   drivers/rapidio/devices/rio_mport_cdev.c
>         modified:   include/drm/drm_atomic.h
>         modified:   include/drm/drm_bridge.h
>         modified:   include/drm/drm_connector.h
>         modified:   include/drm/drm_crtc.h
>         modified:   include/drm/drm_dp_helper.h
>         modified:   include/drm/drm_dp_mst_helper.h
>         modified:   include/drm/drm_edid.h
>         modified:   include/drm/drm_gem_framebuffer_helper.h
>         modified:   include/drm/drm_modeset_helper_vtables.h
>         modified:   include/drm/drm_modeset_lock.h
>         modified:   include/drm/drm_plane.h
>         modified:   include/drm/i915_pciids.h
>         new file:   include/drm/ttm/ttm_debug.h
>         modified:   include/drm/ttm/ttm_page_alloc.h
>         modified:   include/linux/scatterlist.h
>         modified:   include/linux/shmem_fs.h
>         modified:   include/linux/sync_file.h
>         modified:   include/uapi/drm/amdgpu_drm.h
>         modified:   include/uapi/drm/drm_mode.h
>         modified:   include/uapi/drm/i915_drm.h
>         modified:   lib/scatterlist.c
>         modified:   mm/shmem.c
>         new file:   tools/testing/scatterlist/Makefile
>         new file:   tools/testing/scatterlist/linux/mm.h
>         new file:   tools/testing/scatterlist/main.c
>
> Unmerged paths:
>   (use "git add <file>..." to mark resolution)
>
>         both modified:   drivers/gpu/drm/i915/intel_runtime_pm.c
>
> notro at agl:~/drm-linux/drm-tip$ git diff
> diff --cc drivers/gpu/drm/i915/intel_runtime_pm.c
> index b3a087c,c4e1aba..0000000
> --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
> @@@ -2782,13 -2809,10 +2809,17 @@@ static void 
> cnl_display_core_init(struc
>
>         /* 6. Enable DBUF */
>         gen9_dbuf_enable(dev_priv);
> ++<<<<<<< HEAD
>  +
>  +      if (resume && dev_priv->csr.dmc_payload)
>  +              intel_csr_load_program(dev_priv);
>  +}
> ++=======
> ++>>>>>>> drm-intel/drm-intel-next-queued
>
> - #undef CNL_PROCMON_IDX
> - #undef NUM_CNL_PROCMON
> +       if (resume && dev_priv->csr.dmc_payload)
> +               intel_csr_load_program(dev_priv);
> + }
>
>   static void cnl_display_core_uninit(struct drm_i915_private *dev_priv)
>   {
>
>
>
>
>> -Daniel
>>
>>> notro at agl:~/drm-linux/src$ dim update-branches
>>> Fetching linux (local remote origin)... Done.
>>> Fetching sound-upstream (local remote sound)... Done.
>>> Fetching drm-intel (local remote drm-intel)... Done.
>>> Fetching drm-tip (local remote drm-tip)... Done.
>>> Fetching drm-misc (local remote drm-misc)... Done.
>>> Fetching linux-upstream (local remote origin)... Done.
>>> Fetching drm-amd (local remote drm-amd)... Done.
>>> Fetching drm-upstream (local remote airlied)... Done.
>>> Already on 'drm-misc-next'
>>> Your branch is up-to-date with 'drm-misc/drm-misc-next'.
>>> Already up-to-date.
>>> Updating maintainer-tools ...
>>> Current branch maintainer-tools is up to date.
>>> Updating rerere cache... Done.
>>>
>>> Noralf.
>>>
>>>
>>> _______________________________________________
>>> dim-tools mailing list
>>> dim-tools at lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/dim-tools
>>
>>
>
> _______________________________________________
> dim-tools mailing list
> dim-tools at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dim-tools
>



More information about the dim-tools mailing list