* [git pull] drm fixes for 4.10-rc6 (just missed rc5 tagging :-)
@ 2017-01-22 23:38 Dave Airlie
2017-01-23 8:13 ` Daniel Vetter
2017-01-25 8:33 ` Markus Trippelsdorf
0 siblings, 2 replies; 11+ messages in thread
From: Dave Airlie @ 2017-01-22 23:38 UTC (permalink / raw)
To: Linus Torvalds; +Cc: dri-devel, LKML
Hi Linus,
Okay holidays and LCA kinda caught up with me, I thought I'd get some
of this dequeued last week, but Hobart was
sunny and warm and not all gloomy and rainy as usual.
This is a bit large, but not too much considering it's two weeks stuff
from AMD and Intel.
core: one locking fix that helps with dynamic suspend/resume races
i915: mostly GVT updates, GVT was a recent introduction so fixes for
it shouldn't cause any notable side effects.
amdgpu: a bunch of fixes for GPUs with a different memory controller
design that need different firmware.
exynos: decon regression fixes
msm: two regression fixes
etnaviv: a workaround for an mmu bug that needs a lot more work.
virtio: sparse fix, and a maintainers update
I've looked through most of this and I think it should be fine, but
let me know if it's scarily too much.
Dave.
The following changes since commit 6edd870bca30b3aa69370a99bcefc1e5f2b8b190:
Merge branch 'drm-fixes-4.10' of
git://people.freedesktop.org/~agd5f/linux into drm-fixes (2017-01-09
09:47:19 +1000)
are available in the git repository at:
git://people.freedesktop.org/~airlied/linux tags/drm-fixes-for-v4.10-rc6
for you to fetch changes up to 932790109f62aa52bdb4bb62aa66653c0b51bc75:
Merge tag 'drm-qemu-20170110' of git://git.kraxel.org/linux into
drm-fixes (2017-01-23 09:25:53 +1000)
----------------------------------------------------------------
drm fixes across the board
----------------------------------------------------------------
Alex Deucher (8):
drm/radeon/si: load special ucode for certain MC configs
drm/amdgpu/si: load special ucode for certain MC configs
drm/amdgpu: drop oland quirks
drm/amdgpu: drop the mclk quirk for hainan
drm/radeon: drop oland quirks
drm/radeon: drop the mclk quirk for hainan
drm/radeon: add support for new hainan variants
drm/amdgpu: add support for new hainan variants
Andrzej Hajda (5):
drm/exynos/decon5433: update shadow registers iff there are active windows
drm/exynos/decon5433: set STANDALONE_UPDATE_F also if planes are disabled
drm/exynos/decon5433: do not disable video after reset
drm/exynos/decon5433: fix CMU programming
drm/exynos/decon5433: set STANDALONE_UPDATE_F on output enablement
Changbin Du (13):
drm/i915/gvt: fix error handing of tlb_control emulation
drm/i915/gvt: fix return value in mul_force_wake_write
drm/i915/gvt: always use readq and writeq
drm/i915/gvt: fix use after free for workload
drm/i915/gvt: dec vgpu->running_workload_num after the workload
is really done
drm/i915/gvt: introudce intel_vgpu_reset_resource() to reset
vgpu resource state
drm/i915/gvt: introuduce intel_vgpu_reset_gtt() to reset gtt
drm/i915/gvt: move cfg space inititation function to cfg_space.c
drm/i915/gvt: introduce intel_vgpu_reset_cfg_space to reset
configuration space
drm/i915/gvt: move mmio init/clean function to mmio.c
drm/i915/gvt: introduce intel_vgpu_reset_mmio() to reset mmio space
drm/i915/gvt: fix vGPU instance reuse issues by vGPU reset function
drm/i915/gvt: rewrite gt reset handler using new function
intel_gvt_reset_vgpu_locked
Chris Wilson (2):
drm/i915: Clear ret before unbinding in i915_gem_evict_something()
drm/i915: Fix phys pwrite for struct_mutex-less operation
Daniel Vetter (1):
drm/probe-helpers: Drop locking from poll_enable
Dave Airlie (8):
Merge tag 'drm-misc-fixes-2017-01-09' of
git://anongit.freedesktop.org/git/drm-misc into drm-fixes
Merge tag 'drm-intel-fixes-2017-01-19' of
git://anongit.freedesktop.org/git/drm-intel into drm-fixes
Merge tag 'drm-misc-fixes-2017-01-13' of
git://anongit.freedesktop.org/git/drm-misc into drm-fixes
Merge branch 'msm-fixes-4.10-rc4' of
git://people.freedesktop.org/~robclark/linux into drm-fixes
Merge branch 'drm-fixes-4.10' of
git://people.freedesktop.org/~agd5f/linux into drm-fixes
Merge branch 'exynos-drm-fixes' of
git://git.kernel.org/.../daeinki/drm-exynos into drm-fixes
Merge branch 'drm-etnaviv-fixes' of
https://git.pengutronix.de/git/lst/linux into drm-fixes
Merge tag 'drm-qemu-20170110' of git://git.kraxel.org/linux into drm-fixes
Flora Cui (1):
drm/amdgpu: fix vm_fault_stop on gfx6
Francisco Jerez (1):
drm/i915: Remove WaDisableLSQCROPERFforOCL KBL workaround.
Gerd Hoffmann (3):
drm/virtio: fix framebuffer sparse warning
drm: update MAINTAINERS for qemu drivers (bochs, cirrus, qxl, virtio-gpu)
drm: flip cirrus driver status to "obsolete".
Jani Nikula (2):
Merge tag 'gvt-fixes-2017-01-10' of
https://github.com/01org/gvt-linux into drm-intel-fixes
Merge tag 'gvt-fixes-2017-01-16' of
https://github.com/01org/gvt-linux into drm-intel-fixes
Jike Song (5):
drm/i915/gvt: init/destroy vgpu_idr properly
drm/i915/gvt: destroy the allocated idr on vgpu creating failures
drm/i915/gvt: cleanup opregion memory allocation code
drm/i915/gvt/kvmgt: return meaningful error for vgpu creating failure
drm/i915/gvt: cleanup GFP flags
Lucas Stach (1):
drm/etnaviv: trick drm_mm into giving out a low IOVA
Marek Szyprowski (1):
drm/bridge: analogix dp: Fix runtime PM state on driver bind
Michel Dänzer (1):
Revert "drm/amdgpu: Only update the CUR_SIZE register when necessary"
Nicolas Iooss (1):
drm/i915/gvt: verify functions types in new_mmio_info()
Pei Zhang (1):
drm/i915/gvt: print correct value for untracked mmio
Peter Ujfalusi (1):
drm: Schedule the output_poll_work with 1s delay if we have delayed event
Rex Zhu (5):
drm/amd/powerplay: fix vce cg logic error on CZ/St.
drm/amd/powerplay: refine vce dpm update code on Cz.
drm/amdgpu: fix bug set incorrect value to vce register
drm/amdgpu: fix program vce instance logic error.
drm/amdgpu: change clock gating mode for uvd_v4.
Rob Clark (2):
drm/msm/mdp5: rip out plane->pending tracking
drm/msm: fix potential null ptr issue in non-iommu case
Takashi Iwai (1):
drm: Fix broken VT switch with video=1366x768 option
Ville Syrjälä (1):
drm/i915: Ignore bogus plane coordinates on SKL when the plane
is not visible
Zhenyu Wang (2):
drm/i915/gvt: adjust high memory size for default vGPU type
drm/i915/gvt: remove duplicated definition
MAINTAINERS | 16 +-
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 22 +--
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 22 +--
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 24 ++-
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 22 +--
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 34 +++--
drivers/gpu/drm/amd/amdgpu/si_dpm.c | 20 +--
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 42 ++----
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 27 ++--
.../drm/amd/powerplay/hwmgr/cz_clockpowergating.c | 4 +-
drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 24 ++-
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 7 +
drivers/gpu/drm/cirrus/Kconfig | 9 ++
drivers/gpu/drm/drm_modes.c | 7 +
drivers/gpu/drm/drm_probe_helper.c | 63 ++++----
drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 7 +-
drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 15 +-
drivers/gpu/drm/i915/gvt/aperture_gm.c | 36 +++--
drivers/gpu/drm/i915/gvt/cfg_space.c | 74 ++++++++++
drivers/gpu/drm/i915/gvt/gtt.c | 81 ++++++-----
drivers/gpu/drm/i915/gvt/gtt.h | 1 +
drivers/gpu/drm/i915/gvt/gvt.c | 8 +-
drivers/gpu/drm/i915/gvt/gvt.h | 8 +-
drivers/gpu/drm/i915/gvt/handlers.c | 103 +++++--------
drivers/gpu/drm/i915/gvt/kvmgt.c | 14 +-
drivers/gpu/drm/i915/gvt/mmio.c | 84 +++++++++--
drivers/gpu/drm/i915/gvt/mmio.h | 4 +
drivers/gpu/drm/i915/gvt/opregion.c | 8 +-
drivers/gpu/drm/i915/gvt/reg.h | 3 +-
drivers/gpu/drm/i915/gvt/scheduler.c | 14 +-
drivers/gpu/drm/i915/gvt/vgpu.c | 162 ++++++++++-----------
drivers/gpu/drm/i915/i915_gem.c | 34 +----
drivers/gpu/drm/i915/i915_gem_evict.c | 1 +
drivers/gpu/drm/i915/intel_display.c | 3 +
drivers/gpu/drm/i915/intel_hotplug.c | 4 +-
drivers/gpu/drm/i915/intel_lrc.c | 10 --
drivers/gpu/drm/i915/intel_ringbuffer.c | 8 -
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 5 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 6 -
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 4 -
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 22 ---
drivers/gpu/drm/msm/msm_gem.c | 2 +
drivers/gpu/drm/radeon/si.c | 25 +++-
drivers/gpu/drm/radeon/si_dpm.c | 12 --
drivers/gpu/drm/virtio/virtgpu_fb.c | 2 +-
include/drm/drm_crtc_helper.h | 1 -
46 files changed, 584 insertions(+), 520 deletions(-)
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [git pull] drm fixes for 4.10-rc6 (just missed rc5 tagging :-)
2017-01-22 23:38 [git pull] drm fixes for 4.10-rc6 (just missed rc5 tagging :-) Dave Airlie
@ 2017-01-23 8:13 ` Daniel Vetter
2017-01-25 8:33 ` Markus Trippelsdorf
1 sibling, 0 replies; 11+ messages in thread
From: Daniel Vetter @ 2017-01-23 8:13 UTC (permalink / raw)
To: Dave Airlie; +Cc: Linus Torvalds, LKML, dri-devel
On Mon, Jan 23, 2017 at 09:38:48AM +1000, Dave Airlie wrote:
> Hi Linus,
>
> Okay holidays and LCA kinda caught up with me, I thought I'd get some
> of this dequeued last week, but Hobart was
> sunny and warm and not all gloomy and rainy as usual.
>
> This is a bit large, but not too much considering it's two weeks stuff
> from AMD and Intel.
>
> core: one locking fix that helps with dynamic suspend/resume races
> i915: mostly GVT updates, GVT was a recent introduction so fixes for
> it shouldn't cause any notable side effects.
> amdgpu: a bunch of fixes for GPUs with a different memory controller
> design that need different firmware.
> exynos: decon regression fixes
> msm: two regression fixes
> etnaviv: a workaround for an mmu bug that needs a lot more work.
> virtio: sparse fix, and a maintainers update
>
> I've looked through most of this and I think it should be fine, but
> let me know if it's scarily too much.
>
> Dave.
>
> The following changes since commit 6edd870bca30b3aa69370a99bcefc1e5f2b8b190:
>
> Merge branch 'drm-fixes-4.10' of
> git://people.freedesktop.org/~agd5f/linux into drm-fixes (2017-01-09
> 09:47:19 +1000)
>
> are available in the git repository at:
>
> git://people.freedesktop.org/~airlied/linux tags/drm-fixes-for-v4.10-rc6
You pushed the tag, but didn't update your drm-fixes branch. Confuses my
pull request scripts a bit :-)
-Daniel
>
> for you to fetch changes up to 932790109f62aa52bdb4bb62aa66653c0b51bc75:
>
> Merge tag 'drm-qemu-20170110' of git://git.kraxel.org/linux into
> drm-fixes (2017-01-23 09:25:53 +1000)
>
> ----------------------------------------------------------------
> drm fixes across the board
>
> ----------------------------------------------------------------
> Alex Deucher (8):
> drm/radeon/si: load special ucode for certain MC configs
> drm/amdgpu/si: load special ucode for certain MC configs
> drm/amdgpu: drop oland quirks
> drm/amdgpu: drop the mclk quirk for hainan
> drm/radeon: drop oland quirks
> drm/radeon: drop the mclk quirk for hainan
> drm/radeon: add support for new hainan variants
> drm/amdgpu: add support for new hainan variants
>
> Andrzej Hajda (5):
> drm/exynos/decon5433: update shadow registers iff there are active windows
> drm/exynos/decon5433: set STANDALONE_UPDATE_F also if planes are disabled
> drm/exynos/decon5433: do not disable video after reset
> drm/exynos/decon5433: fix CMU programming
> drm/exynos/decon5433: set STANDALONE_UPDATE_F on output enablement
>
> Changbin Du (13):
> drm/i915/gvt: fix error handing of tlb_control emulation
> drm/i915/gvt: fix return value in mul_force_wake_write
> drm/i915/gvt: always use readq and writeq
> drm/i915/gvt: fix use after free for workload
> drm/i915/gvt: dec vgpu->running_workload_num after the workload
> is really done
> drm/i915/gvt: introudce intel_vgpu_reset_resource() to reset
> vgpu resource state
> drm/i915/gvt: introuduce intel_vgpu_reset_gtt() to reset gtt
> drm/i915/gvt: move cfg space inititation function to cfg_space.c
> drm/i915/gvt: introduce intel_vgpu_reset_cfg_space to reset
> configuration space
> drm/i915/gvt: move mmio init/clean function to mmio.c
> drm/i915/gvt: introduce intel_vgpu_reset_mmio() to reset mmio space
> drm/i915/gvt: fix vGPU instance reuse issues by vGPU reset function
> drm/i915/gvt: rewrite gt reset handler using new function
> intel_gvt_reset_vgpu_locked
>
> Chris Wilson (2):
> drm/i915: Clear ret before unbinding in i915_gem_evict_something()
> drm/i915: Fix phys pwrite for struct_mutex-less operation
>
> Daniel Vetter (1):
> drm/probe-helpers: Drop locking from poll_enable
>
> Dave Airlie (8):
> Merge tag 'drm-misc-fixes-2017-01-09' of
> git://anongit.freedesktop.org/git/drm-misc into drm-fixes
> Merge tag 'drm-intel-fixes-2017-01-19' of
> git://anongit.freedesktop.org/git/drm-intel into drm-fixes
> Merge tag 'drm-misc-fixes-2017-01-13' of
> git://anongit.freedesktop.org/git/drm-misc into drm-fixes
> Merge branch 'msm-fixes-4.10-rc4' of
> git://people.freedesktop.org/~robclark/linux into drm-fixes
> Merge branch 'drm-fixes-4.10' of
> git://people.freedesktop.org/~agd5f/linux into drm-fixes
> Merge branch 'exynos-drm-fixes' of
> git://git.kernel.org/.../daeinki/drm-exynos into drm-fixes
> Merge branch 'drm-etnaviv-fixes' of
> https://git.pengutronix.de/git/lst/linux into drm-fixes
> Merge tag 'drm-qemu-20170110' of git://git.kraxel.org/linux into drm-fixes
>
> Flora Cui (1):
> drm/amdgpu: fix vm_fault_stop on gfx6
>
> Francisco Jerez (1):
> drm/i915: Remove WaDisableLSQCROPERFforOCL KBL workaround.
>
> Gerd Hoffmann (3):
> drm/virtio: fix framebuffer sparse warning
> drm: update MAINTAINERS for qemu drivers (bochs, cirrus, qxl, virtio-gpu)
> drm: flip cirrus driver status to "obsolete".
>
> Jani Nikula (2):
> Merge tag 'gvt-fixes-2017-01-10' of
> https://github.com/01org/gvt-linux into drm-intel-fixes
> Merge tag 'gvt-fixes-2017-01-16' of
> https://github.com/01org/gvt-linux into drm-intel-fixes
>
> Jike Song (5):
> drm/i915/gvt: init/destroy vgpu_idr properly
> drm/i915/gvt: destroy the allocated idr on vgpu creating failures
> drm/i915/gvt: cleanup opregion memory allocation code
> drm/i915/gvt/kvmgt: return meaningful error for vgpu creating failure
> drm/i915/gvt: cleanup GFP flags
>
> Lucas Stach (1):
> drm/etnaviv: trick drm_mm into giving out a low IOVA
>
> Marek Szyprowski (1):
> drm/bridge: analogix dp: Fix runtime PM state on driver bind
>
> Michel Dänzer (1):
> Revert "drm/amdgpu: Only update the CUR_SIZE register when necessary"
>
> Nicolas Iooss (1):
> drm/i915/gvt: verify functions types in new_mmio_info()
>
> Pei Zhang (1):
> drm/i915/gvt: print correct value for untracked mmio
>
> Peter Ujfalusi (1):
> drm: Schedule the output_poll_work with 1s delay if we have delayed event
>
> Rex Zhu (5):
> drm/amd/powerplay: fix vce cg logic error on CZ/St.
> drm/amd/powerplay: refine vce dpm update code on Cz.
> drm/amdgpu: fix bug set incorrect value to vce register
> drm/amdgpu: fix program vce instance logic error.
> drm/amdgpu: change clock gating mode for uvd_v4.
>
> Rob Clark (2):
> drm/msm/mdp5: rip out plane->pending tracking
> drm/msm: fix potential null ptr issue in non-iommu case
>
> Takashi Iwai (1):
> drm: Fix broken VT switch with video=1366x768 option
>
> Ville Syrjälä (1):
> drm/i915: Ignore bogus plane coordinates on SKL when the plane
> is not visible
>
> Zhenyu Wang (2):
> drm/i915/gvt: adjust high memory size for default vGPU type
> drm/i915/gvt: remove duplicated definition
>
> MAINTAINERS | 16 +-
> drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 22 +--
> drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 22 +--
> drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 24 ++-
> drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 22 +--
> drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 34 +++--
> drivers/gpu/drm/amd/amdgpu/si_dpm.c | 20 +--
> drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 42 ++----
> drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 27 ++--
> .../drm/amd/powerplay/hwmgr/cz_clockpowergating.c | 4 +-
> drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 24 ++-
> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 7 +
> drivers/gpu/drm/cirrus/Kconfig | 9 ++
> drivers/gpu/drm/drm_modes.c | 7 +
> drivers/gpu/drm/drm_probe_helper.c | 63 ++++----
> drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 7 +-
> drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 15 +-
> drivers/gpu/drm/i915/gvt/aperture_gm.c | 36 +++--
> drivers/gpu/drm/i915/gvt/cfg_space.c | 74 ++++++++++
> drivers/gpu/drm/i915/gvt/gtt.c | 81 ++++++-----
> drivers/gpu/drm/i915/gvt/gtt.h | 1 +
> drivers/gpu/drm/i915/gvt/gvt.c | 8 +-
> drivers/gpu/drm/i915/gvt/gvt.h | 8 +-
> drivers/gpu/drm/i915/gvt/handlers.c | 103 +++++--------
> drivers/gpu/drm/i915/gvt/kvmgt.c | 14 +-
> drivers/gpu/drm/i915/gvt/mmio.c | 84 +++++++++--
> drivers/gpu/drm/i915/gvt/mmio.h | 4 +
> drivers/gpu/drm/i915/gvt/opregion.c | 8 +-
> drivers/gpu/drm/i915/gvt/reg.h | 3 +-
> drivers/gpu/drm/i915/gvt/scheduler.c | 14 +-
> drivers/gpu/drm/i915/gvt/vgpu.c | 162 ++++++++++-----------
> drivers/gpu/drm/i915/i915_gem.c | 34 +----
> drivers/gpu/drm/i915/i915_gem_evict.c | 1 +
> drivers/gpu/drm/i915/intel_display.c | 3 +
> drivers/gpu/drm/i915/intel_hotplug.c | 4 +-
> drivers/gpu/drm/i915/intel_lrc.c | 10 --
> drivers/gpu/drm/i915/intel_ringbuffer.c | 8 -
> drivers/gpu/drm/msm/adreno/adreno_gpu.c | 5 +-
> drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 6 -
> drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 4 -
> drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 22 ---
> drivers/gpu/drm/msm/msm_gem.c | 2 +
> drivers/gpu/drm/radeon/si.c | 25 +++-
> drivers/gpu/drm/radeon/si_dpm.c | 12 --
> drivers/gpu/drm/virtio/virtgpu_fb.c | 2 +-
> include/drm/drm_crtc_helper.h | 1 -
> 46 files changed, 584 insertions(+), 520 deletions(-)
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [git pull] drm fixes for 4.10-rc6 (just missed rc5 tagging :-)
2017-01-22 23:38 [git pull] drm fixes for 4.10-rc6 (just missed rc5 tagging :-) Dave Airlie
2017-01-23 8:13 ` Daniel Vetter
@ 2017-01-25 8:33 ` Markus Trippelsdorf
2017-01-25 9:10 ` Michel Dänzer
1 sibling, 1 reply; 11+ messages in thread
From: Markus Trippelsdorf @ 2017-01-25 8:33 UTC (permalink / raw)
To: Dave Airlie; +Cc: dri-devel, LKML, Alex Deucher
On 2017.01.23 at 09:38 +1000, Dave Airlie wrote:
> ----------------------------------------------------------------
> Alex Deucher (8):
> drm/radeon/si: load special ucode for certain MC configs
> drm/amdgpu/si: load special ucode for certain MC configs
> drm/amdgpu: drop oland quirks
> drm/amdgpu: drop the mclk quirk for hainan
> drm/radeon: drop oland quirks
> drm/radeon: drop the mclk quirk for hainan
> drm/radeon: add support for new hainan variants
> drm/amdgpu: add support for new hainan variants
Since the merge I get the following warning during boot:
[ 2.463532] [drm] Initialized
[ 2.463576] [drm] radeon kernel modesetting enabled.
[ 2.463788] [drm] initializing kernel modesetting (RS780 0x1002:0x9614 0x1043:0x834D 0x00).
[ 2.463830] [drm] register mmio base: 0xFBEE0000
[ 2.463867] [drm] register mmio size: 65536
[ 2.464429] ATOM BIOS: 113
[ 2.464481] radeon 0000:01:05.0: VRAM: 128M 0x00000000C0000000 - 0x00000000C7FFFFFF (128M used)
[ 2.464531] radeon 0000:01:05.0: GTT: 512M 0x00000000A0000000 - 0x00000000BFFFFFFF
[ 2.464573] [drm] Detected VRAM RAM=128M, BAR=128M
[ 2.464610] [drm] RAM width 32bits DDR
[ 2.464698] [TTM] Zone kernel: Available graphics memory: 4079298 kiB
[ 2.464736] [TTM] Zone dma32: Available graphics memory: 2097152 kiB
[ 2.464775] [TTM] Initializing pool allocator
[ 2.464815] [TTM] Initializing DMA pool allocator
[ 2.464869] [drm] radeon: 128M of VRAM memory ready
[ 2.464906] [drm] radeon: 512M of GTT memory ready.
[ 2.464951] [drm] Loading RS780 Microcode
[ 2.464993] [drm] radeon: power management initialized
[ 2.465033] [drm] GART: num cpu pages 131072, num gpu pages 131072
[ 2.476534] [drm] PCIE GART of 512M enabled (table at 0x00000000C0040000).
[ 2.476617] radeon 0000:01:05.0: WB enabled
[ 2.476656] radeon 0000:01:05.0: fence driver on ring 0 use gpu addr 0x00000000a0000c00 and cpu addr 0xffff880215c8fc00
[ 2.476707] [drm] Supports vblank timestamp caching Rev 2 (21.10.2013).
[ 2.476745] [drm] Driver supports precise vblank timestamp query.
[ 2.476783] radeon 0000:01:05.0: radeon: MSI limited to 32-bit
[ 2.476833] [drm] radeon: irq initialized.
[ 2.509088] [drm] ring test on 0 succeeded in 1 usecs
[ 2.509395] [drm] ib test on ring 0 succeeded in 0 usecs
[ 2.509594] [drm] Radeon Display Connectors
[ 2.509632] [drm] Connector 0:
[ 2.509669] [drm] VGA-1
[ 2.509706] [drm] DDC: 0x7e40 0x7e40 0x7e44 0x7e44 0x7e48 0x7e48 0x7e4c 0x7e4c
[ 2.509744] [drm] Encoders:
[ 2.509781] [drm] CRT1: INTERNAL_KLDSCP_DAC1
[ 2.509818] [drm] Connector 1:
[ 2.509855] [drm] DVI-D-1
[ 2.509892] [drm] HPD3
[ 2.509929] [drm] DDC: 0x7e50 0x7e50 0x7e54 0x7e54 0x7e58 0x7e58 0x7e5c 0x7e5c
[ 2.509967] [drm] Encoders:
[ 2.510004] [drm] DFP3: INTERNAL_KLDSCP_LVTMA
[ 2.556637] [drm] fb mappable at 0xF0141000
[ 2.556675] [drm] vram apper at 0xF0000000
[ 2.556712] [drm] size 8294400
[ 2.556749] [drm] fb depth is 24
[ 2.556786] [drm] pitch is 7680
[ 2.556871] fbcon: radeondrmfb (fb0) is primary device
[ 2.602802] Console: switching to colour frame buffer device 135x120
[ 2.610664] radeon 0000:01:05.0: fb0: radeondrmfb frame buffer device
[ 2.627020] ------------[ cut here ]------------
[ 2.627043] WARNING: CPU: 0 PID: 1 at ./include/drm/drm_crtc.h:857 drm_kms_helper_poll_init+0x127/0x140
[ 2.627090] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.10.0-rc5-00107-g883af14e67e8-dirty #84
[ 2.627130] Hardware name: System manufacturer System Product Name/M4A78T-E, BIOS 3503 04/13/2011
[ 2.627172] Call Trace:
[ 2.627181] ? dump_stack+0x46/0x64
[ 2.627194] ? drm_kms_helper_poll_init+0x127/0x140
[ 2.627214] ? warn_slowpath_null+0x5a/0xd1
[ 2.627230] ? drm_kms_helper_poll_init+0x127/0x140
[ 2.627250] ? radeon_modeset_init+0x48d/0x9a0
[ 2.627268] ? radeon_driver_load_kms+0x13d/0x220
[ 2.627286] ? drm_dev_register+0x31a/0x380
[ 2.627302] ? drm_get_pci_dev+0x94/0x1e0
[ 2.627318] ? pci_device_probe+0x81/0x100
[ 2.627334] ? driver_probe_device+0x2d4/0x480
[ 2.627352] ? __driver_attach+0xd1/0xe0
[ 2.627367] ? driver_probe_device+0x480/0x480
[ 2.627384] ? bus_for_each_dev+0x55/0xa0
[ 2.627399] ? bus_add_driver+0x189/0x220
[ 2.627414] ? driver_register+0x78/0x100
[ 2.627430] ? ttm_init+0x5b/0x5b
[ 2.627442] ? do_one_initcall+0x8c/0x122
[ 2.627457] ? set_debug_rodata+0xc/0xc
[ 2.627471] ? kernel_init_freeable+0x117/0x198
[ 2.627489] ? rest_init+0x80/0x80
[ 2.627501] ? kernel_init+0x6/0x240
[ 2.627513] ? rest_init+0x80/0x80
[ 2.627526] ? ret_from_fork+0x23/0x30
[ 2.627540] ---[ end trace 3cb8d4a331963460 ]---
[ 2.627608] [drm] Initialized radeon 2.48.0 20080528 for 0000:01:05.0 on minor 0
--
Markus
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [git pull] drm fixes for 4.10-rc6 (just missed rc5 tagging :-)
2017-01-25 8:33 ` Markus Trippelsdorf
@ 2017-01-25 9:10 ` Michel Dänzer
0 siblings, 0 replies; 11+ messages in thread
From: Michel Dänzer @ 2017-01-25 9:10 UTC (permalink / raw)
To: Markus Trippelsdorf, Dave Airlie, Daniel Vetter; +Cc: LKML, dri-devel
On 25/01/17 05:33 PM, Markus Trippelsdorf wrote:
> On 2017.01.23 at 09:38 +1000, Dave Airlie wrote:
>> ----------------------------------------------------------------
>> Alex Deucher (8):
>> drm/radeon/si: load special ucode for certain MC configs
>> drm/amdgpu/si: load special ucode for certain MC configs
>> drm/amdgpu: drop oland quirks
>> drm/amdgpu: drop the mclk quirk for hainan
>> drm/radeon: drop oland quirks
>> drm/radeon: drop the mclk quirk for hainan
>> drm/radeon: add support for new hainan variants
>> drm/amdgpu: add support for new hainan variants
>
> Since the merge I get the following warning during boot:
[...]
> [ 2.627043] WARNING: CPU: 0 PID: 1 at ./include/drm/drm_crtc.h:857 drm_kms_helper_poll_init+0x127/0x140
This is likely due to
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=3846fd9b86001bea171943cc3bb9222cb6da6b42
Daniel, please take a look.
--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Mesa and X developer
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [git pull] drm fixes for 4.10-rc6 (just missed rc5 tagging :-)
@ 2017-01-25 9:10 ` Michel Dänzer
0 siblings, 0 replies; 11+ messages in thread
From: Michel Dänzer @ 2017-01-25 9:10 UTC (permalink / raw)
To: Markus Trippelsdorf, Dave Airlie, Daniel Vetter; +Cc: LKML, dri-devel
On 25/01/17 05:33 PM, Markus Trippelsdorf wrote:
> On 2017.01.23 at 09:38 +1000, Dave Airlie wrote:
>> ----------------------------------------------------------------
>> Alex Deucher (8):
>> drm/radeon/si: load special ucode for certain MC configs
>> drm/amdgpu/si: load special ucode for certain MC configs
>> drm/amdgpu: drop oland quirks
>> drm/amdgpu: drop the mclk quirk for hainan
>> drm/radeon: drop oland quirks
>> drm/radeon: drop the mclk quirk for hainan
>> drm/radeon: add support for new hainan variants
>> drm/amdgpu: add support for new hainan variants
>
> Since the merge I get the following warning during boot:
[...]
> [ 2.627043] WARNING: CPU: 0 PID: 1 at ./include/drm/drm_crtc.h:857 drm_kms_helper_poll_init+0x127/0x140
This is likely due to
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=3846fd9b86001bea171943cc3bb9222cb6da6b42
Daniel, please take a look.
--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Mesa and X developer
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [git pull] drm fixes for 4.10-rc6 (just missed rc5 tagging :-)
2017-01-25 9:10 ` Michel Dänzer
@ 2017-01-25 12:54 ` Daniel Vetter
-1 siblings, 0 replies; 11+ messages in thread
From: Daniel Vetter @ 2017-01-25 12:54 UTC (permalink / raw)
To: Michel Dänzer, Dave Airlie
Cc: Markus Trippelsdorf, Dave Airlie, Daniel Vetter, LKML, dri-devel
On Wed, Jan 25, 2017 at 06:10:57PM +0900, Michel Dänzer wrote:
> On 25/01/17 05:33 PM, Markus Trippelsdorf wrote:
> > On 2017.01.23 at 09:38 +1000, Dave Airlie wrote:
> >> ----------------------------------------------------------------
> >> Alex Deucher (8):
> >> drm/radeon/si: load special ucode for certain MC configs
> >> drm/amdgpu/si: load special ucode for certain MC configs
> >> drm/amdgpu: drop oland quirks
> >> drm/amdgpu: drop the mclk quirk for hainan
> >> drm/radeon: drop oland quirks
> >> drm/radeon: drop the mclk quirk for hainan
> >> drm/radeon: add support for new hainan variants
> >> drm/amdgpu: add support for new hainan variants
> >
> > Since the merge I get the following warning during boot:
>
> [...]
>
> > [ 2.627043] WARNING: CPU: 0 PID: 1 at ./include/drm/drm_crtc.h:857 drm_kms_helper_poll_init+0x127/0x140
>
> This is likely due to
> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=3846fd9b86001bea171943cc3bb9222cb6da6b42
>
> Daniel, please take a look.
Yup, I butchered this badly. The patch is correct, it also references the
right commits and if those commits would all be in 4.10 it would even
work. But the connector_list locking rework is only in drm-next, which
means it's totally not working :(
Dave, can you pls revert this in drm-fixes and re-apply to drm-next, and
then when you backmerge -fixes into -next make sure git doesn't drop it on
the floor? Or maybe for safety do it the other way round:
- first revert on drm-fixes
- then backmerge
- then reapply to drm-next.
Sorry for this mess ...
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [git pull] drm fixes for 4.10-rc6 (just missed rc5 tagging :-)
@ 2017-01-25 12:54 ` Daniel Vetter
0 siblings, 0 replies; 11+ messages in thread
From: Daniel Vetter @ 2017-01-25 12:54 UTC (permalink / raw)
To: Michel Dänzer, Dave Airlie
Cc: Daniel Vetter, dri-devel, LKML, Markus Trippelsdorf
On Wed, Jan 25, 2017 at 06:10:57PM +0900, Michel Dänzer wrote:
> On 25/01/17 05:33 PM, Markus Trippelsdorf wrote:
> > On 2017.01.23 at 09:38 +1000, Dave Airlie wrote:
> >> ----------------------------------------------------------------
> >> Alex Deucher (8):
> >> drm/radeon/si: load special ucode for certain MC configs
> >> drm/amdgpu/si: load special ucode for certain MC configs
> >> drm/amdgpu: drop oland quirks
> >> drm/amdgpu: drop the mclk quirk for hainan
> >> drm/radeon: drop oland quirks
> >> drm/radeon: drop the mclk quirk for hainan
> >> drm/radeon: add support for new hainan variants
> >> drm/amdgpu: add support for new hainan variants
> >
> > Since the merge I get the following warning during boot:
>
> [...]
>
> > [ 2.627043] WARNING: CPU: 0 PID: 1 at ./include/drm/drm_crtc.h:857 drm_kms_helper_poll_init+0x127/0x140
>
> This is likely due to
> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=3846fd9b86001bea171943cc3bb9222cb6da6b42
>
> Daniel, please take a look.
Yup, I butchered this badly. The patch is correct, it also references the
right commits and if those commits would all be in 4.10 it would even
work. But the connector_list locking rework is only in drm-next, which
means it's totally not working :(
Dave, can you pls revert this in drm-fixes and re-apply to drm-next, and
then when you backmerge -fixes into -next make sure git doesn't drop it on
the floor? Or maybe for safety do it the other way round:
- first revert on drm-fixes
- then backmerge
- then reapply to drm-next.
Sorry for this mess ...
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [git pull] drm fixes for 4.10-rc6 (just missed rc5 tagging :-)
2017-01-25 12:54 ` Daniel Vetter
(?)
@ 2017-01-26 4:33 ` Lukas Wunner
2017-01-26 9:42 ` Daniel Vetter
-1 siblings, 1 reply; 11+ messages in thread
From: Lukas Wunner @ 2017-01-26 4:33 UTC (permalink / raw)
To: Michel Dänzer, Dave Airlie, Markus Trippelsdorf, LKML, dri-devel
On Wed, Jan 25, 2017 at 01:54:32PM +0100, Daniel Vetter wrote:
> On Wed, Jan 25, 2017 at 06:10:57PM +0900, Michel Dänzer wrote:
> > On 25/01/17 05:33 PM, Markus Trippelsdorf wrote:
> > > On 2017.01.23 at 09:38 +1000, Dave Airlie wrote:
> > >> ----------------------------------------------------------------
> > >> Alex Deucher (8):
> > >> drm/radeon/si: load special ucode for certain MC configs
> > >> drm/amdgpu/si: load special ucode for certain MC configs
> > >> drm/amdgpu: drop oland quirks
> > >> drm/amdgpu: drop the mclk quirk for hainan
> > >> drm/radeon: drop oland quirks
> > >> drm/radeon: drop the mclk quirk for hainan
> > >> drm/radeon: add support for new hainan variants
> > >> drm/amdgpu: add support for new hainan variants
> > >
> > > Since the merge I get the following warning during boot:
> >
> > [...]
> >
> > > [ 2.627043] WARNING: CPU: 0 PID: 1 at ./include/drm/drm_crtc.h:857 drm_kms_helper_poll_init+0x127/0x140
> >
> > This is likely due to
> > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=3846fd9b86001bea171943cc3bb9222cb6da6b42
> >
> > Daniel, please take a look.
>
> Yup, I butchered this badly. The patch is correct, it also references the
> right commits and if those commits would all be in 4.10 it would even
> work. But the connector_list locking rework is only in drm-next, which
> means it's totally not working :(
>
> Dave, can you pls revert this in drm-fixes and re-apply to drm-next, and
> then when you backmerge -fixes into -next make sure git doesn't drop it on
> the floor? Or maybe for safety do it the other way round:
> - first revert on drm-fixes
> - then backmerge
> - then reapply to drm-next.
It's not sufficient to only fix this in drm-next. Without 3846fd9b8600,
certain Optimus laptops won't (runtime) resume:
https://bugzilla.kernel.org/show_bug.cgi?id=190861
Bjorn Helgaas therefore had queued up a revert for PCIe port runtime PM
and only dequeued it once 3846fd9b8600 landed in Linus' tree.
Please re-submit 3846fd9b8600 and its prerequisites for drm-fixes at
your earliest convenience.
Thanks,
Lukas
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [git pull] drm fixes for 4.10-rc6 (just missed rc5 tagging :-)
2017-01-26 4:33 ` Lukas Wunner
@ 2017-01-26 9:42 ` Daniel Vetter
0 siblings, 0 replies; 11+ messages in thread
From: Daniel Vetter @ 2017-01-26 9:42 UTC (permalink / raw)
To: Lukas Wunner
Cc: Michel Dänzer, Dave Airlie, Markus Trippelsdorf, LKML, dri-devel
On Thu, Jan 26, 2017 at 05:33:57AM +0100, Lukas Wunner wrote:
> On Wed, Jan 25, 2017 at 01:54:32PM +0100, Daniel Vetter wrote:
> > On Wed, Jan 25, 2017 at 06:10:57PM +0900, Michel Dänzer wrote:
> > > On 25/01/17 05:33 PM, Markus Trippelsdorf wrote:
> > > > On 2017.01.23 at 09:38 +1000, Dave Airlie wrote:
> > > >> ----------------------------------------------------------------
> > > >> Alex Deucher (8):
> > > >> drm/radeon/si: load special ucode for certain MC configs
> > > >> drm/amdgpu/si: load special ucode for certain MC configs
> > > >> drm/amdgpu: drop oland quirks
> > > >> drm/amdgpu: drop the mclk quirk for hainan
> > > >> drm/radeon: drop oland quirks
> > > >> drm/radeon: drop the mclk quirk for hainan
> > > >> drm/radeon: add support for new hainan variants
> > > >> drm/amdgpu: add support for new hainan variants
> > > >
> > > > Since the merge I get the following warning during boot:
> > >
> > > [...]
> > >
> > > > [ 2.627043] WARNING: CPU: 0 PID: 1 at ./include/drm/drm_crtc.h:857 drm_kms_helper_poll_init+0x127/0x140
> > >
> > > This is likely due to
> > > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=3846fd9b86001bea171943cc3bb9222cb6da6b42
> > >
> > > Daniel, please take a look.
> >
> > Yup, I butchered this badly. The patch is correct, it also references the
> > right commits and if those commits would all be in 4.10 it would even
> > work. But the connector_list locking rework is only in drm-next, which
> > means it's totally not working :(
> >
> > Dave, can you pls revert this in drm-fixes and re-apply to drm-next, and
> > then when you backmerge -fixes into -next make sure git doesn't drop it on
> > the floor? Or maybe for safety do it the other way round:
> > - first revert on drm-fixes
> > - then backmerge
> > - then reapply to drm-next.
>
> It's not sufficient to only fix this in drm-next. Without 3846fd9b8600,
> certain Optimus laptops won't (runtime) resume:
> https://bugzilla.kernel.org/show_bug.cgi?id=190861
>
> Bjorn Helgaas therefore had queued up a revert for PCIe port runtime PM
> and only dequeued it once 3846fd9b8600 landed in Linus' tree.
>
> Please re-submit 3846fd9b8600 and its prerequisites for drm-fixes at
> your earliest convenience.
That's way, way too much depencies for 4.10, the connector_locking rework
is by far not simple. We'll do this properly in 4.11, and for 4.10 the
most we'll be a quick hack to make nouveau happy (which we'll revert for
4.11 again). This probably means we need to delay the pci change until
4.11 too :(
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [git pull] drm fixes for 4.10-rc6 (just missed rc5 tagging :-)
@ 2017-01-26 9:42 ` Daniel Vetter
0 siblings, 0 replies; 11+ messages in thread
From: Daniel Vetter @ 2017-01-26 9:42 UTC (permalink / raw)
To: Lukas Wunner; +Cc: dri-devel, Michel Dänzer, LKML, Markus Trippelsdorf
On Thu, Jan 26, 2017 at 05:33:57AM +0100, Lukas Wunner wrote:
> On Wed, Jan 25, 2017 at 01:54:32PM +0100, Daniel Vetter wrote:
> > On Wed, Jan 25, 2017 at 06:10:57PM +0900, Michel Dänzer wrote:
> > > On 25/01/17 05:33 PM, Markus Trippelsdorf wrote:
> > > > On 2017.01.23 at 09:38 +1000, Dave Airlie wrote:
> > > >> ----------------------------------------------------------------
> > > >> Alex Deucher (8):
> > > >> drm/radeon/si: load special ucode for certain MC configs
> > > >> drm/amdgpu/si: load special ucode for certain MC configs
> > > >> drm/amdgpu: drop oland quirks
> > > >> drm/amdgpu: drop the mclk quirk for hainan
> > > >> drm/radeon: drop oland quirks
> > > >> drm/radeon: drop the mclk quirk for hainan
> > > >> drm/radeon: add support for new hainan variants
> > > >> drm/amdgpu: add support for new hainan variants
> > > >
> > > > Since the merge I get the following warning during boot:
> > >
> > > [...]
> > >
> > > > [ 2.627043] WARNING: CPU: 0 PID: 1 at ./include/drm/drm_crtc.h:857 drm_kms_helper_poll_init+0x127/0x140
> > >
> > > This is likely due to
> > > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=3846fd9b86001bea171943cc3bb9222cb6da6b42
> > >
> > > Daniel, please take a look.
> >
> > Yup, I butchered this badly. The patch is correct, it also references the
> > right commits and if those commits would all be in 4.10 it would even
> > work. But the connector_list locking rework is only in drm-next, which
> > means it's totally not working :(
> >
> > Dave, can you pls revert this in drm-fixes and re-apply to drm-next, and
> > then when you backmerge -fixes into -next make sure git doesn't drop it on
> > the floor? Or maybe for safety do it the other way round:
> > - first revert on drm-fixes
> > - then backmerge
> > - then reapply to drm-next.
>
> It's not sufficient to only fix this in drm-next. Without 3846fd9b8600,
> certain Optimus laptops won't (runtime) resume:
> https://bugzilla.kernel.org/show_bug.cgi?id=190861
>
> Bjorn Helgaas therefore had queued up a revert for PCIe port runtime PM
> and only dequeued it once 3846fd9b8600 landed in Linus' tree.
>
> Please re-submit 3846fd9b8600 and its prerequisites for drm-fixes at
> your earliest convenience.
That's way, way too much depencies for 4.10, the connector_locking rework
is by far not simple. We'll do this properly in 4.11, and for 4.10 the
most we'll be a quick hack to make nouveau happy (which we'll revert for
4.11 again). This probably means we need to delay the pci change until
4.11 too :(
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [git pull] drm fixes for 4.10-rc6 (just missed rc5 tagging :-)
2017-01-26 9:42 ` Daniel Vetter
(?)
@ 2017-01-26 10:19 ` Dave Airlie
-1 siblings, 0 replies; 11+ messages in thread
From: Dave Airlie @ 2017-01-26 10:19 UTC (permalink / raw)
To: Markus Trippelsdorf, Michel Dänzer, dri-devel, LKML, Lukas Wunner
[-- Attachment #1.1: Type: text/plain, Size: 2988 bytes --]
On 26 Jan. 2017 19:42, "Daniel Vetter" <daniel@ffwll.ch> wrote:
On Thu, Jan 26, 2017 at 05:33:57AM +0100, Lukas Wunner wrote:
> On Wed, Jan 25, 2017 at 01:54:32PM +0100, Daniel Vetter wrote:
> > On Wed, Jan 25, 2017 at 06:10:57PM +0900, Michel Dänzer wrote:
> > > On 25/01/17 05:33 PM, Markus Trippelsdorf wrote:
> > > > On 2017.01.23 at 09:38 +1000, Dave Airlie wrote:
> > > >> ----------------------------------------------------------------
> > > >> Alex Deucher (8):
> > > >> drm/radeon/si: load special ucode for certain MC configs
> > > >> drm/amdgpu/si: load special ucode for certain MC configs
> > > >> drm/amdgpu: drop oland quirks
> > > >> drm/amdgpu: drop the mclk quirk for hainan
> > > >> drm/radeon: drop oland quirks
> > > >> drm/radeon: drop the mclk quirk for hainan
> > > >> drm/radeon: add support for new hainan variants
> > > >> drm/amdgpu: add support for new hainan variants
> > > >
> > > > Since the merge I get the following warning during boot:
> > >
> > > [...]
> > >
> > > > [ 2.627043] WARNING: CPU: 0 PID: 1 at
./include/drm/drm_crtc.h:857 drm_kms_helper_poll_init+0x127/0x140
> > >
> > > This is likely due to
> > > https://git.kernel.org/cgit/linux/kernel/git/torvalds/
linux.git/commit/?id=3846fd9b86001bea171943cc3bb9222cb6da6b42
> > >
> > > Daniel, please take a look.
> >
> > Yup, I butchered this badly. The patch is correct, it also references
the
> > right commits and if those commits would all be in 4.10 it would even
> > work. But the connector_list locking rework is only in drm-next, which
> > means it's totally not working :(
> >
> > Dave, can you pls revert this in drm-fixes and re-apply to drm-next, and
> > then when you backmerge -fixes into -next make sure git doesn't drop it
on
> > the floor? Or maybe for safety do it the other way round:
> > - first revert on drm-fixes
> > - then backmerge
> > - then reapply to drm-next.
>
> It's not sufficient to only fix this in drm-next. Without 3846fd9b8600,
> certain Optimus laptops won't (runtime) resume:
> https://bugzilla.kernel.org/show_bug.cgi?id=190861
>
> Bjorn Helgaas therefore had queued up a revert for PCIe port runtime PM
> and only dequeued it once 3846fd9b8600 landed in Linus' tree.
>
> Please re-submit 3846fd9b8600 and its prerequisites for drm-fixes at
> your earliest convenience.
That's way, way too much depencies for 4.10, the connector_locking rework
is by far not simple. We'll do this properly in 4.11, and for 4.10 the
most we'll be a quick hack to make nouveau happy (which we'll revert for
4.11 again). This probably means we need to delay the pci change until
4.11 too :(
I think Lyude's nouveau changes should be enough to avoid the problem
completely, they aren't incorrect either just not as optimal.
I'll line things up tomorrow.
Dave.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
[-- Attachment #1.2: Type: text/html, Size: 4759 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2017-01-26 10:19 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-22 23:38 [git pull] drm fixes for 4.10-rc6 (just missed rc5 tagging :-) Dave Airlie
2017-01-23 8:13 ` Daniel Vetter
2017-01-25 8:33 ` Markus Trippelsdorf
2017-01-25 9:10 ` Michel Dänzer
2017-01-25 9:10 ` Michel Dänzer
2017-01-25 12:54 ` Daniel Vetter
2017-01-25 12:54 ` Daniel Vetter
2017-01-26 4:33 ` Lukas Wunner
2017-01-26 9:42 ` Daniel Vetter
2017-01-26 9:42 ` Daniel Vetter
2017-01-26 10:19 ` Dave Airlie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.