| Message ID | 20200730203642.17553-6-nicholas.kazlauskas@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/amd/display: Drop DRM private objects from amdgpu_dm | expand |
[AMD Official Use Only - Internal Distribution Only] Reviewed-by: Hersen Wu <hersenxs.wu@amd.com> -----Original Message----- From: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> Sent: Thursday, July 30, 2020 4:37 PM To: amd-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org Cc: Kazlauskas, Nicholas <Nicholas.Kazlauskas@amd.com>; Lakha, Bhawanpreet <Bhawanpreet.Lakha@amd.com>; Wu, Hersen <hersenxs.wu@amd.com> Subject: [PATCH 5/7] drm/amd/display: Reset plane for anything that's not a FAST update [Why] MEDIUM or FULL updates can require global validation or affect bandwidth. By treating these all simply as surface updates we aren't actually passing this through DC global validation. [How] There's currently no way to pass surface updates through DC global validation, nor do I think it's a good idea to change the interface to accept these. DC global validation itself is currently stateless, and we can move our update type checking to be stateless as well by duplicating DC surface checks in DM based on DRM properties. We wanted to rely on DC automatically determining this since DC knows best, but DM is ultimately what fills in everything into DC plane state so it does need to know as well. There are basically only three paths that we exercise in DM today: 1) Cursor (async update) 2) Pageflip (fast update) 3) Full pipe programming (medium/full updates) Which means that anything that's more than a pageflip really needs to go down path #3. So this change duplicates all the surface update checks based on DRM state instead inside of should_reset_plane(). Next step is dropping dm_determine_update_type_for_commit and we no longer require the old DC state at all for global validation. Optimization can come later so we don't reset DC planes at all for MEDIUM udpates and avoid validation, but we might require some extra checks in DM to achieve this. Cc: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> Cc: Hersen Wu <hersenxs.wu@amd.com> Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) 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 0d5f45742bb5..2cbb29199e61 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -8336,6 +8336,31 @@ static bool should_reset_plane(struct drm_atomic_state *state, if (old_other_state->crtc != new_other_state->crtc) return true; + /* Src/dst size and scaling updates. */ + if (old_other_state->src_w != new_other_state->src_w || + old_other_state->src_h != new_other_state->src_h || + old_other_state->crtc_w != new_other_state->crtc_w || + old_other_state->crtc_h != new_other_state->crtc_h) + return true; + + /* Rotation / mirroring updates. */ + if (old_other_state->rotation != new_other_state->rotation) + return true; + + /* Blending updates. */ + if (old_other_state->pixel_blend_mode != + new_other_state->pixel_blend_mode) + return true; + + /* Alpha updates. */ + if (old_other_state->alpha != new_other_state->alpha) + return true; + + /* Colorspace changes. */ + if (old_other_state->color_range != new_other_state->color_range || + old_other_state->color_encoding != new_other_state->color_encoding) + return true; + /* Framebuffer checks fall at the end. */ if (!old_other_state->fb || !new_other_state->fb) continue; -- 2.25.1
On 07/30, Nicholas Kazlauskas wrote: > [Why] > MEDIUM or FULL updates can require global validation or affect > bandwidth. By treating these all simply as surface updates we aren't > actually passing this through DC global validation. > > [How] > There's currently no way to pass surface updates through DC global > validation, nor do I think it's a good idea to change the interface > to accept these. > > DC global validation itself is currently stateless, and we can move > our update type checking to be stateless as well by duplicating DC > surface checks in DM based on DRM properties. > > We wanted to rely on DC automatically determining this since DC knows > best, but DM is ultimately what fills in everything into DC plane > state so it does need to know as well. > > There are basically only three paths that we exercise in DM today: > > 1) Cursor (async update) > 2) Pageflip (fast update) > 3) Full pipe programming (medium/full updates) > > Which means that anything that's more than a pageflip really needs to > go down path #3. > > So this change duplicates all the surface update checks based on DRM > state instead inside of should_reset_plane(). > > Next step is dropping dm_determine_update_type_for_commit and we no > longer require the old DC state at all for global validation. > > Optimization can come later so we don't reset DC planes at all for > MEDIUM udpates and avoid validation, but we might require some extra > checks in DM to achieve this. How about adding this optimization description in our TODO list under-display folder? Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> > Cc: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> > Cc: Hersen Wu <hersenxs.wu@amd.com> > Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> > --- > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 25 +++++++++++++++++++ > 1 file changed, 25 insertions(+) > > 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 0d5f45742bb5..2cbb29199e61 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -8336,6 +8336,31 @@ static bool should_reset_plane(struct drm_atomic_state *state, > if (old_other_state->crtc != new_other_state->crtc) > return true; > > + /* Src/dst size and scaling updates. */ > + if (old_other_state->src_w != new_other_state->src_w || > + old_other_state->src_h != new_other_state->src_h || > + old_other_state->crtc_w != new_other_state->crtc_w || > + old_other_state->crtc_h != new_other_state->crtc_h) > + return true; > + > + /* Rotation / mirroring updates. */ > + if (old_other_state->rotation != new_other_state->rotation) > + return true; > + > + /* Blending updates. */ > + if (old_other_state->pixel_blend_mode != > + new_other_state->pixel_blend_mode) > + return true; > + > + /* Alpha updates. */ > + if (old_other_state->alpha != new_other_state->alpha) > + return true; > + > + /* Colorspace changes. */ > + if (old_other_state->color_range != new_other_state->color_range || > + old_other_state->color_encoding != new_other_state->color_encoding) > + return true; > + > /* Framebuffer checks fall at the end. */ > if (!old_other_state->fb || !new_other_state->fb) > continue; > -- > 2.25.1 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7CRodrigo.Siqueira%40amd.com%7Ccc095e7ce6164f529e2708d834c86d1b%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637317382766607890&sdata=omLC%2BizXVEjjGe6IylBpniZzyUGlzTATrgRoWEo6dHc%3D&reserved=0
On 2020-08-05 4:45 p.m., Rodrigo Siqueira wrote: > On 07/30, Nicholas Kazlauskas wrote: >> [Why] >> MEDIUM or FULL updates can require global validation or affect >> bandwidth. By treating these all simply as surface updates we aren't >> actually passing this through DC global validation. >> >> [How] >> There's currently no way to pass surface updates through DC global >> validation, nor do I think it's a good idea to change the interface >> to accept these. >> >> DC global validation itself is currently stateless, and we can move >> our update type checking to be stateless as well by duplicating DC >> surface checks in DM based on DRM properties. >> >> We wanted to rely on DC automatically determining this since DC knows >> best, but DM is ultimately what fills in everything into DC plane >> state so it does need to know as well. >> >> There are basically only three paths that we exercise in DM today: >> >> 1) Cursor (async update) >> 2) Pageflip (fast update) >> 3) Full pipe programming (medium/full updates) >> >> Which means that anything that's more than a pageflip really needs to >> go down path #3. >> >> So this change duplicates all the surface update checks based on DRM >> state instead inside of should_reset_plane(). >> >> Next step is dropping dm_determine_update_type_for_commit and we no >> longer require the old DC state at all for global validation. >> >> Optimization can come later so we don't reset DC planes at all for >> MEDIUM udpates and avoid validation, but we might require some extra >> checks in DM to achieve this. > > How about adding this optimization description in our TODO list > under-display folder? > > Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> Sure, I'll make another patch to clean up some of the TODO items in the text file. Regards, Nicholas Kazlauskas > >> Cc: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> >> Cc: Hersen Wu <hersenxs.wu@amd.com> >> Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> >> --- >> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 25 +++++++++++++++++++ >> 1 file changed, 25 insertions(+) >> >> 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 0d5f45742bb5..2cbb29199e61 100644 >> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c >> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c >> @@ -8336,6 +8336,31 @@ static bool should_reset_plane(struct drm_atomic_state *state, >> if (old_other_state->crtc != new_other_state->crtc) >> return true; >> >> + /* Src/dst size and scaling updates. */ >> + if (old_other_state->src_w != new_other_state->src_w || >> + old_other_state->src_h != new_other_state->src_h || >> + old_other_state->crtc_w != new_other_state->crtc_w || >> + old_other_state->crtc_h != new_other_state->crtc_h) >> + return true; >> + >> + /* Rotation / mirroring updates. */ >> + if (old_other_state->rotation != new_other_state->rotation) >> + return true; >> + >> + /* Blending updates. */ >> + if (old_other_state->pixel_blend_mode != >> + new_other_state->pixel_blend_mode) >> + return true; >> + >> + /* Alpha updates. */ >> + if (old_other_state->alpha != new_other_state->alpha) >> + return true; >> + >> + /* Colorspace changes. */ >> + if (old_other_state->color_range != new_other_state->color_range || >> + old_other_state->color_encoding != new_other_state->color_encoding) >> + return true; >> + >> /* Framebuffer checks fall at the end. */ >> if (!old_other_state->fb || !new_other_state->fb) >> continue; >> -- >> 2.25.1 >> >> _______________________________________________ >> amd-gfx mailing list >> amd-gfx@lists.freedesktop.org >> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7CRodrigo.Siqueira%40amd.com%7Ccc095e7ce6164f529e2708d834c86d1b%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637317382766607890&sdata=omLC%2BizXVEjjGe6IylBpniZzyUGlzTATrgRoWEo6dHc%3D&reserved=0 >
On Thu, Jul 30, 2020 at 04:36:40PM -0400, Nicholas Kazlauskas wrote: > [Why] > MEDIUM or FULL updates can require global validation or affect > bandwidth. By treating these all simply as surface updates we aren't > actually passing this through DC global validation. > > [How] > There's currently no way to pass surface updates through DC global > validation, nor do I think it's a good idea to change the interface > to accept these. > > DC global validation itself is currently stateless, and we can move > our update type checking to be stateless as well by duplicating DC > surface checks in DM based on DRM properties. > > We wanted to rely on DC automatically determining this since DC knows > best, but DM is ultimately what fills in everything into DC plane > state so it does need to know as well. > > There are basically only three paths that we exercise in DM today: > > 1) Cursor (async update) > 2) Pageflip (fast update) > 3) Full pipe programming (medium/full updates) > > Which means that anything that's more than a pageflip really needs to > go down path #3. > > So this change duplicates all the surface update checks based on DRM > state instead inside of should_reset_plane(). > > Next step is dropping dm_determine_update_type_for_commit and we no > longer require the old DC state at all for global validation. I think we do something similar in i915, where we have a "nothing except base address changed" fast path, but for anything else we fully compute a new state. Obviously you should try to keep global state synchronization to a minimum for this step, so it's not entirely only 2 options. Once we have the states, we compare them and figure out whether we can get away with a fast modeset operation (maybe what you guys call medium update). Anyway I think being slightly more aggressive with computing full state, and then falling back to more optimized update again is a good approach. Only risk is if we you have too much synchronization in your locking (e.g. modern compositors do like to change tiling and stuff, especially once you have modifiers enabled, so this shouldn't cause a sync across crtc except when absolutely needed). -Daniel > > Optimization can come later so we don't reset DC planes at all for > MEDIUM udpates and avoid validation, but we might require some extra > checks in DM to achieve this. > > Cc: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> > Cc: Hersen Wu <hersenxs.wu@amd.com> > Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> > --- > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 25 +++++++++++++++++++ > 1 file changed, 25 insertions(+) > > 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 0d5f45742bb5..2cbb29199e61 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -8336,6 +8336,31 @@ static bool should_reset_plane(struct drm_atomic_state *state, > if (old_other_state->crtc != new_other_state->crtc) > return true; > > + /* Src/dst size and scaling updates. */ > + if (old_other_state->src_w != new_other_state->src_w || > + old_other_state->src_h != new_other_state->src_h || > + old_other_state->crtc_w != new_other_state->crtc_w || > + old_other_state->crtc_h != new_other_state->crtc_h) > + return true; > + > + /* Rotation / mirroring updates. */ > + if (old_other_state->rotation != new_other_state->rotation) > + return true; > + > + /* Blending updates. */ > + if (old_other_state->pixel_blend_mode != > + new_other_state->pixel_blend_mode) > + return true; > + > + /* Alpha updates. */ > + if (old_other_state->alpha != new_other_state->alpha) > + return true; > + > + /* Colorspace changes. */ > + if (old_other_state->color_range != new_other_state->color_range || > + old_other_state->color_encoding != new_other_state->color_encoding) > + return true; > + > /* Framebuffer checks fall at the end. */ > if (!old_other_state->fb || !new_other_state->fb) > continue; > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
On 2020-08-07 4:34 a.m., daniel@ffwll.ch wrote: > On Thu, Jul 30, 2020 at 04:36:40PM -0400, Nicholas Kazlauskas wrote: >> [Why] >> MEDIUM or FULL updates can require global validation or affect >> bandwidth. By treating these all simply as surface updates we aren't >> actually passing this through DC global validation. >> >> [How] >> There's currently no way to pass surface updates through DC global >> validation, nor do I think it's a good idea to change the interface >> to accept these. >> >> DC global validation itself is currently stateless, and we can move >> our update type checking to be stateless as well by duplicating DC >> surface checks in DM based on DRM properties. >> >> We wanted to rely on DC automatically determining this since DC knows >> best, but DM is ultimately what fills in everything into DC plane >> state so it does need to know as well. >> >> There are basically only three paths that we exercise in DM today: >> >> 1) Cursor (async update) >> 2) Pageflip (fast update) >> 3) Full pipe programming (medium/full updates) >> >> Which means that anything that's more than a pageflip really needs to >> go down path #3. >> >> So this change duplicates all the surface update checks based on DRM >> state instead inside of should_reset_plane(). >> >> Next step is dropping dm_determine_update_type_for_commit and we no >> longer require the old DC state at all for global validation. > > I think we do something similar in i915, where we have a "nothing except > base address changed" fast path, but for anything else we fully compute a > new state. Obviously you should try to keep global state synchronization > to a minimum for this step, so it's not entirely only 2 options. > > Once we have the states, we compare them and figure out whether we can get > away with a fast modeset operation (maybe what you guys call medium > update). Anyway I think being slightly more aggressive with computing full > state, and then falling back to more optimized update again is a good > approach. Only risk is if we you have too much synchronization in your > locking (e.g. modern compositors do like to change tiling and stuff, > especially once you have modifiers enabled, so this shouldn't cause a sync > across crtc except when absolutely needed). > -Daniel Sounds like the right approach then. We can support tiling changes in the fast path, but the more optimized version of that last check is really linear <-> tiled. That requires global validation with DC to revalidate bandwidth and calculate requestor parameters for HW. So we'll have to stall for some of these changes unfortunately since we need the full HW state for validation. Regards, Nicholas Kazlauskas > >> >> Optimization can come later so we don't reset DC planes at all for >> MEDIUM udpates and avoid validation, but we might require some extra >> checks in DM to achieve this. >> >> Cc: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> >> Cc: Hersen Wu <hersenxs.wu@amd.com> >> Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> >> --- >> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 25 +++++++++++++++++++ >> 1 file changed, 25 insertions(+) >> >> 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 0d5f45742bb5..2cbb29199e61 100644 >> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c >> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c >> @@ -8336,6 +8336,31 @@ static bool should_reset_plane(struct drm_atomic_state *state, >> if (old_other_state->crtc != new_other_state->crtc) >> return true; >> >> + /* Src/dst size and scaling updates. */ >> + if (old_other_state->src_w != new_other_state->src_w || >> + old_other_state->src_h != new_other_state->src_h || >> + old_other_state->crtc_w != new_other_state->crtc_w || >> + old_other_state->crtc_h != new_other_state->crtc_h) >> + return true; >> + >> + /* Rotation / mirroring updates. */ >> + if (old_other_state->rotation != new_other_state->rotation) >> + return true; >> + >> + /* Blending updates. */ >> + if (old_other_state->pixel_blend_mode != >> + new_other_state->pixel_blend_mode) >> + return true; >> + >> + /* Alpha updates. */ >> + if (old_other_state->alpha != new_other_state->alpha) >> + return true; >> + >> + /* Colorspace changes. */ >> + if (old_other_state->color_range != new_other_state->color_range || >> + old_other_state->color_encoding != new_other_state->color_encoding) >> + return true; >> + >> /* Framebuffer checks fall at the end. */ >> if (!old_other_state->fb || !new_other_state->fb) >> continue; >> -- >> 2.25.1 >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dri-devel >
On Fri, Aug 07, 2020 at 10:26:51AM -0400, Kazlauskas, Nicholas wrote: > On 2020-08-07 4:34 a.m., daniel@ffwll.ch wrote: > > On Thu, Jul 30, 2020 at 04:36:40PM -0400, Nicholas Kazlauskas wrote: > > > [Why] > > > MEDIUM or FULL updates can require global validation or affect > > > bandwidth. By treating these all simply as surface updates we aren't > > > actually passing this through DC global validation. > > > > > > [How] > > > There's currently no way to pass surface updates through DC global > > > validation, nor do I think it's a good idea to change the interface > > > to accept these. > > > > > > DC global validation itself is currently stateless, and we can move > > > our update type checking to be stateless as well by duplicating DC > > > surface checks in DM based on DRM properties. > > > > > > We wanted to rely on DC automatically determining this since DC knows > > > best, but DM is ultimately what fills in everything into DC plane > > > state so it does need to know as well. > > > > > > There are basically only three paths that we exercise in DM today: > > > > > > 1) Cursor (async update) > > > 2) Pageflip (fast update) > > > 3) Full pipe programming (medium/full updates) > > > > > > Which means that anything that's more than a pageflip really needs to > > > go down path #3. > > > > > > So this change duplicates all the surface update checks based on DRM > > > state instead inside of should_reset_plane(). > > > > > > Next step is dropping dm_determine_update_type_for_commit and we no > > > longer require the old DC state at all for global validation. > > > > I think we do something similar in i915, where we have a "nothing except > > base address changed" fast path, but for anything else we fully compute a > > new state. Obviously you should try to keep global state synchronization > > to a minimum for this step, so it's not entirely only 2 options. > > > > Once we have the states, we compare them and figure out whether we can get > > away with a fast modeset operation (maybe what you guys call medium > > update). Anyway I think being slightly more aggressive with computing full > > state, and then falling back to more optimized update again is a good > > approach. Only risk is if we you have too much synchronization in your > > locking (e.g. modern compositors do like to change tiling and stuff, > > especially once you have modifiers enabled, so this shouldn't cause a sync > > across crtc except when absolutely needed). > > -Daniel > > Sounds like the right approach then. > > We can support tiling changes in the fast path, but the more optimized > version of that last check is really linear <-> tiled. That requires global > validation with DC to revalidate bandwidth and calculate requestor > parameters for HW. So we'll have to stall for some of these changes > unfortunately since we need the full HW state for validation. Yeah I think that's perfectly ok, and probably worth it to still optimize for tiled->tiled changes. If you can. tiled<->untiled only happens for boot-splash, so no one cares, but with modifiers the idea is that tiling changes (especially once we get into the different compression modes amdgpu support, and which Bas' series tries to enable) are fairly common and should be doable without any stalls anywhere. Cheers, Daniel > > Regards, > Nicholas Kazlauskas > > > > > > > > > Optimization can come later so we don't reset DC planes at all for > > > MEDIUM udpates and avoid validation, but we might require some extra > > > checks in DM to achieve this. > > > > > > Cc: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> > > > Cc: Hersen Wu <hersenxs.wu@amd.com> > > > Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> > > > --- > > > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 25 +++++++++++++++++++ > > > 1 file changed, 25 insertions(+) > > > > > > 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 0d5f45742bb5..2cbb29199e61 100644 > > > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > > > @@ -8336,6 +8336,31 @@ static bool should_reset_plane(struct drm_atomic_state *state, > > > if (old_other_state->crtc != new_other_state->crtc) > > > return true; > > > + /* Src/dst size and scaling updates. */ > > > + if (old_other_state->src_w != new_other_state->src_w || > > > + old_other_state->src_h != new_other_state->src_h || > > > + old_other_state->crtc_w != new_other_state->crtc_w || > > > + old_other_state->crtc_h != new_other_state->crtc_h) > > > + return true; > > > + > > > + /* Rotation / mirroring updates. */ > > > + if (old_other_state->rotation != new_other_state->rotation) > > > + return true; > > > + > > > + /* Blending updates. */ > > > + if (old_other_state->pixel_blend_mode != > > > + new_other_state->pixel_blend_mode) > > > + return true; > > > + > > > + /* Alpha updates. */ > > > + if (old_other_state->alpha != new_other_state->alpha) > > > + return true; > > > + > > > + /* Colorspace changes. */ > > > + if (old_other_state->color_range != new_other_state->color_range || > > > + old_other_state->color_encoding != new_other_state->color_encoding) > > > + return true; > > > + > > > /* Framebuffer checks fall at the end. */ > > > if (!old_other_state->fb || !new_other_state->fb) > > > continue; > > > -- > > > 2.25.1 > > > > > > _______________________________________________ > > > dri-devel mailing list > > > dri-devel@lists.freedesktop.org > > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > >
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 0d5f45742bb5..2cbb29199e61 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -8336,6 +8336,31 @@ static bool should_reset_plane(struct drm_atomic_state *state, if (old_other_state->crtc != new_other_state->crtc) return true; + /* Src/dst size and scaling updates. */ + if (old_other_state->src_w != new_other_state->src_w || + old_other_state->src_h != new_other_state->src_h || + old_other_state->crtc_w != new_other_state->crtc_w || + old_other_state->crtc_h != new_other_state->crtc_h) + return true; + + /* Rotation / mirroring updates. */ + if (old_other_state->rotation != new_other_state->rotation) + return true; + + /* Blending updates. */ + if (old_other_state->pixel_blend_mode != + new_other_state->pixel_blend_mode) + return true; + + /* Alpha updates. */ + if (old_other_state->alpha != new_other_state->alpha) + return true; + + /* Colorspace changes. */ + if (old_other_state->color_range != new_other_state->color_range || + old_other_state->color_encoding != new_other_state->color_encoding) + return true; + /* Framebuffer checks fall at the end. */ if (!old_other_state->fb || !new_other_state->fb) continue;
[Why] MEDIUM or FULL updates can require global validation or affect bandwidth. By treating these all simply as surface updates we aren't actually passing this through DC global validation. [How] There's currently no way to pass surface updates through DC global validation, nor do I think it's a good idea to change the interface to accept these. DC global validation itself is currently stateless, and we can move our update type checking to be stateless as well by duplicating DC surface checks in DM based on DRM properties. We wanted to rely on DC automatically determining this since DC knows best, but DM is ultimately what fills in everything into DC plane state so it does need to know as well. There are basically only three paths that we exercise in DM today: 1) Cursor (async update) 2) Pageflip (fast update) 3) Full pipe programming (medium/full updates) Which means that anything that's more than a pageflip really needs to go down path #3. So this change duplicates all the surface update checks based on DRM state instead inside of should_reset_plane(). Next step is dropping dm_determine_update_type_for_commit and we no longer require the old DC state at all for global validation. Optimization can come later so we don't reset DC planes at all for MEDIUM udpates and avoid validation, but we might require some extra checks in DM to achieve this. Cc: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com> Cc: Hersen Wu <hersenxs.wu@amd.com> Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+)