* [PATCH RESEND 01/14] drm/bridge: ti-tfp410: Update drm_connector_init_with_ddc() error message
2019-08-26 19:25 [PATCH RESEND 00/14] Next round of associating ddc adapters with connectors Andrzej Pietrasiewicz
@ 2019-08-26 19:25 ` Andrzej Pietrasiewicz
2019-08-26 19:25 ` [PATCH RESEND 02/14] drm/radeon: Provide ddc symlink in connector sysfs directory Andrzej Pietrasiewicz
` (10 subsequent siblings)
11 siblings, 0 replies; 21+ messages in thread
From: Andrzej Pietrasiewicz @ 2019-08-26 19:25 UTC (permalink / raw)
To: dri-devel
Cc: Heiko Stübner, Geert Uytterhoeven, Neil Armstrong,
David Airlie, Bhawanpreet Lakha, Andrzej Hajda, Laurent Pinchart,
kernel, Anthony Koo, David (ChunMing) Zhou, linux-samsung-soc,
Joonyoung Shim, Tomi Valkeinen, David Francis,
Krzysztof Kozlowski, Jonathan Hunter, linux-rockchip, Kukjin Kim,
linux-arm-msm, CK Hu, Harry Wentland, linux-tegra, Philipp Zabel
From: Geert Uytterhoeven <geert+renesas@glider.be>
The code was changed to call drm_connector_init_with_ddc() instead of
drm_connector_init(), but the corresponding error message was not
updated.
Fixes: cfb444552926989f ("drm/bridge: ti-tfp410: Provide ddc symlink in connector sysfs directory")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
---
drivers/gpu/drm/bridge/ti-tfp410.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
index 61cc2354ef1b..be6c99cac419 100644
--- a/drivers/gpu/drm/bridge/ti-tfp410.c
+++ b/drivers/gpu/drm/bridge/ti-tfp410.c
@@ -139,7 +139,8 @@ static int tfp410_attach(struct drm_bridge *bridge)
dvi->connector_type,
dvi->ddc);
if (ret) {
- dev_err(dvi->dev, "drm_connector_init() failed: %d\n", ret);
+ dev_err(dvi->dev, "drm_connector_init_with_ddc() failed: %d\n",
+ ret);
return ret;
}
--
2.17.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH RESEND 02/14] drm/radeon: Provide ddc symlink in connector sysfs directory
2019-08-26 19:25 [PATCH RESEND 00/14] Next round of associating ddc adapters with connectors Andrzej Pietrasiewicz
2019-08-26 19:25 ` [PATCH RESEND 01/14] drm/bridge: ti-tfp410: Update drm_connector_init_with_ddc() error message Andrzej Pietrasiewicz
@ 2019-08-26 19:25 ` Andrzej Pietrasiewicz
2019-08-27 14:12 ` Alex Deucher
2019-08-26 19:25 ` [PATCH RESEND 04/14] drm/exynos: Provide ddc symlink in connector's sysfs Andrzej Pietrasiewicz
` (9 subsequent siblings)
11 siblings, 1 reply; 21+ messages in thread
From: Andrzej Pietrasiewicz @ 2019-08-26 19:25 UTC (permalink / raw)
To: dri-devel
Cc: Heiko Stübner, Neil Armstrong, David Airlie,
Bhawanpreet Lakha, Andrzej Hajda, Laurent Pinchart, kernel,
Anthony Koo, David (ChunMing) Zhou, linux-samsung-soc,
Joonyoung Shim, Tomi Valkeinen, David Francis,
Krzysztof Kozlowski, Jonathan Hunter, linux-rockchip, Kukjin Kim,
linux-arm-kernel, linux-arm-msm, CK Hu, Harry Wentland, freedreno,
linux-tegra
Use the ddc pointer provided by the generic connector.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
---
drivers/gpu/drm/radeon/radeon_connectors.c | 143 +++++++++++++++------
1 file changed, 107 insertions(+), 36 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index c60d1a44d22a..62d37eddf99c 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -1870,6 +1870,7 @@ radeon_add_atom_connector(struct drm_device *dev,
struct radeon_connector_atom_dig *radeon_dig_connector;
struct drm_encoder *encoder;
struct radeon_encoder *radeon_encoder;
+ struct i2c_adapter *ddc = NULL;
uint32_t subpixel_order = SubPixelNone;
bool shared_ddc = false;
bool is_dp_bridge = false;
@@ -1947,17 +1948,21 @@ radeon_add_atom_connector(struct drm_device *dev,
radeon_connector->con_priv = radeon_dig_connector;
if (i2c_bus->valid) {
radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
- if (radeon_connector->ddc_bus)
+ if (radeon_connector->ddc_bus) {
has_aux = true;
- else
+ ddc = &radeon_connector->ddc_bus->adapter;
+ } else {
DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
+ }
}
switch (connector_type) {
case DRM_MODE_CONNECTOR_VGA:
case DRM_MODE_CONNECTOR_DVIA:
default:
- drm_connector_init(dev, &radeon_connector->base,
- &radeon_dp_connector_funcs, connector_type);
+ drm_connector_init_with_ddc(dev, &radeon_connector->base,
+ &radeon_dp_connector_funcs,
+ connector_type,
+ ddc);
drm_connector_helper_add(&radeon_connector->base,
&radeon_dp_connector_helper_funcs);
connector->interlace_allowed = true;
@@ -1979,8 +1984,10 @@ radeon_add_atom_connector(struct drm_device *dev,
case DRM_MODE_CONNECTOR_HDMIA:
case DRM_MODE_CONNECTOR_HDMIB:
case DRM_MODE_CONNECTOR_DisplayPort:
- drm_connector_init(dev, &radeon_connector->base,
- &radeon_dp_connector_funcs, connector_type);
+ drm_connector_init_with_ddc(dev, &radeon_connector->base,
+ &radeon_dp_connector_funcs,
+ connector_type,
+ ddc);
drm_connector_helper_add(&radeon_connector->base,
&radeon_dp_connector_helper_funcs);
drm_object_attach_property(&radeon_connector->base.base,
@@ -2027,8 +2034,10 @@ radeon_add_atom_connector(struct drm_device *dev,
break;
case DRM_MODE_CONNECTOR_LVDS:
case DRM_MODE_CONNECTOR_eDP:
- drm_connector_init(dev, &radeon_connector->base,
- &radeon_lvds_bridge_connector_funcs, connector_type);
+ drm_connector_init_with_ddc(dev, &radeon_connector->base,
+ &radeon_lvds_bridge_connector_funcs,
+ connector_type,
+ ddc);
drm_connector_helper_add(&radeon_connector->base,
&radeon_dp_connector_helper_funcs);
drm_object_attach_property(&radeon_connector->base.base,
@@ -2042,13 +2051,18 @@ radeon_add_atom_connector(struct drm_device *dev,
} else {
switch (connector_type) {
case DRM_MODE_CONNECTOR_VGA:
- drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);
- drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);
if (i2c_bus->valid) {
radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
if (!radeon_connector->ddc_bus)
DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
+ else
+ ddc = &radeon_connector->ddc_bus->adapter;
}
+ drm_connector_init_with_ddc(dev, &radeon_connector->base,
+ &radeon_vga_connector_funcs,
+ connector_type,
+ ddc);
+ drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);
radeon_connector->dac_load_detect = true;
drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.load_detect_property,
@@ -2067,13 +2081,18 @@ radeon_add_atom_connector(struct drm_device *dev,
connector->doublescan_allowed = true;
break;
case DRM_MODE_CONNECTOR_DVIA:
- drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);
- drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);
if (i2c_bus->valid) {
radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
if (!radeon_connector->ddc_bus)
DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
+ else
+ ddc = &radeon_connector->ddc_bus->adapter;
}
+ drm_connector_init_with_ddc(dev, &radeon_connector->base,
+ &radeon_vga_connector_funcs,
+ connector_type,
+ ddc);
+ drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);
radeon_connector->dac_load_detect = true;
drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.load_detect_property,
@@ -2098,13 +2117,18 @@ radeon_add_atom_connector(struct drm_device *dev,
goto failed;
radeon_dig_connector->igp_lane_info = igp_lane_info;
radeon_connector->con_priv = radeon_dig_connector;
- drm_connector_init(dev, &radeon_connector->base, &radeon_dvi_connector_funcs, connector_type);
- drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs);
if (i2c_bus->valid) {
radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
if (!radeon_connector->ddc_bus)
DRM_ERROR("DVI: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
+ else
+ ddc = &radeon_connector->ddc_bus->adapter;
}
+ drm_connector_init_with_ddc(dev, &radeon_connector->base,
+ &radeon_dvi_connector_funcs,
+ connector_type,
+ ddc);
+ drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs);
subpixel_order = SubPixelHorizontalRGB;
drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.coherent_mode_property,
@@ -2155,13 +2179,18 @@ radeon_add_atom_connector(struct drm_device *dev,
goto failed;
radeon_dig_connector->igp_lane_info = igp_lane_info;
radeon_connector->con_priv = radeon_dig_connector;
- drm_connector_init(dev, &radeon_connector->base, &radeon_dvi_connector_funcs, connector_type);
- drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs);
if (i2c_bus->valid) {
radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
if (!radeon_connector->ddc_bus)
DRM_ERROR("HDMI: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
+ else
+ ddc = &radeon_connector->ddc_bus->adapter;
}
+ drm_connector_init_with_ddc(dev, &radeon_connector->base,
+ &radeon_dvi_connector_funcs,
+ connector_type,
+ ddc);
+ drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs);
drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.coherent_mode_property,
1);
@@ -2205,15 +2234,20 @@ radeon_add_atom_connector(struct drm_device *dev,
goto failed;
radeon_dig_connector->igp_lane_info = igp_lane_info;
radeon_connector->con_priv = radeon_dig_connector;
- drm_connector_init(dev, &radeon_connector->base, &radeon_dp_connector_funcs, connector_type);
- drm_connector_helper_add(&radeon_connector->base, &radeon_dp_connector_helper_funcs);
if (i2c_bus->valid) {
radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
- if (radeon_connector->ddc_bus)
+ if (radeon_connector->ddc_bus) {
has_aux = true;
- else
+ ddc = &radeon_connector->ddc_bus->adapter;
+ } else {
DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
+ }
}
+ drm_connector_init_with_ddc(dev, &radeon_connector->base,
+ &radeon_dp_connector_funcs,
+ connector_type,
+ ddc);
+ drm_connector_helper_add(&radeon_connector->base, &radeon_dp_connector_helper_funcs);
subpixel_order = SubPixelHorizontalRGB;
drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.coherent_mode_property,
@@ -2255,15 +2289,20 @@ radeon_add_atom_connector(struct drm_device *dev,
goto failed;
radeon_dig_connector->igp_lane_info = igp_lane_info;
radeon_connector->con_priv = radeon_dig_connector;
- drm_connector_init(dev, &radeon_connector->base, &radeon_edp_connector_funcs, connector_type);
- drm_connector_helper_add(&radeon_connector->base, &radeon_dp_connector_helper_funcs);
if (i2c_bus->valid) {
radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
- if (radeon_connector->ddc_bus)
+ if (radeon_connector->ddc_bus) {
has_aux = true;
- else
+ ddc = &radeon_connector->ddc_bus->adapter;
+ } else {
DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
+ }
}
+ drm_connector_init_with_ddc(dev, &radeon_connector->base,
+ &radeon_edp_connector_funcs,
+ connector_type,
+ ddc);
+ drm_connector_helper_add(&radeon_connector->base, &radeon_dp_connector_helper_funcs);
drm_object_attach_property(&radeon_connector->base.base,
dev->mode_config.scaling_mode_property,
DRM_MODE_SCALE_FULLSCREEN);
@@ -2274,7 +2313,10 @@ radeon_add_atom_connector(struct drm_device *dev,
case DRM_MODE_CONNECTOR_SVIDEO:
case DRM_MODE_CONNECTOR_Composite:
case DRM_MODE_CONNECTOR_9PinDIN:
- drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type);
+ drm_connector_init_with_ddc(dev, &radeon_connector->base,
+ &radeon_tv_connector_funcs,
+ connector_type,
+ ddc);
drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs);
radeon_connector->dac_load_detect = true;
drm_object_attach_property(&radeon_connector->base.base,
@@ -2294,13 +2336,18 @@ radeon_add_atom_connector(struct drm_device *dev,
goto failed;
radeon_dig_connector->igp_lane_info = igp_lane_info;
radeon_connector->con_priv = radeon_dig_connector;
- drm_connector_init(dev, &radeon_connector->base, &radeon_lvds_connector_funcs, connector_type);
- drm_connector_helper_add(&radeon_connector->base, &radeon_lvds_connector_helper_funcs);
if (i2c_bus->valid) {
radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
if (!radeon_connector->ddc_bus)
DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
+ else
+ ddc = &radeon_connector->ddc_bus->adapter;
}
+ drm_connector_init_with_ddc(dev, &radeon_connector->base,
+ &radeon_lvds_connector_funcs,
+ connector_type,
+ ddc);
+ drm_connector_helper_add(&radeon_connector->base, &radeon_lvds_connector_helper_funcs);
drm_object_attach_property(&radeon_connector->base.base,
dev->mode_config.scaling_mode_property,
DRM_MODE_SCALE_FULLSCREEN);
@@ -2344,6 +2391,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
struct radeon_device *rdev = dev->dev_private;
struct drm_connector *connector;
struct radeon_connector *radeon_connector;
+ struct i2c_adapter *ddc = NULL;
uint32_t subpixel_order = SubPixelNone;
if (connector_type == DRM_MODE_CONNECTOR_Unknown)
@@ -2378,13 +2426,18 @@ radeon_add_legacy_connector(struct drm_device *dev,
switch (connector_type) {
case DRM_MODE_CONNECTOR_VGA:
- drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);
- drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);
if (i2c_bus->valid) {
radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
if (!radeon_connector->ddc_bus)
DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
+ else
+ ddc = &radeon_connector->ddc_bus->adapter;
}
+ drm_connector_init_with_ddc(dev, &radeon_connector->base,
+ &radeon_vga_connector_funcs,
+ connector_type,
+ ddc);
+ drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);
radeon_connector->dac_load_detect = true;
drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.load_detect_property,
@@ -2395,13 +2448,18 @@ radeon_add_legacy_connector(struct drm_device *dev,
connector->doublescan_allowed = true;
break;
case DRM_MODE_CONNECTOR_DVIA:
- drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);
- drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);
if (i2c_bus->valid) {
radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
if (!radeon_connector->ddc_bus)
DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
+ else
+ ddc = &radeon_connector->ddc_bus->adapter;
}
+ drm_connector_init_with_ddc(dev, &radeon_connector->base,
+ &radeon_vga_connector_funcs,
+ connector_type,
+ ddc);
+ drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);
radeon_connector->dac_load_detect = true;
drm_object_attach_property(&radeon_connector->base.base,
rdev->mode_info.load_detect_property,
@@ -2413,13 +2471,18 @@ radeon_add_legacy_connector(struct drm_device *dev,
break;
case DRM_MODE_CONNECTOR_DVII:
case DRM_MODE_CONNECTOR_DVID:
- drm_connector_init(dev, &radeon_connector->base, &radeon_dvi_connector_funcs, connector_type);
- drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs);
if (i2c_bus->valid) {
radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
if (!radeon_connector->ddc_bus)
DRM_ERROR("DVI: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
+ else
+ ddc = &radeon_connector->ddc_bus->adapter;
}
+ drm_connector_init_with_ddc(dev, &radeon_connector->base,
+ &radeon_dvi_connector_funcs,
+ connector_type,
+ ddc);
+ drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs);
if (connector_type == DRM_MODE_CONNECTOR_DVII) {
radeon_connector->dac_load_detect = true;
drm_object_attach_property(&radeon_connector->base.base,
@@ -2436,7 +2499,10 @@ radeon_add_legacy_connector(struct drm_device *dev,
case DRM_MODE_CONNECTOR_SVIDEO:
case DRM_MODE_CONNECTOR_Composite:
case DRM_MODE_CONNECTOR_9PinDIN:
- drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type);
+ drm_connector_init_with_ddc(dev, &radeon_connector->base,
+ &radeon_tv_connector_funcs,
+ connector_type,
+ ddc);
drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs);
radeon_connector->dac_load_detect = true;
/* RS400,RC410,RS480 chipset seems to report a lot
@@ -2458,13 +2524,18 @@ radeon_add_legacy_connector(struct drm_device *dev,
connector->doublescan_allowed = false;
break;
case DRM_MODE_CONNECTOR_LVDS:
- drm_connector_init(dev, &radeon_connector->base, &radeon_lvds_connector_funcs, connector_type);
- drm_connector_helper_add(&radeon_connector->base, &radeon_lvds_connector_helper_funcs);
if (i2c_bus->valid) {
radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
if (!radeon_connector->ddc_bus)
DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
+ else
+ ddc = &radeon_connector->ddc_bus->adapter;
}
+ drm_connector_init_with_ddc(dev, &radeon_connector->base,
+ &radeon_lvds_connector_funcs,
+ connector_type,
+ ddc);
+ drm_connector_helper_add(&radeon_connector->base, &radeon_lvds_connector_helper_funcs);
drm_object_attach_property(&radeon_connector->base.base,
dev->mode_config.scaling_mode_property,
DRM_MODE_SCALE_FULLSCREEN);
--
2.17.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH RESEND 02/14] drm/radeon: Provide ddc symlink in connector sysfs directory
2019-08-26 19:25 ` [PATCH RESEND 02/14] drm/radeon: Provide ddc symlink in connector sysfs directory Andrzej Pietrasiewicz
@ 2019-08-27 14:12 ` Alex Deucher
0 siblings, 0 replies; 21+ messages in thread
From: Alex Deucher @ 2019-08-27 14:12 UTC (permalink / raw)
To: Andrzej Pietrasiewicz
Cc: Neil Armstrong, David Airlie, Maling list - DRI developers,
Thierry Reding, Laurent Pinchart, Shawn Guo, kernel, Anthony Koo,
linux-samsung-soc, Sean Paul, David Francis, Kyungmin Park,
Krzysztof Kozlowski, Jonathan Hunter, linux-rockchip,
Tomi Valkeinen, Matthias Brugger, Allison Randal, Uma Shankar,
Jonas Karlman, Leo Li, linux-arm-msm
On Mon, Aug 26, 2019 at 3:26 PM Andrzej Pietrasiewicz
<andrzej.p@collabora.com> wrote:
>
> Use the ddc pointer provided by the generic connector.
>
> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/radeon/radeon_connectors.c | 143 +++++++++++++++------
> 1 file changed, 107 insertions(+), 36 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
> index c60d1a44d22a..62d37eddf99c 100644
> --- a/drivers/gpu/drm/radeon/radeon_connectors.c
> +++ b/drivers/gpu/drm/radeon/radeon_connectors.c
> @@ -1870,6 +1870,7 @@ radeon_add_atom_connector(struct drm_device *dev,
> struct radeon_connector_atom_dig *radeon_dig_connector;
> struct drm_encoder *encoder;
> struct radeon_encoder *radeon_encoder;
> + struct i2c_adapter *ddc = NULL;
> uint32_t subpixel_order = SubPixelNone;
> bool shared_ddc = false;
> bool is_dp_bridge = false;
> @@ -1947,17 +1948,21 @@ radeon_add_atom_connector(struct drm_device *dev,
> radeon_connector->con_priv = radeon_dig_connector;
> if (i2c_bus->valid) {
> radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
> - if (radeon_connector->ddc_bus)
> + if (radeon_connector->ddc_bus) {
> has_aux = true;
> - else
> + ddc = &radeon_connector->ddc_bus->adapter;
> + } else {
> DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
> + }
> }
> switch (connector_type) {
> case DRM_MODE_CONNECTOR_VGA:
> case DRM_MODE_CONNECTOR_DVIA:
> default:
> - drm_connector_init(dev, &radeon_connector->base,
> - &radeon_dp_connector_funcs, connector_type);
> + drm_connector_init_with_ddc(dev, &radeon_connector->base,
> + &radeon_dp_connector_funcs,
> + connector_type,
> + ddc);
> drm_connector_helper_add(&radeon_connector->base,
> &radeon_dp_connector_helper_funcs);
> connector->interlace_allowed = true;
> @@ -1979,8 +1984,10 @@ radeon_add_atom_connector(struct drm_device *dev,
> case DRM_MODE_CONNECTOR_HDMIA:
> case DRM_MODE_CONNECTOR_HDMIB:
> case DRM_MODE_CONNECTOR_DisplayPort:
> - drm_connector_init(dev, &radeon_connector->base,
> - &radeon_dp_connector_funcs, connector_type);
> + drm_connector_init_with_ddc(dev, &radeon_connector->base,
> + &radeon_dp_connector_funcs,
> + connector_type,
> + ddc);
> drm_connector_helper_add(&radeon_connector->base,
> &radeon_dp_connector_helper_funcs);
> drm_object_attach_property(&radeon_connector->base.base,
> @@ -2027,8 +2034,10 @@ radeon_add_atom_connector(struct drm_device *dev,
> break;
> case DRM_MODE_CONNECTOR_LVDS:
> case DRM_MODE_CONNECTOR_eDP:
> - drm_connector_init(dev, &radeon_connector->base,
> - &radeon_lvds_bridge_connector_funcs, connector_type);
> + drm_connector_init_with_ddc(dev, &radeon_connector->base,
> + &radeon_lvds_bridge_connector_funcs,
> + connector_type,
> + ddc);
> drm_connector_helper_add(&radeon_connector->base,
> &radeon_dp_connector_helper_funcs);
> drm_object_attach_property(&radeon_connector->base.base,
> @@ -2042,13 +2051,18 @@ radeon_add_atom_connector(struct drm_device *dev,
> } else {
> switch (connector_type) {
> case DRM_MODE_CONNECTOR_VGA:
> - drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);
> - drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);
> if (i2c_bus->valid) {
> radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
> if (!radeon_connector->ddc_bus)
> DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
> + else
> + ddc = &radeon_connector->ddc_bus->adapter;
> }
> + drm_connector_init_with_ddc(dev, &radeon_connector->base,
> + &radeon_vga_connector_funcs,
> + connector_type,
> + ddc);
> + drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);
> radeon_connector->dac_load_detect = true;
> drm_object_attach_property(&radeon_connector->base.base,
> rdev->mode_info.load_detect_property,
> @@ -2067,13 +2081,18 @@ radeon_add_atom_connector(struct drm_device *dev,
> connector->doublescan_allowed = true;
> break;
> case DRM_MODE_CONNECTOR_DVIA:
> - drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);
> - drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);
> if (i2c_bus->valid) {
> radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
> if (!radeon_connector->ddc_bus)
> DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
> + else
> + ddc = &radeon_connector->ddc_bus->adapter;
> }
> + drm_connector_init_with_ddc(dev, &radeon_connector->base,
> + &radeon_vga_connector_funcs,
> + connector_type,
> + ddc);
> + drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);
> radeon_connector->dac_load_detect = true;
> drm_object_attach_property(&radeon_connector->base.base,
> rdev->mode_info.load_detect_property,
> @@ -2098,13 +2117,18 @@ radeon_add_atom_connector(struct drm_device *dev,
> goto failed;
> radeon_dig_connector->igp_lane_info = igp_lane_info;
> radeon_connector->con_priv = radeon_dig_connector;
> - drm_connector_init(dev, &radeon_connector->base, &radeon_dvi_connector_funcs, connector_type);
> - drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs);
> if (i2c_bus->valid) {
> radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
> if (!radeon_connector->ddc_bus)
> DRM_ERROR("DVI: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
> + else
> + ddc = &radeon_connector->ddc_bus->adapter;
> }
> + drm_connector_init_with_ddc(dev, &radeon_connector->base,
> + &radeon_dvi_connector_funcs,
> + connector_type,
> + ddc);
> + drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs);
> subpixel_order = SubPixelHorizontalRGB;
> drm_object_attach_property(&radeon_connector->base.base,
> rdev->mode_info.coherent_mode_property,
> @@ -2155,13 +2179,18 @@ radeon_add_atom_connector(struct drm_device *dev,
> goto failed;
> radeon_dig_connector->igp_lane_info = igp_lane_info;
> radeon_connector->con_priv = radeon_dig_connector;
> - drm_connector_init(dev, &radeon_connector->base, &radeon_dvi_connector_funcs, connector_type);
> - drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs);
> if (i2c_bus->valid) {
> radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
> if (!radeon_connector->ddc_bus)
> DRM_ERROR("HDMI: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
> + else
> + ddc = &radeon_connector->ddc_bus->adapter;
> }
> + drm_connector_init_with_ddc(dev, &radeon_connector->base,
> + &radeon_dvi_connector_funcs,
> + connector_type,
> + ddc);
> + drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs);
> drm_object_attach_property(&radeon_connector->base.base,
> rdev->mode_info.coherent_mode_property,
> 1);
> @@ -2205,15 +2234,20 @@ radeon_add_atom_connector(struct drm_device *dev,
> goto failed;
> radeon_dig_connector->igp_lane_info = igp_lane_info;
> radeon_connector->con_priv = radeon_dig_connector;
> - drm_connector_init(dev, &radeon_connector->base, &radeon_dp_connector_funcs, connector_type);
> - drm_connector_helper_add(&radeon_connector->base, &radeon_dp_connector_helper_funcs);
> if (i2c_bus->valid) {
> radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
> - if (radeon_connector->ddc_bus)
> + if (radeon_connector->ddc_bus) {
> has_aux = true;
> - else
> + ddc = &radeon_connector->ddc_bus->adapter;
> + } else {
> DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
> + }
> }
> + drm_connector_init_with_ddc(dev, &radeon_connector->base,
> + &radeon_dp_connector_funcs,
> + connector_type,
> + ddc);
> + drm_connector_helper_add(&radeon_connector->base, &radeon_dp_connector_helper_funcs);
> subpixel_order = SubPixelHorizontalRGB;
> drm_object_attach_property(&radeon_connector->base.base,
> rdev->mode_info.coherent_mode_property,
> @@ -2255,15 +2289,20 @@ radeon_add_atom_connector(struct drm_device *dev,
> goto failed;
> radeon_dig_connector->igp_lane_info = igp_lane_info;
> radeon_connector->con_priv = radeon_dig_connector;
> - drm_connector_init(dev, &radeon_connector->base, &radeon_edp_connector_funcs, connector_type);
> - drm_connector_helper_add(&radeon_connector->base, &radeon_dp_connector_helper_funcs);
> if (i2c_bus->valid) {
> radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
> - if (radeon_connector->ddc_bus)
> + if (radeon_connector->ddc_bus) {
> has_aux = true;
> - else
> + ddc = &radeon_connector->ddc_bus->adapter;
> + } else {
> DRM_ERROR("DP: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
> + }
> }
> + drm_connector_init_with_ddc(dev, &radeon_connector->base,
> + &radeon_edp_connector_funcs,
> + connector_type,
> + ddc);
> + drm_connector_helper_add(&radeon_connector->base, &radeon_dp_connector_helper_funcs);
> drm_object_attach_property(&radeon_connector->base.base,
> dev->mode_config.scaling_mode_property,
> DRM_MODE_SCALE_FULLSCREEN);
> @@ -2274,7 +2313,10 @@ radeon_add_atom_connector(struct drm_device *dev,
> case DRM_MODE_CONNECTOR_SVIDEO:
> case DRM_MODE_CONNECTOR_Composite:
> case DRM_MODE_CONNECTOR_9PinDIN:
> - drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type);
> + drm_connector_init_with_ddc(dev, &radeon_connector->base,
> + &radeon_tv_connector_funcs,
> + connector_type,
> + ddc);
> drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs);
> radeon_connector->dac_load_detect = true;
> drm_object_attach_property(&radeon_connector->base.base,
> @@ -2294,13 +2336,18 @@ radeon_add_atom_connector(struct drm_device *dev,
> goto failed;
> radeon_dig_connector->igp_lane_info = igp_lane_info;
> radeon_connector->con_priv = radeon_dig_connector;
> - drm_connector_init(dev, &radeon_connector->base, &radeon_lvds_connector_funcs, connector_type);
> - drm_connector_helper_add(&radeon_connector->base, &radeon_lvds_connector_helper_funcs);
> if (i2c_bus->valid) {
> radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
> if (!radeon_connector->ddc_bus)
> DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
> + else
> + ddc = &radeon_connector->ddc_bus->adapter;
> }
> + drm_connector_init_with_ddc(dev, &radeon_connector->base,
> + &radeon_lvds_connector_funcs,
> + connector_type,
> + ddc);
> + drm_connector_helper_add(&radeon_connector->base, &radeon_lvds_connector_helper_funcs);
> drm_object_attach_property(&radeon_connector->base.base,
> dev->mode_config.scaling_mode_property,
> DRM_MODE_SCALE_FULLSCREEN);
> @@ -2344,6 +2391,7 @@ radeon_add_legacy_connector(struct drm_device *dev,
> struct radeon_device *rdev = dev->dev_private;
> struct drm_connector *connector;
> struct radeon_connector *radeon_connector;
> + struct i2c_adapter *ddc = NULL;
> uint32_t subpixel_order = SubPixelNone;
>
> if (connector_type == DRM_MODE_CONNECTOR_Unknown)
> @@ -2378,13 +2426,18 @@ radeon_add_legacy_connector(struct drm_device *dev,
>
> switch (connector_type) {
> case DRM_MODE_CONNECTOR_VGA:
> - drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);
> - drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);
> if (i2c_bus->valid) {
> radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
> if (!radeon_connector->ddc_bus)
> DRM_ERROR("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
> + else
> + ddc = &radeon_connector->ddc_bus->adapter;
> }
> + drm_connector_init_with_ddc(dev, &radeon_connector->base,
> + &radeon_vga_connector_funcs,
> + connector_type,
> + ddc);
> + drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);
> radeon_connector->dac_load_detect = true;
> drm_object_attach_property(&radeon_connector->base.base,
> rdev->mode_info.load_detect_property,
> @@ -2395,13 +2448,18 @@ radeon_add_legacy_connector(struct drm_device *dev,
> connector->doublescan_allowed = true;
> break;
> case DRM_MODE_CONNECTOR_DVIA:
> - drm_connector_init(dev, &radeon_connector->base, &radeon_vga_connector_funcs, connector_type);
> - drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);
> if (i2c_bus->valid) {
> radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
> if (!radeon_connector->ddc_bus)
> DRM_ERROR("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
> + else
> + ddc = &radeon_connector->ddc_bus->adapter;
> }
> + drm_connector_init_with_ddc(dev, &radeon_connector->base,
> + &radeon_vga_connector_funcs,
> + connector_type,
> + ddc);
> + drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);
> radeon_connector->dac_load_detect = true;
> drm_object_attach_property(&radeon_connector->base.base,
> rdev->mode_info.load_detect_property,
> @@ -2413,13 +2471,18 @@ radeon_add_legacy_connector(struct drm_device *dev,
> break;
> case DRM_MODE_CONNECTOR_DVII:
> case DRM_MODE_CONNECTOR_DVID:
> - drm_connector_init(dev, &radeon_connector->base, &radeon_dvi_connector_funcs, connector_type);
> - drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs);
> if (i2c_bus->valid) {
> radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
> if (!radeon_connector->ddc_bus)
> DRM_ERROR("DVI: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
> + else
> + ddc = &radeon_connector->ddc_bus->adapter;
> }
> + drm_connector_init_with_ddc(dev, &radeon_connector->base,
> + &radeon_dvi_connector_funcs,
> + connector_type,
> + ddc);
> + drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs);
> if (connector_type == DRM_MODE_CONNECTOR_DVII) {
> radeon_connector->dac_load_detect = true;
> drm_object_attach_property(&radeon_connector->base.base,
> @@ -2436,7 +2499,10 @@ radeon_add_legacy_connector(struct drm_device *dev,
> case DRM_MODE_CONNECTOR_SVIDEO:
> case DRM_MODE_CONNECTOR_Composite:
> case DRM_MODE_CONNECTOR_9PinDIN:
> - drm_connector_init(dev, &radeon_connector->base, &radeon_tv_connector_funcs, connector_type);
> + drm_connector_init_with_ddc(dev, &radeon_connector->base,
> + &radeon_tv_connector_funcs,
> + connector_type,
> + ddc);
> drm_connector_helper_add(&radeon_connector->base, &radeon_tv_connector_helper_funcs);
> radeon_connector->dac_load_detect = true;
> /* RS400,RC410,RS480 chipset seems to report a lot
> @@ -2458,13 +2524,18 @@ radeon_add_legacy_connector(struct drm_device *dev,
> connector->doublescan_allowed = false;
> break;
> case DRM_MODE_CONNECTOR_LVDS:
> - drm_connector_init(dev, &radeon_connector->base, &radeon_lvds_connector_funcs, connector_type);
> - drm_connector_helper_add(&radeon_connector->base, &radeon_lvds_connector_helper_funcs);
> if (i2c_bus->valid) {
> radeon_connector->ddc_bus = radeon_i2c_lookup(rdev, i2c_bus);
> if (!radeon_connector->ddc_bus)
> DRM_ERROR("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n");
> + else
> + ddc = &radeon_connector->ddc_bus->adapter;
> }
> + drm_connector_init_with_ddc(dev, &radeon_connector->base,
> + &radeon_lvds_connector_funcs,
> + connector_type,
> + ddc);
> + drm_connector_helper_add(&radeon_connector->base, &radeon_lvds_connector_helper_funcs);
> drm_object_attach_property(&radeon_connector->base.base,
> dev->mode_config.scaling_mode_property,
> DRM_MODE_SCALE_FULLSCREEN);
> --
> 2.17.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH RESEND 04/14] drm/exynos: Provide ddc symlink in connector's sysfs
2019-08-26 19:25 [PATCH RESEND 00/14] Next round of associating ddc adapters with connectors Andrzej Pietrasiewicz
2019-08-26 19:25 ` [PATCH RESEND 01/14] drm/bridge: ti-tfp410: Update drm_connector_init_with_ddc() error message Andrzej Pietrasiewicz
2019-08-26 19:25 ` [PATCH RESEND 02/14] drm/radeon: Provide ddc symlink in connector sysfs directory Andrzej Pietrasiewicz
@ 2019-08-26 19:25 ` Andrzej Pietrasiewicz
2019-08-26 19:25 ` [PATCH RESEND 05/14] drm: rockchip: Provide ddc symlink in rk3066_hdmi sysfs directory Andrzej Pietrasiewicz
` (8 subsequent siblings)
11 siblings, 0 replies; 21+ messages in thread
From: Andrzej Pietrasiewicz @ 2019-08-26 19:25 UTC (permalink / raw)
To: dri-devel
Cc: Neil Armstrong, David Airlie, Bhawanpreet Lakha, Thierry Reding,
Laurent Pinchart, kernel, Anthony Koo, linux-samsung-soc,
Tomi Valkeinen, David Francis, Krzysztof Kozlowski,
Jonathan Hunter, linux-rockchip, Kukjin Kim, linux-arm-msm,
freedreno, linux-tegra, Jonas Karlman, Leo Li, linux-kernel,
intel-gfx, Alexios Zavras, Mamta Shukla, linux-mediatek, Jyri
Switch to using the ddc provided by the generic connector.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
---
drivers/gpu/drm/exynos/exynos_hdmi.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index bc1565f1822a..d4a9c9e17436 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -940,8 +940,10 @@ static int hdmi_create_connector(struct drm_encoder *encoder)
connector->interlace_allowed = true;
connector->polled = DRM_CONNECTOR_POLL_HPD;
- ret = drm_connector_init(hdata->drm_dev, connector,
- &hdmi_connector_funcs, DRM_MODE_CONNECTOR_HDMIA);
+ ret = drm_connector_init_with_ddc(hdata->drm_dev, connector,
+ &hdmi_connector_funcs,
+ DRM_MODE_CONNECTOR_HDMIA,
+ hdata->ddc_adpt);
if (ret) {
DRM_DEV_ERROR(hdata->dev,
"Failed to initialize connector with drm\n");
--
2.17.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH RESEND 05/14] drm: rockchip: Provide ddc symlink in rk3066_hdmi sysfs directory
2019-08-26 19:25 [PATCH RESEND 00/14] Next round of associating ddc adapters with connectors Andrzej Pietrasiewicz
` (2 preceding siblings ...)
2019-08-26 19:25 ` [PATCH RESEND 04/14] drm/exynos: Provide ddc symlink in connector's sysfs Andrzej Pietrasiewicz
@ 2019-08-26 19:25 ` Andrzej Pietrasiewicz
[not found] ` <4cad24dde4508cec17483f983da08226ba7e48b0.1566845537.git.andrzej.p-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
2019-08-26 19:25 ` [PATCH RESEND 08/14] drm/mediatek: Provide ddc symlink in hdmi connector " Andrzej Pietrasiewicz
` (7 subsequent siblings)
11 siblings, 1 reply; 21+ messages in thread
From: Andrzej Pietrasiewicz @ 2019-08-26 19:25 UTC (permalink / raw)
To: dri-devel
Cc: Neil Armstrong, David Airlie, Bhawanpreet Lakha, Thierry Reding,
Laurent Pinchart, kernel, Anthony Koo, linux-samsung-soc,
Tomi Valkeinen, David Francis, Krzysztof Kozlowski,
Jonathan Hunter, linux-rockchip, Kukjin Kim, linux-arm-msm,
freedreno, linux-tegra, Jonas Karlman, Leo Li, linux-kernel,
intel-gfx, Mamta Shukla, linux-mediatek, Jyri Sarha,
Rodrigo Vivi <rodrigo.vi>
Use the ddc pointer provided by the generic connector.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
---
drivers/gpu/drm/rockchip/rk3066_hdmi.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/rk3066_hdmi.c b/drivers/gpu/drm/rockchip/rk3066_hdmi.c
index 85fc5f01f761..e874f5fdeec4 100644
--- a/drivers/gpu/drm/rockchip/rk3066_hdmi.c
+++ b/drivers/gpu/drm/rockchip/rk3066_hdmi.c
@@ -564,9 +564,10 @@ rk3066_hdmi_register(struct drm_device *drm, struct rk3066_hdmi *hdmi)
drm_connector_helper_add(&hdmi->connector,
&rk3066_hdmi_connector_helper_funcs);
- drm_connector_init(drm, &hdmi->connector,
- &rk3066_hdmi_connector_funcs,
- DRM_MODE_CONNECTOR_HDMIA);
+ drm_connector_init_with_ddc(drm, &hdmi->connector,
+ &rk3066_hdmi_connector_funcs,
+ DRM_MODE_CONNECTOR_HDMIA,
+ hdmi->ddc);
drm_connector_attach_encoder(&hdmi->connector, encoder);
--
2.17.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH RESEND 08/14] drm/mediatek: Provide ddc symlink in hdmi connector sysfs directory
2019-08-26 19:25 [PATCH RESEND 00/14] Next round of associating ddc adapters with connectors Andrzej Pietrasiewicz
` (3 preceding siblings ...)
2019-08-26 19:25 ` [PATCH RESEND 05/14] drm: rockchip: Provide ddc symlink in rk3066_hdmi sysfs directory Andrzej Pietrasiewicz
@ 2019-08-26 19:25 ` Andrzej Pietrasiewicz
2019-08-26 19:25 ` [PATCH RESEND 09/14] drm/tegra: Provide ddc symlink in output " Andrzej Pietrasiewicz
` (6 subsequent siblings)
11 siblings, 0 replies; 21+ messages in thread
From: Andrzej Pietrasiewicz @ 2019-08-26 19:25 UTC (permalink / raw)
To: dri-devel
Cc: Neil Armstrong, David Airlie, Bhawanpreet Lakha, Thierry Reding,
Laurent Pinchart, kernel, Anthony Koo, Emil Velikov,
linux-samsung-soc, Tomi Valkeinen, David Francis,
Krzysztof Kozlowski, Jonathan Hunter, linux-rockchip, Kukjin Kim,
linux-arm-msm, Uma Shankar, freedreno, linux-tegra, Jonas Karlman,
Leo Li, linux-kernel, intel-gfx, Mamta Shukla, linux-me
Use the ddc pointer provided by the generic connector.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
---
drivers/gpu/drm/mediatek/mtk_hdmi.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index ce91b61364eb..f419765b7cc0 100644
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -1299,9 +1299,10 @@ static int mtk_hdmi_bridge_attach(struct drm_bridge *bridge)
struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
int ret;
- ret = drm_connector_init(bridge->encoder->dev, &hdmi->conn,
- &mtk_hdmi_connector_funcs,
- DRM_MODE_CONNECTOR_HDMIA);
+ ret = drm_connector_init_with_ddc(bridge->encoder->dev, &hdmi->conn,
+ &mtk_hdmi_connector_funcs,
+ DRM_MODE_CONNECTOR_HDMIA,
+ hdmi->ddc_adpt);
if (ret) {
dev_err(hdmi->dev, "Failed to initialize connector: %d\n", ret);
return ret;
--
2.17.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH RESEND 09/14] drm/tegra: Provide ddc symlink in output connector sysfs directory
2019-08-26 19:25 [PATCH RESEND 00/14] Next round of associating ddc adapters with connectors Andrzej Pietrasiewicz
` (4 preceding siblings ...)
2019-08-26 19:25 ` [PATCH RESEND 08/14] drm/mediatek: Provide ddc symlink in hdmi connector " Andrzej Pietrasiewicz
@ 2019-08-26 19:25 ` Andrzej Pietrasiewicz
2019-08-26 19:25 ` [PATCH RESEND 10/14] drm/vc4: Provide ddc symlink in " Andrzej Pietrasiewicz
` (5 subsequent siblings)
11 siblings, 0 replies; 21+ messages in thread
From: Andrzej Pietrasiewicz @ 2019-08-26 19:25 UTC (permalink / raw)
To: dri-devel
Cc: Neil Armstrong, David Airlie, Bhawanpreet Lakha, Thierry Reding,
Laurent Pinchart, kernel, Anthony Koo, linux-samsung-soc,
Tomi Valkeinen, David Francis, Krzysztof Kozlowski,
Jonathan Hunter, linux-rockchip, Kukjin Kim, linux-arm-kernel,
linux-arm-msm, freedreno, linux-tegra, Jonas Karlman, Leo Li,
linux-kernel, intel-gfx, Alexios Zavras, Mamta Shukla, linux-m
Use the ddc pointer provided by the generic connector.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
---
drivers/gpu/drm/tegra/hdmi.c | 7 ++++---
drivers/gpu/drm/tegra/sor.c | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
index 50269ffbcb6b..21a629adcb51 100644
--- a/drivers/gpu/drm/tegra/hdmi.c
+++ b/drivers/gpu/drm/tegra/hdmi.c
@@ -1430,9 +1430,10 @@ static int tegra_hdmi_init(struct host1x_client *client)
hdmi->output.dev = client->dev;
- drm_connector_init(drm, &hdmi->output.connector,
- &tegra_hdmi_connector_funcs,
- DRM_MODE_CONNECTOR_HDMIA);
+ drm_connector_init_with_ddc(drm, &hdmi->output.connector,
+ &tegra_hdmi_connector_funcs,
+ DRM_MODE_CONNECTOR_HDMIA,
+ hdmi->output.ddc);
drm_connector_helper_add(&hdmi->output.connector,
&tegra_hdmi_connector_helper_funcs);
hdmi->output.connector.dpms = DRM_MODE_DPMS_OFF;
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index e1669ada0a40..0ad99dc0b4a1 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -2835,9 +2835,10 @@ static int tegra_sor_init(struct host1x_client *client)
sor->output.dev = sor->dev;
- drm_connector_init(drm, &sor->output.connector,
- &tegra_sor_connector_funcs,
- connector);
+ drm_connector_init_with_ddc(drm, &sor->output.connector,
+ &tegra_sor_connector_funcs,
+ connector,
+ sor->output.ddc);
drm_connector_helper_add(&sor->output.connector,
&tegra_sor_connector_helper_funcs);
sor->output.connector.dpms = DRM_MODE_DPMS_OFF;
--
2.17.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH RESEND 10/14] drm/vc4: Provide ddc symlink in connector sysfs directory
2019-08-26 19:25 [PATCH RESEND 00/14] Next round of associating ddc adapters with connectors Andrzej Pietrasiewicz
` (5 preceding siblings ...)
2019-08-26 19:25 ` [PATCH RESEND 09/14] drm/tegra: Provide ddc symlink in output " Andrzej Pietrasiewicz
@ 2019-08-26 19:25 ` Andrzej Pietrasiewicz
2019-08-26 19:25 ` [PATCH RESEND 11/14] drm: zte: Provide ddc symlink in hdmi " Andrzej Pietrasiewicz
` (4 subsequent siblings)
11 siblings, 0 replies; 21+ messages in thread
From: Andrzej Pietrasiewicz @ 2019-08-26 19:25 UTC (permalink / raw)
To: dri-devel
Cc: Neil Armstrong, David Airlie, Bhawanpreet Lakha, Thierry Reding,
Laurent Pinchart, kernel, Anthony Koo, linux-samsung-soc,
Tomi Valkeinen, David Francis, Krzysztof Kozlowski,
Jonathan Hunter, linux-rockchip, Kukjin Kim, linux-arm-msm,
Uma Shankar, freedreno, linux-tegra, Jonas Karlman, Leo Li,
linux-kernel, intel-gfx, Alexios Zavras, Mamta Shukla, linux-me
Use the ddc pointer provided by the generic connector.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
---
drivers/gpu/drm/vc4/vc4_hdmi.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index ee7d4e7b0ee3..eb57c907a256 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -267,7 +267,8 @@ static const struct drm_connector_helper_funcs vc4_hdmi_connector_helper_funcs =
};
static struct drm_connector *vc4_hdmi_connector_init(struct drm_device *dev,
- struct drm_encoder *encoder)
+ struct drm_encoder *encoder,
+ struct i2c_adapter *ddc)
{
struct drm_connector *connector;
struct vc4_hdmi_connector *hdmi_connector;
@@ -281,8 +282,10 @@ static struct drm_connector *vc4_hdmi_connector_init(struct drm_device *dev,
hdmi_connector->encoder = encoder;
- drm_connector_init(dev, connector, &vc4_hdmi_connector_funcs,
- DRM_MODE_CONNECTOR_HDMIA);
+ drm_connector_init_with_ddc(dev, connector,
+ &vc4_hdmi_connector_funcs,
+ DRM_MODE_CONNECTOR_HDMIA,
+ ddc);
drm_connector_helper_add(connector, &vc4_hdmi_connector_helper_funcs);
/* Create and attach TV margin props to this connector. */
@@ -1395,7 +1398,8 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
DRM_MODE_ENCODER_TMDS, NULL);
drm_encoder_helper_add(hdmi->encoder, &vc4_hdmi_encoder_helper_funcs);
- hdmi->connector = vc4_hdmi_connector_init(drm, hdmi->encoder);
+ hdmi->connector =
+ vc4_hdmi_connector_init(drm, hdmi->encoder, hdmi->ddc);
if (IS_ERR(hdmi->connector)) {
ret = PTR_ERR(hdmi->connector);
goto err_destroy_encoder;
--
2.17.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH RESEND 11/14] drm: zte: Provide ddc symlink in hdmi connector sysfs directory
2019-08-26 19:25 [PATCH RESEND 00/14] Next round of associating ddc adapters with connectors Andrzej Pietrasiewicz
` (6 preceding siblings ...)
2019-08-26 19:25 ` [PATCH RESEND 10/14] drm/vc4: Provide ddc symlink in " Andrzej Pietrasiewicz
@ 2019-08-26 19:25 ` Andrzej Pietrasiewicz
2019-08-26 19:25 ` [PATCH RESEND 12/14] drm: zte: Provide ddc symlink in vga " Andrzej Pietrasiewicz
` (3 subsequent siblings)
11 siblings, 0 replies; 21+ messages in thread
From: Andrzej Pietrasiewicz @ 2019-08-26 19:25 UTC (permalink / raw)
To: dri-devel
Cc: Neil Armstrong, David Airlie, Bhawanpreet Lakha, Thierry Reding,
Laurent Pinchart, kernel, Anthony Koo, linux-samsung-soc,
Tomi Valkeinen, David Francis, Krzysztof Kozlowski,
Jonathan Hunter, linux-rockchip, Kukjin Kim, linux-arm-kernel,
linux-arm-msm, Uma Shankar, freedreno, linux-tegra, Jonas Karlman,
Leo Li, linux-kernel, intel-gfx, Alexios Zavras, Mamta
Use the ddc pointer provided by the generic connector.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
---
drivers/gpu/drm/zte/zx_hdmi.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/zte/zx_hdmi.c b/drivers/gpu/drm/zte/zx_hdmi.c
index a50f5a1f09b8..b98a1420dcd3 100644
--- a/drivers/gpu/drm/zte/zx_hdmi.c
+++ b/drivers/gpu/drm/zte/zx_hdmi.c
@@ -319,8 +319,10 @@ static int zx_hdmi_register(struct drm_device *drm, struct zx_hdmi *hdmi)
hdmi->connector.polled = DRM_CONNECTOR_POLL_HPD;
- drm_connector_init(drm, &hdmi->connector, &zx_hdmi_connector_funcs,
- DRM_MODE_CONNECTOR_HDMIA);
+ drm_connector_init_with_ddc(drm, &hdmi->connector,
+ &zx_hdmi_connector_funcs,
+ DRM_MODE_CONNECTOR_HDMIA,
+ &hdmi->ddc->adap);
drm_connector_helper_add(&hdmi->connector,
&zx_hdmi_connector_helper_funcs);
--
2.17.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH RESEND 12/14] drm: zte: Provide ddc symlink in vga connector sysfs directory
2019-08-26 19:25 [PATCH RESEND 00/14] Next round of associating ddc adapters with connectors Andrzej Pietrasiewicz
` (7 preceding siblings ...)
2019-08-26 19:25 ` [PATCH RESEND 11/14] drm: zte: Provide ddc symlink in hdmi " Andrzej Pietrasiewicz
@ 2019-08-26 19:25 ` Andrzej Pietrasiewicz
2019-08-26 19:25 ` [PATCH RESEND 13/14] drm/tilcdc: Provide ddc symlink in " Andrzej Pietrasiewicz
` (2 subsequent siblings)
11 siblings, 0 replies; 21+ messages in thread
From: Andrzej Pietrasiewicz @ 2019-08-26 19:25 UTC (permalink / raw)
To: dri-devel
Cc: Heiko Stübner, Sam Ravnborg, Neil Armstrong, David Airlie,
Bhawanpreet Lakha, Andrzej Hajda, Laurent Pinchart, kernel,
Anthony Koo, David (ChunMing) Zhou, linux-samsung-soc,
Joonyoung Shim, Tomi Valkeinen, David Francis,
Krzysztof Kozlowski, Jonathan Hunter, linux-rockchip, Kukjin Kim,
linux-arm-msm, CK Hu, Harry Wentland, freedreno, linux-tegra
Use the ddc pointer provided by the generic connector.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
---
drivers/gpu/drm/zte/zx_vga.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/zte/zx_vga.c b/drivers/gpu/drm/zte/zx_vga.c
index 9b67e419280c..c4fa3bbaba78 100644
--- a/drivers/gpu/drm/zte/zx_vga.c
+++ b/drivers/gpu/drm/zte/zx_vga.c
@@ -165,8 +165,10 @@ static int zx_vga_register(struct drm_device *drm, struct zx_vga *vga)
vga->connector.polled = DRM_CONNECTOR_POLL_HPD;
- ret = drm_connector_init(drm, connector, &zx_vga_connector_funcs,
- DRM_MODE_CONNECTOR_VGA);
+ ret = drm_connector_init_with_ddc(drm, connector,
+ &zx_vga_connector_funcs,
+ DRM_MODE_CONNECTOR_VGA,
+ &vga->ddc->adap);
if (ret) {
DRM_DEV_ERROR(dev, "failed to init connector: %d\n", ret);
goto clean_encoder;
--
2.17.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH RESEND 13/14] drm/tilcdc: Provide ddc symlink in connector sysfs directory
2019-08-26 19:25 [PATCH RESEND 00/14] Next round of associating ddc adapters with connectors Andrzej Pietrasiewicz
` (8 preceding siblings ...)
2019-08-26 19:25 ` [PATCH RESEND 12/14] drm: zte: Provide ddc symlink in vga " Andrzej Pietrasiewicz
@ 2019-08-26 19:25 ` Andrzej Pietrasiewicz
[not found] ` <cover.1566845537.git.andrzej.p-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
2019-09-18 14:01 ` [PATCH RESEND 00/14] Next round of associating ddc adapters with connectors Andrzej Pietrasiewicz
11 siblings, 0 replies; 21+ messages in thread
From: Andrzej Pietrasiewicz @ 2019-08-26 19:25 UTC (permalink / raw)
To: dri-devel
Cc: Heiko Stübner, Neil Armstrong, David Airlie,
Bhawanpreet Lakha, Andrzej Hajda, Laurent Pinchart, kernel,
Anthony Koo, David (ChunMing) Zhou, linux-samsung-soc,
Joonyoung Shim, Tomi Valkeinen, David Francis,
Krzysztof Kozlowski, Jonathan Hunter, linux-rockchip, Kukjin Kim,
linux-arm-msm, CK Hu, Harry Wentland, freedreno, linux-tegra,
Philipp Zabel
Use the ddc pointer provided by the generic connector.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
---
drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
index 525dc1c0f1c1..46d1b30cc164 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
@@ -213,8 +213,10 @@ static struct drm_connector *tfp410_connector_create(struct drm_device *dev,
connector = &tfp410_connector->base;
- drm_connector_init(dev, connector, &tfp410_connector_funcs,
- DRM_MODE_CONNECTOR_DVID);
+ drm_connector_init_with_ddc(dev, connector,
+ &tfp410_connector_funcs,
+ DRM_MODE_CONNECTOR_DVID,
+ mod->i2c);
drm_connector_helper_add(connector, &tfp410_connector_helper_funcs);
connector->polled = DRM_CONNECTOR_POLL_CONNECT |
--
2.17.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 21+ messages in thread[parent not found: <cover.1566845537.git.andrzej.p-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>]
* [PATCH RESEND 03/14] drm/amdgpu: Provide ddc symlink in dm connector's sysfs directory
[not found] ` <cover.1566845537.git.andrzej.p-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
@ 2019-08-26 19:25 ` Andrzej Pietrasiewicz
[not found] ` <40293fa4e619d1d1af213a076b1d03440e50c56c.1566845537.git.andrzej.p-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
2019-08-26 19:25 ` [PATCH RESEND 06/14] drm: rockchip: Provide ddc symlink in inno_hdmi " Andrzej Pietrasiewicz
` (2 subsequent siblings)
3 siblings, 1 reply; 21+ messages in thread
From: Andrzej Pietrasiewicz @ 2019-08-26 19:25 UTC (permalink / raw)
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Heiko Stübner, Sam Ravnborg, Neil Armstrong, David Airlie,
Ramalingam C, Joonas Lahtinen, Chris Wilson, Bhawanpreet Lakha,
Andrzej Hajda, Thierry Reding, Laurent Pinchart,
kernel-ZGY8ohtN/8qB+jHODAdFcQ, Anthony Koo,
Ville Syrjälä, David (ChunMing) Zhou, Mario Kleiner,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA, Joonyoung Shim,
Tomi Valkeinen, David Francis, Rob Clark
Use the ddc pointer provided by the generic connector.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 +++--
1 file changed, 3 insertions(+), 2 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 cb7cfa9b34f2..e872a415b409 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -5144,11 +5144,12 @@ static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm,
connector_type = to_drm_connector_type(link->connector_signal);
- res = drm_connector_init(
+ res = drm_connector_init_with_ddc(
dm->ddev,
&aconnector->base,
&amdgpu_dm_connector_funcs,
- connector_type);
+ connector_type,
+ &i2c->base);
if (res) {
DRM_ERROR("connector_init failed\n");
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH RESEND 06/14] drm: rockchip: Provide ddc symlink in inno_hdmi sysfs directory
[not found] ` <cover.1566845537.git.andrzej.p-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
2019-08-26 19:25 ` [PATCH RESEND 03/14] drm/amdgpu: Provide ddc symlink in dm connector's " Andrzej Pietrasiewicz
@ 2019-08-26 19:25 ` Andrzej Pietrasiewicz
[not found] ` <a1f778d328328f15300338600bb2400850717300.1566845537.git.andrzej.p-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
2019-08-26 19:25 ` [PATCH RESEND 07/14] drm/msm/hdmi: Provide ddc symlink in hdmi connector " Andrzej Pietrasiewicz
2019-08-26 19:25 ` [PATCH RESEND 14/14] drm/i915: " Andrzej Pietrasiewicz
3 siblings, 1 reply; 21+ messages in thread
From: Andrzej Pietrasiewicz @ 2019-08-26 19:25 UTC (permalink / raw)
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Heiko Stübner, Sam Ravnborg, Neil Armstrong, David Airlie,
Ramalingam C, Joonas Lahtinen, Chris Wilson, Bhawanpreet Lakha,
Andrzej Hajda, Thierry Reding, Laurent Pinchart,
kernel-ZGY8ohtN/8qB+jHODAdFcQ, Anthony Koo,
Ville Syrjälä, David (ChunMing) Zhou, Mario Kleiner,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA, Joonyoung Shim,
Tomi Valkeinen, David Francis, Rob Clark
Use the ddc pointer provided by the generic connector.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
---
drivers/gpu/drm/rockchip/inno_hdmi.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
index ed344a795b4d..e5864e823020 100644
--- a/drivers/gpu/drm/rockchip/inno_hdmi.c
+++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
@@ -624,8 +624,10 @@ static int inno_hdmi_register(struct drm_device *drm, struct inno_hdmi *hdmi)
drm_connector_helper_add(&hdmi->connector,
&inno_hdmi_connector_helper_funcs);
- drm_connector_init(drm, &hdmi->connector, &inno_hdmi_connector_funcs,
- DRM_MODE_CONNECTOR_HDMIA);
+ drm_connector_init_with_ddc(drm, &hdmi->connector,
+ &inno_hdmi_connector_funcs,
+ DRM_MODE_CONNECTOR_HDMIA,
+ hdmi->ddc);
drm_connector_attach_encoder(&hdmi->connector, encoder);
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 21+ messages in thread* [PATCH RESEND 07/14] drm/msm/hdmi: Provide ddc symlink in hdmi connector sysfs directory
[not found] ` <cover.1566845537.git.andrzej.p-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
2019-08-26 19:25 ` [PATCH RESEND 03/14] drm/amdgpu: Provide ddc symlink in dm connector's " Andrzej Pietrasiewicz
2019-08-26 19:25 ` [PATCH RESEND 06/14] drm: rockchip: Provide ddc symlink in inno_hdmi " Andrzej Pietrasiewicz
@ 2019-08-26 19:25 ` Andrzej Pietrasiewicz
2019-11-06 15:58 ` Sean Paul
2019-08-26 19:25 ` [PATCH RESEND 14/14] drm/i915: " Andrzej Pietrasiewicz
3 siblings, 1 reply; 21+ messages in thread
From: Andrzej Pietrasiewicz @ 2019-08-26 19:25 UTC (permalink / raw)
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Heiko Stübner, Sam Ravnborg, Neil Armstrong, David Airlie,
Ramalingam C, Joonas Lahtinen, Chris Wilson, Bhawanpreet Lakha,
Andrzej Hajda, Thierry Reding, Laurent Pinchart,
kernel-ZGY8ohtN/8qB+jHODAdFcQ, Anthony Koo,
Ville Syrjälä, David (ChunMing) Zhou, Mario Kleiner,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA, Joonyoung Shim,
Tomi Valkeinen, David Francis, Rob Clark
Use the ddc pointer provided by the generic connector.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
---
drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
index 07b4cb877d82..1f03262b8a52 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
@@ -450,8 +450,10 @@ struct drm_connector *msm_hdmi_connector_init(struct hdmi *hdmi)
connector = &hdmi_connector->base;
- drm_connector_init(hdmi->dev, connector, &hdmi_connector_funcs,
- DRM_MODE_CONNECTOR_HDMIA);
+ drm_connector_init_with_ddc(hdmi->dev, connector,
+ &hdmi_connector_funcs,
+ DRM_MODE_CONNECTOR_HDMIA,
+ hdmi->i2c);
drm_connector_helper_add(connector, &msm_hdmi_connector_helper_funcs);
connector->polled = DRM_CONNECTOR_POLL_CONNECT |
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [PATCH RESEND 07/14] drm/msm/hdmi: Provide ddc symlink in hdmi connector sysfs directory
2019-08-26 19:25 ` [PATCH RESEND 07/14] drm/msm/hdmi: Provide ddc symlink in hdmi connector " Andrzej Pietrasiewicz
@ 2019-11-06 15:58 ` Sean Paul
0 siblings, 0 replies; 21+ messages in thread
From: Sean Paul @ 2019-11-06 15:58 UTC (permalink / raw)
To: Andrzej Pietrasiewicz
Cc: Heiko Stübner, Sam Ravnborg, Neil Armstrong, David Airlie,
Ramalingam C, Joonas Lahtinen, dri-devel, Chris Wilson,
Andrzej Hajda, Thierry Reding, Laurent Pinchart, kernel,
Anthony Koo, Ville Syrjälä, David (ChunMing) Zhou,
Mario Kleiner, linux-samsung-soc, Joonyoung Shim, Tomi Valkeinen,
David Francis, Rob Clark, Krzysztof Kozlowski, Jonathan Hunter,
open list:ARM/Rockchip SoC..., Kukjin Kim, linux-arm-kernel,
linux-arm-msm, CK Hu, Harry Wentland, Uma Shankar,
Shashank Sharma, freedreno, linux-tegra, Philipp Zabel,
Jonas Karlman, Leo Li, LKML, Intel Graphics Development,
Maarten Lankhorst, Jani Nikula, Inki Dae, Alexios Zavras,
Mamta Shukla, moderated list:ARM/Mediatek SoC support, Jyri Sarha,
Rodrigo Vivi, Matthias Brugger, Thomas Gleixner,
Bhawanpreet Lakha, Allison Randal, Jernej Skrabec, amd-gfx list,
Eric Anholt, Greg Kroah-Hartman, Seung-Woo Kim, Sandy Huang,
Nicholas Kazlauskas, Todor Tomov, Kyungmin Park, Daniel Vetter,
Alex Deucher, Shawn Guo, Christian König
On Mon, Aug 26, 2019 at 3:27 PM Andrzej Pietrasiewicz
<andrzej.p@collabora.com> wrote:
>
> Use the ddc pointer provided by the generic connector.
>
> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
> Acked-by: Sam Ravnborg <sam@ravnborg.org>
> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Sean Paul <sean@poorly.run>
> ---
> drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
> index 07b4cb877d82..1f03262b8a52 100644
> --- a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
> +++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
> @@ -450,8 +450,10 @@ struct drm_connector *msm_hdmi_connector_init(struct hdmi *hdmi)
>
> connector = &hdmi_connector->base;
>
> - drm_connector_init(hdmi->dev, connector, &hdmi_connector_funcs,
> - DRM_MODE_CONNECTOR_HDMIA);
> + drm_connector_init_with_ddc(hdmi->dev, connector,
> + &hdmi_connector_funcs,
> + DRM_MODE_CONNECTOR_HDMIA,
> + hdmi->i2c);
> drm_connector_helper_add(connector, &msm_hdmi_connector_helper_funcs);
>
> connector->polled = DRM_CONNECTOR_POLL_CONNECT |
> --
> 2.17.1
>
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH RESEND 14/14] drm/i915: Provide ddc symlink in hdmi connector sysfs directory
[not found] ` <cover.1566845537.git.andrzej.p-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
` (2 preceding siblings ...)
2019-08-26 19:25 ` [PATCH RESEND 07/14] drm/msm/hdmi: Provide ddc symlink in hdmi connector " Andrzej Pietrasiewicz
@ 2019-08-26 19:25 ` Andrzej Pietrasiewicz
3 siblings, 0 replies; 21+ messages in thread
From: Andrzej Pietrasiewicz @ 2019-08-26 19:25 UTC (permalink / raw)
To: dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: Heiko Stübner, Neil Armstrong, David Airlie, Ramalingam C,
Joonas Lahtinen, Chris Wilson, Bhawanpreet Lakha, Andrzej Hajda,
Thierry Reding, Laurent Pinchart, kernel-ZGY8ohtN/8qB+jHODAdFcQ,
Anthony Koo, Ville Syrjälä, Emil Velikov,
David (ChunMing) Zhou, Mario Kleiner,
linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA, Joonyoung Shim,
Tomi Valkeinen, David Francis, Rob Clark
Use the ddc pointer provided by the generic connector.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
---
drivers/gpu/drm/i915/display/intel_hdmi.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 0ebec69bbbfc..7e69e5782f6e 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -3084,6 +3084,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
struct intel_encoder *intel_encoder = &intel_dig_port->base;
struct drm_device *dev = intel_encoder->base.dev;
struct drm_i915_private *dev_priv = to_i915(dev);
+ struct i2c_adapter *ddc;
enum port port = intel_encoder->port;
DRM_DEBUG_KMS("Adding HDMI connector on port %c\n",
@@ -3094,8 +3095,13 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
intel_dig_port->max_lanes, port_name(port)))
return;
- drm_connector_init(dev, connector, &intel_hdmi_connector_funcs,
- DRM_MODE_CONNECTOR_HDMIA);
+ intel_hdmi->ddc_bus = intel_hdmi_ddc_pin(dev_priv, port);
+ ddc = intel_gmbus_get_adapter(dev_priv, intel_hdmi->ddc_bus);
+
+ drm_connector_init_with_ddc(dev, connector,
+ &intel_hdmi_connector_funcs,
+ DRM_MODE_CONNECTOR_HDMIA,
+ ddc);
drm_connector_helper_add(connector, &intel_hdmi_connector_helper_funcs);
connector->interlace_allowed = 1;
@@ -3105,8 +3111,6 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
connector->ycbcr_420_allowed = true;
- intel_hdmi->ddc_bus = intel_hdmi_ddc_pin(dev_priv, port);
-
if (WARN_ON(port == PORT_A))
return;
intel_encoder->hpd_pin = intel_hpd_pin_default(dev_priv, port);
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH RESEND 00/14] Next round of associating ddc adapters with connectors
2019-08-26 19:25 [PATCH RESEND 00/14] Next round of associating ddc adapters with connectors Andrzej Pietrasiewicz
` (10 preceding siblings ...)
[not found] ` <cover.1566845537.git.andrzej.p-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>
@ 2019-09-18 14:01 ` Andrzej Pietrasiewicz
11 siblings, 0 replies; 21+ messages in thread
From: Andrzej Pietrasiewicz @ 2019-09-18 14:01 UTC (permalink / raw)
To: dri-devel
Cc: Neil Armstrong, David Airlie, Matthias Brugger, Laurent Pinchart,
kernel, Anthony Koo, Emil Velikov, linux-samsung-soc,
Tomi Valkeinen, David Francis, Krzysztof Kozlowski,
Jonathan Hunter, linux-rockchip, Kukjin Kim, Jonas Karlman,
Leo Li, linux-arm-msm, intel-gfx, Jyri Sarha, Mamta Shukla,
linux-mediatek, linux-tegra, Thomas Gleixner, Bhawanpreet Lakha
Hi All,
A gentle ping.
Andrzej
W dniu 26.08.2019 o 21:25, Andrzej Pietrasiewicz pisze:
> I'm resending the patches which have somehow got lost: one patch
> from Geert and 13 patches from me.
>
> Geert's patch updates the error message to reflect the actually
> called function's name.
>
> Most of patches from me have their Acked-by and Reviewed-by tags
> and deal with providing a ddc symlink in connector's sysfs directory.
>
> Rebased onto drm-misc-next as of 26th August.
>
> Andrzej Pietrasiewicz (13):
> drm/radeon: Provide ddc symlink in connector sysfs directory
> drm/amdgpu: Provide ddc symlink in dm connector's sysfs directory
> drm/exynos: Provide ddc symlink in connector's sysfs
> drm: rockchip: Provide ddc symlink in rk3066_hdmi sysfs directory
> drm: rockchip: Provide ddc symlink in inno_hdmi sysfs directory
> drm/msm/hdmi: Provide ddc symlink in hdmi connector sysfs directory
> drm/mediatek: Provide ddc symlink in hdmi connector sysfs directory
> drm/tegra: Provide ddc symlink in output connector sysfs directory
> drm/vc4: Provide ddc symlink in connector sysfs directory
> drm: zte: Provide ddc symlink in hdmi connector sysfs directory
> drm: zte: Provide ddc symlink in vga connector sysfs directory
> drm/tilcdc: Provide ddc symlink in connector sysfs directory
> drm/i915: Provide ddc symlink in hdmi connector sysfs directory
>
> Geert Uytterhoeven (1):
> drm/bridge: ti-tfp410: Update drm_connector_init_with_ddc() error
> message
>
> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 +-
> drivers/gpu/drm/bridge/ti-tfp410.c | 3 +-
> drivers/gpu/drm/exynos/exynos_hdmi.c | 6 +-
> drivers/gpu/drm/i915/display/intel_hdmi.c | 12 +-
> drivers/gpu/drm/mediatek/mtk_hdmi.c | 7 +-
> drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 6 +-
> drivers/gpu/drm/radeon/radeon_connectors.c | 143 +++++++++++++-----
> drivers/gpu/drm/rockchip/inno_hdmi.c | 6 +-
> drivers/gpu/drm/rockchip/rk3066_hdmi.c | 7 +-
> drivers/gpu/drm/tegra/hdmi.c | 7 +-
> drivers/gpu/drm/tegra/sor.c | 7 +-
> drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 6 +-
> drivers/gpu/drm/vc4/vc4_hdmi.c | 12 +-
> drivers/gpu/drm/zte/zx_hdmi.c | 6 +-
> drivers/gpu/drm/zte/zx_vga.c | 6 +-
> 15 files changed, 168 insertions(+), 71 deletions(-)
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 21+ messages in thread