Skip to contentSkip to conversation

drm/amd/display: Add stereo mux and dig programming calls for dcn21

PATCH In review [email protected] 3 participants 3 messages Sep 4, 2019 – Sep 5, 2019 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amd/display: Add stereo mux and dig programming calls for dcn21

From: Roman Li <[email protected]>

[Why]
The earlier patch "Hook up calls to do stereo mux and dig programming..." doesn't include update for dcn21.

[How]
Align dcn21 gpio settings with updated stereo control interface.

---
 .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.c   | 38 ++++++++++++++++++++--
 .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.c |  3 +-
 2 files changed, 36 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_factory_dcn21.c +35 -3
index 34485d9..8572678 100644
@@ -35,12 +35,10 @@
 
 #include "hw_factory_dcn21.h"
 
-
 #include "dcn/dcn_2_1_0_offset.h"
 #include "dcn/dcn_2_1_0_sh_mask.h"
 #include "renoir_ip_offset.h"
 
-
 #include "reg_helper.h"
 #include "../hpd_regs.h"
 /* begin *********************
@@ -136,6 +134,39 @@ static const struct ddc_sh_mask ddc_mask[] = {
 	DDC_MASK_SH_LIST_DCN2(_MASK, 6)
 };
 
+#include "../generic_regs.h"
+
+/* set field name */
+#define SF_GENERIC(reg_name, field_name, post_fix)\
+	.field_name = reg_name ## __ ## field_name ## post_fix
+
+#define generic_regs(id) \
+{\
+	GENERIC_REG_LIST(id)\
+}
+
+static const struct generic_registers generic_regs[] = {
+	generic_regs(A),
+};
+
+static const struct generic_sh_mask generic_shift[] = {
+	GENERIC_MASK_SH_LIST(__SHIFT, A),
+};
+
+static const struct generic_sh_mask generic_mask[] = {
+	GENERIC_MASK_SH_LIST(_MASK, A),
+};
+
+static void define_generic_registers(struct hw_gpio_pin *pin, uint32_t en)
+{
+	struct hw_generic *generic = HW_GENERIC_FROM_BASE(pin);
+
+	generic->regs = &generic_regs[en];
+	generic->shifts = &generic_shift[en];
+	generic->masks = &generic_mask[en];
+	generic->base.regs = &generic_regs[en].gpio;
+}
+
 static void define_ddc_registers(
 		struct hw_gpio_pin *pin,
 		uint32_t en)
@@ -181,7 +212,8 @@ static const struct hw_factory_funcs funcs = {
 	.get_hpd_pin = dal_hw_hpd_get_pin,
 	.get_generic_pin = dal_hw_generic_get_pin,
 	.define_hpd_registers = define_hpd_registers,
-	.define_ddc_registers = define_ddc_registers
+	.define_ddc_registers = define_ddc_registers,
+	.define_generic_registers = define_generic_registers
 };
 /*
  * dal_hw_factory_dcn10_init
drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_translate_dcn21.c +1 -2
index ad7c437..fbb58fb 100644
@@ -58,7 +58,6 @@
 #define SF_HPD(reg_name, field_name, post_fix)\
 	.field_name = reg_name ## __ ## field_name ## post_fix
 
-
 /* macros to expend register list macro defined in HW object header file
  * end *********************/
 
