Skip to contentSkip to conversation

drm/ast: DDC improvements

PATCH In review Thomas Zimmermann 2 participants 7 messages Apr 3, 2024 – Apr 10, 2024

Subsystems (4)
lore
Share & tools
lore

Thomas Zimmermann

author maintainer
#0 lore raw

cover drm/ast: DDC improvements

One fix and two minor improvements to ast's DDC code. Follow-up to the recently added support for connector polling. [1]

Tested on AST2500 hardware.

[1] https://patchwork.freedesktop.org/series/131306/

Thomas Zimmermann (3):
drm/ast: Set DDC timeout in milliseconds
drm/ast: Group DDC init code by data structure
drm/ast: Define struct ast_ddc in ast_ddc.c

 drivers/gpu/drm/ast/ast_ddc.c  | 30 ++++++++++++++++++++----------
 drivers/gpu/drm/ast/ast_ddc.h  | 13 ++-----------
 drivers/gpu/drm/ast/ast_mode.c |  8 ++++----
 3 files changed, 26 insertions(+), 25 deletions(-)
Signature · 1 line
2.44.0
author maintainer
#1 lore raw

PATCH 1/3 drm/ast: Set DDC timeout in milliseconds

Compute the i2c timeout in jiffies from a value in milliseconds. The original values of 2 jiffies equals 2 milliseconds if HZ has been configured to a value of 1000. This corresponds to 2.2 milliseconds used by most other DRM drivers. Update ast accordingly.

Fixes 312fec1405dd ("drm: Initial KMS driver for AST (ASpeed Technologies) 2000 series (v2)")
Cc Dave Airlie <[email protected]>
Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Thomas Zimmermann <[email protected]>
Cc Jocelyn Falempe <[email protected]>
Cc <[email protected]> # v3.5+
---
 drivers/gpu/drm/ast/ast_ddc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/ast/ast_ddc.c +1 -1
index b7718084422f3..3e156a6b6831d 100644
@@ -153,7 +153,7 @@ struct ast_ddc *ast_ddc_create(struct ast_device *ast)
 
 	bit = &ddc->bit;
 	bit->udelay = 20;
-	bit->timeout = 2;
+	bit->timeout = usecs_to_jiffies(2200);
 	bit->data = ddc;
 	bit->setsda = ast_ddc_algo_bit_data_setsda;
 	bit->setscl = ast_ddc_algo_bit_data_setscl;
Signature · 1 line
2.44.0
reviewer Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] drm/ast: Set DDC timeout in milliseconds

Hi,

Thanks for the patch, it looks good to me.

Signature · 1 line
Jocelyn
Quoted 31 lines · Thomas Zimmermann

Compute the i2c timeout in jiffies from a value in milliseconds. The original values of 2 jiffies equals 2 milliseconds if HZ has been configured to a value of 1000. This corresponds to 2.2 milliseconds used by most other DRM drivers. Update ast accordingly.

Fixes 312fec1405dd ("drm: Initial KMS driver for AST (ASpeed Technologies) 2000 series (v2)")
Cc Dave Airlie <[email protected]>
Cc Maarten Lankhorst <[email protected]>
Cc Maxime Ripard <[email protected]>
Cc Thomas Zimmermann <[email protected]>
Cc Jocelyn Falempe <[email protected]>
Cc <[email protected]> # v3.5+
---
  drivers/gpu/drm/ast/ast_ddc.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/ast/ast_ddc.c +1 -1
index b7718084422f3..3e156a6b6831d 100644
@@ -153,7 +153,7 @@ struct ast_ddc *ast_ddc_create(struct ast_device *ast)
 
  	bit = &ddc->bit;
  	bit->udelay = 20;
-	bit->timeout = 2;
+	bit->timeout = usecs_to_jiffies(2200);
  	bit->data = ddc;
  	bit->setsda = ast_ddc_algo_bit_data_setsda;
  	bit->setscl = ast_ddc_algo_bit_data_setscl;
author maintainer
#3 lore raw

PATCH 2/3 drm/ast: Group DDC init code by data structure

In reply to Thomas Zimmermann

Reorder the code to set up the DDC channel by data structure, so that each data structure's init is in a separate block: first the bit algo then the i2c adapter. Makes the code more readable. No functional changes.

---
 drivers/gpu/drm/ast/ast_ddc.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/ast/ast_ddc.c +8 -8
index 3e156a6b6831d..4df52aeba4f7e 100644
@@ -145,15 +145,7 @@ struct ast_ddc *ast_ddc_create(struct ast_device *ast)
 		return ERR_PTR(-ENOMEM);
 	ddc->ast = ast;
 
