Commit fc184dbe authored by Hamza Mahfooz's avatar Hamza Mahfooz Committed by Alex Deucher

drm/amdgpu: make damage clips support configurable

We have observed that there are quite a number of PSR-SU panels on the
market that are unable to keep up with what user space throws at them,
resulting in hangs and random black screens. So, make damage clips
support configurable and disable it by default for PSR-SU displays.

Cc: stable@vger.kernel.org
Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarHamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b6d1a063
...@@ -198,6 +198,7 @@ extern uint amdgpu_dc_debug_mask; ...@@ -198,6 +198,7 @@ extern uint amdgpu_dc_debug_mask;
extern uint amdgpu_dc_visual_confirm; extern uint amdgpu_dc_visual_confirm;
extern uint amdgpu_dm_abm_level; extern uint amdgpu_dm_abm_level;
extern int amdgpu_backlight; extern int amdgpu_backlight;
extern int amdgpu_damage_clips;
extern struct amdgpu_mgpu_info mgpu_info; extern struct amdgpu_mgpu_info mgpu_info;
extern int amdgpu_ras_enable; extern int amdgpu_ras_enable;
extern uint amdgpu_ras_mask; extern uint amdgpu_ras_mask;
......
...@@ -211,6 +211,7 @@ int amdgpu_seamless = -1; /* auto */ ...@@ -211,6 +211,7 @@ int amdgpu_seamless = -1; /* auto */
uint amdgpu_debug_mask; uint amdgpu_debug_mask;
int amdgpu_agp = -1; /* auto */ int amdgpu_agp = -1; /* auto */
int amdgpu_wbrf = -1; int amdgpu_wbrf = -1;
int amdgpu_damage_clips = -1; /* auto */
static void amdgpu_drv_delayed_reset_work_handler(struct work_struct *work); static void amdgpu_drv_delayed_reset_work_handler(struct work_struct *work);
...@@ -859,6 +860,18 @@ int amdgpu_backlight = -1; ...@@ -859,6 +860,18 @@ int amdgpu_backlight = -1;
MODULE_PARM_DESC(backlight, "Backlight control (0 = pwm, 1 = aux, -1 auto (default))"); MODULE_PARM_DESC(backlight, "Backlight control (0 = pwm, 1 = aux, -1 auto (default))");
module_param_named(backlight, amdgpu_backlight, bint, 0444); module_param_named(backlight, amdgpu_backlight, bint, 0444);
/**
* DOC: damageclips (int)
* Enable or disable damage clips support. If damage clips support is disabled,
* we will force full frame updates, irrespective of what user space sends to
* us.
*
* Defaults to -1 (where it is enabled unless a PSR-SU display is detected).
*/
MODULE_PARM_DESC(damageclips,
"Damage clips support (0 = disable, 1 = enable, -1 auto (default))");
module_param_named(damageclips, amdgpu_damage_clips, int, 0444);
/** /**
* DOC: tmz (int) * DOC: tmz (int)
* Trusted Memory Zone (TMZ) is a method to protect data being written * Trusted Memory Zone (TMZ) is a method to protect data being written
......
...@@ -5254,6 +5254,7 @@ static void fill_dc_dirty_rects(struct drm_plane *plane, ...@@ -5254,6 +5254,7 @@ static void fill_dc_dirty_rects(struct drm_plane *plane,
struct drm_plane_state *new_plane_state, struct drm_plane_state *new_plane_state,
struct drm_crtc_state *crtc_state, struct drm_crtc_state *crtc_state,
struct dc_flip_addrs *flip_addrs, struct dc_flip_addrs *flip_addrs,
bool is_psr_su,
bool *dirty_regions_changed) bool *dirty_regions_changed)
{ {
struct dm_crtc_state *dm_crtc_state = to_dm_crtc_state(crtc_state); struct dm_crtc_state *dm_crtc_state = to_dm_crtc_state(crtc_state);
...@@ -5278,6 +5279,10 @@ static void fill_dc_dirty_rects(struct drm_plane *plane, ...@@ -5278,6 +5279,10 @@ static void fill_dc_dirty_rects(struct drm_plane *plane,
num_clips = drm_plane_get_damage_clips_count(new_plane_state); num_clips = drm_plane_get_damage_clips_count(new_plane_state);
clips = drm_plane_get_damage_clips(new_plane_state); clips = drm_plane_get_damage_clips(new_plane_state);
if (num_clips && (!amdgpu_damage_clips || (amdgpu_damage_clips < 0 &&
is_psr_su)))
goto ffu;
if (!dm_crtc_state->mpo_requested) { if (!dm_crtc_state->mpo_requested) {
if (!num_clips || num_clips > DC_MAX_DIRTY_RECTS) if (!num_clips || num_clips > DC_MAX_DIRTY_RECTS)
goto ffu; goto ffu;
...@@ -8412,6 +8417,8 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, ...@@ -8412,6 +8417,8 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
fill_dc_dirty_rects(plane, old_plane_state, fill_dc_dirty_rects(plane, old_plane_state,
new_plane_state, new_crtc_state, new_plane_state, new_crtc_state,
&bundle->flip_addrs[planes_count], &bundle->flip_addrs[planes_count],
acrtc_state->stream->link->psr_settings.psr_version ==
DC_PSR_VERSION_SU_1,
&dirty_rects_changed); &dirty_rects_changed);
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment