Re: [PATCH] Revert "drm/radeon: Provide ddc symlink in connector sysfs directory"
On 01/08/2019 14:01, Daniel Vetter wrote:
> On Thu, Aug 1, 2019 at 1:53 PM Neil Armstrong wrote:
>>
>> This reverts commit bed7a2182de6833f5d0f990a656bffb1c6000c70.
>>
>> It causes the following build error:
>> ../drm/radeon/radeon_connectors.c: In function 'radeon_add_legacy_connector':
>> ../drm/radeon/radeon_connectors.c:2433:5: error: 'ddc' undeclared (first use
>> in this function)
>> ddc = _connector->ddc_bus->adapter;
>> ^~~
>>
>> Suggested-by: Daniel Vetter
>> Signed-off-by: Neil Armstrong
>
> Also ddc isn't initialized to NULL in the other function, so doesn't
> work too well there either.
>
> Acked-by: Daniel Vetter
Applied,
Thanks
Neil
>
> Let's try again once the tree is back in shape.
> -Daniel
>> ---
>> drivers/gpu/drm/radeon/radeon_connectors.c | 142 ++---
>> 1 file changed, 36 insertions(+), 106 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c
>> b/drivers/gpu/drm/radeon/radeon_connectors.c
>> index b3ad8d890801..c60d1a44d22a 100644
>> --- a/drivers/gpu/drm/radeon/radeon_connectors.c
>> +++ b/drivers/gpu/drm/radeon/radeon_connectors.c
>> @@ -1870,7 +1870,6 @@ 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;
>> uint32_t subpixel_order = SubPixelNone;
>> bool shared_ddc = false;
>> bool is_dp_bridge = false;
>> @@ -1948,21 +1947,17 @@ 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;
>> - ddc = _connector->ddc_bus->adapter;
>> - } else {
>> + 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_with_ddc(dev,
>> _connector->base,
>> -
>> _dp_connector_funcs,
>> - connector_type,
>> - ddc);
>> + drm_connector_init(dev, _connector->base,
>> + _dp_connector_funcs,
>> connector_type);
>> drm_connector_helper_add(_connector->base,
>>
>> _dp_connector_helper_funcs);
>> connector->interlace_allowed = true;
>> @@ -1984,10 +1979,8 @@ 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_with_ddc(dev,
>> _connector->base,
>> -
>> _dp_connector_funcs,
>> - connector_type,
>> - ddc);
>> + drm_connector_init(dev, _connector->base,
>> + _dp_connector_funcs,
>> connector_type);
>> drm_connector_helper_add(_connector->base,
>>
>> _dp_connector_helper_funcs);
>>
>> drm_object_attach_property(_connector->base.base,
>> @@ -2034,10 +2027,8 @@ radeon_add_atom_connector(struct drm_device *dev,
>> break;
>> case DRM_MODE_CONNECTOR_LVDS:
>> case DRM_MODE_CONNECTOR_eDP:
>> - drm_connector_init_with_ddc(dev,
>> _connector->base,
>> -
>> _lvds_bridge_connector_funcs,
>> - connector_type,
>> - ddc);
>> + drm_connector_init(dev, _connector->base,
>> +
>> _lvds_bridge_connector_funcs, connector_type);
>> drm_connector_helper_add(_connector->base,
>>
>> _dp_connector_helper_funcs);
>>
>> drm_object_attach_property(_connector->base.base,
>> @@ -2051,18 +2042,13 @@
Re: [PATCH] Revert "drm/radeon: Provide ddc symlink in connector sysfs directory"
On Thu, Aug 1, 2019 at 1:53 PM Neil Armstrong wrote:
>
> This reverts commit bed7a2182de6833f5d0f990a656bffb1c6000c70.
>
> It causes the following build error:
> ../drm/radeon/radeon_connectors.c: In function 'radeon_add_legacy_connector':
> ../drm/radeon/radeon_connectors.c:2433:5: error: 'ddc' undeclared (first use
> in this function)
> ddc = _connector->ddc_bus->adapter;
> ^~~
>
> Suggested-by: Daniel Vetter
> Signed-off-by: Neil Armstrong
Also ddc isn't initialized to NULL in the other function, so doesn't
work too well there either.
Acked-by: Daniel Vetter
Let's try again once the tree is back in shape.
-Daniel
> ---
> drivers/gpu/drm/radeon/radeon_connectors.c | 142 ++---
> 1 file changed, 36 insertions(+), 106 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c
> b/drivers/gpu/drm/radeon/radeon_connectors.c
> index b3ad8d890801..c60d1a44d22a 100644
> --- a/drivers/gpu/drm/radeon/radeon_connectors.c
> +++ b/drivers/gpu/drm/radeon/radeon_connectors.c
> @@ -1870,7 +1870,6 @@ 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;
> uint32_t subpixel_order = SubPixelNone;
> bool shared_ddc = false;
> bool is_dp_bridge = false;
> @@ -1948,21 +1947,17 @@ 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;
> - ddc = _connector->ddc_bus->adapter;
> - } else {
> + 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_with_ddc(dev,
> _connector->base,
> -
> _dp_connector_funcs,
> - connector_type,
> - ddc);
> + drm_connector_init(dev, _connector->base,
> + _dp_connector_funcs,
> connector_type);
> drm_connector_helper_add(_connector->base,
>
> _dp_connector_helper_funcs);
> connector->interlace_allowed = true;
> @@ -1984,10 +1979,8 @@ 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_with_ddc(dev,
> _connector->base,
> -
> _dp_connector_funcs,
> - connector_type,
> - ddc);
> + drm_connector_init(dev, _connector->base,
> + _dp_connector_funcs,
> connector_type);
> drm_connector_helper_add(_connector->base,
>
> _dp_connector_helper_funcs);
>
> drm_object_attach_property(_connector->base.base,
> @@ -2034,10 +2027,8 @@ radeon_add_atom_connector(struct drm_device *dev,
> break;
> case DRM_MODE_CONNECTOR_LVDS:
> case DRM_MODE_CONNECTOR_eDP:
> - drm_connector_init_with_ddc(dev,
> _connector->base,
> -
> _lvds_bridge_connector_funcs,
> - connector_type,
> - ddc);
> + drm_connector_init(dev, _connector->base,
> +
> _lvds_bridge_connector_funcs, connector_type);
> drm_connector_helper_add(_connector->base,
>
> _dp_connector_helper_funcs);
>
> drm_object_attach_property(_connector->base.base,
> @@ -2051,18 +2042,13 @@ radeon_add_atom_connector(struct drm_device *dev,
> } else {
> switch (connector_type) {
> case DRM_MODE_CONNECTOR_VGA:
> +
[PATCH] Revert "drm/radeon: Provide ddc symlink in connector sysfs directory"
This reverts commit bed7a2182de6833f5d0f990a656bffb1c6000c70.
It causes the following build error:
../drm/radeon/radeon_connectors.c: In function 'radeon_add_legacy_connector':
../drm/radeon/radeon_connectors.c:2433:5: error: 'ddc' undeclared (first use in
this function)
ddc = _connector->ddc_bus->adapter;
^~~
Suggested-by: Daniel Vetter
Signed-off-by: Neil Armstrong
---
drivers/gpu/drm/radeon/radeon_connectors.c | 142 ++---
1 file changed, 36 insertions(+), 106 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c
b/drivers/gpu/drm/radeon/radeon_connectors.c
index b3ad8d890801..c60d1a44d22a 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -1870,7 +1870,6 @@ 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;
uint32_t subpixel_order = SubPixelNone;
bool shared_ddc = false;
bool is_dp_bridge = false;
@@ -1948,21 +1947,17 @@ 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;
- ddc = _connector->ddc_bus->adapter;
- } else {
+ 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_with_ddc(dev,
_connector->base,
- _dp_connector_funcs,
- connector_type,
- ddc);
+ drm_connector_init(dev, _connector->base,
+ _dp_connector_funcs,
connector_type);
drm_connector_helper_add(_connector->base,
_dp_connector_helper_funcs);
connector->interlace_allowed = true;
@@ -1984,10 +1979,8 @@ 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_with_ddc(dev,
_connector->base,
- _dp_connector_funcs,
- connector_type,
- ddc);
+ drm_connector_init(dev, _connector->base,
+ _dp_connector_funcs,
connector_type);
drm_connector_helper_add(_connector->base,
_dp_connector_helper_funcs);
drm_object_attach_property(_connector->base.base,
@@ -2034,10 +2027,8 @@ radeon_add_atom_connector(struct drm_device *dev,
break;
case DRM_MODE_CONNECTOR_LVDS:
case DRM_MODE_CONNECTOR_eDP:
- drm_connector_init_with_ddc(dev,
_connector->base,
-
_lvds_bridge_connector_funcs,
- connector_type,
- ddc);
+ drm_connector_init(dev, _connector->base,
+ _lvds_bridge_connector_funcs,
connector_type);
drm_connector_helper_add(_connector->base,
_dp_connector_helper_funcs);
drm_object_attach_property(_connector->base.base,
@@ -2051,18 +2042,13 @@ radeon_add_atom_connector(struct drm_device *dev,
} else {
switch (connector_type) {
case DRM_MODE_CONNECTOR_VGA:
+ drm_connector_init(dev, _connector->base,
_vga_connector_funcs, connector_type);
+ drm_connector_helper_add(_connector->base,
_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
