From: "Kazlauskas, Nicholas" <nicholas.kazlauskas@amd.com>
To: daniel@ffwll.ch
Cc: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>,
Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>,
dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org
Subject: Re: [PATCH 3/7] drm/amd/display: Avoid using unvalidated tiling_flags and tmz_surface in prepare_planes
Date: Fri, 7 Aug 2020 10:29:09 -0400 [thread overview]
Message-ID: <4117cdee-2f5d-a8bd-1e80-1c550c9d9af3@amd.com> (raw)
In-Reply-To: <20200807083041.GL6419@phenom.ffwll.local>
On 2020-08-07 4:30 a.m., daniel@ffwll.ch wrote:
> On Thu, Jul 30, 2020 at 04:36:38PM -0400, Nicholas Kazlauskas wrote:
>> [Why]
>> We're racing with userspace as the flags could potentially change
>> from when we acquired and validated them in commit_check.
>
> Uh ... I didn't know these could change. I think my comments on Bas'
> series are even more relevant now. I think long term would be best to bake
> these flags in at addfb time when modifiers aren't set. And otherwise
> always use the modifiers flag, and completely ignore the legacy flags
> here.
> -Daniel
>
There's a set tiling/mod flags IOCTL that can be called after addfb
happens, so unless there's some sort of driver magic preventing this
from working when it's already been pinned for scanout then I don't see
anything stopping this from happening.
I still need to review the modifiers series in a little more detail but
that looks like a good approach to fixing these kind of issues.
Regards,
Nicholas Kazlauskas
>>
>> [How]
>> We unfortunately can't drop this function in its entirety from
>> prepare_planes since we don't know the afb->address at commit_check
>> time yet.
>>
>> So instead of querying new tiling_flags and tmz_surface use the ones
>> from the plane_state directly.
>>
>> While we're at it, also update the force_disable_dcc option based
>> on the state from atomic check.
>>
>> Cc: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
>> Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
>> Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
>> ---
>> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 36 ++++++++++---------
>> 1 file changed, 19 insertions(+), 17 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> index bf1881bd492c..f78c09c9585e 100644
>> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> @@ -5794,14 +5794,8 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane,
>> struct list_head list;
>> struct ttm_validate_buffer tv;
>> struct ww_acquire_ctx ticket;
>> - uint64_t tiling_flags;
>> uint32_t domain;
>> int r;
>> - bool tmz_surface = false;
>> - bool force_disable_dcc = false;
>> -
>> - dm_plane_state_old = to_dm_plane_state(plane->state);
>> - dm_plane_state_new = to_dm_plane_state(new_state);
>>
>> if (!new_state->fb) {
>> DRM_DEBUG_DRIVER("No FB bound\n");
>> @@ -5845,27 +5839,35 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane,
>> return r;
>> }
>>
>> - amdgpu_bo_get_tiling_flags(rbo, &tiling_flags);
>> -
>> - tmz_surface = amdgpu_bo_encrypted(rbo);
>> -
>> ttm_eu_backoff_reservation(&ticket, &list);
>>
>> afb->address = amdgpu_bo_gpu_offset(rbo);
>>
>> amdgpu_bo_ref(rbo);
>>
>> + /**
>> + * We don't do surface updates on planes that have been newly created,
>> + * but we also don't have the afb->address during atomic check.
>> + *
>> + * Fill in buffer attributes depending on the address here, but only on
>> + * newly created planes since they're not being used by DC yet and this
>> + * won't modify global state.
>> + */
>> + dm_plane_state_old = to_dm_plane_state(plane->state);
>> + dm_plane_state_new = to_dm_plane_state(new_state);
>> +
>> if (dm_plane_state_new->dc_state &&
>> - dm_plane_state_old->dc_state != dm_plane_state_new->dc_state) {
>> - struct dc_plane_state *plane_state = dm_plane_state_new->dc_state;
>> + dm_plane_state_old->dc_state != dm_plane_state_new->dc_state) {
>> + struct dc_plane_state *plane_state =
>> + dm_plane_state_new->dc_state;
>> + bool force_disable_dcc = !plane_state->dcc.enable;
>>
>> - force_disable_dcc = adev->asic_type == CHIP_RAVEN && adev->in_suspend;
>> fill_plane_buffer_attributes(
>> adev, afb, plane_state->format, plane_state->rotation,
>> - tiling_flags, &plane_state->tiling_info,
>> - &plane_state->plane_size, &plane_state->dcc,
>> - &plane_state->address, tmz_surface,
>> - force_disable_dcc);
>> + dm_plane_state_new->tiling_flags,
>> + &plane_state->tiling_info, &plane_state->plane_size,
>> + &plane_state->dcc, &plane_state->address,
>> + dm_plane_state_new->tmz_surface, force_disable_dcc);
>> }
>>
>> return 0;
>> --
>> 2.25.1
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-08-07 14:29 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-30 20:36 [PATCH 0/7] drm/amd/display: Drop DRM private objects from amdgpu_dm Nicholas Kazlauskas
2020-07-30 20:36 ` [PATCH 1/7] drm/amd/display: Store tiling_flags and tmz_surface on dm_plane_state Nicholas Kazlauskas
2020-08-05 21:04 ` Rodrigo Siqueira
2020-08-07 8:24 ` daniel
2020-07-30 20:36 ` [PATCH 2/7] drm/amd/display: Reset plane when tiling flags change Nicholas Kazlauskas
2020-07-30 20:50 ` Wu, Hersen
2020-08-05 21:11 ` Rodrigo Siqueira
2020-08-06 18:18 ` Kazlauskas, Nicholas
2020-07-30 20:36 ` [PATCH 3/7] drm/amd/display: Avoid using unvalidated tiling_flags and tmz_surface in prepare_planes Nicholas Kazlauskas
2020-08-05 21:12 ` Rodrigo Siqueira
2020-08-07 8:30 ` daniel
2020-08-07 14:29 ` Kazlauskas, Nicholas [this message]
2020-08-10 12:25 ` Daniel Vetter
2020-08-10 12:30 ` Christian König
2020-08-10 12:32 ` Daniel Vetter
2020-08-11 13:42 ` Marek Olšák
2020-08-12 13:54 ` Daniel Vetter
2020-08-17 6:23 ` Marek Olšák
2020-09-01 7:20 ` Daniel Vetter
2020-07-30 20:36 ` [PATCH 4/7] drm/amd/display: Use validated tiling_flags and tmz_surface in commit_tail Nicholas Kazlauskas
2020-08-05 21:15 ` Rodrigo Siqueira
2020-07-30 20:36 ` [PATCH 5/7] drm/amd/display: Reset plane for anything that's not a FAST update Nicholas Kazlauskas
2020-07-30 20:51 ` Wu, Hersen
2020-08-05 20:45 ` Rodrigo Siqueira
2020-08-06 18:27 ` Kazlauskas, Nicholas
2020-08-07 8:34 ` daniel
2020-08-07 14:26 ` Kazlauskas, Nicholas
2020-08-10 12:30 ` Daniel Vetter
2020-07-30 20:36 ` [PATCH 6/7] drm/amd/display: Drop dm_determine_update_type_for_commit Nicholas Kazlauskas
2020-08-05 20:48 ` Rodrigo Siqueira
2020-07-30 20:36 ` [PATCH 7/7] drm/amd/display: Replace DRM private objects with subclassed DRM atomic state Nicholas Kazlauskas
2020-08-05 20:37 ` Rodrigo Siqueira
2020-08-06 14:25 ` Kazlauskas, Nicholas
2020-08-07 8:40 ` daniel
2020-08-07 8:52 ` daniel
2020-08-07 14:32 ` Kazlauskas, Nicholas
2020-08-10 12:34 ` Daniel Vetter
2020-08-07 8:29 ` [PATCH 0/7] drm/amd/display: Drop DRM private objects from amdgpu_dm daniel
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=4117cdee-2f5d-a8bd-1e80-1c550c9d9af3@amd.com \
--to=nicholas.kazlauskas@amd.com \
--cc=Bhawanpreet.Lakha@amd.com \
--cc=Rodrigo.Siqueira@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.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).