-	adapter = &ddc->adapter;
-	adapter->owner = THIS_MODULE;
-	adapter->dev.parent = dev->dev;
-	i2c_set_adapdata(adapter, ddc);
-	snprintf(adapter->name, sizeof(adapter->name), "AST DDC bus");
-
 	bit = &ddc->bit;
-	bit->udelay = 20;
-	bit->timeout = usecs_to_jiffies(2200);
 	bit->data = ddc;
 	bit->setsda = ast_ddc_algo_bit_data_setsda;
 	bit->setscl = ast_ddc_algo_bit_data_setscl;
@@ -161,8 +153,16 @@ struct ast_ddc *ast_ddc_create(struct ast_device *ast)
 	bit->getscl = ast_ddc_algo_bit_data_getscl;
 	bit->pre_xfer = ast_ddc_algo_bit_data_pre_xfer;
 	bit->post_xfer = ast_ddc_algo_bit_data_post_xfer;
+	bit->udelay = 20;
+	bit->timeout = usecs_to_jiffies(2200);
 
+	adapter = &ddc->adapter;
+	adapter->owner = THIS_MODULE;
 	adapter->algo_data = bit;
+	adapter->dev.parent = dev->dev;
+	snprintf(adapter->name, sizeof(adapter->name), "AST DDC bus");
+	i2c_set_adapdata(adapter, ddc);
+
 	ret = i2c_bit_add_bus(adapter);
 	if (ret) {
 		drm_err(dev, "Failed to register bit i2c\n");
Signature · 1 line
2.44.0
reviewer Reviewed-by on v1 2/3
#4 lore raw

Re: [PATCH 2/3] drm/ast: Group DDC init code by data structure

Hi,

Thanks for the patch, it looks good to me.

Signature · 1 line
Jocelyn
Quoted 47 lines · Thomas Zimmermann

Reorder the code to set up the DDC channel by data structure, so that each data structure's init is in a separate block: first the bit algo then the i2c adapter. Makes the code more readable. No functional changes.

---
  drivers/gpu/drm/ast/ast_ddc.c | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/ast/ast_ddc.c +8 -8
index 3e156a6b6831d..4df52aeba4f7e 100644
@@ -145,15 +145,7 @@ struct ast_ddc *ast_ddc_create(struct ast_device *ast)
  		return ERR_PTR(-ENOMEM);
  	ddc->ast = ast;
 
-	adapter = &ddc->adapter;
-	adapter->owner = THIS_MODULE;
-	adapter->dev.parent = dev->dev;
-	i2c_set_adapdata(adapter, ddc);
-	snprintf(adapter->name, sizeof(adapter->name), "AST DDC bus");
-
  	bit = &ddc->bit;
-	bit->udelay = 20;
-	bit->timeout = usecs_to_jiffies(2200);
  	bit->data = ddc;
  	bit->setsda = ast_ddc_algo_bit_data_setsda;
  	bit->setscl = ast_ddc_algo_bit_data_setscl;
@@ -161,8 +153,16 @@ struct ast_ddc *ast_ddc_create(struct ast_device *ast)
  	bit->getscl = ast_ddc_algo_bit_data_getscl;
  	bit->pre_xfer = ast_ddc_algo_bit_data_pre_xfer;
  	bit->post_xfer = ast_ddc_algo_bit_data_post_xfer;
+	bit->udelay = 20;
+	bit->timeout = usecs_to_jiffies(2200);
 
+	adapter = &ddc->adapter;
+	adapter->owner = THIS_MODULE;
  	adapter->algo_data = bit;
+	adapter->dev.parent = dev->dev;
+	snprintf(adapter->name, sizeof(adapter->name), "AST DDC bus");
+	i2c_set_adapdata(adapter, ddc);
+
  	ret = i2c_bit_add_bus(adapter);
  	if (ret) {
  		drm_err(dev, "Failed to register bit i2c\n");
author maintainer
#5 lore raw

PATCH 3/3 drm/ast: Define struct ast_ddc in ast_ddc.c

In reply to Thomas Zimmermann

Move the definition of struct ast_ddc to ast_ddc.c and return the i2c adapter from ast_ddc_create(). Update callers accordingly. Avoids including Linux i2c header files, except where required. No functional changes.

---
 drivers/gpu/drm/ast/ast_ddc.c  | 14 ++++++++++++--
 drivers/gpu/drm/ast/ast_ddc.h  | 13 ++-----------
 drivers/gpu/drm/ast/ast_mode.c |  8 ++++----
 3 files changed, 18 insertions(+), 17 deletions(-)
drivers/gpu/drm/ast/ast_ddc.c +12 -2
index 4df52aeba4f7e..29cf5d157f344 100644
@@ -21,12 +21,22 @@
  * of the Software.
  */
 
+#include <linux/i2c-algo-bit.h>
+#include <linux/i2c.h>
+
 #include <drm/drm_managed.h>
 #include <drm/drm_print.h>
 
 #include "ast_ddc.h"
 #include "ast_drv.h"
 
+struct ast_ddc {
+	struct ast_device *ast;
+
+	struct i2c_algo_bit_data bit;
+	struct i2c_adapter adapter;
+};
+
 static void ast_ddc_algo_bit_data_setsda(void *data, int state)
 {
 	struct ast_ddc *ddc = data;
@@ -132,7 +142,7 @@ static void ast_ddc_release(struct drm_device *dev, void *res)
 	i2c_del_adapter(&ddc->adapter);
 }
 
-struct ast_ddc *ast_ddc_create(struct ast_device *ast)
+struct i2c_adapter *ast_ddc_create(struct ast_device *ast)
 {
 	struct drm_device *dev = &ast->base;
 	struct ast_ddc *ddc;
@@ -173,5 +183,5 @@ struct ast_ddc *ast_ddc_create(struct ast_device *ast)
 	if (ret)
 		return ERR_PTR(ret);
 
-	return ddc;
+	return &ddc->adapter;
 }
drivers/gpu/drm/ast/ast_ddc.h +2 -11
index 08f3994e09ccd..85c93edc9ae12 100644
@@ -3,18 +3,9 @@
 #ifndef __AST_DDC_H__
 #define __AST_DDC_H__
 
-#include <linux/i2c.h>
-#include <linux/i2c-algo-bit.h>
-
 struct ast_device;
+struct i2c_adapter;
 
-struct ast_ddc {
-	struct ast_device *ast;
-
-	struct i2c_adapter adapter;
-	struct i2c_algo_bit_data bit;
-};
-
-struct ast_ddc *ast_ddc_create(struct ast_device *ast);
+struct i2c_adapter *ast_ddc_create(struct ast_device *ast);
 
 #endif
drivers/gpu/drm/ast/ast_mode.c +4 -4
index bb9b66aba9ee9..ae21d89b899c8 100644
@@ -1360,7 +1360,7 @@ static const struct drm_connector_funcs ast_vga_connector_funcs = {
 static int ast_vga_connector_init(struct drm_device *dev, struct drm_connector *connector)
 {
 	struct ast_device *ast = to_ast_device(dev);
-	struct ast_ddc *ddc;
+	struct i2c_adapter *ddc;
 	int ret;
 
 	ddc = ast_ddc_create(ast);
@@ -1371,7 +1371,7 @@ static int ast_vga_connector_init(struct drm_device *dev, struct drm_connector *
 	}
 
 	ret = drm_connector_init_with_ddc(dev, connector, &ast_vga_connector_funcs,
-					  DRM_MODE_CONNECTOR_VGA, &ddc->adapter);
+					  DRM_MODE_CONNECTOR_VGA, ddc);
 	if (ret)
 		return ret;
 
@@ -1429,7 +1429,7 @@ static const struct drm_connector_funcs ast_sil164_connector_funcs = {
 static int ast_sil164_connector_init(struct drm_device *dev, struct drm_connector *connector)
 {
 	struct ast_device *ast = to_ast_device(dev);
-	struct ast_ddc *ddc;
+	struct i2c_adapter *ddc;
 	int ret;
 
 	ddc = ast_ddc_create(ast);
@@ -1440,7 +1440,7 @@ static int ast_sil164_connector_init(struct drm_device *dev, struct drm_connecto
 	}
 
 	ret = drm_connector_init_with_ddc(dev, connector, &ast_sil164_connector_funcs,
-					  DRM_MODE_CONNECTOR_DVII, &ddc->adapter);
+					  DRM_MODE_CONNECTOR_DVII, ddc);
 	if (ret)
 		return ret;
 
Signature · 1 line
2.44.0
reviewer Reviewed-by on v1 3/3
#6 lore raw

Re: [PATCH 3/3] drm/ast: Define struct ast_ddc in ast_ddc.c

Hi,

Thanks for the patch, it looks good to me.

Signature · 1 line
Jocelyn
Quoted 120 lines · Thomas Zimmermann

Move the definition of struct ast_ddc to ast_ddc.c and return the i2c adapter from ast_ddc_create(). Update callers accordingly. Avoids including Linux i2c header files, except where required. No functional changes.

---
  drivers/gpu/drm/ast/ast_ddc.c  | 14 ++++++++++++--
  drivers/gpu/drm/ast/ast_ddc.h  | 13 ++-----------
  drivers/gpu/drm/ast/ast_mode.c |  8 ++++----
  3 files changed, 18 insertions(+), 17 deletions(-)
drivers/gpu/drm/ast/ast_ddc.c +12 -2
index 4df52aeba4f7e..29cf5d157f344 100644
@@ -21,12 +21,22 @@
   * of the Software.
   */
 
+#include <linux/i2c-algo-bit.h>
+#include <linux/i2c.h>
+
  #include <drm/drm_managed.h>
  #include <drm/drm_print.h>
 
  #include "ast_ddc.h"
  #include "ast_drv.h"
 
+struct ast_ddc {
+	struct ast_device *ast;
+
+	struct i2c_algo_bit_data bit;
+	struct i2c_adapter adapter;
+};
+
  static void ast_ddc_algo_bit_data_setsda(void *data, int state)
  {
  	struct ast_ddc *ddc = data;
@@ -132,7 +142,7 @@ static void ast_ddc_release(struct drm_device *dev, void *res)
  	i2c_del_adapter(&ddc->adapter);
  }
 
-struct ast_ddc *ast_ddc_create(struct ast_device *ast)
+struct i2c_adapter *ast_ddc_create(struct ast_device *ast)
  {
  	struct drm_device *dev = &ast->base;
  	struct ast_ddc *ddc;
@@ -173,5 +183,5 @@ struct ast_ddc *ast_ddc_create(struct ast_device *ast)
  	if (ret)
  		return ERR_PTR(ret);
 
-	return ddc;
+	return &ddc->adapter;
  }
drivers/gpu/drm/ast/ast_ddc.h +2 -11
index 08f3994e09ccd..85c93edc9ae12 100644
@@ -3,18 +3,9 @@
  #ifndef __AST_DDC_H__
  #define __AST_DDC_H__
 
-#include <linux/i2c.h>
-#include <linux/i2c-algo-bit.h>
-
  struct ast_device;
+struct i2c_adapter;
 
-struct ast_ddc {
-	struct ast_device *ast;
-
-	struct i2c_adapter adapter;
-	struct i2c_algo_bit_data bit;
-};
-
-struct ast_ddc *ast_ddc_create(struct ast_device *ast);
+struct i2c_adapter *ast_ddc_create(struct ast_device *ast);
 
  #endif
drivers/gpu/drm/ast/ast_mode.c +4 -4
index bb9b66aba9ee9..ae21d89b899c8 100644
@@ -1360,7 +1360,7 @@ static const struct drm_connector_funcs ast_vga_connector_funcs = {
  static int ast_vga_connector_init(struct drm_device *dev, struct drm_connector *connector)
  {
  	struct ast_device *ast = to_ast_device(dev);
-	struct ast_ddc *ddc;
+	struct i2c_adapter *ddc;
  	int ret;
 
  	ddc = ast_ddc_create(ast);
@@ -1371,7 +1371,7 @@ static int ast_vga_connector_init(struct drm_device *dev, struct drm_connector *
  	}
 
  	ret = drm_connector_init_with_ddc(dev, connector, &ast_vga_connector_funcs,
-					  DRM_MODE_CONNECTOR_VGA, &ddc->adapter);
+					  DRM_MODE_CONNECTOR_VGA, ddc);
  	if (ret)
  		return ret;
 
@@ -1429,7 +1429,7 @@ static const struct drm_connector_funcs ast_sil164_connector_funcs = {
  static int ast_sil164_connector_init(struct drm_device *dev, struct drm_connector *connector)
  {
  	struct ast_device *ast = to_ast_device(dev);
-	struct ast_ddc *ddc;
+	struct i2c_adapter *ddc;
  	int ret;
 
  	ddc = ast_ddc_create(ast);
@@ -1440,7 +1440,7 @@ static int ast_sil164_connector_init(struct drm_device *dev, struct drm_connecto
  	}
 
  	ret = drm_connector_init_with_ddc(dev, connector, &ast_sil164_connector_funcs,
-					  DRM_MODE_CONNECTOR_DVII, &ddc->adapter);
+					  DRM_MODE_CONNECTOR_DVII, ddc);
  	if (ret)
  		return ret;