@@ -71,7 +70,7 @@ static bool offset_to_id(
 {
 	switch (offset) {
 	/* GENERIC */
-	case REG(DC_GENERICA):
+	case REG(DC_GPIO_GENERIC_A):
 		*id = GPIO_ID_GENERIC;
 		switch (mask) {
 		case DC_GPIO_GENERIC_A__DC_GPIO_GENERICA_A_MASK:
Signature · 6 lines
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1567633392-26602-1-git-send-email-Roman.Li-5C7GfCeVMHo@public.gmane.org

Acked-by Aaron Liu
#2 lore raw

BR,
Aaron Liu

Quoted 122 lines

-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of [email protected]
Sent: Thursday, September 5, 2019 5:43 AM
To: [email protected]
Cc: Wentland, Harry <[email protected]>; Liu, Aaron <[email protected]>; Li, Roman <[email protected]>; Huang, Ray <[email protected]>; Deucher, Alexander <[email protected]>; Lakha, Bhawanpreet <[email protected]>
Subject: [PATCH] drm/amd/display: Add stereo mux and dig programming calls for dcn21

From: Roman Li <[email protected]>

[Why]
The earlier patch "Hook up calls to do stereo mux and dig programming..." doesn't include update for dcn21.

[How]
Align dcn21 gpio settings with updated stereo control interface.

---
 .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.c   | 38
++++++++++++++++++++--
 .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.c |  3 +-
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_factory_dcn21.c b/drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_factory_dcn21.c index 34485d9..8572678 100644

drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_factory_dcn21.c +34 -3
@@ -35,12 +35,10 @@
 
 #include "hw_factory_dcn21.h"
 
-
 #include "dcn/dcn_2_1_0_offset.h"
 #include "dcn/dcn_2_1_0_sh_mask.h"
 #include "renoir_ip_offset.h"
 
-
 #include "reg_helper.h"
 #include "../hpd_regs.h"
 /* begin *********************
@@ -136,6 +134,39 @@ static const struct ddc_sh_mask ddc_mask[] = {
 	DDC_MASK_SH_LIST_DCN2(_MASK, 6)
 };
 
+#include "../generic_regs.h"
+
+/* set field name */
+#define SF_GENERIC(reg_name, field_name, post_fix)\
+	.field_name = reg_name ## __ ## field_name ## post_fix
+
+#define generic_regs(id) \
+{\
+	GENERIC_REG_LIST(id)\
+}
+
+static const struct generic_registers generic_regs[] = {
+	generic_regs(A),
+};
+
+static const struct generic_sh_mask generic_shift[] = {
+	GENERIC_MASK_SH_LIST(__SHIFT, A),
+};
+
+static const struct generic_sh_mask generic_mask[] = {
+	GENERIC_MASK_SH_LIST(_MASK, A),
+};
+
+static void define_generic_registers(struct hw_gpio_pin *pin, uint32_t
+en) {
+	struct hw_generic *generic = HW_GENERIC_FROM_BASE(pin);
+
+	generic->regs = &generic_regs[en];
+	generic->shifts = &generic_shift[en];
+	generic->masks = &generic_mask[en];
+	generic->base.regs = &generic_regs[en].gpio; }
+
 static void define_ddc_registers(
 		struct hw_gpio_pin *pin,
 		uint32_t en)
@@ -181,7 +212,8 @@ static const struct hw_factory_funcs funcs = {
 	.get_hpd_pin = dal_hw_hpd_get_pin,
 	.get_generic_pin = dal_hw_generic_get_pin,
 	.define_hpd_registers = define_hpd_registers,
-	.define_ddc_registers = define_ddc_registers
+	.define_ddc_registers = define_ddc_registers,
+	.define_generic_registers = define_generic_registers
 };
 /*
  * dal_hw_factory_dcn10_init

diff --git a/drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_translate_dcn21.c b/drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_translate_dcn21.c index ad7c437..fbb58fb 100644

drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_translate_dcn21.c +1 -3
@@ -58,7 +58,6 @@
 #define SF_HPD(reg_name, field_name, post_fix)\
 	.field_name = reg_name ## __ ## field_name ## post_fix
 
-
 /* macros to expend register list macro defined in HW object header file
  * end *********************/
 
@@ -71,7 +70,7 @@ static bool offset_to_id(  {
 	switch (offset) {
 	/* GENERIC */
-	case REG(DC_GENERICA):
+	case REG(DC_GPIO_GENERIC_A):
 		*id = GPIO_ID_GENERIC;
 		switch (mask) {
 		case DC_GPIO_GENERIC_A__DC_GPIO_GENERICA_A_MASK:
--

2.7.4

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#3 lore raw
In reply to a message not in the archive
Quoted 10 lines · On 2019-09-04 5:43 p.m., [email protected] wrote:

From: Roman Li <[email protected]>

[Why]
The earlier patch "Hook up calls to do stereo mux and dig programming..." doesn't include update for dcn21.

[How]
Align dcn21 gpio settings with updated stereo control interface.

The patch itself looks good but the commit description doesn't actually describe what's being done here - this doesn't hook up programming calls, it just fills the dcn21 gpio generic registers that were previously missing.

Nicholas Kazlauskas

Quoted 86 lines
---
  .../amd/display/dc/gpio/dcn21/hw_factory_dcn21.c   | 38 ++++++++++++++++++++--
  .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.c |  3 +-
  2 files changed, 36 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_factory_dcn21.c +35 -3
index 34485d9..8572678 100644
@@ -35,12 +35,10 @@
 
  #include "hw_factory_dcn21.h"
 
-
  #include "dcn/dcn_2_1_0_offset.h"
  #include "dcn/dcn_2_1_0_sh_mask.h"
  #include "renoir_ip_offset.h"
 
-
  #include "reg_helper.h"
  #include "../hpd_regs.h"
  /* begin *********************
@@ -136,6 +134,39 @@ static const struct ddc_sh_mask ddc_mask[] = {
  	DDC_MASK_SH_LIST_DCN2(_MASK, 6)
  };
 
+#include "../generic_regs.h"
+
+/* set field name */
+#define SF_GENERIC(reg_name, field_name, post_fix)\
+	.field_name = reg_name ## __ ## field_name ## post_fix
+
+#define generic_regs(id) \
+{\
+	GENERIC_REG_LIST(id)\
+}
+
+static const struct generic_registers generic_regs[] = {
+	generic_regs(A),
+};
+
+static const struct generic_sh_mask generic_shift[] = {
+	GENERIC_MASK_SH_LIST(__SHIFT, A),
+};
+
+static const struct generic_sh_mask generic_mask[] = {
+	GENERIC_MASK_SH_LIST(_MASK, A),
+};
+
+static void define_generic_registers(struct hw_gpio_pin *pin, uint32_t en)
+{
+	struct hw_generic *generic = HW_GENERIC_FROM_BASE(pin);
+
+	generic->regs = &generic_regs[en];
+	generic->shifts = &generic_shift[en];
+	generic->masks = &generic_mask[en];
+	generic->base.regs = &generic_regs[en].gpio;
+}
+
  static void define_ddc_registers(
  		struct hw_gpio_pin *pin,
  		uint32_t en)
@@ -181,7 +212,8 @@ static const struct hw_factory_funcs funcs = {
  	.get_hpd_pin = dal_hw_hpd_get_pin,
  	.get_generic_pin = dal_hw_generic_get_pin,
  	.define_hpd_registers = define_hpd_registers,
-	.define_ddc_registers = define_ddc_registers
+	.define_ddc_registers = define_ddc_registers,
+	.define_generic_registers = define_generic_registers
  };
  /*
   * dal_hw_factory_dcn10_init
drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_translate_dcn21.c +0 -1
index ad7c437..fbb58fb 100644
@@ -58,7 +58,6 @@
  #define SF_HPD(reg_name, field_name, post_fix)\
  	.field_name = reg_name ## __ ## field_name ## post_fix
 
-
  /* macros to expend register list macro defined in HW object header file
   * end *********************/
 

drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_translate_dcn21.c static bool offset_to_id( · line 76

Quoted 8 lines
drivers/gpu/drm/amd/display/dc/gpio/dcn21/hw_translate_dcn21.c +1 -1
@@ -71,7 +70,7 @@ static bool offset_to_id(
  {
  	switch (offset) {
  	/* GENERIC */
-	case REG(DC_GENERICA):
+	case REG(DC_GPIO_GENERIC_A):
  		*id = GPIO_ID_GENERIC;
  		switch (mask) {
  		case DC_GPIO_GENERIC_A__DC_GPIO_GENERICA_A_MASK:

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx