| Message ID | 20210204045717.3823-1-alexander.deucher@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [pull] amdgpu, amdkfd drm-next-5.12 | expand |
On Thu, 4 Feb 2021 at 14:57, Alex Deucher <alexdeucher@gmail.com> wrote: > > Hi Dave, Daniel, > > More fixes for 5.12. Same PR from last week with the issue Felix reported > fixed and a few more additional fixes on top. > > The following changes since commit a6b8720c2f85143561c3453e1cf928a2f8586ac0: > > Merge tag 'amd-drm-next-5.12-2021-01-20' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2021-01-20 13:08:18 +0100) > This brought an arm32 warning with it, I've applied Arnd's patch to drm-next to fix it. https://patchwork.freedesktop.org/patch/msgid/20210125124849.102037-1-arnd@kernel.org However that function has an ifdef around an ifdef that probably could do with cleaning up. Dave.
On Thu, Feb 4, 2021 at 6:52 PM Dave Airlie <airlied@gmail.com> wrote: > > On Thu, 4 Feb 2021 at 14:57, Alex Deucher <alexdeucher@gmail.com> wrote: > > > > Hi Dave, Daniel, > > > > More fixes for 5.12. Same PR from last week with the issue Felix reported > > fixed and a few more additional fixes on top. > > > > The following changes since commit a6b8720c2f85143561c3453e1cf928a2f8586ac0: > > > > Merge tag 'amd-drm-next-5.12-2021-01-20' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2021-01-20 13:08:18 +0100) > > > This brought an arm32 warning with it, I've applied Arnd's patch to > drm-next to fix it. > > https://patchwork.freedesktop.org/patch/msgid/20210125124849.102037-1-arnd@kernel.org > > However that function has an ifdef around an ifdef that probably could > do with cleaning up. Sorry about that. Bhawan fixed that up at the time: https://patchwork.freedesktop.org/patch/415092/ Daniel said he picked that up last week: https://lists.freedesktop.org/archives/dri-devel/2021-January/294941.html but I guess it never landed, otherwise I would have included it in my PR. Alex
On Fri, Feb 5, 2021 at 5:33 AM Alex Deucher <alexdeucher@gmail.com> wrote: > > On Thu, Feb 4, 2021 at 6:52 PM Dave Airlie <airlied@gmail.com> wrote: > > > > On Thu, 4 Feb 2021 at 14:57, Alex Deucher <alexdeucher@gmail.com> wrote: > > > > > > Hi Dave, Daniel, > > > > > > More fixes for 5.12. Same PR from last week with the issue Felix reported > > > fixed and a few more additional fixes on top. > > > > > > The following changes since commit a6b8720c2f85143561c3453e1cf928a2f8586ac0: > > > > > > Merge tag 'amd-drm-next-5.12-2021-01-20' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2021-01-20 13:08:18 +0100) > > > > > This brought an arm32 warning with it, I've applied Arnd's patch to > > drm-next to fix it. > > > > https://patchwork.freedesktop.org/patch/msgid/20210125124849.102037-1-arnd@kernel.org > > > > However that function has an ifdef around an ifdef that probably could > > do with cleaning up. > > Sorry about that. Bhawan fixed that up at the time: > https://patchwork.freedesktop.org/patch/415092/ > Daniel said he picked that up last week: > https://lists.freedesktop.org/archives/dri-devel/2021-January/294941.html > but I guess it never landed, otherwise I would have included it in my PR. Oops sorry, I somehow failed to push that one out :-/ I kinda liked the patch from Bhawan more, since less #ifdef. -Daniel
Hi Dave, Daniel, More fixes for 5.12. Same PR from last week with the issue Felix reported fixed and a few more additional fixes on top. The following changes since commit a6b8720c2f85143561c3453e1cf928a2f8586ac0: Merge tag 'amd-drm-next-5.12-2021-01-20' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2021-01-20 13:08:18 +0100) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.12-2021-02-03 for you to fetch changes up to c915ef890d5dc79f483e1ca3b3a5b5f1a170690c: drm/amdgpu: Prevent shift wrapping in amdgpu_read_mask() (2021-02-02 12:12:55 -0500) ---------------------------------------------------------------- amd-drm-next-5.12-2021-02-03: amdgpu: - Display fixes and cleanups - Vangogh fixes - Fix possible race when there are timeouts on two rings - SR-IOV fixes - Add missing license - DCE 10/12 bpc fixes - Display MALL fixes - Fix SMU user preference settings persistence - Fix retry in gem allocate - Add new PCI DID - Fix for manual fan speed control on cards where it was problematic - Fix regression in pinning GTT - Misc display fixes - Misc code cleanups amdkfd: - Fix config handling - Fix regression in buffer free ---------------------------------------------------------------- Aaron Liu (1): drm/amdgpu: update mmhub mgcg&ls for mmhub_v2_3 Abaci Team (1): drm/amd/display: Simplify bool conversion Alex Deucher (3): drm/amdgpu: disable gpu reset on Vangogh for now Revert "drm/amdgpu/swsmu: drop set_fan_speed_percent (v2)" drm/amdgpu/swsmu: use percent rather than rpm for manual fan control (v2) Anthony Koo (4): drm/amd/display: [FW Promotion] Release 0.0.48 drm/amd/display: [FW Promotion] Release 0.0.49 drm/amd/display: fix calculation for the pwl backlight curve drm/amd/display: [FW Promotion] Release 0.0.50 Aric Cyr (4): drm/amd/display: Allow PSTATE chnage when no displays are enabled drm/amd/display: 3.2.119 drm/amd/display: 3.2.120 drm/amd/display: 3.2.121 Arnd Bergmann (1): amdgpu: fix clang build warning Arunpravin (1): drm/amd/pm: store and reinstate swsmu user power configurations Bernard Zhao (1): amd/display: remove unneeded variable: "pattern" Bhawanpreet Lakha (4): drm/amd/display: Enable programing of MALL watermarks drm/amd/display: Dynamic cursor cache size for MALL eligibility check drm/amd/display: Update dcn30_apply_idle_power_optimizations() code drm/amd/display: reuse current context instead of recreating one Bing Guo (2): drm/amd/display: Change function decide_dp_link_settings to avoid infinite looping drm/amd/display: Fix dml20v2_ModeSupportAndSystemConfigurationFull() to check DesiredBPP. Brendan Steve Leder (1): drm/amd/display: initialize i2c speed if not initialized in dcnxxx__resource.c Christian König (1): drm/amdgpu: enable freesync for A+A configs Colin Ian King (2): drm/amd/display: Fix spelling mistake of function name drm/amdgpu: Fix masking binary not operator on two mask operations Dan Carpenter (2): drm/amd/display: Fix a potential NULL dereference drm/amdgpu: Prevent shift wrapping in amdgpu_read_mask() Evan Quan (2): Revert "Revert "drm/amdgpu: Fix NULL dereference in dpm sysfs handlers"" drm/amd/pm: correct string parsing for extra separator characters case Feifei Xu (1): drm/amdgpu:Add pcie gen5 support in pcie capability. Felix Kuehling (2): drm/amdkfd: Enable userptr support when KFD is enabled drm/amdgpu: Make contiguous pinning optional George Shen (2): drm/amd/display: Log link/connector info provided in BIOS object table drm/amd/display: Fix DPCD translation for LTTPR AUX_RD_INTERVAL Horace Chen (1): drm/amdgpu: race issue when jobs on 2 ring timeout Huang Rui (4): drm/amd/pm: print the timeout of smc message drm/amdgpu: remove gpu info firmware of green sardine drm/amdgpu: fix the issue that retry constantly once the buffer is oversize drm/amdkfd: fix null pointer panic while free buffer in kfd Jake Wang (1): drm/amd/display: Update dram_clock_change_latency for DCN2.1 Jiapeng Zhong (1): drm/amdgpu: Assign boolean values to a bool variable Jingwen Chen (2): drm/amd/amdgpu: remove redundant flush_delayed_work drm/amd/amdgpu: add error handling to amdgpu_virt_read_pf2vf_data Jinzhou Su (5): drm/amdgpu: Remove GFXOFF MASK for Vangogh drm/amdgpu: modify GCR_GENERAL_CNTL for Vangogh drm/amdgpu: Add RLC_PG_DELAY_3 for Vangogh drm/amdgpu: Allow GfxOff on Vangogh as default drm/amd/pm: Disable GFXOFF when GFX DPM or PG disabled Jonathan Gray (1): drm/amd/display: change license of color_table.c Joshua Aberback (1): drm/amd/display: Better handling of dummy p-state table Jun Lei (1): drm/amd/display: implement support for DID2.0 dsc passthrough Kevin Wang (1): drm/amd/pm: remove unused message SMU_MSG_SpareX Lang Yu (2): drm/amd/display: fix 64-bit division issue on 32-bit OS drm/amd/amdkfd: adjust dummy functions' placement Lewis Huang (1): drm/amd/display: Set power_gated to true for seamless boot pipe init Mario Kleiner (2): drm/amd/display: Fix 10/12 bpc setup in DCE output bit depth reduction. drm/amd/display: Fix HDMI deep color output for DCE 6-11. Matt Coffin (1): drm/amdgpu/pm: Account for extra separator characters in sysfs interface Michael Strauss (1): drm/amd/display: Add null pointer check to is_dig_enabled func Mike Hsieh (1): drm/amd/display: disable FEC while using eDP Mikita Lipski (1): drm/amd/display: Release DSC before acquiring Nicholas Kazlauskas (6): drm/amd/display: Use hardware sequencer functions for PG control drm/amd/display: Allow dmub srv hardware reset before HW init drm/amd/display: Guard against NULL pointer deref when get_i2c_info fails drm/amd/display: Fix reset sequence with driver direct DMCUB fw load drm/amd/display: Drop SOC bounding box hookup in DM/DC drm/amd/display: Fix CW4 programming for dmub30 cached inbox Nikola Cornij (1): drm/amd/display: Reject too small viewport size when validating plane Ori Messinger (1): amdgpu: Add Missing Sienna Cichlid DID Pratik Vishwakarma (1): Revert "drm/amd/display: Tune min clk values for MPO for RV" Prike Liang (1): drm/amdgpu/pm: no need GPU status set since mmnbif_gpu_BIF_DOORBELL_FENCE_CNTL added in FSDL Ramesh Errabolu (1): drm/amdgpu: Limit the maximum size of contiguous VRAM that can be encapsulated by an instance of DRM memory node Samson Tam (1): drm/amd/display: fix initial bounding box values for dcn3.02 Stylon Wang (4): drm/amd/display: Report Freesync to vrr_range debugfs entry in DRM drm/amd/display: Revert "Fix EDID parsing after resume from suspend" drm/amd/display: Enable "trigger_hotplug" debugfs on all outputs drm/amd/display: Add Freesync HDMI support to DMCU Sung Lee (2): drm/amd/display: DCN2X Find Secondary Pipe properly in MPO + ODM Case drm/amd/display: Add more Clock Sources to DCN2.1 Taimur Hassan (1): drm/amd/display: Workaround for some legacy DP-VGA dongles Victor Lu (3): drm/amd/display: Fix dc_sink kref count in emulated_link_detect drm/amd/display: Free atomic state after drm_atomic_commit drm/amd/display: Decrement refcount of dc_sink before reassignment Vladimir Stempen (1): drm/amd/display: Fixed corruptions on HPDRX link loss restore Wenjing Liu (2): drm/amd/display: correct some hdcp variable naming drm/amd/display: remove unused force_ignore_link_settings debug option Wyatt Wood (1): drm/amd/display: Allow dmu_stg to support cached inbox for dmub Xiaojian Du (2): drm/amd/pm: fill in the data member of v2 gpu metrics table for vangogh drm/amd/pm: remove some useless code for vangogh chen gong (1): drm/amdgpu/gfx10: update CGTS_TCC_DISABLE and CGTS_USER_TCC_DISABLE register offsets for VGH xinhui pan (1): drm/amdgpu: Fix a false positive when pin non-VRAM memory drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 87 ---------- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 138 +++++++++++++--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 87 ++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 3 + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 41 ++++- drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 84 +++++++--- drivers/gpu/drm/amd/amdgpu/nv.c | 4 + drivers/gpu/drm/amd/amdkfd/Kconfig | 2 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 80 +++++---- .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 10 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 7 +- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 6 +- drivers/gpu/drm/amd/display/dc/Makefile | 4 +- .../gpu/drm/amd/display/dc/bios/command_table.c | 61 +++++++ .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 30 +--- .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 24 +-- .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 3 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 46 ++++-- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 42 ++++- drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 19 ++- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 17 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 +- drivers/gpu/drm/amd/display/dc/dc.h | 17 +- drivers/gpu/drm/amd/display/dc/dc_dsc.h | 7 +- drivers/gpu/drm/amd/display/dc/dc_edid_parser.c | 80 +++++++++ drivers/gpu/drm/amd/display/dc/dc_edid_parser.h | 44 +++++ drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + drivers/gpu/drm/amd/display/dc/dc_stream.h | 3 +- .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 14 ++ drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 120 ++++++++++++++ drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 11 ++ .../drm/amd/display/dc/dce/dce_stream_encoder.c | 1 + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 8 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 21 ++- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 9 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 118 +------------ .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 12 +- drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 6 +- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 182 ++++++++++++++++----- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 3 +- .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 143 +++------------- drivers/gpu/drm/amd/display/dc/dcn301/Makefile | 3 +- .../drm/amd/display/dc/dcn301/dcn301_resource.c | 107 +----------- drivers/gpu/drm/amd/display/dc/dcn302/Makefile | 3 +- .../drm/amd/display/dc/dcn302/dcn302_resource.c | 173 +++++++++++++++++++- .../drm/amd/display/dc/dcn302/dcn302_resource.h | 2 + drivers/gpu/drm/amd/display/dc/dm_cp_psp.h | 7 +- .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 117 ++++++++----- .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 32 ++-- drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 29 ++-- drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 10 ++ drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 3 +- drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 10 +- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 11 +- drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 2 + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 2 +- drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 9 +- .../drm/amd/display/modules/color/color_table.c | 26 ++- drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 2 +- .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 2 +- drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 4 +- .../drm/amd/display/modules/power/power_helpers.c | 2 +- drivers/gpu/drm/amd/include/amd_pcie.h | 2 + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 19 ++- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 25 ++- drivers/gpu/drm/amd/pm/inc/smu_types.h | 2 - drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 7 +- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 176 ++++++++++++++++++-- drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 26 ++- drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 26 ++- .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 26 ++- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 89 ++++------ drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 19 ++- drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 4 +- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 11 +- 81 files changed, 1721 insertions(+), 910 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dc_edid_parser.c create mode 100644 drivers/gpu/drm/amd/display/dc/dc_edid_parser.h