amd-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] drm/amdgpu/display: fix abm shift and mask lists for DCN3.01/3.02
@ 2020-10-26 15:57 Alex Deucher
  2020-10-26 15:57 ` [PATCH 2/2] drm/amdgpu/display: drop disconnect_pipes callback for DCN3.01 Alex Deucher
  2020-10-26 16:05 ` [PATCH 1/2] drm/amdgpu/display: fix abm shift and mask lists for DCN3.01/3.02 Abramov, Slava
  0 siblings, 2 replies; 4+ messages in thread
From: Alex Deucher @ 2020-10-26 15:57 UTC (permalink / raw)
  To: amd-gfx; +Cc: Alex Deucher

Updating these were missed.

Fixes: 2c8193fc72b1c5 ("drm/amd/display: Refactor ABM_MASK_SH_LIST_DCN301 naming")
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c | 4 ++--
 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c b/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c
index fe46a0b911fc..5a47b4106b7b 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c
@@ -363,11 +363,11 @@ static const struct dce_abm_registers abm_regs[] = {
 };
 
 static const struct dce_abm_shift abm_shift = {
-		ABM_MASK_SH_LIST_DCN301(__SHIFT)
+		ABM_MASK_SH_LIST_DCN30(__SHIFT)
 };
 
 static const struct dce_abm_mask abm_mask = {
-		ABM_MASK_SH_LIST_DCN301(_MASK)
+		ABM_MASK_SH_LIST_DCN30(_MASK)
 };
 
 #define audio_regs(id)\
diff --git a/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c b/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c
index 38e807f22060..c4ffed95d35e 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c
@@ -1276,11 +1276,11 @@ static const struct dce_abm_registers abm_regs[] = {
 };
 
 static const struct dce_abm_shift abm_shift = {
-		ABM_MASK_SH_LIST_DCN301(__SHIFT)
+		ABM_MASK_SH_LIST_DCN30(__SHIFT)
 };
 
 static const struct dce_abm_mask abm_mask = {
-		ABM_MASK_SH_LIST_DCN301(_MASK)
+		ABM_MASK_SH_LIST_DCN30(_MASK)
 };
 
 static bool dcn302_resource_construct(
-- 
2.25.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH 2/2] drm/amdgpu/display: drop disconnect_pipes callback for DCN3.01
  2020-10-26 15:57 [PATCH 1/2] drm/amdgpu/display: fix abm shift and mask lists for DCN3.01/3.02 Alex Deucher
@ 2020-10-26 15:57 ` Alex Deucher
  2020-10-26 16:05   ` Abramov, Slava
  2020-10-26 16:05 ` [PATCH 1/2] drm/amdgpu/display: fix abm shift and mask lists for DCN3.01/3.02 Abramov, Slava
  1 sibling, 1 reply; 4+ messages in thread
From: Alex Deucher @ 2020-10-26 15:57 UTC (permalink / raw)
  To: amd-gfx; +Cc: Alex Deucher

Was missed in a later update.

Fixes: 4d269c40066e ("drm/amd/display: Update GSL state if leaving immediate flip")
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.c b/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.c
index d4bebb3a52e4..6d9587c39efd 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.c
@@ -37,7 +37,6 @@ static const struct hw_sequencer_funcs dcn301_funcs = {
 	.apply_ctx_to_hw = dce110_apply_ctx_to_hw,
 	.apply_ctx_for_surface = NULL,
 	.program_front_end_for_ctx = dcn20_program_front_end_for_ctx,
-	.disconnect_pipes = dcn10_disconnect_pipes,
 	.wait_for_pending_cleared = dcn10_wait_for_pending_cleared,
 	.post_unlock_program_front_end = dcn20_post_unlock_program_front_end,
 	.update_plane_addr = dcn20_update_plane_addr,
-- 
2.25.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] drm/amdgpu/display: fix abm shift and mask lists for DCN3.01/3.02
  2020-10-26 15:57 [PATCH 1/2] drm/amdgpu/display: fix abm shift and mask lists for DCN3.01/3.02 Alex Deucher
  2020-10-26 15:57 ` [PATCH 2/2] drm/amdgpu/display: drop disconnect_pipes callback for DCN3.01 Alex Deucher
