Lang Yu
5daff15cd0
drm/amdgpu: unmap and remove csa_va properly
...
Root PD BO should be reserved before unmap and remove
a bo_va from VM otherwise lockdep will complain.
v2: check fpriv->csa_va is not NULL instead of amdgpu_mcbp (christian)
[14616.936827] WARNING: CPU: 6 PID: 1711 at drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1762 amdgpu_vm_bo_del+0x399/0x3f0 [amdgpu]
[14616.937096] Call Trace:
[14616.937097] <TASK>
[14616.937102] amdgpu_driver_postclose_kms+0x249/0x2f0 [amdgpu]
[14616.937187] drm_file_free+0x1d6/0x300 [drm]
[14616.937207] drm_close_helper.isra.0+0x62/0x70 [drm]
[14616.937220] drm_release+0x5e/0x100 [drm]
[14616.937234] __fput+0x9f/0x280
[14616.937239] ____fput+0xe/0x20
[14616.937241] task_work_run+0x61/0x90
[14616.937246] exit_to_user_mode_prepare+0x215/0x220
[14616.937251] syscall_exit_to_user_mode+0x2a/0x60
[14616.937254] do_syscall_64+0x48/0x90
[14616.937257] entry_SYSCALL_64_after_hwframe+0x63/0xcd
Signed-off-by: Lang Yu <Lang.Yu@amd.com >
Acked-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:47:26 -04:00
Joshua Ashton
eaa7d83011
drm/amd/display: Refactor avi_info_frame colorimetry determination
...
Replace the messy two if-else chains here that were
on the same value with a switch on the enum.
Signed-off-by: Joshua Ashton <joshua@froggi.es >
Signed-off-by: Harry Wentland <harry.wentland@amd.com >
Reviewed-by: Harry Wentland <harry.wentland@amd.com >
Cc: Pekka Paalanen <ppaalanen@gmail.com >
Cc: Sebastian Wick <sebastian.wick@redhat.com >
Cc: Vitaly.Prosyak@amd.com
Cc: Joshua Ashton <joshua@froggi.es >
Cc: Simon Ser <contact@emersion.fr >
Cc: Melissa Wen <mwen@igalia.com >
Cc: dri-devel@lists.freedesktop.org
Cc: amd-gfx@lists.freedesktop.org
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:47:22 -04:00
Harry Wentland
fd45b6540f
drm/amd/display: Add debugfs for testing output colorspace
...
In order to IGT test colorspace we'll want to print
the currently enabled colorspace on a stream. We add
a new debugfs to do so, using the same scheme as
current bpc reporting.
This might also come in handy when debugging display
issues.
v4:
- Fix function doc comment
- Fix sRGB debug print
Signed-off-by: Harry Wentland <harry.wentland@amd.com >
Reviewed-by: Joshua Ashton <joshua@froggi.es >
Cc: Pekka Paalanen <ppaalanen@gmail.com >
Cc: Sebastian Wick <sebastian.wick@redhat.com >
Cc: Vitaly.Prosyak@amd.com
Cc: Joshua Ashton <joshua@froggi.es >
Cc: Simon Ser <contact@emersion.fr >
Cc: Melissa Wen <mwen@igalia.com >
Cc: dri-devel@lists.freedesktop.org
Cc: amd-gfx@lists.freedesktop.org
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:47:16 -04:00
Joshua Ashton
bd49f19039
drm/amd/display: Always set crtcinfo from create_stream_for_sink
...
Given that we always pass dm_state into here now, this won't ever
trigger anymore.
This is needed for we will always fail mode validation with invalid
clocks or link bandwidth errors.
Signed-off-by: Joshua Ashton <joshua@froggi.es >
Signed-off-by: Harry Wentland <harry.wentland@amd.com >
Reviewed-by: Harry Wentland <harry.wentland@amd.com >
Cc: Pekka Paalanen <ppaalanen@gmail.com >
Cc: Sebastian Wick <sebastian.wick@redhat.com >
Cc: Vitaly.Prosyak@amd.com
Cc: Joshua Ashton <joshua@froggi.es >
Cc: Simon Ser <contact@emersion.fr >
Cc: Melissa Wen <mwen@igalia.com >
Cc: dri-devel@lists.freedesktop.org
Cc: amd-gfx@lists.freedesktop.org
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:47:11 -04:00
Harry Wentland
2e656827ce
drm/amd/display: Send correct DP colorspace infopacket
...
Look at connector->colorimetry to determine output colorspace.
We don't want to impact current SDR behavior, so
DRM_MODE_COLORIMETRY_DEFAULT preserves current behavior.
Also add support to explicitly set BT601 and BT709.
v4:
- Roll support for BT709 and BT601 into this patch
- Add default case to avoid warnings for unhandled
enum values
Signed-off-by: Harry Wentland <harry.wentland@amd.com >
Reviewed-by: Joshua Ashton <joshua@froggi.es >
Cc: Pekka Paalanen <ppaalanen@gmail.com >
Cc: Sebastian Wick <sebastian.wick@redhat.com >
Cc: Vitaly.Prosyak@amd.com
Cc: Joshua Ashton <joshua@froggi.es >
Cc: Simon Ser <contact@emersion.fr >
Cc: Melissa Wen <mwen@igalia.com >
Cc: dri-devel@lists.freedesktop.org
Cc: amd-gfx@lists.freedesktop.org
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:47:05 -04:00
Harry Wentland
a0b433c858
drm/amd/display: Signal mode_changed if colorspace changed
...
We need to signal mode_changed to make sure we update the output
colorspace.
v2: No need to call drm_hdmi_avi_infoframe_colorimetry as DC does its
own infoframe packing.
Signed-off-by: Harry Wentland <harry.wentland@amd.com >
Reviewed-by: Leo Li <sunpeng.li@amd.com >
Reviewed-by: Joshua Ashton <joshua@froggi.es >
Cc: Pekka Paalanen <ppaalanen@gmail.com >
Cc: Sebastian Wick <sebastian.wick@redhat.com >
Cc: Vitaly.Prosyak@amd.com
Cc: Uma Shankar <uma.shankar@intel.com >
Cc: Joshua Ashton <joshua@froggi.es >
Cc: Simon Ser <contact@emersion.fr >
Cc: Melissa Wen <mwen@igalia.com >
Cc: dri-devel@lists.freedesktop.org
Cc: amd-gfx@lists.freedesktop.org
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:46:57 -04:00
Harry Wentland
15f9dfd545
drm/amd/display: Register Colorspace property for DP and HDMI
...
We want compositors to be able to set the output
colorspace on DP and HDMI outputs, based on the
caps reported from the receiver via EDID.
Signed-off-by: Harry Wentland <harry.wentland@amd.com >
Reviewed-by: Joshua Ashton <joshua@froggi.es >
Cc: Pekka Paalanen <ppaalanen@gmail.com >
Cc: Sebastian Wick <sebastian.wick@redhat.com >
Cc: Vitaly.Prosyak@amd.com
Cc: Joshua Ashton <joshua@froggi.es >
Cc: Simon Ser <contact@emersion.fr >
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com >
Cc: Melissa Wen <mwen@igalia.com >
Cc: dri-devel@lists.freedesktop.org
Cc: amd-gfx@lists.freedesktop.org
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:46:52 -04:00
Harry Wentland
cb841d27b8
drm/amd/display: Always pass connector_state to stream validation
...
We need the connector_state for colorspace and scaling information
and can get it from connector->state.
Signed-off-by: Harry Wentland <harry.wentland@amd.com >
Reviewed-by: Joshua Ashton <joshua@froggi.es >
Cc: Pekka Paalanen <ppaalanen@gmail.com >
Cc: Sebastian Wick <sebastian.wick@redhat.com >
Cc: Vitaly.Prosyak@amd.com
Cc: Joshua Ashton <joshua@froggi.es >
Cc: Simon Ser <contact@emersion.fr >
Cc: Melissa Wen <mwen@igalia.com >
Cc: dri-devel@lists.freedesktop.org
Cc: amd-gfx@lists.freedesktop.org
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:46:49 -04:00
Harry Wentland
c265f340ea
drm/connector: Allow drivers to pass list of supported colorspaces
...
Drivers might not support all colorspaces defined in
dp_colorspaces and hdmi_colorspaces. This results in
undefined behavior when userspace is setting an
unsupported colorspace.
Allow drivers to pass the list of supported colorspaces
when creating the colorspace property.
v2:
- Use 0 to indicate support for all colorspaces (Jani)
- Print drm_dbg_kms message when drivers pass 0
to signal that drivers should specify supported
colorspaecs explicity (Jani)
v3:
- Move changes to create a common colorspace_names array
to separate patch
v6:
- Avoid magic when passing 0 for supported_colorspaces;
be explicit in treating it as "all DP/HDMI"
Signed-off-by: Harry Wentland <harry.wentland@amd.com >
Reviewed-by: Sebastian Wick <sebastian.wick@redhat.com >
Reviewed-by: Joshua Ashton <joshua@froggi.es >
Reviewed-by: Simon Ser <contact@emersion.fr >
Cc: Pekka Paalanen <ppaalanen@gmail.com >
Cc: Sebastian Wick <sebastian.wick@redhat.com >
Cc: Vitaly.Prosyak@amd.com
Cc: Uma Shankar <uma.shankar@intel.com >
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com >
Cc: Joshua Ashton <joshua@froggi.es >
Cc: Jani Nikula <jani.nikula@linux.intel.com >
Cc: Simon Ser <contact@emersion.fr >
Cc: Melissa Wen <mwen@igalia.com >
Cc: dri-devel@lists.freedesktop.org
Cc: amd-gfx@lists.freedesktop.org
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:46:44 -04:00
Harry Wentland
035d53e0f3
drm/connector: Print connector colorspace in state debugfs
...
v3: Fix kerneldocs (kernel test robot)
v4: Avoid returning NULL from drm_get_colorspace_name
Signed-off-by: Harry Wentland <harry.wentland@amd.com >
Reviewed-by: Sebastian Wick <sebastian.wick@redhat.com >
Reviewed-by: Joshua Ashton <joshua@froggi.es >
Reviewed-by: Simon Ser <contact@emersion.fr >
Cc: Pekka Paalanen <ppaalanen@gmail.com >
Cc: Sebastian Wick <sebastian.wick@redhat.com >
Cc: Vitaly.Prosyak@amd.com
Cc: Uma Shankar <uma.shankar@intel.com >
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com >
Cc: Joshua Ashton <joshua@froggi.es >
Cc: Jani Nikula <jani.nikula@linux.intel.com >
Cc: Simon Ser <contact@emersion.fr >
Cc: Melissa Wen <mwen@igalia.com >
Cc: dri-devel@lists.freedesktop.org
Cc: amd-gfx@lists.freedesktop.org
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:46:41 -04:00
Harry Wentland
c627087cb1
drm/connector: Use common colorspace_names array
...
We an use bitfields to track the support ones for HDMI
and DP. This allows us to print colorspaces in a consistent
manner without needing to know whether we're dealing with
DP or HDMI.
v4:
- Rename _MAX to _COUNT and leave comment to indicate
it's not a valid value
- Fix misplaced function doc
v6:
- Drop magic in drm_mode_create_colorspace_property for
dealing with "0" supported_colorspaces. Expect the caller
to always provide a non-zero supported_colorspaces.
- Improve error checking and logging
Signed-off-by: Harry Wentland <harry.wentland@amd.com >
Reviewed-by: Sebastian Wick <sebastian.wick@redhat.com >
Reviewed-by: Joshua Ashton <joshua@froggi.es >
Reviewed-by: Simon Ser <contact@emersion.fr >
Cc: Pekka Paalanen <ppaalanen@gmail.com >
Cc: Sebastian Wick <sebastian.wick@redhat.com >
Cc: Vitaly.Prosyak@amd.com
Cc: Uma Shankar <uma.shankar@intel.com >
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com >
Cc: Joshua Ashton <joshua@froggi.es >
Cc: Jani Nikula <jani.nikula@linux.intel.com >
Cc: Simon Ser <contact@emersion.fr >
Cc: Melissa Wen <mwen@igalia.com >
Cc: dri-devel@lists.freedesktop.org
Cc: amd-gfx@lists.freedesktop.org
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:46:34 -04:00
Harry Wentland
6120611abc
drm/connector: Pull out common create_colorspace_property code
...
Signed-off-by: Harry Wentland <harry.wentland@amd.com >
Reviewed-by: Sebastian Wick <sebastian.wick@redhat.com >
Reviewed-by: Joshua Ashton <joshua@froggi.es >
Reviewed-by: Simon Ser <contact@emersion.fr >
Cc: Pekka Paalanen <ppaalanen@gmail.com >
Cc: Sebastian Wick <sebastian.wick@redhat.com >
Cc: Vitaly.Prosyak@amd.com
Cc: Uma Shankar <uma.shankar@intel.com >
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com >
Cc: Joshua Ashton <joshua@froggi.es >
Cc: Jani Nikula <jani.nikula@linux.intel.com >
Cc: Simon Ser <contact@emersion.fr >
Cc: Melissa Wen <mwen@igalia.com >
Cc: dri-devel@lists.freedesktop.org
Cc: amd-gfx@lists.freedesktop.org
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:46:28 -04:00
Joshua Ashton
f96c61fe03
drm/connector: Add enum documentation to drm_colorspace
...
To match the other enums, and add more information about these values.
v2:
- Specify where an enum entry comes from
- Clarify DEFAULT and NO_DATA behavior
- BT.2020 CYCC is "constant luminance"
- correct type for BT.601
v4:
- drop DP/HDMI clarifications that might create
more questions than answers
v5:
- Add note on YCC and RGB variants
Signed-off-by: Joshua Ashton <joshua@froggi.es >
Signed-off-by: Harry Wentland <harry.wentland@amd.com >
Reviewed-by: Harry Wentland <harry.wentland@amd.com >
Reviewed-by: Sebastian Wick <sebastian.wick@redhat.com >
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.com >
Reviewed-by: Simon Ser <contact@emersion.fr >
Cc: Pekka Paalanen <ppaalanen@gmail.com >
Cc: Sebastian Wick <sebastian.wick@redhat.com >
Cc: Vitaly.Prosyak@amd.com
Cc: Uma Shankar <uma.shankar@intel.com >
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com >
Cc: Joshua Ashton <joshua@froggi.es >
Cc: Simon Ser <contact@emersion.fr >
Cc: Melissa Wen <mwen@igalia.com >
Cc: dri-devel@lists.freedesktop.org
Cc: amd-gfx@lists.freedesktop.org
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:46:20 -04:00
Harry Wentland
1626761ee4
drm/connector: Convert DRM_MODE_COLORIMETRY to enum
...
This allows us to use strongly typed arguments.
v2:
- Bring NO_DATA back
- Provide explicit enum values
v3:
- Drop unnecessary '&' from kerneldoc (emersion)
v4:
- Fix Normal Colorimetry comment
Signed-off-by: Harry Wentland <harry.wentland@amd.com >
Reviewed-by: Simon Ser <contact@emersion.fr >
Reviewed-by: Sebastian Wick <sebastian.wick@redhat.com >
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.com >
Reviewed-by: Joshua Ashton <joshua@froggi.es >
Cc: Pekka Paalanen <ppaalanen@gmail.com >
Cc: Sebastian Wick <sebastian.wick@redhat.com >
Cc: Vitaly.Prosyak@amd.com
Cc: Uma Shankar <uma.shankar@intel.com >
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com >
Cc: Joshua Ashton <joshua@froggi.es >
Cc: Simon Ser <contact@emersion.fr >
Cc: Melissa Wen <mwen@igalia.com >
Cc: dri-devel@lists.freedesktop.org
Cc: amd-gfx@lists.freedesktop.org
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:46:14 -04:00
Mukul Joshi
597364adc0
drm/amdkfd: Fix reserved SDMA queues handling
...
This patch fixes a regression caused by a bad merge where
the handling of reserved SDMA queues was accidentally removed.
With the fix, the reserved SDMA queues are again correctly
marked as unavailable for allocation.
Fixes: a805889a15 ("drm/amdkfd: Update SDMA queue management for GFX9.4.3")
Signed-off-by: Mukul Joshi <mukul.joshi@amd.com >
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:44:56 -04:00
Alex Deucher
c1ac2ea802
drm/amdgpu: add missing radeon secondary PCI ID
...
0x5b70 is a missing RV370 secondary id. Add it so
we don't try and probe it with amdgpu.
Cc: michel@daenzer.net
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com >
Tested-by: Michel Dänzer <mdaenzer@redhat.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:44:49 -04:00
Mario Limonciello
bbcc3514ab
drm/amd: Check that a system is a NUMA system before looking for SRAT
...
It's pointless on laptops to look for the SRAT table as these are not
NUMA. Check the number of possible nodes is > 1 to decide whether to
look for SRAT.
Suggested-by: Felix Kuehling <Felix.Kuehling@amd.com >
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com >
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:44:46 -04:00
Jonathan Kim
7386f88ab1
drm/amdkfd: fix vmfault signalling with additional data.
...
Exception handling for vmfaults should be raised with additional data.
Reported-by: Mukul Joshi <mukul.joshi@amd.com >
Signed-off-by: Jonathan Kim <jonathan.kim@amd.com >
Reviewed-by: Mukul Joshi <mukul.joshi@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:44:44 -04:00
Stanley.Yang
0bc3137b21
drm/amdgpu: Set EEPROM ras info
...
Set EEPROM ras info: rma status, health percent and bad
page threshold.
Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:44:40 -04:00
Stanley.Yang
7c2551fa1d
drm/amdgpu: Calculate EEPROM table ras info bytes sum
...
It's more reasonable to check EEPROM table ras info bytes.
Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:44:38 -04:00
Stanley.Yang
7f599fed3b
drm/amdgpu: Add support EEPROM table v2.1
...
Add ras info to EEPROM table, app can analyse device ECC
status without GPU driver through EEPROM table ras info.
Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:44:34 -04:00
Stanley.Yang
b573cf88c0
drm/amdgpu: Support setting EEPROM table version
...
Add setting EEPROM table version interface for umcv8.10,
Add EEPROM table v2.1 to UMC v8.10.
Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:44:31 -04:00
Stanley.Yang
65183faec8
drm/amdgpu: Add RAS table v2.1 macro definition
...
Add RAS EEPROM table version 2.1 macro definition.
Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:44:28 -04:00
Stanley.Yang
71c79a1960
drm/amdgpu: Rename ras table version
...
Rename RAS_TABLE_VER to RAS_TABLE_VER_V1,
move RAS_TABLE_VER_V1 from amdgpu_ras_eeprom.c to amdgpu_ras_eeprom.h.
Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:44:24 -04:00
Jiadong Zhu
ea791e704b
drm/amdgpu: Implement gfx9 patch functions for resubmission
...
Patch the packages including CONTEXT_CONTROL and WRITE_DATA for gfx9
during the resubmission scenario.
Signed-off-by: Jiadong Zhu <Jiadong.Zhu@amd.com >
Acked-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:44:22 -04:00
Jiadong Zhu
8ff865be93
drm/amdgpu: Modify indirect buffer packages for resubmission
...
When the preempted IB frame resubmitted to cp, we need to modify the frame
data including:
1. set PRE_RESUME 1 in CONTEXT_CONTROL.
2. use meta data(DE and CE) read from CSA in WRITE_DATA.
Add functions to save the location the first time IBs emitted and callback
to patch the package when resubmission happens.
Signed-off-by: Jiadong Zhu <Jiadong.Zhu@amd.com >
Acked-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:44:15 -04:00
Emily Deng
f2bcc0c7db
drm/amdgpu/mmsch: Correct the definition for mmsch init header
...
For the header, it is version related, shouldn't use MAX_VCN_INSTANCES.
Signed-off-by: Emily Deng <Emily.Deng@amd.com >
Reviewed-by: Feifei Xu <Feifei.Xu@amd.com >
Acked-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:44:12 -04:00
Dan Carpenter
8be2950467
drm/amdkfd: potential error pointer dereference in ioctl
...
The "target" either comes from kfd_create_process() which returns error
pointers on error or kfd_lookup_process_by_pid() which returns NULL on
error. So we need to check for both types of errors.
Fixes: 0ab2d7532b ("drm/amdkfd: prepare per-process debug enable and disable")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org >
Reviewed-by: Jonathan Kim <jonathan.kim@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:43:00 -04:00
Aurabindo Pillai
33e82119cf
drm/amd/display: Only use ODM2:1 policy for high pixel rate displays
...
We only gain a benefit of using the ODM2:1 dynamic policy if it allow us
to decrease DISPCLK to use the VMIN freq. If the display config can
already achieve VMIN DISPCLK freq without ODM2:1, don't apply the
policy.
This patch was reverted but that causes some IGT regressions. To
unblock, the patch is being applied again until IGT failures are
fixed.
Signed-off-by: Alvin Lee <Alvin.Lee2@amd.com >
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com >
Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com >
2023-06-09 12:42:56 -04:00
Dan Carpenter
b758850715
drm/amd/pm: Fix memory some memory corruption
...
The "od_table" is a pointer to a large struct, but this code is doing
pointer math as if it were pointing to bytes. It results in writing
far outside the struct.
Fixes: 2e8452ea4e ("drm/amd/pm: fulfill the OD support for SMU13.0.0")
Fixes: 2a9aa52e46 ("drm/amd/pm: fulfill the OD support for SMU13.0.7")
Reviewed-by: Evan Quan <evan.quan@amd.com >
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:41:48 -04:00
Sui Jingfeng
d155cfff48
drm/amdgpu: display/Kconfig: replace leading spaces with tab
...
This patch replace the leading spaces with tab, make them keep aligned with
the rest of the config options. No functional change.
Signed-off-by: Sui Jingfeng <suijingfeng@loongson.cn >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:41:45 -04:00
Hamza Mahfooz
8205494247
drm/amd/display: mark dml314's UseMinimumDCFCLK() as noinline_for_stack
...
clang reports:
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn314/display_mode_vba_314.c:3892:6: error: stack frame size (2632) exceeds limit (2048) in 'dml314_ModeSupportAndSystemConfigurationFull' [-Werror,-Wframe-larger-than]
3892 | void dml314_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_lib)
| ^
1 error generated.
So, since UseMinimumDCFCLK() consumes a lot of stack space, mark it as
noinline_for_stack to prevent it from blowing up
dml314_ModeSupportAndSystemConfigurationFull()'s stack size.
Acked-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:41:41 -04:00
Hamza Mahfooz
caf0f98dc2
drm/amd/display: mark dml31's UseMinimumDCFCLK() as noinline_for_stack
...
clang reports:
drivers/gpu/drm/amd/amdgpu/../display/dc/dml/dcn31/display_mode_vba_31.c:3797:6: error: stack frame size (2632) exceeds limit (2048) in 'dml31_ModeSupportAndSystemConfigurationFull' [-Werror,-Wframe-larger-than]
3797 | void dml31_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_lib)
| ^
1 error generated.
So, since UseMinimumDCFCLK() consumes a lot of stack space, mark it as
noinline_for_stack to prevent it from blowing up
dml31_ModeSupportAndSystemConfigurationFull()'s stack size.
Acked-by: Alex Deucher <alexander.deucher@amd.com >
Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:41:38 -04:00
Srinivasan Shanmugam
35c7b59e36
drm/amd/display: Fix unused variable ‘should_lock_all_pipes’
...
Fix below compilation error:
drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc.c:3524:7: error: unused variable 'should_lock_all_pipes' [-Werror,-Wunused-variable]
bool should_lock_all_pipes = (update_type != UPDATE_TYPE_FAST);
Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com >
Cc: Aurabindo Pillai <aurabindo.pillai@amd.com >
Cc: Harry Wentland <harry.wentland@amd.com >
Cc: Alex Deucher <alexander.deucher@amd.com >
Reviewed-by: Hamza Mahfooz <hamza.mahfooz@amd.com >
Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com >
Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:41:35 -04:00
Alvin Lee
bbd069a860
drm/amd/display: Reduce sdp bw after urgent to 90%
...
[Description]
Reduce expected SDP bandwidth due to poor QoS and
arbitration issues on high bandwidth configs
Cc: Mario Limonciello <mario.limonciello@amd.com >
Cc: Alex Deucher <alexander.deucher@amd.com >
Cc: stable@vger.kernel.org
Acked-by: Stylon Wang <stylon.wang@amd.com >
Signed-off-by: Alvin Lee <alvin.lee2@amd.com >
Reviewed-by: Nevenko Stupar <Nevenko.Stupar@amd.com >
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:41:31 -04:00
Max Tseng
8e7b3f5435
drm/amd/display: Add control flag to dc_stream_state to skip eDP BL off/link off
...
Add control flag to dc_stream_state to skip eDP BL off/link off.
Acked-by: Stylon Wang <stylon.wang@amd.com >
Signed-off-by: Max Tseng <max.tseng@amd.com >
Reviewed-by: Anthony Koo <Anthony.Koo@amd.com >
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:41:29 -04:00
Saaem Rizvi
490ddccb84
drm/amd/display: Wrong index type for pipe iterator
...
[Why and How]
Type mismatch in index and pipe count might cause an infinite loop. code
Change should resolve this issue.
Acked-by: Stylon Wang <stylon.wang@amd.com >
Signed-off-by: Saaem Rizvi <syedsaaem.rizvi@amd.com >
Reviewed-by: Josip Pavic <Josip.Pavic@amd.com >
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:41:26 -04:00
Alvin Lee
0baae62463
drm/amd/display: Refactor fast update to use new HWSS build sequence
...
[Description]
- Refactor HW sequencer to use a build / execute sequence
- Also move gamma updates to become fast
v2: squash in build fix ("drm/amd/display: Fix guarding of 'if (dc->debug.visual_confirm)'")
Acked-by: Stylon Wang <stylon.wang@amd.com >
Signed-off-by: Alvin Lee <alvin.lee2@amd.com >
Reviewed-by: Jun Lei <jun.lei@amd.com >
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:41:22 -04:00
Dmytro Laktyushkin
49f26218c3
drm/amd/display: fix dcn315 single stream crb allocation
...
Change to improve avoiding asymetric crb calculations for single stream
scenarios.
Cc: Mario Limonciello <mario.limonciello@amd.com >
Cc: Alex Deucher <alexander.deucher@amd.com >
Cc: stable@vger.kernel.org
Acked-by: Stylon Wang <stylon.wang@amd.com >
Signed-off-by: Dmytro Laktyushkin <dmytro.laktyushkin@amd.com >
Reviewed-by: Charlene Liu <Charlene.Liu@amd.com >
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:41:18 -04:00
YiPeng Chai
869bcf59fd
drm/amdgpu: change reserved vram info print
...
The link object of mgr->reserved_pages is the blocks
variable in struct amdgpu_vram_reservation, not the
link variable in struct drm_buddy_block.
Signed-off-by: YiPeng Chai <YiPeng.Chai@amd.com >
Reviewed-by: Arunpravin Paneer Selvam <Arunpravin.PaneerSelvam@amd.com >
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
Cc: stable@vger.kernel.org
2023-06-09 12:41:14 -04:00
Chia-I Wu
5a863904ba
drm/amdgpu: fix xclk freq on CHIP_STONEY
...
According to Alex, most APUs from that time seem to have the same issue
(vbios says 48Mhz, actual is 100Mhz). I only have a CHIP_STONEY so I
limit the fixup to CHIP_STONEY
Signed-off-by: Chia-I Wu <olvaffe@gmail.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:41:11 -04:00
Min Li
e6850f98ef
drm/radeon: fix race condition UAF in radeon_gem_set_domain_ioctl
...
Userspace can race to free the gobj(robj converted from), robj should not
be accessed again after drm_gem_object_put, otherwith it will result in
use-after-free.
Reviewed-by: Christian König <christian.koenig@amd.com >
Signed-off-by: Min Li <lm0963hack@gmail.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:41:08 -04:00
Alex Deucher
5a03159ab7
Revert "drm/amdgpu: switch to golden tsc registers for raven/raven2"
...
This reverts commit f03eb1d26c .
This results in inconsistent timing reported via asynchronous
GPU queries.
Link: https://lists.freedesktop.org/archives/amd-gfx/2023-May/093731.html
Cc: Jesse.Zhang@amd.com
Cc: michel@daenzer.net
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:40:56 -04:00
Alex Deucher
f9bfc9fff2
Revert "drm/amdgpu: Differentiate between Raven2 and Raven/Picasso according to revision id"
...
This reverts commit 9d2d1827af .
This results in inconsistent timing reported via asynchronous
GPU queries.
Link: https://lists.freedesktop.org/archives/amd-gfx/2023-May/093731.html
Cc: Jesse.Zhang@amd.com
Cc: michel@daenzer.net
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:40:17 -04:00
Alex Deucher
a15a77c8e6
Revert "drm/amdgpu: change the reference clock for raven/raven2"
...
This reverts commit fbc24293ca .
This results in inconsistent timing reported via asynchronous
GPU queries.
Link: https://lists.freedesktop.org/archives/amd-gfx/2023-May/093731.html
Cc: Jesse.Zhang@amd.com
Cc: michel@daenzer.net
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:40:01 -04:00
Stanley.Yang
3898c8fc42
drm/amdgpu: convert vcn/jpeg logical mask to physical mask
...
Changed from V1:
Remove amdgpu_ras_logical_mask_to_physical_mask
due to GET_MASK provides same feature.
Support convert VCN/JPEG logical mask to physical
mask.
Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com >
Reviewed-by: Tao Zhou <tao.zhou1@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:39:58 -04:00
Stanley.Yang
e3959cb547
drm/amdgpu: support check vcn jpeg block mask
...
Support VCN/JPEG instance mask checking, pass logical
mask directly except GFX/SDMA/VCN/JPEG blocks.
Changed from V1:
correct a typo
Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com >
Reviewed-by: Tao Zhou <tao.zhou1@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:39:54 -04:00
Stanley.Yang
61a7c16239
drm/amdgpu: pass xcc mask to ras ta
...
pass xcc mask to ras ta, ras ta will compare
the mask with the one from chiplet topology.
Changed from V1:
Remove IP version checking.
Set ras_cmd->ras_init_message.init_flags.xcc_mask
directly due to xcc_mask is common structres to
all the devices.
Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com >
Reviewed-by: Tao Zhou <tao.zhou1@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:39:51 -04:00
Kenneth Feng
d522ca2714
drm/amd/pm: update smu-driver if header for smu 13.0.0 and smu 13.0.10
...
update smu-driver if header for smu 13.0.0 and smu 13.0.10
Signed-off-by: Kenneth Feng <kenneth.feng@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:39:45 -04:00
Le Ma
09a77a40b5
drm/amdgpu/pm: notify driver unloading to PMFW for SMU v13.0.6 dGPU
...
Per requested, follow the same sequence as APU to send only
PPSMC_MSG_PrepareForDriverUnload to PMFW during driver unloading.
Signed-off-by: Le Ma <le.ma@amd.com >
Reviewed-by: Shiwu Zhang <shiwu.zhang@amd.com >
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com >
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com >
Signed-off-by: Alex Deucher <alexander.deucher@amd.com >
2023-06-09 12:39:41 -04:00