From: Dave Airlie <airlied@gmail.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: LKML <linux-kernel@vger.kernel.org>,
dri-devel <dri-devel@lists.freedesktop.org>
Subject: [git pull] drm fixes (part2) for 6.7 final
Date: Fri, 5 Jan 2024 13:31:53 +1000 [thread overview]
Message-ID: <CAPM=9txH-Rag6weAFHx_VgozGmLd4RinHCOzpGbyVsLT7qpcfA@mail.gmail.com> (raw)
Hi Linus,
Hopefully I got the version numbers right this time. This is the final
set of fixes I think, some amdgpu and nouveau.
Since I suspect this is a bit larger than you might be comfortable
with, I'll give some more info:
The amdgpu ones are fairly normal, the one that is a bit large is a
fix for a newly introduced IP in 6.7 so unlikely to cause regressions.
The nouveau ones are mostly memory leaks and debugging cleanups from
the GSP (new nvidia firmware) enablement. There are some GSP changes
to the message passing code and a subsequent fix for eDP panel turn
on, that means my laptop can turn on the panel in GSP mode. These are
fairly low chance of disrupting things since GSP is new in 6.7. The
final not all in GSP fix is a deadlock seen with i915/nouveau when GSP
is used where the the fence and irq paths have locking inversions,
I've pushed some irq enablement out to a workqueue, and this has seen
some fairly decent testing.
Dave.
drm-fixes-2024-01-05:
drm fixes for 6.7 final (part 2 - correct version)
amdgpu:
- DP MST fix
- SMU 13.0.6 fixes
- Fix displays on macbooks using vega12
- Fix VSC and colorimetry on DP/eDP
nouveau:
- fix deadlock between fence signalling and irq paths
- fix GSP memory leaks
- fix GSP leftover debug
- hide some GSP callback messages
- fix GSP display disable path
- fix GSP ACPI interaction
- handle errors in ctrl messages
- use errors info to fix DP link training
The following changes since commit faa21f4c20960fee268bdb0fe977ed0edb6685fe:
Merge tag 'drm-misc-fixes-2024-01-03' of
git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2024-01-04
11:18:32 +1000)
are available in the Git repository at:
git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2024-01-05
for you to fetch changes up to eb284f4b37817d2038fdfe1a9d51769730ab7b5f:
drm/nouveau/dp: Honor GSP link training retry timeouts (2024-01-05
12:27:53 +1000)
----------------------------------------------------------------
drm fixes for 6.7 final (part 2 - correct version)
amdgpu:
- DP MST fix
- SMU 13.0.6 fixes
- Fix displays on macbooks using vega12
- Fix VSC and colorimetry on DP/eDP
nouveau:
- fix deadlock between fence signalling and irq paths
- fix GSP memory leaks
- fix GSP leftover debug
- hide some GSP callback messages
- fix GSP display disable path
- fix GSP ACPI interaction
- handle errors in ctrl messages
- use errors info to fix DP link training
----------------------------------------------------------------
Alex Deucher (2):
drm/amd/display: add nv12 bounding box
drm/amdgpu: skip gpu_info fw loading on navi12
Asad Kamal (5):
drm/amd/pm: Use separate metric table for APU
drm/amd/pm: Update metric table for jpeg/vcn data
drm/amd/pm: Add mem_busy_percent for GCv9.4.3 apu
drm/amd/pm: Add gpu_metrics_v1_5
drm/amd/pm: Use gpu_metrics_v1_5 for SMUv13.0.6
Dave Airlie (10):
Merge tag 'amd-drm-fixes-6.7-2024-01-04' of
https://gitlab.freedesktop.org/agd5f/linux into drm-fixes
nouveau/gsp: add three notifier callbacks that we see in normal
operation (v2)
nouveau/gsp: drop some acpi related debug
nouveau: fix disp disabling with GSP
nouveau/gsp: free acpi object after use
nouveau/gsp: free userd allocation.
nouveau/gsp: convert gsp errors to generic errors
nouveau/gsp: don't free ctrl messages on errors
nouveau/gsp: always free the alloc messages on r535
nouveau: push event block/allowing out of the fence context
Joshua Ashton (1):
drm/amd/display: Fix sending VSC (+ colorimetry) packets for
DP/eDP displays without PSR
Lyude Paul (2):
drm/nouveau/gsp: Fix ACPI MXDM/MXDS method invocations
drm/nouveau/dp: Honor GSP link training retry timeouts
Wayne Lin (1):
drm/amd/display: pbn_div need be updated for hotplug event
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 11 +-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 11 +-
.../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 110 ++++++++++++-
.../amd/display/modules/info_packet/info_packet.c | 13 +-
drivers/gpu/drm/amd/include/kgd_pp_interface.h | 80 ++++++++++
drivers/gpu/drm/amd/pm/amdgpu_pm.c | 4 +-
.../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_pmfw.h | 100 +++++++++++-
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 153 ++++++++++--------
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 3 +
drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 17 +-
drivers/gpu/drm/nouveau/nouveau_fence.c | 28 +++-
drivers/gpu/drm/nouveau/nouveau_fence.h | 5 +-
drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c | 6 +-
drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c | 171 +++++++++++++--------
drivers/gpu/drm/nouveau/nvkm/engine/fifo/r535.c | 1 +
drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 86 +++++++----
16 files changed, 603 insertions(+), 196 deletions(-)
next reply other threads:[~2024-01-05 3:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-05 3:31 Dave Airlie [this message]
2024-01-05 20:47 ` [git pull] drm fixes (part2) for 6.7 final pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAPM=9txH-Rag6weAFHx_VgozGmLd4RinHCOzpGbyVsLT7qpcfA@mail.gmail.com' \
--to=airlied@gmail.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).