@ 2020-10-26 16:05 ` Abramov, Slava
  1 sibling, 0 replies; 4+ messages in thread
From: Abramov, Slava @ 2020-10-26 16:05 UTC (permalink / raw)
  To: Alex Deucher, amd-gfx; +Cc: Deucher, Alexander


[-- Attachment #1.1: Type: text/plain, Size: 2852 bytes --]

[AMD Official Use Only - Internal Distribution Only]

Reviewed-by: Slava Abramov <slava.abramov@amd.com>
________________________________
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Alex Deucher <alexdeucher@gmail.com>
Sent: Monday, October 26, 2020 11:57 AM
To: amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>
Cc: Deucher, Alexander <Alexander.Deucher@amd.com>
Subject: [PATCH 1/2] drm/amdgpu/display: fix abm shift and mask lists for DCN3.01/3.02

Updating these were missed.

Fixes: 2c8193fc72b1c5 ("drm/amd/display: Refactor ABM_MASK_SH_LIST_DCN301 naming")
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c | 4 ++--
 drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c b/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c
index fe46a0b911fc..5a47b4106b7b 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c
@@ -363,11 +363,11 @@ static const struct dce_abm_registers abm_regs[] = {
 };

 static const struct dce_abm_shift abm_shift = {
-               ABM_MASK_SH_LIST_DCN301(__SHIFT)
+               ABM_MASK_SH_LIST_DCN30(__SHIFT)
 };

 static const struct dce_abm_mask abm_mask = {
-               ABM_MASK_SH_LIST_DCN301(_MASK)
+               ABM_MASK_SH_LIST_DCN30(_MASK)
 };

 #define audio_regs(id)\
diff --git a/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c b/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c
index 38e807f22060..c4ffed95d35e 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn302/dcn302_resource.c
@@ -1276,11 +1276,11 @@ static const struct dce_abm_registers abm_regs[] = {
 };

 static const struct dce_abm_shift abm_shift = {
-               ABM_MASK_SH_LIST_DCN301(__SHIFT)
+               ABM_MASK_SH_LIST_DCN30(__SHIFT)
 };

 static const struct dce_abm_mask abm_mask = {
-               ABM_MASK_SH_LIST_DCN301(_MASK)
+               ABM_MASK_SH_LIST_DCN30(_MASK)
 };

 static bool dcn302_resource_construct(
--
2.25.4

_______________________________________________
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&amp;data=04%7C01%7Cslava.abramov%40amd.com%7C12c425e35e00433fc62808d879c7e660%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637393246821297231%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=jZx1%2ByKkYSfL3IO%2B7Eo0GQrX%2FQRsADRb1u33y6VxayY%3D&amp;reserved=0

[-- Attachment #1.2: Type: text/html, Size: 5065 bytes --]

[-- Attachment #2: Type: text/plain, Size: 154 bytes --]

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] drm/amdgpu/display: drop disconnect_pipes callback for DCN3.01
  2020-10-26 15:57 ` [PATCH 2/2] drm/amdgpu/display: drop disconnect_pipes callback for DCN3.01 Alex Deucher
@ 2020-10-26 16:05   ` Abramov, Slava
  0 siblings, 0 replies; 4+ messages in thread
From: Abramov, Slava @ 2020-10-26 16:05 UTC (permalink / raw)
  To: Alex Deucher, amd-gfx; +Cc: Deucher, Alexander


[-- Attachment #1.1: Type: text/plain, Size: 2099 bytes --]

[AMD Official Use Only - Internal Distribution Only]

Reviewed-by: Slava Abramov <slava.abramov@amd.com>
________________________________
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Alex Deucher <alexdeucher@gmail.com>
Sent: Monday, October 26, 2020 11:57 AM
To: amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>
Cc: Deucher, Alexander <Alexander.Deucher@amd.com>
Subject: [PATCH 2/2] drm/amdgpu/display: drop disconnect_pipes callback for DCN3.01

Was missed in a later update.

Fixes: 4d269c40066e ("drm/amd/display: Update GSL state if leaving immediate flip")
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.c b/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.c
index d4bebb3a52e4..6d9587c39efd 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.c
@@ -37,7 +37,6 @@ static const struct hw_sequencer_funcs dcn301_funcs = {
         .apply_ctx_to_hw = dce110_apply_ctx_to_hw,
         .apply_ctx_for_surface = NULL,
         .program_front_end_for_ctx = dcn20_program_front_end_for_ctx,
-       .disconnect_pipes = dcn10_disconnect_pipes,
         .wait_for_pending_cleared = dcn10_wait_for_pending_cleared,
         .post_unlock_program_front_end = dcn20_post_unlock_program_front_end,
         .update_plane_addr = dcn20_update_plane_addr,
--
2.25.4

_______________________________________________
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&amp;data=04%7C01%7Cslava.abramov%40amd.com%7Cf9bafa91bf3b43effdb408d879c7e771%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637393246812184058%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=4pqb3l%2F%2FMgjrAUGB9Y0dAU0SV82mHvZIUlQQZe0bEvY%3D&amp;reserved=0

[-- Attachment #1.2: Type: text/html, Size: 3908 bytes --]

[-- Attachment #2: Type: text/plain, Size: 154 bytes --]

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-26 16:05 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-26 15:57 [PATCH 1/2] drm/amdgpu/display: fix abm shift and mask lists for DCN3.01/3.02 Alex Deucher
2020-10-26 15:57 ` [PATCH 2/2] drm/amdgpu/display: drop disconnect_pipes callback for DCN3.01 Alex Deucher
2020-10-26 16:05   ` Abramov, Slava
2020-10-26 16:05 ` [PATCH 1/2] drm/amdgpu/display: fix abm shift and mask lists for DCN3.01/3.02 Abramov, Slava

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).