Associate ddc adapters with connectors
Subsystems (24)
v5 cover Associate ddc adapters with connectors
It is difficult for a user to know which of the i2c adapters is for which drm connector. This series addresses this problem.
The idea is to have a symbolic link in connector's sysfs directory, e.g.:
ls -l /sys/class/drm/card0-HDMI-A-1/ddc
lrwxrwxrwx 1 root root 0 Jun 24 10:42 /sys/class/drm/card0-HDMI-A-1/ddc \ -> ../../../../soc/13880000.i2c/i2c-2
The user then knows that their card0-HDMI-A-1 uses i2c-2 and can e.g. run ddcutil:
ddcutil -b 2 getvcp 0x10
VCP code 0x10 (Brightness): current value = 90, max value = 100
The first patch in the series adds struct i2c_adapter pointer to struct drm_connector. If the field is used by a particular driver, then an appropriate symbolic link is created by the generic code, which is also added by this patch.
Patch 2 adds a new variant of drm_connector_init(), see the changelog below.
Patches 3..24 are examples of how to convert a driver to this new scheme.
v1..v2:
- used fixed name "ddc" for the symbolic link in order to make it easy for userspace to find the i2c adapter
v2..v3:
- converted as many drivers as possible.
v3..v4:
- added Reviewed-by for patch 01/23
- moved "ddc" field assignment to before drm_connector_init() is called in msm, vc4, sti, mgag200, ast, amdgpu, radeon
- simplified the code in amdgpu and radeon at the expense of some lines exceeding 80 characters as per Alex Deucher's suggestion
- added i915
v4..v5:
- changed "include <linux/i2c.h>" to "struct i2c_adapter;" in drm_connector.h, consequently, added "include <linux/i2c.h>" in drm_sysfs.c.
- added "drm_connector_init_with_ddc()" variant to ensure that the ddc field of drm_connector is preserved accross its invocation
- accordingly changed invocations of drm_connector_init() in the touched drivers to use the new variant
@Benjamin
@Shawn
@Thomas
There were your Acked-by or Reviewed-by for some patches in v4, but now that the patches use the newly added function I'm not sure I can still include those tags without you actually confirming. Can I? Or can you please re-review?
TODO: nouveau, gma500, omapdrm, panel-simple - if applicable. Other drivers are either already converted or don't mention neither "ddc" nor "i2c_adapter".
Andrzej Pietrasiewicz (24):
drm: Include ddc adapter pointer in struct drm_connector
drm: Add drm_connector_init() variant with ddc
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/sun4i: hdmi: Provide ddc symlink in sun4i 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/imx: imx-ldb: Provide ddc symlink in connector's sysfs drm/imx: imx-tve: Provide ddc symlink in connector's sysfs 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: sti: Provide ddc symlink in hdmi connector sysfs directory drm/mgag200: Provide ddc symlink in connector sysfs directory drm/ast: Provide ddc symlink in connector sysfs directory drm/bridge: dumb-vga-dac: Provide ddc symlink in connector sysfs
directory
drm/bridge: dw-hdmi: Provide ddc symlink in connector sysfs directory drm/bridge: ti-tfp410: Provide ddc symlink in connector sysfs
directory
drm/amdgpu: Provide ddc symlink in connector sysfs directory drm/radeon: Provide ddc symlink in connector sysfs directory drm/i915: Provide ddc symlink in hdmi connector sysfs directory
.../gpu/drm/amd/amdgpu/amdgpu_connectors.c | 95 ++++++++---- drivers/gpu/drm/ast/ast_mode.c | 13 +- drivers/gpu/drm/bridge/dumb-vga-dac.c | 25 ++-- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 46 +++--- drivers/gpu/drm/bridge/ti-tfp410.c | 25 ++-- drivers/gpu/drm/drm_connector.c | 19 +++ drivers/gpu/drm/drm_sysfs.c | 8 + drivers/gpu/drm/exynos/exynos_hdmi.c | 17 ++- drivers/gpu/drm/i915/display/intel_hdmi.c | 11 +- drivers/gpu/drm/imx/imx-ldb.c | 20 +-- drivers/gpu/drm/imx/imx-tve.c | 14 +- drivers/gpu/drm/mediatek/mtk_hdmi.c | 16 +- drivers/gpu/drm/mgag200/mgag200_mode.c | 13 +- drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 6 +- drivers/gpu/drm/radeon/radeon_connectors.c | 141 +++++++++++++----- drivers/gpu/drm/rockchip/inno_hdmi.c | 23 +-- drivers/gpu/drm/rockchip/rk3066_hdmi.c | 24 +-- drivers/gpu/drm/sti/sti_hdmi.c | 6 +- drivers/gpu/drm/sun4i/sun4i_hdmi.h | 1 - drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 21 +-- drivers/gpu/drm/tegra/drm.h | 1 - drivers/gpu/drm/tegra/hdmi.c | 7 +- drivers/gpu/drm/tegra/output.c | 12 +- drivers/gpu/drm/tegra/sor.c | 13 +- drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 6 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 26 ++-- drivers/gpu/drm/zte/zx_hdmi.c | 31 ++-- drivers/gpu/drm/zte/zx_vga.c | 31 ++-- include/drm/drm_connector.h | 16 ++ 29 files changed, 428 insertions(+), 259 deletions(-)
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 1/24 drm: Include ddc adapter pointer in struct drm_connector
Add generic code which creates symbolic links in sysfs, pointing to ddc interface used by a particular video output. For example:
ls -l /sys/class/drm/card0-HDMI-A-1/ddc
lrwxrwxrwx 1 root root 0 Jun 24 10:42 /sys/class/drm/card0-HDMI-A-1/ddc \ -> ../../../../soc/13880000.i2c/i2c-2
This makes it easy for user to associate a display with its ddc adapter and use e.g. ddcutil to control the chosen monitor.
This patch adds an i2c_adapter pointer to struct drm_connector. Particular drivers can then use it instead of using their own private instance. If a connector contains a ddc, then create a symbolic link in sysfs.
--- drivers/gpu/drm/drm_sysfs.c | 8 ++++++++ include/drm/drm_connector.h | 11 +++++++++++ 2 files changed, 19 insertions(+)
drivers/gpu/drm/drm_sysfs.c +8 -0
@@ -14,6 +14,7 @@#include <linux/err.h> #include <linux/export.h> #include <linux/gfp.h> +#include <linux/i2c.h> #include <linux/kdev_t.h> #include <linux/slab.h>
@@ -294,6 +295,9 @@ int drm_sysfs_connector_add(struct drm_connector *connector)/* Let userspace know we have a new connector */ drm_sysfs_hotplug_event (dev); +if (connector->ddc) +return sysfs_create_link (&connector->kdev->kobj, + &connector->ddc->dev.kobj,"ddc" );return 0 ; }
@@ -301,6 +305,10 @@ void drm_sysfs_connector_remove(struct drm_connector *connector) {if (!connector->kdev)return ; + +if (connector->ddc) +sysfs_remove_link (&connector->kdev->kobj,"ddc" ); +DRM_DEBUG ("removing \"%s\" from sysfs\n" , connector->name);
include/drm/drm_connector.h +11 -0
@@ -41,6 +41,7 @@ struct drm_property;struct drm_property_blob ;struct drm_printer ;struct edid ; +struct i2c_adapter ;enum drm_connector_force {DRM_FORCE_UNSPECIFIED ,
@@ -1311,6 +1312,16 @@ struct drm_connector {* [0]: progressive, [1]: interlaced */ int audio_latency[2 ]; + +/** +* @ddc: associated ddc adapter. +* A connector usually has its associated ddc adapter. If a driver uses +* this field, then an appropriate symbolic link is created in connector +* sysfs directory to make it easy for the user to tell which i2c +* adapter is for a particular display. +*/ +struct i2c_adapter *ddc; +/** * @null_edid_counter: track sinks that give us all zeros for the EDID. * Needed to workaround some HW bugs where we get all 0s
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
A message that is not in the archive (sent off-list or not yet received): e82d6aca4f8abc95834c8a36c101d153518bb1ac.1563960855.git.andrzej.p-ZGY8ohtN/[email protected]
Re: [PATCH v5 01/24] drm: Include ddc adapter pointer in struct drm_connector
Hi Andrzej.
Patch looks good, but one kernel-doc detail.
Quoted 70 lines · Andrzej Pietrasiewicz
Add generic code which creates symbolic links in sysfs, pointing to ddc interface used by a particular video output. For example:
ls -l
/sys/class/drm/card0-HDMI-A-1/ddclrwxrwxrwx 1 root root 0 Jun 24 10:42 /sys/class/drm/card0-HDMI-A-1/ddc \ -> ../../../../soc/13880000.i2c/i2c-2This makes it easy for user to associate a display with its ddc adapter and use e.g. ddcutil to control the chosen monitor.
This patch adds an
i2c_adapterpointer to structdrm_connector. Particular drivers can then use it instead of using their own private instance. If a connector contains a ddc, then create a symbolic link in sysfs.Reviewed-by Andrzej Hajda <[email protected]>--- drivers/gpu/drm/drm_sysfs.c | 8 ++++++++ include/drm/drm_connector.h | 11 +++++++++++ 2 files changed, 19 insertions(+)drivers/gpu/drm/drm_sysfs.c +8
-0@@ -14,6 +14,7 @@#include <linux/err.h> #include <linux/export.h> #include <linux/gfp.h> +#include <linux/i2c.h> #include <linux/kdev_t.h> #include <linux/slab.h> @@ -294,6 +295,9 @@ int drm_sysfs_connector_add(struct drm_connector *connector)/* Let userspace know we have a new connector */ drm_sysfs_hotplug_event (dev); +if (connector->ddc) +return sysfs_create_link (&connector->kdev->kobj, + &connector->ddc->dev.kobj,"ddc" );return 0 ; }@@ -301,6 +305,10 @@ void drm_sysfs_connector_remove(struct drm_connector *connector) {if (!connector->kdev)return ; + +if (connector->ddc) +sysfs_remove_link (&connector->kdev->kobj,"ddc" ); +DRM_DEBUG ("removing \"%s\" from sysfs\n" , connector->name);include/drm/drm_connector.h +1
-0@@ -41,6 +41,7 @@ struct drm_property;struct drm_property_blob ;struct drm_printer ;struct edid ; +struct i2c_adapter ;enum drm_connector_force {DRM_FORCE_UNSPECIFIED ,@@ -1311,6 +1312,16 @@ struct drm_connector {* [0]: progressive, [1]: interlaced */
include/drm/drm_connector.h struct drm_connector { · line 1323
Quoted 10 lines
include/drm/drm_connector.h +9
-0int audio_latency[2 ]; + +/** +* @ddc: associated ddc adapter. +* A connector usually has its associated ddc adapter. If a driver uses +* this field, then an appropriate symbolic link is created in connector +* sysfs directory to make it easy for the user to tell which i2c +* adapter is for a particular display. +*/ +struct i2c_adapter *ddc;
To help the reader could you add in the above a reference to drm_connector_init_with_ddc() sp the reader is told how to init this field.
Either add it in PATCH 2 - or merge patch 1 and 2.
Sam
Quoted 6 lines
include/drm/drm_connector.h +1
-0+/** * @null_edid_counter: track sinks that give us all zeros for the EDID. * Needed to workaround some HW bugs where we get all 0s Signature · 1 line
2.17.1
Re: [PATCH v5 01/24] drm: Include ddc adapter pointer in struct drm_connector
Hi Andrzej.
After reading through the series a few more comments.
1) The subject of this patch could be improved. Consider something like:
drm: add ddc link in sysfs created by drm_connector
This spells out much better what the patch achieve.
2) The purpsoe of drm_connector.ddc is to provide drm_connector with info to create the symlink.
Yet in many follow-up patches the drivers are changed so drm_connector.ddc is their only reference to struct i2c_adapter.
But the ownership is not clear here.
Who owns the reference to i2c_adapter - and who has the responsibility to call put() on the adapter.
Looking at the conversions done then some drivers are converted so they only use drm_connector.ddc, and other drivers have their own reference to i2c_adapter.
The latter looks like the correct solution as the ownership of the reference belongs to the driver and not drm_connector.
In other words - a conversion where the drivers only assigned drm_connector.ddc (using drm_connector_init_with_ddc()), seems like a more clean design that does not mix up ownership. This is at least how I see it.
I did not take this type of look at the patches before. Sorry for providing feedback this late.
Sam
Quoted 100 lines · Sam Ravnborg
Hi Andrzej.
Patch looks good, but one kernel-doc detail.
Quoted 70 lines · Andrzej Pietrasiewicz
Add generic code which creates symbolic links in sysfs, pointing to ddc interface used by a particular video output. For example:
ls -l
/sys/class/drm/card0-HDMI-A-1/ddclrwxrwxrwx 1 root root 0 Jun 24 10:42 /sys/class/drm/card0-HDMI-A-1/ddc \ -> ../../../../soc/13880000.i2c/i2c-2This makes it easy for user to associate a display with its ddc adapter and use e.g. ddcutil to control the chosen monitor.
This patch adds an
i2c_adapterpointer to structdrm_connector. Particular drivers can then use it instead of using their own private instance. If a connector contains a ddc, then create a symbolic link in sysfs.Signed-off-by Andrzej Pietrasiewicz <[email protected]>Acked-by Daniel Vetter <[email protected]>Reviewed-by Andrzej Hajda <[email protected]>--- drivers/gpu/drm/drm_sysfs.c | 8 ++++++++ include/drm/drm_connector.h | 11 +++++++++++ 2 files changed, 19 insertions(+)drivers/gpu/drm/drm_sysfs.c +8
-0@@ -14,6 +14,7 @@#include <linux/err.h> #include <linux/export.h> #include <linux/gfp.h> +#include <linux/i2c.h> #include <linux/kdev_t.h> #include <linux/slab.h> @@ -294,6 +295,9 @@ int drm_sysfs_connector_add(struct drm_connector *connector)/* Let userspace know we have a new connector */ drm_sysfs_hotplug_event (dev); +if (connector->ddc) +return sysfs_create_link (&connector->kdev->kobj, + &connector->ddc->dev.kobj,"ddc" );return 0 ; }@@ -301,6 +305,10 @@ void drm_sysfs_connector_remove(struct drm_connector *connector) {if (!connector->kdev)return ; + +if (connector->ddc) +sysfs_remove_link (&connector->kdev->kobj,"ddc" ); +DRM_DEBUG ("removing \"%s\" from sysfs\n" , connector->name);include/drm/drm_connector.h +1
-0@@ -41,6 +41,7 @@ struct drm_property;struct drm_property_blob ;struct drm_printer ;struct edid ; +struct i2c_adapter ;enum drm_connector_force {DRM_FORCE_UNSPECIFIED ,@@ -1311,6 +1312,16 @@ struct drm_connector {* [0]: progressive, [1]: interlaced */ include/drm/drm_connector.h struct drm_connector { · line 1323
Quoted 10 lines
include/drm/drm_connector.h +9
-0int audio_latency[2 ]; + +/** +* @ddc: associated ddc adapter. +* A connector usually has its associated ddc adapter. If a driver uses +* this field, then an appropriate symbolic link is created in connector +* sysfs directory to make it easy for the user to tell which i2c +* adapter is for a particular display. +*/ +struct i2c_adapter *ddc;To help the reader could you add in the above a reference to
drm_connector_init_with_ddc()sp the reader is told how to init this field.Either add it in PATCH 2 - or merge patch 1 and 2.
Sam
Quoted 6 lines
include/drm/drm_connector.h +1
-0+/** * @null_edid_counter: track sinks that give us all zeros for the EDID. * Needed to workaround some HW bugs where we get all 0s Signature · 1 line
2.17.1
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v5 01/24] drm: Include ddc adapter pointer in struct drm_connector
In reply to Sam RavnborgHi Sam,
W dniu 26.07.2019 o 08:37, Sam Ravnborg pisze:
Quoted 4 lines
Hi Andrzej.
Patch looks good, but one kernel-doc detail.
Thanks, I will address both issues you found, in v6.
Andrzej
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 2/24 drm: Add drm_connector_init() variant with ddc
In reply to Andrzej PietrasiewiczAllow passing ddc adapter pointer to the init function. Even if drm_connector_init() sometime in the future decides to e.g. memset() all connector fields to zeros, the newly added function ensures that at its completion the ddc member of connector is correctly set.
--- drivers/gpu/drm/drm_connector.c | 19 +++++++++++++++++++ include/drm/drm_connector.h | 5 +++++ 2 files changed, 24 insertions(+)
drivers/gpu/drm/drm_connector.c +19 -0
@@ -296,6 +296,25 @@ int drm_connector_init(struct drm_device *dev, }EXPORT_SYMBOL (drm_connector_init); +int drm_connector_init_with_ddc (struct drm_device *dev, +struct drm_connector *connector, +const struct drm_connector_funcs *funcs, +int connector_type, +struct i2c_adapter *ddc) +{ +int ret; + + ret =drm_connector_init (dev, connector, funcs, connector_type); +if (ret) +return ret; + +/* provide ddc symlink in sysfs */ + connector->ddc = ddc; + +return ret; +} +EXPORT_SYMBOL (drm_connector_init_with_ddc); +/** * drm_connector_attach_edid_property - attach edid property. * @connector: the connector
include/drm/drm_connector.h +5 -0
@@ -1410,6 +1410,11 @@ int drm_connector_init(struct drm_device *dev,struct drm_connector *connector, const struct drm_connector_funcs *funcs, int connector_type); +int drm_connector_init_with_ddc (struct drm_device *dev, +struct drm_connector *connector, +const struct drm_connector_funcs *funcs, +int connector_type, +struct i2c_adapter *ddc);void drm_connector_attach_edid_property (struct drm_connector *connector);int drm_connector_register (struct drm_connector *connector);void drm_connector_unregister (struct drm_connector *connector);
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v5 02/24] drm: Add drm_connector_init() variant with ddc
Hi
Am 24.07.19 um 15:59 schrieb Andrzej Pietrasiewicz:
Quoted 28 lines
Allow passing ddc adapter pointer to the init function. Even if
drm_connector_init()sometime in the future decides to e.g.memset()all connector fields to zeros, the newly added function ensures that at its completion the ddc member of connector is correctly set.--- drivers/gpu/drm/drm_connector.c | 19 +++++++++++++++++++ include/drm/drm_connector.h | 5 +++++ 2 files changed, 24 insertions(+)drivers/gpu/drm/drm_connector.c +9
-0@@ -296,6 +296,25 @@ int drm_connector_init(struct drm_device *dev, }EXPORT_SYMBOL (drm_connector_init); +int drm_connector_init_with_ddc (struct drm_device *dev, +struct drm_connector *connector, +const struct drm_connector_funcs *funcs, +int connector_type, +struct i2c_adapter *ddc) +{ +int ret; + + ret =drm_connector_init (dev, connector, funcs, connector_type);
drivers/gpu/drm/drm_connector.c int drm_connector_init(struct drm_device *dev, · line 317
Quoted 10 lines
drivers/gpu/drm/drm_connector.c +10
-0+if (ret) +return ret; + +/* provide ddc symlink in sysfs */ + connector->ddc = ddc; + +return ret; +} +EXPORT_SYMBOL (drm_connector_init_with_ddc); +
Thanks for including such a function.
Quoted 20 lines
drivers/gpu/drm/drm_connector.c +0
-0/** * drm_connector_attach_edid_property - attach edid property. * @connector: the connector include/drm/drm_connector.h +5
-0@@ -1410,6 +1410,11 @@ int drm_connector_init(struct drm_device *dev,struct drm_connector *connector, const struct drm_connector_funcs *funcs, int connector_type); +int drm_connector_init_with_ddc (struct drm_device *dev, +struct drm_connector *connector, +const struct drm_connector_funcs *funcs, +int connector_type, +struct i2c_adapter *ddc);void drm_connector_attach_edid_property (struct drm_connector *connector);int drm_connector_register (struct drm_connector *connector);void drm_connector_unregister (struct drm_connector *connector);
Signature · 5 lines
Thomas Zimmermann Graphics Driver Developer SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 53f5ded2971235e5b63c9a3ed4ed8bccf10c78f2.1563960855.git.andrzej.p-ZGY8ohtN/[email protected]
Re: [PATCH v5 02/24] drm: Add drm_connector_init() variant with ddc
Hi Andrzej.
Quoted 16 lines · Andrzej Pietrasiewicz
Allow passing ddc adapter pointer to the init function. Even if
drm_connector_init()sometime in the future decides to e.g.memset()all connector fields to zeros, the newly added function ensures that at its completion the ddc member of connector is correctly set.--- drivers/gpu/drm/drm_connector.c | 19 +++++++++++++++++++ include/drm/drm_connector.h | 5 +++++ 2 files changed, 24 insertions(+)drivers/gpu/drm/drm_connector.c +0
-0
drivers/gpu/drm/drm_connector.c int drm_connector_init(struct drm_device *dev, · line 304
Quoted 9 lines
drivers/gpu/drm/drm_connector.c +6
-0@@ -296,6 +296,25 @@ int drm_connector_init(struct drm_device *dev, }EXPORT_SYMBOL (drm_connector_init); +int drm_connector_init_with_ddc (struct drm_device *dev, +struct drm_connector *connector, +const struct drm_connector_funcs *funcs, +int connector_type, +struct i2c_adapter *ddc) +{
This is good, with this helper there is no longer any confusion about ordering.
drm_connector_init_with_ddc() is part of the public interface for drm_connector and needs kernel-doc documentation.
Sam
Quoted 34 lines
drivers/gpu/drm/drm_connector.c +13
-0+int ret; + + ret =drm_connector_init (dev, connector, funcs, connector_type); +if (ret) +return ret; + +/* provide ddc symlink in sysfs */ + connector->ddc = ddc; + +return ret; +} +EXPORT_SYMBOL (drm_connector_init_with_ddc); +/** * drm_connector_attach_edid_property - attach edid property. * @connector: the connector include/drm/drm_connector.h +5
-0@@ -1410,6 +1410,11 @@ int drm_connector_init(struct drm_device *dev,struct drm_connector *connector, const struct drm_connector_funcs *funcs, int connector_type); +int drm_connector_init_with_ddc (struct drm_device *dev, +struct drm_connector *connector, +const struct drm_connector_funcs *funcs, +int connector_type, +struct i2c_adapter *ddc);void drm_connector_attach_edid_property (struct drm_connector *connector);int drm_connector_register (struct drm_connector *connector);void drm_connector_unregister (struct drm_connector *connector);Signature · 1 line
2.17.1
Jani Nikula
maintainerRe: [PATCH v5 02/24] drm: Add drm_connector_init() variant with ddc
In reply to Andrzej PietrasiewiczQuoted 16 lines · Andrzej Pietrasiewicz
Allow passing ddc adapter pointer to the init function. Even if
drm_connector_init()sometime in the future decides to e.g.memset()all connector fields to zeros, the newly added function ensures that at its completion the ddc member of connector is correctly set.Signed-off-by Andrzej Pietrasiewicz <[email protected]>--- drivers/gpu/drm/drm_connector.c | 19 +++++++++++++++++++ include/drm/drm_connector.h | 5 +++++ 2 files changed, 24 insertions(+)drivers/gpu/drm/drm_connector.c +0
-0
drivers/gpu/drm/drm_connector.c int drm_connector_init(struct drm_device *dev, · line 303
Quoted 8 lines
drivers/gpu/drm/drm_connector.c +5
-0@@ -296,6 +296,25 @@ int drm_connector_init(struct drm_device *dev, }EXPORT_SYMBOL (drm_connector_init); +int drm_connector_init_with_ddc (struct drm_device *dev, +struct drm_connector *connector, +const struct drm_connector_funcs *funcs, +int connector_type, +struct i2c_adapter *ddc)
Playing the devil's advocate here a bit. What if you end up adding another thing you need to initialize like this? Are you going to need three more functions to account for the combinations? Init with ddc, with foo, with ddc and foo? So I generally frown upon interfaces like this.
If everyone thinks this is the way to go, I'm not going to stand in the way, but personally I'd rather switch over all of i915 to a new version of drm_connector_init() that just takes another parameter.
BR,
Jani.
Quoted 33 lines
drivers/gpu/drm/drm_connector.c +14
-0+{ +int ret; + + ret =drm_connector_init (dev, connector, funcs, connector_type); +if (ret) +return ret; + +/* provide ddc symlink in sysfs */ + connector->ddc = ddc; + +return ret; +} +EXPORT_SYMBOL (drm_connector_init_with_ddc); +/** * drm_connector_attach_edid_property - attach edid property. * @connector: the connector include/drm/drm_connector.h +5
-0@@ -1410,6 +1410,11 @@ int drm_connector_init(struct drm_device *dev,struct drm_connector *connector, const struct drm_connector_funcs *funcs, int connector_type); +int drm_connector_init_with_ddc (struct drm_device *dev, +struct drm_connector *connector, +const struct drm_connector_funcs *funcs, +int connector_type, +struct i2c_adapter *ddc);void drm_connector_attach_edid_property (struct drm_connector *connector);int drm_connector_register (struct drm_connector *connector);void drm_connector_unregister (struct drm_connector *connector);
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 3/24 drm/exynos: Provide ddc symlink in connector's sysfs
In reply to Andrzej PietrasiewiczSwitch to using the ddc provided by the generic connector.
--- drivers/gpu/drm/exynos/exynos_hdmi.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/gpu/drm/exynos/exynos_hdmi.c +9 -8
@@ -125,7 +125,6 @@ struct hdmi_context {void __iomem *regs;void __iomem *regs_hdmiphy;struct i2c_client *hdmiphy_port; -struct i2c_adapter *ddc_adpt;struct gpio_desc *hpd_gpio;int irq;struct regmap *pmureg;
@@ -871,10 +870,10 @@ static int hdmi_get_modes(struct drm_connector *connector)struct edid *edid;int ret; -if (!hdata->ddc_adpt) +if (!connector->ddc)return -ENODEV ; - edid =drm_get_edid (connector, hdata->ddc_adpt); + edid =drm_get_edid (connector, connector->ddc);if (!edid)return -ENODEV ;
@@ -940,8 +939,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 , + connector->ddc);if (ret) {DRM_DEV_ERROR (hdata->dev,"Failed to initialize connector with drm\n" );
@@ -1892,7 +1893,7 @@ static int hdmi_get_ddc_adapter(struct hdmi_context *hdata)return -EPROBE_DEFER ; } - hdata->ddc_adpt = adpt; + hdata->connector.ddc = adpt;return 0 ; }
@@ -2044,7 +2045,7 @@ static int hdmi_probe(struct platform_device *pdev)if (hdata->regs_hdmiphy)iounmap (hdata->regs_hdmiphy); err_ddc: -put_device (&hdata->ddc_adpt->dev); +put_device (&hdata->connector.ddc->dev);return ret; }
@@ -2071,7 +2072,7 @@ static int hdmi_remove(struct platform_device *pdev)if (hdata->regs_hdmiphy)iounmap (hdata->regs_hdmiphy); -put_device (&hdata->ddc_adpt->dev); +put_device (&hdata->connector.ddc->dev);mutex_destroy (&hdata->mutex);
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 4/24 drm: rockchip: Provide ddc symlink in rk3066_hdmi sysfs directory
In reply to Andrzej PietrasiewiczUse the ddc pointer provided by the generic connector.
--- drivers/gpu/drm/rockchip/rk3066_hdmi.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/gpu/drm/rockchip/rk3066_hdmi.c +12 -12
@@ -49,7 +49,6 @@ struct rk3066_hdmi {struct drm_encoder encoder;struct rk3066_hdmi_i2c *i2c; -struct i2c_adapter *ddc;unsigned int tmdsclk;
@@ -470,10 +469,10 @@ static int rk3066_hdmi_connector_get_modes(struct drm_connector *connector)struct edid *edid;int ret =0 ; -if (!hdmi->ddc) +if (!connector->ddc)return 0 ; - edid =drm_get_edid (connector, hdmi->ddc); + edid =drm_get_edid (connector, connector->ddc);if (edid) { hdmi->hdmi_data.sink_is_hdmi =drm_detect_hdmi_monitor (edid);drm_connector_update_edid_property (connector, edid);
@@ -564,9 +563,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->connector.ddc);drm_connector_attach_encoder (&hdmi->connector, encoder);
@@ -789,10 +789,10 @@ static int rk3066_hdmi_bind(struct device *dev, struct device *master,/* internal hclk = hdmi_hclk / 25 */ hdmi_writeb (hdmi,HDMI_INTERNAL_CLK_DIVIDER ,25 ); - hdmi->ddc =rk3066_hdmi_i2c_adapter (hdmi); -if (IS_ERR (hdmi->ddc)) { - ret =PTR_ERR (hdmi->ddc); - hdmi->ddc =NULL ; + hdmi->connector.ddc =rk3066_hdmi_i2c_adapter (hdmi); +if (IS_ERR (hdmi->connector.ddc)) { + ret =PTR_ERR (hdmi->connector.ddc); + hdmi->connector.ddc =NULL ; goto err_disable_hclk; }
@@ -824,7 +824,7 @@ static int rk3066_hdmi_bind(struct device *dev, struct device *master, hdmi->connector.funcs->destroy (&hdmi->connector); hdmi->encoder.funcs->destroy (&hdmi->encoder); err_disable_i2c: -i2c_put_adapter (hdmi->ddc); +i2c_put_adapter (hdmi->connector.ddc); err_disable_hclk:clk_disable_unprepare (hdmi->hclk);
@@ -839,7 +839,7 @@ static void rk3066_hdmi_unbind(struct device *dev, struct device *master, hdmi->connector.funcs->destroy (&hdmi->connector); hdmi->encoder.funcs->destroy (&hdmi->encoder); -i2c_put_adapter (hdmi->ddc); +i2c_put_adapter (hdmi->connector.ddc);clk_disable_unprepare (hdmi->hclk); }
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 5/24 drm: rockchip: Provide ddc symlink in inno_hdmi sysfs directory
In reply to Andrzej PietrasiewiczUse the ddc pointer provided by the generic connector.
--- drivers/gpu/drm/rockchip/inno_hdmi.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
drivers/gpu/drm/rockchip/inno_hdmi.c +12 -11
@@ -58,7 +58,6 @@ struct inno_hdmi {struct drm_encoder encoder;struct inno_hdmi_i2c *i2c; -struct i2c_adapter *ddc;unsigned int tmds_rate;
@@ -551,10 +550,10 @@ static int inno_hdmi_connector_get_modes(struct drm_connector *connector)struct edid *edid;int ret =0 ; -if (!hdmi->ddc) +if (!hdmi->connector.ddc)return 0 ; - edid =drm_get_edid (connector, hdmi->ddc); + edid =drm_get_edid (connector, hdmi->connector.ddc);if (edid) { hdmi->hdmi_data.sink_is_hdmi =drm_detect_hdmi_monitor (edid); hdmi->hdmi_data.sink_has_audio =drm_detect_monitor_audio (edid);
@@ -624,8 +623,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->connector.ddc);drm_connector_attach_encoder (&hdmi->connector, encoder);
@@ -849,10 +850,10 @@ static int inno_hdmi_bind(struct device *dev, struct device *master,inno_hdmi_reset (hdmi); - hdmi->ddc =inno_hdmi_i2c_adapter (hdmi); -if (IS_ERR (hdmi->ddc)) { - ret =PTR_ERR (hdmi->ddc); - hdmi->ddc =NULL ; + hdmi->connector.ddc =inno_hdmi_i2c_adapter (hdmi); +if (IS_ERR (hdmi->connector.ddc)) { + ret =PTR_ERR (hdmi->connector.ddc); + hdmi->connector.ddc =NULL ; goto err_disable_clk; }
@@ -885,7 +886,7 @@ static int inno_hdmi_bind(struct device *dev, struct device *master, hdmi->connector.funcs->destroy (&hdmi->connector); hdmi->encoder.funcs->destroy (&hdmi->encoder); err_put_adapter: -i2c_put_adapter (hdmi->ddc); +i2c_put_adapter (hdmi->connector.ddc); err_disable_clk:clk_disable_unprepare (hdmi->pclk);return ret;
@@ -899,7 +900,7 @@ static void inno_hdmi_unbind(struct device *dev, struct device *master, hdmi->connector.funcs->destroy (&hdmi->connector); hdmi->encoder.funcs->destroy (&hdmi->encoder); -i2c_put_adapter (hdmi->ddc); +i2c_put_adapter (hdmi->connector.ddc);clk_disable_unprepare (hdmi->pclk); }
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 6/24 drm/msm/hdmi: Provide ddc symlink in hdmi connector sysfs directory
In reply to Andrzej PietrasiewiczUse the ddc pointer provided by the generic connector.
--- drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/hdmi/hdmi_connector.c +4 -2
@@ -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 |
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
A message that is not in the archive (sent off-list or not yet received): cover.1563960855.git.andrzej.p-ZGY8ohtN/[email protected]
PATCH v5 7/24 drm/sun4i: hdmi: Provide ddc symlink in sun4i hdmi connector sysfs directory
Use the ddc pointer provided by the generic connector.
--- drivers/gpu/drm/sun4i/sun4i_hdmi.h | 1 - drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 21 +++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-)
drivers/gpu/drm/sun4i/sun4i_hdmi.h +0 -1
@@ -265,7 +265,6 @@ struct sun4i_hdmi {struct clk *tmds_clk;struct i2c_adapter *i2c; -struct i2c_adapter *ddc_i2c;/* Regmap fields for I2C adapter */ struct regmap_field *field_ddc_en;
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c +11 -10
@@ -214,7 +214,7 @@ static int sun4i_hdmi_get_modes(struct drm_connector *connector)struct edid *edid;int ret; - edid =drm_get_edid (connector, hdmi->ddc_i2c ?: hdmi->i2c); + edid =drm_get_edid (connector, connector->ddc ?: hdmi->i2c);if (!edid)return 0 ;
@@ -599,11 +599,11 @@ static int sun4i_hdmi_bind(struct device *dev, struct device *master, goto err_disable_mod_clk; } - hdmi->ddc_i2c =sun4i_hdmi_get_ddc (dev); -if (IS_ERR (hdmi->ddc_i2c)) { - ret =PTR_ERR (hdmi->ddc_i2c); + hdmi->connector.ddc =sun4i_hdmi_get_ddc (dev); +if (IS_ERR (hdmi->connector.ddc)) { + ret =PTR_ERR (hdmi->connector.ddc);if (ret == -ENODEV ) - hdmi->ddc_i2c =NULL ; + hdmi->connector.ddc =NULL ;else goto err_del_i2c_adapter; }
@@ -640,9 +640,10 @@ static int sun4i_hdmi_bind(struct device *dev, struct device *master,drm_connector_helper_add (&hdmi->connector, &sun4i_hdmi_connector_helper_funcs); - ret =drm_connector_init (drm, &hdmi->connector, - &sun4i_hdmi_connector_funcs, -DRM_MODE_CONNECTOR_HDMIA ); + ret =drm_connector_init_with_ddc (drm, &hdmi->connector, + &sun4i_hdmi_connector_funcs, +DRM_MODE_CONNECTOR_HDMIA , + hdmi->connector.ddc);if (ret) {dev_err (dev,"Couldn't initialise the HDMI connector\n" );
@@ -664,7 +665,7 @@ static int sun4i_hdmi_bind(struct device *dev, struct device *master,cec_delete_adapter (hdmi->cec_adap);drm_encoder_cleanup (&hdmi->encoder); err_put_ddc_i2c: -i2c_put_adapter (hdmi->ddc_i2c); +i2c_put_adapter (hdmi->connector.ddc); err_del_i2c_adapter:i2c_del_adapter (hdmi->i2c); err_disable_mod_clk:
@@ -685,7 +686,7 @@ static void sun4i_hdmi_unbind(struct device *dev, struct device *master,drm_connector_cleanup (&hdmi->connector);drm_encoder_cleanup (&hdmi->encoder);i2c_del_adapter (hdmi->i2c); -i2c_put_adapter (hdmi->ddc_i2c); +i2c_put_adapter (hdmi->connector.ddc);clk_disable_unprepare (hdmi->mod_clk);clk_disable_unprepare (hdmi->bus_clk); }
Signature · 6 lines
2.17.1 _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v5 23/24 drm/radeon: Provide ddc symlink in connector sysfs directory
In reply to a message not in the archiveUse the ddc pointer provided by the generic connector.
--- drivers/gpu/drm/radeon/radeon_connectors.c | 141 +++++++++++++++------ 1 file changed, 105 insertions(+), 36 deletions(-)
drivers/gpu/drm/radeon/radeon_connectors.c +105 -36
@@ -1947,17 +1947,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 + connector->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, + radeon_connector->base.ddc);drm_connector_helper_add (&radeon_connector->base, &radeon_dp_connector_helper_funcs); connector->interlace_allowed = true;
@@ -1979,8 +1983,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, + radeon_connector->base.ddc);drm_connector_helper_add (&radeon_connector->base, &radeon_dp_connector_helper_funcs); drm_object_attach_property(&radeon_connector->base.base,
@@ -2027,8 +2033,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, + radeon_connector->base.ddc);drm_connector_helper_add (&radeon_connector->base, &radeon_dp_connector_helper_funcs); drm_object_attach_property(&radeon_connector->base.base,
@@ -2042,13 +2050,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 + connector->ddc = &radeon_connector->ddc_bus->adapter; } +drm_connector_init_with_ddc (dev, &radeon_connector->base, + &radeon_vga_connector_funcs, + connector_type, + radeon_connector->base.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 +2080,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 + connector->ddc = &radeon_connector->ddc_bus->adapter; } +drm_connector_init_with_ddc (dev, &radeon_connector->base, + &radeon_vga_connector_funcs, + connector_type, + radeon_connector->base.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 +2116,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 + connector->ddc = &radeon_connector->ddc_bus->adapter; } +drm_connector_init_with_ddc (dev, &radeon_connector->base, + &radeon_dvi_connector_funcs, + connector_type, + radeon_connector->base.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 +2178,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 + connector->ddc = &radeon_connector->ddc_bus->adapter; } +drm_connector_init_with_ddc (dev, &radeon_connector->base, + &radeon_dvi_connector_funcs, + connector_type, + radeon_connector->base.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 +2233,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 + connector->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, + radeon_connector->base.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 +2288,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 + connector->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, + radeon_connector->base.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 +2312,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, + radeon_connector->base.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 +2335,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 + connector->ddc = &radeon_connector->ddc_bus->adapter; } +drm_connector_init_with_ddc (dev, &radeon_connector->base, + &radeon_lvds_connector_funcs, + connector_type, + radeon_connector->base.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 );
@@ -2378,13 +2424,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 + connector->ddc = &radeon_connector->ddc_bus->adapter; } +drm_connector_init_with_ddc (dev, &radeon_connector->base, + &radeon_vga_connector_funcs, + connector_type, + radeon_connector->base.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 +2446,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 + connector->ddc = &radeon_connector->ddc_bus->adapter; } +drm_connector_init_with_ddc (dev, &radeon_connector->base, + &radeon_vga_connector_funcs, + connector_type, + radeon_connector->base.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 +2469,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 + connector->ddc = &radeon_connector->ddc_bus->adapter; } +drm_connector_init_with_ddc (dev, &radeon_connector->base, + &radeon_dvi_connector_funcs, + connector_type, + radeon_connector->base.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 +2497,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, + radeon_connector->base.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 +2522,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 + connector->ddc = &radeon_connector->ddc_bus->adapter; } +drm_connector_init_with_ddc (dev, &radeon_connector->base, + &radeon_lvds_connector_funcs, + connector_type, + radeon_connector->base.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 );
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v5 24/24 drm/i915: Provide ddc symlink in hdmi connector sysfs directory
In reply to a message not in the archiveUse the ddc pointer provided by the generic connector.
--- drivers/gpu/drm/i915/display/intel_hdmi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_hdmi.c +7 -4
@@ -3077,8 +3077,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); + connector->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 , + connector->ddc);drm_connector_helper_add (connector, &intel_hdmi_connector_helper_funcs); connector->interlace_allowed =1 ;
@@ -3088,8 +3093,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);
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v5 8/24 drm/mediatek: Provide ddc symlink in hdmi connector sysfs directory
In reply to Andrzej PietrasiewiczUse the ddc pointer provided by the generic connector.
--- drivers/gpu/drm/mediatek/mtk_hdmi.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/mediatek/mtk_hdmi.c +8 -8
@@ -150,7 +150,6 @@ struct mtk_hdmi {struct device *dev;struct phy *phy;struct device *cec_dev; -struct i2c_adapter *ddc_adpt;struct clk *clk[MTK_HDMI_CLK_COUNT ];struct drm_display_mode mode;bool dvi_mode;
@@ -1217,10 +1216,10 @@ static int mtk_hdmi_conn_get_modes(struct drm_connector *conn)struct edid *edid;int ret; -if (!hdmi->ddc_adpt) +if (!conn->ddc)return -ENODEV ; - edid =drm_get_edid (conn, hdmi->ddc_adpt); + edid =drm_get_edid (conn, conn->ddc);if (!edid)return -ENODEV ;
@@ -1299,9 +1298,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->conn.ddc);if (ret) {dev_err (hdmi->dev,"Failed to initialize connector: %d\n" , ret);return ret;
@@ -1513,9 +1513,9 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, }of_node_put (remote); - hdmi->ddc_adpt =of_find_i2c_adapter_by_node (i2c_np); + hdmi->conn.ddc =of_find_i2c_adapter_by_node (i2c_np);of_node_put (i2c_np); -if (!hdmi->ddc_adpt) { +if (!hdmi->conn.ddc) {dev_err (dev,"Failed to get ddc i2c adapter by node\n" );return -EINVAL ; }
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 9/24 drm/tegra: Provide ddc symlink in output connector sysfs directory
In reply to Andrzej PietrasiewiczUse the ddc pointer provided by the generic connector.
--- drivers/gpu/drm/tegra/drm.h | 1 - drivers/gpu/drm/tegra/hdmi.c | 7 ++++--- drivers/gpu/drm/tegra/output.c | 12 ++++++------ drivers/gpu/drm/tegra/sor.c | 13 +++++++------ 4 files changed, 17 insertions(+), 16 deletions(-)
drivers/gpu/drm/tegra/drm.h +0 -1
@@ -120,7 +120,6 @@ struct tegra_output {struct device *dev;struct drm_panel *panel; -struct i2c_adapter *ddc;const struct edid *edid;struct cec_notifier *cec;unsigned int hpd_irq;
drivers/gpu/drm/tegra/hdmi.c +4 -3
@@ -1425,9 +1425,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.connector.ddc);drm_connector_helper_add (&hdmi->output.connector, &tegra_hdmi_connector_helper_funcs); hdmi->output.connector.dpms =DRM_MODE_DPMS_OFF ;
drivers/gpu/drm/tegra/output.c +6 -6
@@ -30,8 +30,8 @@ int tegra_output_connector_get_modes(struct drm_connector *connector)if (output->edid) edid =kmemdup (output->edid,sizeof (*edid),GFP_KERNEL ); -else if (output->ddc) - edid =drm_get_edid (connector, output->ddc); +else if (connector->ddc) + edid =drm_get_edid (connector, connector->ddc);cec_notifier_set_phys_addr_from_edid (output->cec, edid);drm_connector_update_edid_property (connector, edid);
@@ -111,8 +111,8 @@ int tegra_output_probe(struct tegra_output *output) ddc =of_parse_phandle (output->of_node,"nvidia,ddc-i2c-bus" ,0 );if (ddc) { - output->ddc =of_find_i2c_adapter_by_node (ddc); -if (!output->ddc) { + output->connector.ddc =of_find_i2c_adapter_by_node (ddc); +if (!output->connector.ddc) { err = -EPROBE_DEFER ;of_node_put (ddc);return err;
@@ -174,8 +174,8 @@ void tegra_output_remove(struct tegra_output *output)if (output->hpd_gpio)free_irq (output->hpd_irq, output); -if (output->ddc) -put_device (&output->ddc->dev); +if (output->connector.ddc) +put_device (&output->connector.ddc->dev); }int tegra_output_init (struct drm_device *drm,struct tegra_output *output)
drivers/gpu/drm/tegra/sor.c +7 -6
@@ -2311,7 +2311,7 @@ static void tegra_sor_hdmi_disable_scrambling(struct tegra_sor *sor)static void tegra_sor_hdmi_scdc_disable (struct tegra_sor *sor) { -struct i2c_adapter *ddc = sor->output.ddc; +struct i2c_adapter *ddc = sor->output.connector.ddc;drm_scdc_set_high_tmds_clock_ratio (ddc, false);drm_scdc_set_scrambling (ddc, false);
@@ -2339,7 +2339,7 @@ static void tegra_sor_hdmi_enable_scrambling(struct tegra_sor *sor)static void tegra_sor_hdmi_scdc_enable (struct tegra_sor *sor) { -struct i2c_adapter *ddc = sor->output.ddc; +struct i2c_adapter *ddc = sor->output.connector.ddc;drm_scdc_set_high_tmds_clock_ratio (ddc, true);drm_scdc_set_scrambling (ddc, true);
@@ -2350,7 +2350,7 @@ static void tegra_sor_hdmi_scdc_enable(struct tegra_sor *sor)static void tegra_sor_hdmi_scdc_work (struct work_struct *work) { struct tegra_sor *sor = container_of(work, struct tegra_sor, scdc.work); -struct i2c_adapter *ddc = sor->output.ddc; +struct i2c_adapter *ddc = sor->output.connector.ddc;if (!drm_scdc_get_scrambling_status (ddc)) {DRM_DEBUG_KMS ("SCDC not scrambled\n" );
@@ -2832,9 +2832,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.connector.ddc);drm_connector_helper_add (&sor->output.connector, &tegra_sor_connector_helper_funcs); sor->output.connector.dpms =DRM_MODE_DPMS_OFF ;
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 10/24 drm/imx: imx-ldb: Provide ddc symlink in connector's sysfs
In reply to Andrzej PietrasiewiczUse the ddc pointer provided by the generic connector.
--- drivers/gpu/drm/imx/imx-ldb.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/imx/imx-ldb.c +10 -10
@@ -57,7 +57,6 @@ struct imx_ldb_channel {struct drm_bridge *bridge;struct device_node *child; -struct i2c_adapter *ddc;int chno;void *edid;int edid_len;
@@ -133,8 +132,8 @@ static int imx_ldb_connector_get_modes(struct drm_connector *connector)return num_modes; } -if (!imx_ldb_ch->edid && imx_ldb_ch->ddc) - imx_ldb_ch->edid =drm_get_edid (connector, imx_ldb_ch->ddc); +if (!imx_ldb_ch->edid && connector->ddc) + imx_ldb_ch->edid =drm_get_edid (connector, connector->ddc);if (imx_ldb_ch->edid) { drm_connector_update_edid_property(connector,
@@ -462,9 +461,10 @@ static int imx_ldb_register(struct drm_device *drm,*/ drm_connector_helper_add (&imx_ldb_ch->connector, &imx_ldb_connector_helper_funcs); -drm_connector_init (drm, &imx_ldb_ch->connector, - &imx_ldb_connector_funcs, -DRM_MODE_CONNECTOR_LVDS ); +drm_connector_init_with_ddc (drm, &imx_ldb_ch->connector, + &imx_ldb_connector_funcs, +DRM_MODE_CONNECTOR_LVDS , + imx_ldb_ch->connector.ddc);drm_connector_attach_encoder (&imx_ldb_ch->connector, encoder); }
@@ -552,15 +552,15 @@ static int imx_ldb_panel_ddc(struct device *dev, ddc_node =of_parse_phandle (child,"ddc-i2c-bus" ,0 );if (ddc_node) { - channel->ddc =of_find_i2c_adapter_by_node (ddc_node); + channel->connector.ddc =of_find_i2c_adapter_by_node (ddc_node);of_node_put (ddc_node); -if (!channel->ddc) { +if (!channel->connector.ddc) {dev_warn (dev,"failed to get ddc i2c adapter\n" );return -EPROBE_DEFER ; } } -if (!channel->ddc) { +if (!channel->connector.ddc) {/* if no DDC available, fallback to hardcoded EDID */ dev_dbg (dev,"no ddc available\n" );
@@ -727,7 +727,7 @@ static void imx_ldb_unbind(struct device *dev, struct device *master,drm_panel_detach (channel->panel);kfree (channel->edid); -i2c_put_adapter (channel->ddc); +i2c_put_adapter (channel->connector.ddc); } }
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 11/24 drm/imx: imx-tve: Provide ddc symlink in connector's sysfs
In reply to Andrzej PietrasiewiczUse the ddc pointer provided by the generic connector.
--- drivers/gpu/drm/imx/imx-tve.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/gpu/drm/imx/imx-tve.c +7 -7
@@ -111,7 +111,6 @@ struct imx_tve {struct regmap *regmap;struct regulator *dac_reg; -struct i2c_adapter *ddc;struct clk *clk;struct clk *di_sel_clk;struct clk_hw clk_hw_di;
@@ -220,14 +219,13 @@ static int tve_setup_vga(struct imx_tve *tve)static int imx_tve_connector_get_modes (struct drm_connector *connector) { -struct imx_tve *tve =con_to_tve (connector);struct edid *edid;int ret =0 ; -if (!tve->ddc) +if (!connector->ddc)return 0 ; - edid =drm_get_edid (connector, tve->ddc); + edid =drm_get_edid (connector, connector->ddc);if (edid) {drm_connector_update_edid_property (connector, edid); ret =drm_add_edid_modes (connector, edid);
@@ -484,8 +482,10 @@ static int imx_tve_register(struct drm_device *drm, struct imx_tve *tve)drm_connector_helper_add (&tve->connector, &imx_tve_connector_helper_funcs); -drm_connector_init (drm, &tve->connector, &imx_tve_connector_funcs, -DRM_MODE_CONNECTOR_VGA ); +drm_connector_init_with_ddc (drm, &tve->connector, + &imx_tve_connector_funcs, +DRM_MODE_CONNECTOR_VGA , + tve->connector.ddc);drm_connector_attach_encoder (&tve->connector, &tve->encoder);
@@ -553,7 +553,7 @@ static int imx_tve_bind(struct device *dev, struct device *master, void *data) ddc_node =of_parse_phandle (np,"ddc-i2c-bus" ,0 );if (ddc_node) { - tve->ddc =of_find_i2c_adapter_by_node (ddc_node); + tve->connector.ddc =of_find_i2c_adapter_by_node (ddc_node);of_node_put (ddc_node); }
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 12/24 drm/vc4: Provide ddc symlink in connector sysfs directory
In reply to Andrzej PietrasiewiczUse the ddc pointer provided by the generic connector.
--- drivers/gpu/drm/vc4/vc4_hdmi.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)
drivers/gpu/drm/vc4/vc4_hdmi.c +15 -11
@@ -76,7 +76,6 @@ struct vc4_hdmi {struct vc4_hdmi_audio audio; -struct i2c_adapter *ddc;void __iomem *hdmicore_regs;void __iomem *hd_regs;int hpd_gpio;
@@ -207,7 +206,7 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force)return connector_status_disconnected; } -if (drm_probe_ddc (vc4->hdmi->ddc)) +if (drm_probe_ddc (connector->ddc))return connector_status_connected;if (HDMI_READ (VC4_HDMI_HOTPLUG ) &VC4_HDMI_HOTPLUG_CONNECTED )
@@ -233,7 +232,7 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector)int ret =0 ;struct edid *edid; - edid =drm_get_edid (connector, vc4->hdmi->ddc); + edid =drm_get_edid (connector, connector->ddc);cec_s_phys_addr_from_edid (vc4->hdmi->cec_adap, edid);if (!edid)return -ENODEV ;
@@ -267,7 +266,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 +281,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. */
@@ -1291,6 +1293,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)struct vc4_hdmi *hdmi;struct vc4_hdmi_encoder *vc4_hdmi_encoder;struct device_node *ddc_node; +struct i2c_adapter *ddc;u32 value;int ret;
@@ -1338,9 +1341,9 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)return -ENODEV ; } - hdmi->ddc =of_find_i2c_adapter_by_node (ddc_node); + ddc =of_find_i2c_adapter_by_node (ddc_node);of_node_put (ddc_node); -if (!hdmi->ddc) { +if (ddc) {DRM_DEBUG ("Failed to get ddc i2c adapter by node\n" );return -EPROBE_DEFER ; }
@@ -1395,7 +1398,7 @@ 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, ddc);if (IS_ERR (hdmi->connector)) { ret =PTR_ERR (hdmi->connector); goto err_destroy_encoder;
@@ -1452,7 +1455,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)clk_disable_unprepare (hdmi->hsm_clock);pm_runtime_disable (dev); err_put_i2c: -put_device (&hdmi->ddc->dev); +put_device (&ddc->dev);return ret; }
@@ -1463,6 +1466,7 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master,struct drm_device *drm =dev_get_drvdata (master);struct vc4_dev *vc4 = drm->dev_private;struct vc4_hdmi *hdmi = vc4->hdmi; +struct i2c_adapter *ddc = hdmi->connector->ddc;cec_unregister_adapter (hdmi->cec_adap);vc4_hdmi_connector_destroy (hdmi->connector);
@@ -1471,7 +1475,7 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master,clk_disable_unprepare (hdmi->hsm_clock);pm_runtime_disable (dev); -put_device (&hdmi->ddc->dev); +put_device (&ddc->dev); vc4->hdmi =NULL ; }
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 13/24 drm: zte: Provide ddc symlink in hdmi connector sysfs directory
In reply to Andrzej PietrasiewiczUse the ddc pointer provided by the generic connector.
--- drivers/gpu/drm/zte/zx_hdmi.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-)
drivers/gpu/drm/zte/zx_hdmi.c +13 -18
@@ -29,15 +29,11 @@#define ZX_HDMI_INFOFRAME_SIZE 31#define DDC_SEGMENT_ADDR 0x30 -struct zx_hdmi_i2c { -struct i2c_adapter adap; -struct mutex lock; -}; -struct zx_hdmi {struct drm_connector connector;struct drm_encoder encoder; -struct zx_hdmi_i2c *ddc; +/* protects ddc access */ +struct mutex ddc_lock;struct device *dev;struct drm_device *drm;void __iomem *mmio;
@@ -264,7 +260,7 @@ static int zx_hdmi_connector_get_modes(struct drm_connector *connector)struct edid *edid;int ret; - edid =drm_get_edid (connector, &hdmi->ddc->adap); + edid =drm_get_edid (connector, connector->ddc);if (!edid)return 0 ;
@@ -319,8 +315,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->connector.ddc);drm_connector_helper_add (&hdmi->connector, &zx_hdmi_connector_helper_funcs);
@@ -562,10 +560,9 @@ static int zx_hdmi_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) {struct zx_hdmi *hdmi =i2c_get_adapdata (adap); -struct zx_hdmi_i2c *ddc = hdmi->ddc;int i, ret =0 ; -mutex_lock (&ddc->lock); +mutex_lock (&hdmi->ddc_lock);/* Enable DDC master access */ hdmi_writeb_mask (hdmi,TPI_DDC_MASTER_EN ,HW_DDC_MASTER ,HW_DDC_MASTER );
@@ -590,7 +587,7 @@ static int zx_hdmi_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,/* Disable DDC master access */ hdmi_writeb_mask (hdmi,TPI_DDC_MASTER_EN ,HW_DDC_MASTER ,0 ); -mutex_unlock (&ddc->lock); +mutex_unlock (&hdmi->ddc_lock);return ret; }
@@ -608,17 +605,15 @@ static const struct i2c_algorithm zx_hdmi_algorithm = {static int zx_hdmi_ddc_register (struct zx_hdmi *hdmi) {struct i2c_adapter *adap; -struct zx_hdmi_i2c *ddc;int ret; - ddc =devm_kzalloc (hdmi->dev,sizeof (*ddc),GFP_KERNEL ); -if (!ddc) + adap =devm_kzalloc (hdmi->dev,sizeof (*adap),GFP_KERNEL ); +if (!adap)return -ENOMEM ; - hdmi->ddc = ddc; -mutex_init (&ddc->lock); + hdmi->connector.ddc = adap; +mutex_init (&hdmi->ddc_lock); - adap = &ddc->adap; adap->owner =THIS_MODULE ; adap->class =I2C_CLASS_DDC ; adap->dev.parent = hdmi->dev;
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 14/24 drm: zte: Provide ddc symlink in vga connector sysfs directory
In reply to Andrzej PietrasiewiczUse the ddc pointer provided by the generic connector.
--- drivers/gpu/drm/zte/zx_vga.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-)
drivers/gpu/drm/zte/zx_vga.c +13 -18
@@ -25,15 +25,11 @@ struct zx_vga_pwrctrl {u32 mask; }; -struct zx_vga_i2c { -struct i2c_adapter adap; -struct mutex lock; -}; -struct zx_vga {struct drm_connector connector;struct drm_encoder encoder; -struct zx_vga_i2c *ddc; +/* protects ddc access */ +struct mutex ddc_lock;struct device *dev;void __iomem *mmio;struct clk *i2c_wclk;
@@ -88,7 +84,7 @@ static int zx_vga_connector_get_modes(struct drm_connector *connector)*/ zx_writel (vga->mmio +VGA_AUTO_DETECT_SEL ,0 ); - edid =drm_get_edid (connector, &vga->ddc->adap); + edid =drm_get_edid (connector, connector->ddc);if (!edid) {/* * If EDID reading fails, we set the device state into
@@ -165,8 +161,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 , + connector->ddc);if (ret) {DRM_DEV_ERROR (dev,"failed to init connector: %d\n" , ret); goto clean_encoder;
@@ -284,11 +282,10 @@ static int zx_vga_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) {struct zx_vga *vga =i2c_get_adapdata (adap); -struct zx_vga_i2c *ddc = vga->ddc;int ret =0 ;int i; -mutex_lock (&ddc->lock); +mutex_lock (&vga->ddc_lock);for (i =0 ; i < num; i++) {if (msgs[i].flags &I2C_M_RD )
@@ -303,7 +300,7 @@ static int zx_vga_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,if (!ret) ret = num; -mutex_unlock (&ddc->lock); +mutex_unlock (&vga->ddc_lock);return ret; }
@@ -322,17 +319,15 @@ static int zx_vga_ddc_register(struct zx_vga *vga) {struct device *dev = vga->dev;struct i2c_adapter *adap; -struct zx_vga_i2c *ddc;int ret; - ddc =devm_kzalloc (dev,sizeof (*ddc),GFP_KERNEL ); -if (!ddc) + adap =devm_kzalloc (dev,sizeof (*adap),GFP_KERNEL ); +if (!adap)return -ENOMEM ; - vga->ddc = ddc; -mutex_init (&ddc->lock); + vga->connector.ddc = adap; +mutex_init (&vga->ddc_lock); - adap = &ddc->adap; adap->owner =THIS_MODULE ; adap->class =I2C_CLASS_DDC ; adap->dev.parent = dev;
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 15/24 drm/tilcdc: Provide ddc symlink in connector sysfs directory
In reply to Andrzej PietrasiewiczUse the ddc pointer provided by the generic connector.
--- drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/tilcdc/tilcdc_tfp410.c +4 -2
@@ -222,8 +222,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 |
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 16/24 drm: sti: Provide ddc symlink in hdmi connector sysfs directory
In reply to Andrzej PietrasiewiczUse the ddc pointer provided by the generic connector.
--- drivers/gpu/drm/sti/sti_hdmi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/sti/sti_hdmi.c +4 -2
@@ -1284,8 +1284,10 @@ static int sti_hdmi_bind(struct device *dev, struct device *master, void *data) drm_connector->polled =DRM_CONNECTOR_POLL_HPD ; -drm_connector_init (drm_dev, drm_connector, - &sti_hdmi_connector_funcs,DRM_MODE_CONNECTOR_HDMIA ); +drm_connector_init_with_ddc (drm_dev, drm_connector, + &sti_hdmi_connector_funcs, +DRM_MODE_CONNECTOR_HDMIA , + hdmi->ddc_adapt);drm_connector_helper_add (drm_connector, &sti_hdmi_connector_helper_funcs);
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 17/24 drm/mgag200: Provide ddc symlink in connector sysfs directory
In reply to Andrzej PietrasiewiczUse the ddc pointer provided by the generic connector.
--- drivers/gpu/drm/mgag200/mgag200_mode.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/gpu/drm/mgag200/mgag200_mode.c +7 -6
@@ -1678,18 +1678,19 @@ static struct drm_connector *mga_vga_init(struct drm_device *dev)return NULL ; connector = &mga_connector->base; + mga_connector->i2c =mgag200_i2c_create (dev); +if (!mga_connector->i2c) +DRM_ERROR ("failed to add ddc bus\n" ); -drm_connector_init (dev, connector, - &mga_vga_connector_funcs,DRM_MODE_CONNECTOR_VGA ); +drm_connector_init_with_ddc (dev, connector, + &mga_vga_connector_funcs, +DRM_MODE_CONNECTOR_VGA , + &mga_connector->i2c->adapter);drm_connector_helper_add (connector, &mga_vga_connector_helper_funcs);drm_connector_register (connector); - mga_connector->i2c =mgag200_i2c_create (dev); -if (!mga_connector->i2c) -DRM_ERROR ("failed to add ddc bus\n" ); -return connector; }
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
A message that is not in the archive (sent off-list or not yet received): f86dfa1ed6e84ab8b36a0b2c24df897bdb957294.1563960855.git.andrzej.p-ZGY8ohtN/[email protected]
Thomas Zimmermann
Reviewed-byRe: [PATCH v5 17/24] drm/mgag200: Provide ddc symlink in connector sysfs directory
Am 24.07.19 um 15:59 schrieb Andrzej Pietrasiewicz:
Quoted 28 lines
Use the ddc pointer provided by the generic connector.
--- drivers/gpu/drm/mgag200/mgag200_mode.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)drivers/gpu/drm/mgag200/mgag200_mode.c +7
-2@@ -1678,18 +1678,19 @@ static struct drm_connector *mga_vga_init(struct drm_device *dev)return NULL ; connector = &mga_connector->base; + mga_connector->i2c =mgag200_i2c_create (dev); +if (!mga_connector->i2c) +DRM_ERROR ("failed to add ddc bus\n" ); -drm_connector_init (dev, connector, - &mga_vga_connector_funcs,DRM_MODE_CONNECTOR_VGA ); +drm_connector_init_with_ddc (dev, connector, + &mga_vga_connector_funcs, +DRM_MODE_CONNECTOR_VGA , + &mga_connector->i2c->adapter);drm_connector_helper_add (connector, &mga_vga_connector_helper_funcs);
drivers/gpu/drm/mgag200/mgag200_mode.c static struct drm_connector *mga_vga_init(struct drm_device *dev) · line 1696
Quoted 10 lines
drivers/gpu/drm/mgag200/mgag200_mode.c +0
-4drm_connector_register (connector); - mga_connector->i2c =mgag200_i2c_create (dev); -if (!mga_connector->i2c) -DRM_ERROR ("failed to add ddc bus\n" ); -return connector; }
Signature · 5 lines
Thomas Zimmermann Graphics Driver Developer SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v5 18/24 drm/ast: Provide ddc symlink in connector sysfs directory
In reply to Andrzej PietrasiewiczUse the ddc pointer provided by the generic connector.
--- drivers/gpu/drm/ast/ast_mode.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/gpu/drm/ast/ast_mode.c +8 -5
@@ -867,7 +867,14 @@ static int ast_connector_init(struct drm_device *dev)return -ENOMEM ; connector = &ast_connector->base; -drm_connector_init (dev, connector, &ast_connector_funcs,DRM_MODE_CONNECTOR_VGA ); + ast_connector->i2c =ast_i2c_create (dev); +if (!ast_connector->i2c) +DRM_ERROR ("failed to add ddc bus for connector\n" ); + +drm_connector_init_with_ddc (dev, connector, + &ast_connector_funcs, +DRM_MODE_CONNECTOR_VGA , + &ast_connector->i2c->adapter);drm_connector_helper_add (connector, &ast_connector_helper_funcs);
@@ -881,10 +888,6 @@ static int ast_connector_init(struct drm_device *dev) encoder = list_first_entry(&dev->mode_config.encoder_list, struct drm_encoder, head);drm_connector_attach_encoder (connector, encoder); - ast_connector->i2c =ast_i2c_create (dev); -if (!ast_connector->i2c) -DRM_ERROR ("failed to add ddc bus for connector\n" ); -return 0 ; }
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v5 18/24] drm/ast: Provide ddc symlink in connector sysfs directory
Am 24.07.19 um 15:59 schrieb Andrzej Pietrasiewicz:
Quoted 29 lines
Use the ddc pointer provided by the generic connector.
Signed-off-by Andrzej Pietrasiewicz <[email protected]>--- drivers/gpu/drm/ast/ast_mode.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)drivers/gpu/drm/ast/ast_mode.c +8
-1@@ -867,7 +867,14 @@ static int ast_connector_init(struct drm_device *dev)return -ENOMEM ; connector = &ast_connector->base; -drm_connector_init (dev, connector, &ast_connector_funcs,DRM_MODE_CONNECTOR_VGA ); + ast_connector->i2c =ast_i2c_create (dev); +if (!ast_connector->i2c) +DRM_ERROR ("failed to add ddc bus for connector\n" ); + +drm_connector_init_with_ddc (dev, connector, + &ast_connector_funcs, +DRM_MODE_CONNECTOR_VGA , + &ast_connector->i2c->adapter);drm_connector_helper_add (connector, &ast_connector_helper_funcs);
drivers/gpu/drm/ast/ast_mode.c static int ast_connector_init(struct drm_device *dev) · line 893
Quoted 10 lines
drivers/gpu/drm/ast/ast_mode.c +0
-4@@ -881,10 +888,6 @@ static int ast_connector_init(struct drm_device *dev) encoder = list_first_entry(&dev->mode_config.encoder_list, struct drm_encoder, head);drm_connector_attach_encoder (connector, encoder); - ast_connector->i2c =ast_i2c_create (dev); -if (!ast_connector->i2c) -DRM_ERROR ("failed to add ddc bus for connector\n" ); -return 0 ; }
Signature · 5 lines
Thomas Zimmermann Graphics Driver Developer SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 19/24 drm/bridge: dumb-vga-dac: Provide ddc symlink in connector sysfs directory
In reply to Andrzej PietrasiewiczUse the ddc pointer provided by the generic connector.
--- drivers/gpu/drm/bridge/dumb-vga-dac.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
drivers/gpu/drm/bridge/dumb-vga-dac.c +13 -12
@@ -20,7 +20,6 @@ struct dumb_vga {struct drm_bridge bridge;struct drm_connector connector; -struct i2c_adapter *ddc;struct regulator *vdd; };
@@ -42,10 +41,10 @@ static int dumb_vga_get_modes(struct drm_connector *connector)struct edid *edid;int ret; -if (IS_ERR (vga->ddc)) +if (IS_ERR (vga->connector.ddc)) goto fallback; - edid =drm_get_edid (connector, vga->ddc); + edid =drm_get_edid (connector, vga->connector.ddc);if (!edid) {DRM_INFO ("EDID readout failed, falling back to standard modes\n" ); goto fallback;
@@ -84,7 +83,7 @@ dumb_vga_connector_detect(struct drm_connector *connector, bool force)* wire the DDC pins, or the I2C bus might not be working at * all. */ -if (!IS_ERR (vga->ddc) &&drm_probe_ddc (vga->ddc)) +if (!IS_ERR (vga->connector.ddc) &&drm_probe_ddc (vga->connector.ddc))return connector_status_connected;return connector_status_unknown;
@@ -111,8 +110,10 @@ static int dumb_vga_attach(struct drm_bridge *bridge)drm_connector_helper_add (&vga->connector, &dumb_vga_con_helper_funcs); - ret =drm_connector_init (bridge->dev, &vga->connector, - &dumb_vga_con_funcs,DRM_MODE_CONNECTOR_VGA ); + ret =drm_connector_init_with_ddc (bridge->dev, &vga->connector, + &dumb_vga_con_funcs, +DRM_MODE_CONNECTOR_VGA , + vga->connector.ddc);if (ret) {DRM_ERROR ("Failed to initialize connector\n" );return ret;
@@ -190,14 +191,14 @@ static int dumb_vga_probe(struct platform_device *pdev)dev_dbg (&pdev->dev,"No vdd regulator found: %d\n" , ret); } - vga->ddc =dumb_vga_retrieve_ddc (&pdev->dev); -if (IS_ERR (vga->ddc)) { -if (PTR_ERR (vga->ddc) == -ENODEV ) { + vga->connector.ddc =dumb_vga_retrieve_ddc (&pdev->dev); +if (IS_ERR (vga->connector.ddc)) { +if (PTR_ERR (vga->connector.ddc) == -ENODEV ) {dev_dbg (&pdev->dev,"No i2c bus specified. Disabling EDID readout\n" ); }else {dev_err (&pdev->dev,"Couldn't retrieve i2c bus\n" ); -return PTR_ERR (vga->ddc); +return PTR_ERR (vga->connector.ddc); } }
@@ -216,8 +217,8 @@ static int dumb_vga_remove(struct platform_device *pdev)drm_bridge_remove (&vga->bridge); -if (!IS_ERR (vga->ddc)) -i2c_put_adapter (vga->ddc); +if (!IS_ERR (vga->connector.ddc)) +i2c_put_adapter (vga->connector.ddc);return 0 ; }
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 20/24 drm/bridge: dw-hdmi: Provide ddc symlink in connector sysfs directory
In reply to Andrzej PietrasiewiczUse the ddc pointer provided by the generic connector.
--- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 46 ++++++++++++----------- 1 file changed, 24 insertions(+), 22 deletions(-)
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +24 -22
@@ -161,7 +161,6 @@ struct dw_hdmi {struct drm_display_mode previous_mode; -struct i2c_adapter *ddc;void __iomem *regs;bool sink_is_hdmi;bool sink_has_audio;
@@ -1133,7 +1132,7 @@ static bool dw_hdmi_support_scdc(struct dw_hdmi *hdmi)return false;/* Disable if no DDC bus */ -if (!hdmi->ddc) +if (!hdmi->connector.ddc)return false;/* Disable if SCDC is not supported, or if an HF-VSDB block is absent */
@@ -1171,10 +1170,11 @@ void dw_hdmi_set_high_tmds_clock_ratio(struct dw_hdmi *hdmi)/* Control for TMDS Bit Period/TMDS Clock-Period Ratio */ if (dw_hdmi_support_scdc (hdmi)) { +struct i2c_adapter *ddc = hdmi->connector.ddc;if (mtmdsclock >HDMI14_MAX_TMDSCLK ) -drm_scdc_set_high_tmds_clock_ratio (hdmi->ddc,1 ); +drm_scdc_set_high_tmds_clock_ratio (ddc,1 );else -drm_scdc_set_high_tmds_clock_ratio (hdmi->ddc,0 ); +drm_scdc_set_high_tmds_clock_ratio (ddc,0 ); } }EXPORT_SYMBOL_GPL (dw_hdmi_set_high_tmds_clock_ratio);
@@ -1765,6 +1765,7 @@ static void hdmi_av_composer(struct dw_hdmi *hdmi,if (dw_hdmi_support_scdc (hdmi)) {if (vmode->mtmdsclock >HDMI14_MAX_TMDSCLK || hdmi_info->scdc.scrambling.low_rates) { +struct i2c_adapter *ddc = hdmi->connector.ddc;/* * HDMI2.0 Specifies the following procedure: * After the Source Device has determined that
@@ -1774,13 +1775,12 @@ static void hdmi_av_composer(struct dw_hdmi *hdmi,* Source Devices compliant shall set the * Source Version = 1. */ -drm_scdc_readb (hdmi->ddc,SCDC_SINK_VERSION , - &bytes); -drm_scdc_writeb (hdmi->ddc,SCDC_SOURCE_VERSION , +drm_scdc_readb (ddc,SCDC_SINK_VERSION , &bytes); +drm_scdc_writeb (ddc,SCDC_SOURCE_VERSION ,min_t (u8, bytes,SCDC_MIN_SOURCE_VERSION ));/* Enabled Scrambling in the Sink */ -drm_scdc_set_scrambling (hdmi->ddc,1 ); +drm_scdc_set_scrambling (hdmi->connector.ddc,1 );/* * To activate the scrambler feature, you must ensure
@@ -1796,7 +1796,7 @@ static void hdmi_av_composer(struct dw_hdmi *hdmi,hdmi_writeb (hdmi,0 ,HDMI_FC_SCRAMBLER_CTRL );hdmi_writeb (hdmi, (u8 )~HDMI_MC_SWRSTZ_TMDSSWRST_REQ ,HDMI_MC_SWRSTZ ); -drm_scdc_set_scrambling (hdmi->ddc,0 ); +drm_scdc_set_scrambling (hdmi->connector.ddc,0 ); } }
@@ -2142,10 +2142,10 @@ static int dw_hdmi_connector_get_modes(struct drm_connector *connector)struct edid *edid;int ret =0 ; -if (!hdmi->ddc) +if (!hdmi->connector.ddc)return 0 ; - edid =drm_get_edid (connector, hdmi->ddc); + edid =drm_get_edid (connector, hdmi->connector.ddc);if (edid) {dev_dbg (hdmi->dev,"got edid: width[%d] x height[%d]\n" , edid->width_cm, edid->height_cm);
@@ -2200,8 +2200,10 @@ static int dw_hdmi_bridge_attach(struct drm_bridge *bridge)drm_connector_helper_add (connector, &dw_hdmi_connector_helper_funcs); -drm_connector_init (bridge->dev, connector, &dw_hdmi_connector_funcs, -DRM_MODE_CONNECTOR_HDMIA ); +drm_connector_init_with_ddc (bridge->dev, connector, + &dw_hdmi_connector_funcs, +DRM_MODE_CONNECTOR_HDMIA , + connector->ddc);drm_connector_attach_encoder (connector, encoder);
@@ -2563,9 +2565,9 @@ __dw_hdmi_probe(struct platform_device *pdev, ddc_node =of_parse_phandle (np,"ddc-i2c-bus" ,0 );if (ddc_node) { - hdmi->ddc =of_get_i2c_adapter_by_node (ddc_node); + hdmi->connector.ddc =of_get_i2c_adapter_by_node (ddc_node);of_node_put (ddc_node); -if (!hdmi->ddc) { +if (!hdmi->connector.ddc) {dev_dbg (hdmi->dev,"failed to read ddc node\n" );return ERR_PTR (-EPROBE_DEFER ); }
@@ -2704,7 +2706,7 @@ __dw_hdmi_probe(struct platform_device *pdev,hdmi_init_clk_regenerator (hdmi);/* If DDC bus is not specified, try to register HDMI I2C bus */ -if (!hdmi->ddc) { +if (!hdmi->connector.ddc) {/* Look for (optional) stuff related to unwedging */ hdmi->pinctrl =devm_pinctrl_get (dev);if (!IS_ERR (hdmi->pinctrl)) {
@@ -2723,9 +2725,9 @@ __dw_hdmi_probe(struct platform_device *pdev, } } - hdmi->ddc =dw_hdmi_i2c_adapter (hdmi); -if (IS_ERR (hdmi->ddc)) - hdmi->ddc =NULL ; + hdmi->connector.ddc =dw_hdmi_i2c_adapter (hdmi); +if (IS_ERR (hdmi->connector.ddc)) + hdmi->connector.ddc =NULL ; } hdmi->bridge.driver_private = hdmi;
@@ -2791,7 +2793,7 @@ __dw_hdmi_probe(struct platform_device *pdev, err_iahb:if (hdmi->i2c) {i2c_del_adapter (&hdmi->i2c->adap); - hdmi->ddc =NULL ; + hdmi->connector.ddc =NULL ; }if (hdmi->cec_notifier)
@@ -2803,7 +2805,7 @@ __dw_hdmi_probe(struct platform_device *pdev, err_isfr:clk_disable_unprepare (hdmi->isfr_clk); err_res: -i2c_put_adapter (hdmi->ddc); +i2c_put_adapter (hdmi->connector.ddc);return ERR_PTR (ret); }
@@ -2829,7 +2831,7 @@ static void __dw_hdmi_remove(struct dw_hdmi *hdmi)if (hdmi->i2c)i2c_del_adapter (&hdmi->i2c->adap);else -i2c_put_adapter (hdmi->ddc); +i2c_put_adapter (hdmi->connector.ddc); }/* -----------------------------------------------------------------------------
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v5 21/24 drm/bridge: ti-tfp410: Provide ddc symlink in connector sysfs directory
In reply to Andrzej PietrasiewiczUse the ddc pointer provided by the generic connector.
--- drivers/gpu/drm/bridge/ti-tfp410.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
drivers/gpu/drm/bridge/ti-tfp410.c +13 -12
@@ -26,7 +26,6 @@ struct tfp410 {unsigned int connector_type;u32 bus_format; -struct i2c_adapter *ddc;struct gpio_desc *hpd;int hpd_irq;struct delayed_work hpd_work;
@@ -55,10 +54,10 @@ static int tfp410_get_modes(struct drm_connector *connector)struct edid *edid;int ret; -if (!dvi->ddc) +if (!dvi->connector.ddc) goto fallback; - edid =drm_get_edid (connector, dvi->ddc); + edid =drm_get_edid (connector, dvi->connector.ddc);if (!edid) {DRM_INFO ("EDID read failed. Fallback to standard modes\n" ); goto fallback;
@@ -98,8 +97,8 @@ tfp410_connector_detect(struct drm_connector *connector, bool force)return connector_status_disconnected; } -if (dvi->ddc) { -if (drm_probe_ddc (dvi->ddc)) +if (dvi->connector.ddc) { +if (drm_probe_ddc (dvi->connector.ddc))return connector_status_connected;else return connector_status_disconnected;
@@ -134,8 +133,10 @@ static int tfp410_attach(struct drm_bridge *bridge)drm_connector_helper_add (&dvi->connector, &tfp410_con_helper_funcs); - ret =drm_connector_init (bridge->dev, &dvi->connector, - &tfp410_con_funcs, dvi->connector_type); + ret =drm_connector_init_with_ddc (bridge->dev, &dvi->connector, + &tfp410_con_funcs, + dvi->connector_type, + dvi->connector.ddc);if (ret) {dev_err (dvi->dev,"drm_connector_init() failed: %d\n" , ret);return ret;
@@ -297,8 +298,8 @@ static int tfp410_get_connector_properties(struct tfp410 *dvi)if (!ddc_phandle) goto fail; - dvi->ddc =of_get_i2c_adapter_by_node (ddc_phandle); -if (dvi->ddc) + dvi->connector.ddc =of_get_i2c_adapter_by_node (ddc_phandle); +if (dvi->connector.ddc)dev_info (dvi->dev,"Connector's ddc i2c bus found\n" );else ret = -EPROBE_DEFER ;
@@ -367,7 +368,7 @@ static int tfp410_init(struct device *dev, bool i2c)return 0 ; fail: -i2c_put_adapter (dvi->ddc); +i2c_put_adapter (dvi->connector.ddc);if (dvi->hpd)gpiod_put (dvi->hpd);return ret;
@@ -382,8 +383,8 @@ static int tfp410_fini(struct device *dev)drm_bridge_remove (&dvi->bridge); -if (dvi->ddc) -i2c_put_adapter (dvi->ddc); +if (dvi->connector.ddc) +i2c_put_adapter (dvi->connector.ddc);if (dvi->hpd)gpiod_put (dvi->hpd);
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 22/24 drm/amdgpu: Provide ddc symlink in connector sysfs directory
In reply to Andrzej PietrasiewiczUse the ddc pointer provided by the generic connector.
--- .../gpu/drm/amd/amdgpu/amdgpu_connectors.c | 95 ++++++++++++++----- 1 file changed, 69 insertions(+), 26 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +69 -26
@@ -1574,17 +1574,21 @@ amdgpu_connector_add(struct amdgpu_device *adev, amdgpu_connector->con_priv = amdgpu_dig_connector;if (i2c_bus->valid) { amdgpu_connector->ddc_bus =amdgpu_i2c_lookup (adev, i2c_bus); -if (amdgpu_connector->ddc_bus) +if (amdgpu_connector->ddc_bus) { has_aux = true; -else + connector->ddc = &amdgpu_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, &amdgpu_connector->base, - &amdgpu_connector_dp_funcs, connector_type); +drm_connector_init_with_ddc (dev, &amdgpu_connector->base, + &amdgpu_connector_dp_funcs, + connector_type, + amdgpu_connector->base.ddc);drm_connector_helper_add (&amdgpu_connector->base, &amdgpu_connector_dp_helper_funcs); connector->interlace_allowed = true;
@@ -1602,8 +1606,10 @@ amdgpu_connector_add(struct amdgpu_device *adev,case DRM_MODE_CONNECTOR_HDMIA :case DRM_MODE_CONNECTOR_HDMIB :case DRM_MODE_CONNECTOR_DisplayPort: -drm_connector_init (dev, &amdgpu_connector->base, - &amdgpu_connector_dp_funcs, connector_type); +drm_connector_init_with_ddc (dev, &amdgpu_connector->base, + &amdgpu_connector_dp_funcs, + connector_type, + amdgpu_connector->base.ddc);drm_connector_helper_add (&amdgpu_connector->base, &amdgpu_connector_dp_helper_funcs); drm_object_attach_property(&amdgpu_connector->base.base,
@@ -1644,8 +1650,10 @@ amdgpu_connector_add(struct amdgpu_device *adev,break ;case DRM_MODE_CONNECTOR_LVDS :case DRM_MODE_CONNECTOR_eDP: -drm_connector_init (dev, &amdgpu_connector->base, - &amdgpu_connector_edp_funcs, connector_type); +drm_connector_init_with_ddc (dev, &amdgpu_connector->base, + &amdgpu_connector_edp_funcs, + connector_type, + amdgpu_connector->base.ddc);drm_connector_helper_add (&amdgpu_connector->base, &amdgpu_connector_dp_helper_funcs); drm_object_attach_property(&amdgpu_connector->base.base,
@@ -1659,13 +1667,18 @@ amdgpu_connector_add(struct amdgpu_device *adev, }else {switch (connector_type) {case DRM_MODE_CONNECTOR_VGA : -drm_connector_init (dev, &amdgpu_connector->base, &amdgpu_connector_vga_funcs, connector_type); -drm_connector_helper_add (&amdgpu_connector->base, &amdgpu_connector_vga_helper_funcs);if (i2c_bus->valid) { amdgpu_connector->ddc_bus =amdgpu_i2c_lookup (adev, i2c_bus);if (!amdgpu_connector->ddc_bus)DRM_ERROR ("VGA: Failed to assign ddc bus! Check dmesg for i2c errors.\n" ); +else + connector->ddc = &amdgpu_connector->ddc_bus->adapter; } +drm_connector_init_with_ddc (dev, &amdgpu_connector->base, + &amdgpu_connector_vga_funcs, + connector_type, + amdgpu_connector->base.ddc); +drm_connector_helper_add (&amdgpu_connector->base, &amdgpu_connector_vga_helper_funcs); amdgpu_connector->dac_load_detect = true; drm_object_attach_property(&amdgpu_connector->base.base, adev->mode_info.load_detect_property,
@@ -1679,13 +1692,18 @@ amdgpu_connector_add(struct amdgpu_device *adev, connector->doublescan_allowed = true;break ;case DRM_MODE_CONNECTOR_DVIA : -drm_connector_init (dev, &amdgpu_connector->base, &amdgpu_connector_vga_funcs, connector_type); -drm_connector_helper_add (&amdgpu_connector->base, &amdgpu_connector_vga_helper_funcs);if (i2c_bus->valid) { amdgpu_connector->ddc_bus =amdgpu_i2c_lookup (adev, i2c_bus);if (!amdgpu_connector->ddc_bus)DRM_ERROR ("DVIA: Failed to assign ddc bus! Check dmesg for i2c errors.\n" ); +else + connector->ddc = &amdgpu_connector->ddc_bus->adapter; } +drm_connector_init_with_ddc (dev, &amdgpu_connector->base, + &amdgpu_connector_vga_funcs, + connector_type, + amdgpu_connector->base.ddc); +drm_connector_helper_add (&amdgpu_connector->base, &amdgpu_connector_vga_helper_funcs); amdgpu_connector->dac_load_detect = true; drm_object_attach_property(&amdgpu_connector->base.base, adev->mode_info.load_detect_property,
@@ -1704,13 +1722,18 @@ amdgpu_connector_add(struct amdgpu_device *adev,if (!amdgpu_dig_connector) goto failed; amdgpu_connector->con_priv = amdgpu_dig_connector; -drm_connector_init (dev, &amdgpu_connector->base, &amdgpu_connector_dvi_funcs, connector_type); -drm_connector_helper_add (&amdgpu_connector->base, &amdgpu_connector_dvi_helper_funcs);if (i2c_bus->valid) { amdgpu_connector->ddc_bus =amdgpu_i2c_lookup (adev, i2c_bus);if (!amdgpu_connector->ddc_bus)DRM_ERROR ("DVI: Failed to assign ddc bus! Check dmesg for i2c errors.\n" ); +else + connector->ddc = &amdgpu_connector->ddc_bus->adapter; } +drm_connector_init_with_ddc (dev, &amdgpu_connector->base, + &amdgpu_connector_dvi_funcs, + connector_type, + amdgpu_connector->base.ddc); +drm_connector_helper_add (&amdgpu_connector->base, &amdgpu_connector_dvi_helper_funcs); subpixel_order = SubPixelHorizontalRGB; drm_object_attach_property(&amdgpu_connector->base.base, adev->mode_info.coherent_mode_property,
@@ -1754,13 +1777,18 @@ amdgpu_connector_add(struct amdgpu_device *adev,if (!amdgpu_dig_connector) goto failed; amdgpu_connector->con_priv = amdgpu_dig_connector; -drm_connector_init (dev, &amdgpu_connector->base, &amdgpu_connector_dvi_funcs, connector_type); -drm_connector_helper_add (&amdgpu_connector->base, &amdgpu_connector_dvi_helper_funcs);if (i2c_bus->valid) { amdgpu_connector->ddc_bus =amdgpu_i2c_lookup (adev, i2c_bus);if (!amdgpu_connector->ddc_bus)DRM_ERROR ("HDMI: Failed to assign ddc bus! Check dmesg for i2c errors.\n" ); +else + connector->ddc = &amdgpu_connector->ddc_bus->adapter; } +drm_connector_init_with_ddc (dev, &amdgpu_connector->base, + &amdgpu_connector_dvi_funcs, + connector_type, + amdgpu_connector->base.ddc); +drm_connector_helper_add (&amdgpu_connector->base, &amdgpu_connector_dvi_helper_funcs);drm_object_attach_property (&amdgpu_connector->base.base, adev->mode_info.coherent_mode_property,1 );
@@ -1796,15 +1824,20 @@ amdgpu_connector_add(struct amdgpu_device *adev,if (!amdgpu_dig_connector) goto failed; amdgpu_connector->con_priv = amdgpu_dig_connector; -drm_connector_init (dev, &amdgpu_connector->base, &amdgpu_connector_dp_funcs, connector_type); -drm_connector_helper_add (&amdgpu_connector->base, &amdgpu_connector_dp_helper_funcs);if (i2c_bus->valid) { amdgpu_connector->ddc_bus =amdgpu_i2c_lookup (adev, i2c_bus); -if (amdgpu_connector->ddc_bus) +if (amdgpu_connector->ddc_bus) { has_aux = true; -else + connector->ddc = &amdgpu_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, &amdgpu_connector->base, + &amdgpu_connector_dp_funcs, + connector_type, + amdgpu_connector->base.ddc); +drm_connector_helper_add (&amdgpu_connector->base, &amdgpu_connector_dp_helper_funcs); subpixel_order = SubPixelHorizontalRGB; drm_object_attach_property(&amdgpu_connector->base.base, adev->mode_info.coherent_mode_property,
@@ -1838,15 +1871,20 @@ amdgpu_connector_add(struct amdgpu_device *adev,if (!amdgpu_dig_connector) goto failed; amdgpu_connector->con_priv = amdgpu_dig_connector; -drm_connector_init (dev, &amdgpu_connector->base, &amdgpu_connector_edp_funcs, connector_type); -drm_connector_helper_add (&amdgpu_connector->base, &amdgpu_connector_dp_helper_funcs);if (i2c_bus->valid) { amdgpu_connector->ddc_bus =amdgpu_i2c_lookup (adev, i2c_bus); -if (amdgpu_connector->ddc_bus) +if (amdgpu_connector->ddc_bus) { has_aux = true; -else + connector->ddc = &amdgpu_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, &amdgpu_connector->base, + &amdgpu_connector_edp_funcs, + connector_type, + amdgpu_connector->base.ddc); +drm_connector_helper_add (&amdgpu_connector->base, &amdgpu_connector_dp_helper_funcs);drm_object_attach_property (&amdgpu_connector->base.base, dev->mode_config.scaling_mode_property,DRM_MODE_SCALE_FULLSCREEN );
@@ -1859,13 +1897,18 @@ amdgpu_connector_add(struct amdgpu_device *adev,if (!amdgpu_dig_connector) goto failed; amdgpu_connector->con_priv = amdgpu_dig_connector; -drm_connector_init (dev, &amdgpu_connector->base, &amdgpu_connector_lvds_funcs, connector_type); -drm_connector_helper_add (&amdgpu_connector->base, &amdgpu_connector_lvds_helper_funcs);if (i2c_bus->valid) { amdgpu_connector->ddc_bus =amdgpu_i2c_lookup (adev, i2c_bus);if (!amdgpu_connector->ddc_bus)DRM_ERROR ("LVDS: Failed to assign ddc bus! Check dmesg for i2c errors.\n" ); +else + connector->ddc = &amdgpu_connector->ddc_bus->adapter; } +drm_connector_init_with_ddc (dev, &amdgpu_connector->base, + &amdgpu_connector_lvds_funcs, + connector_type, + amdgpu_connector->base.ddc); +drm_connector_helper_add (&amdgpu_connector->base, &amdgpu_connector_lvds_helper_funcs);drm_object_attach_property (&amdgpu_connector->base.base, dev->mode_config.scaling_mode_property,DRM_MODE_SCALE_FULLSCREEN );
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for Associate ddc adapters with connectors (rev2)
In reply to Andrzej Pietrasiewicz== Series Details ==
== Series Details ==
Series: Associate ddc adapters with connectors (rev2)
URL : https://patchwork.freedesktop.org/series/63558/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 8ca228e56f33 drm: Include ddc adapter pointer in struct drm_connector c9a7fb60189d drm: Add drm_connector_init() variant with ddc 4adc3b29752a drm/exynos: Provide ddc symlink in connector's sysfs 7395cfe8627d drm: rockchip: Provide ddc symlink in rk3066_hdmi sysfs directory a1de63da5081 drm: rockchip: Provide ddc symlink in inno_hdmi sysfs directory 9458c216387c drm/msm/hdmi: Provide ddc symlink in hdmi connector sysfs directory e1ee513d8c74 drm/sun4i: hdmi: Provide ddc symlink in sun4i hdmi connector sysfs directory e50a1716e2a6 drm/mediatek: Provide ddc symlink in hdmi connector sysfs directory b1070c17513f drm/tegra: Provide ddc symlink in output connector sysfs directory f1b20c1372ed drm/imx: imx-ldb: Provide ddc symlink in connector's sysfs c33c830e605c drm/imx: imx-tve: Provide ddc symlink in connector's sysfs 98b2fbe1c2b7 drm/vc4: Provide ddc symlink in connector sysfs directory 975079bf7bd6 drm: zte: Provide ddc symlink in hdmi connector sysfs directory f891547e71d1 drm: zte: Provide ddc symlink in vga connector sysfs directory db0fc0b283fb drm/tilcdc: Provide ddc symlink in connector sysfs directory 3be6cd6369b3 drm: sti: Provide ddc symlink in hdmi connector sysfs directory e942b331112e drm/mgag200: Provide ddc symlink in connector sysfs directory 71c7598ecb86 drm/ast: Provide ddc symlink in connector sysfs directory 7cc49c5721e4 drm/bridge: dumb-vga-dac: Provide ddc symlink in connector sysfs directory d4f140364daa drm/bridge: dw-hdmi: Provide ddc symlink in connector sysfs directory -:63: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #63: FILE: drivers/gpu/drm/bridge/synopsys/dw-hdmi.c:1780: + drm_scdc_writeb(ddc, SCDC_SOURCE_VERSION, min_t(u8, bytes, SCDC_MIN_SOURCE_VERSION));
total: 0 errors, 0 warnings, 1 checks, 138 lines checkedfc6b3922897e drm/bridge: ti-tfp410: Provide ddc symlink in connector sysfs directory 4fcc4559e922 drm/amdgpu: Provide ddc symlink in connector sysfs directory -:83: WARNING:LONG_LINE: line over 100 characters
#83: FILE: drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c:1681:
+ drm_connector_helper_add(&amdgpu_connector->base, &amdgpu_connector_vga_helper_funcs);
-:104: WARNING:LONG_LINE: line over 100 characters #104: FILE: drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c:1706:
+ drm_connector_helper_add(&amdgpu_connector->base, &amdgpu_connector_vga_helper_funcs);
-:125: WARNING:LONG_LINE: line over 100 characters #125: FILE: drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c:1736:
+ drm_connector_helper_add(&amdgpu_connector->base, &amdgpu_connector_dvi_helper_funcs);
-:146: WARNING:LONG_LINE: line over 100 characters #146: FILE: drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c:1791:
+ drm_connector_helper_add(&amdgpu_connector->base, &amdgpu_connector_dvi_helper_funcs);
-:171: WARNING:LONG_LINE: line over 100 characters #171: FILE: drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c:1840:
+ drm_connector_helper_add(&amdgpu_connector->base, &amdgpu_connector_dp_helper_funcs);
-:196: WARNING:LONG_LINE: line over 100 characters #196: FILE: drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c:1887:
+ drm_connector_helper_add(&amdgpu_connector->base, &amdgpu_connector_dp_helper_funcs);
-:217: WARNING:LONG_LINE: line over 100 characters #217: FILE: drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c:1911:
+ drm_connector_helper_add(&amdgpu_connector->base, &amdgpu_connector_lvds_helper_funcs);
total: 0 errors, 7 warnings, 0 checks, 197 lines checked 1b35dc189ae3 drm/radeon: Provide ddc symlink in connector sysfs directory -:83: WARNING:LONG_LINE: line over 100 characters
#83: FILE: drivers/gpu/drm/radeon/radeon_connectors.c:2064:
+ drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);
-:104: WARNING:LONG_LINE: line over 100 characters #104: FILE: drivers/gpu/drm/radeon/radeon_connectors.c:2094:
+ drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);
-:125: WARNING:LONG_LINE: line over 100 characters #125: FILE: drivers/gpu/drm/radeon/radeon_connectors.c:2130:
+ drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs);
-:146: WARNING:LONG_LINE: line over 100 characters #146: FILE: drivers/gpu/drm/radeon/radeon_connectors.c:2192:
+ drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs);
-:171: WARNING:LONG_LINE: line over 100 characters #171: FILE: drivers/gpu/drm/radeon/radeon_connectors.c:2249:
+ drm_connector_helper_add(&radeon_connector->base, &radeon_dp_connector_helper_funcs);
-:196: WARNING:LONG_LINE: line over 100 characters #196: FILE: drivers/gpu/drm/radeon/radeon_connectors.c:2304:
+ drm_connector_helper_add(&radeon_connector->base, &radeon_dp_connector_helper_funcs);
-:229: WARNING:LONG_LINE: line over 100 characters #229: FILE: drivers/gpu/drm/radeon/radeon_connectors.c:2349:
+ drm_connector_helper_add(&radeon_connector->base, &radeon_lvds_connector_helper_funcs);
-:250: WARNING:LONG_LINE: line over 100 characters #250: FILE: drivers/gpu/drm/radeon/radeon_connectors.c:2438:
+ drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);
-:271: WARNING:LONG_LINE: line over 100 characters #271: FILE: drivers/gpu/drm/radeon/radeon_connectors.c:2460:
+ drm_connector_helper_add(&radeon_connector->base, &radeon_vga_connector_helper_funcs);
-:292: WARNING:LONG_LINE: line over 100 characters #292: FILE: drivers/gpu/drm/radeon/radeon_connectors.c:2483:
+ drm_connector_helper_add(&radeon_connector->base, &radeon_dvi_connector_helper_funcs);
-:325: WARNING:LONG_LINE: line over 100 characters #325: FILE: drivers/gpu/drm/radeon/radeon_connectors.c:2536:
+ drm_connector_helper_add(&radeon_connector->base, &radeon_lvds_connector_helper_funcs);
total: 0 errors, 11 warnings, 0 checks, 299 lines checked 487373549079 drm/i915: Provide ddc symlink in hdmi connector sysfs directory
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Associate ddc adapters with connectors (rev2)
In reply to Andrzej Pietrasiewicz== Series Details ==
== Series Details ==
Series: Associate ddc adapters with connectors (rev2)
URL : https://patchwork.freedesktop.org/series/63558/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6545 -> Patchwork_13736
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/
Known issues
------------
Here are the changes found in Patchwork_13736 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_module_load@reload-no-display:
- fi-icl-u3: [PASS][1] -> [DMESG-WARN][2] ([fdo#107724])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/fi-icl-u3/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/fi-icl-u3/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [PASS][3] -> [FAIL][4] ([fdo#109485])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/fi-kbl-7500u/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/fi-kbl-7500u/igt@[email protected]
* igt@kms_frontbuffer_tracking@basic:
- fi-icl-guc: [PASS][5] -> [FAIL][6] ([fdo#103167])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/fi-icl-guc/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/fi-icl-guc/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_create@basic-files:
- fi-icl-u2: [INCOMPLETE][7] ([fdo#107713] / [fdo#109100]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/fi-icl-u2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/fi-icl-u2/igt@[email protected]
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7567u: [WARN][9] ([fdo#109380]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/fi-kbl-7567u/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/fi-kbl-7567u/igt@[email protected]
* igt@kms_frontbuffer_tracking@basic:
- fi-icl-u3: [FAIL][11] ([fdo#103167]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/fi-icl-u3/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/fi-icl-u3/igt@[email protected]
- {fi-icl-u4}: [FAIL][13] ([fdo#103167]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/fi-icl-u4/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/fi-icl-u4/igt@[email protected]
* igt@kms_pipe_crc_basic@read-crc-pipe-c:
- fi-kbl-7567u: [SKIP][15] ([fdo#109271]) -> [PASS][16] +23 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/fi-kbl-7567u/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/fi-kbl-7567u/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#102505]: https://bugs.freedesktop.org/show_bug.cgi?id=102505
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109380]: https://bugs.freedesktop.org/show_bug.cgi?id=109380
[fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485
[fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
[fdo#111046 ]: https://bugs.freedesktop.org/show_bug.cgi?id=111046
[fdo#111049]: https://bugs.freedesktop.org/show_bug.cgi?id=111049
Participating hosts (52 -> 44)
------------------------------
Additional (1): fi-skl-gvtdvm
Missing (9): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y fi-bdw-samus fi-byt-clapper fi-skl-6700k2
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6545 -> Patchwork_13736
CI-20190529: 20190529
CI_DRM_6545: a6efe73f1e086c7935d56b08342f9e1c5565fcf3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5109: e5fd509e16ec649436be31f38eaa5b85cb7f72f1 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13736: 487373549079a66faee3f96549b7cc375ced6bf8 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
487373549079 drm/i915: Provide ddc symlink in hdmi connector sysfs directory 1b35dc189ae3 drm/radeon: Provide ddc symlink in connector sysfs directory 4fcc4559e922 drm/amdgpu: Provide ddc symlink in connector sysfs directory fc6b3922897e drm/bridge: ti-tfp410: Provide ddc symlink in connector sysfs directory d4f140364daa drm/bridge: dw-hdmi: Provide ddc symlink in connector sysfs directory 7cc49c5721e4 drm/bridge: dumb-vga-dac: Provide ddc symlink in connector sysfs directory 71c7598ecb86 drm/ast: Provide ddc symlink in connector sysfs directory e942b331112e drm/mgag200: Provide ddc symlink in connector sysfs directory 3be6cd6369b3 drm: sti: Provide ddc symlink in hdmi connector sysfs directory db0fc0b283fb drm/tilcdc: Provide ddc symlink in connector sysfs directory f891547e71d1 drm: zte: Provide ddc symlink in vga connector sysfs directory 975079bf7bd6 drm: zte: Provide ddc symlink in hdmi connector sysfs directory 98b2fbe1c2b7 drm/vc4: Provide ddc symlink in connector sysfs directory c33c830e605c drm/imx: imx-tve: Provide ddc symlink in connector's sysfs f1b20c1372ed drm/imx: imx-ldb: Provide ddc symlink in connector's sysfs b1070c17513f drm/tegra: Provide ddc symlink in output connector sysfs directory e50a1716e2a6 drm/mediatek: Provide ddc symlink in hdmi connector sysfs directory e1ee513d8c74 drm/sun4i: hdmi: Provide ddc symlink in sun4i hdmi connector sysfs directory 9458c216387c drm/msm/hdmi: Provide ddc symlink in hdmi connector sysfs directory a1de63da5081 drm: rockchip: Provide ddc symlink in inno_hdmi sysfs directory 7395cfe8627d drm: rockchip: Provide ddc symlink in rk3066_hdmi sysfs directory 4adc3b29752a drm/exynos: Provide ddc symlink in connector's sysfs c9a7fb60189d drm: Add drm_connector_init() variant with ddc8ca228e56f33 drm: Include ddc adapter pointer in struct drm_connector
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for Associate ddc adapters with connectors (rev2)
In reply to Andrzej Pietrasiewicz== Series Details ==
== Series Details ==
Series: Associate ddc adapters with connectors (rev2)
URL : https://patchwork.freedesktop.org/series/63558/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6545_full -> Patchwork_13736_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_13736_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_tiled_swapping@non-threaded:
- shard-apl: [PASS][1] -> [DMESG-WARN][2] ([fdo#108686])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-apl5/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-apl4/igt@[email protected]
* igt@i915_pm_rc6_residency@rc6-accuracy:
- shard-kbl: [PASS][3] -> [SKIP][4] ([fdo#109271])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-kbl1/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-kbl2/igt@[email protected]
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-apl: [PASS][5] -> [DMESG-WARN][6] ([fdo#108566]) +2 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-apl1/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-apl1/igt@[email protected]
* igt@kms_atomic_transition@plane-all-modeset-transition-fencing:
- shard-hsw: [PASS][7] -> [INCOMPLETE][8] ([fdo#103540])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-hsw5/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-hsw4/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-skl: [PASS][9] -> [INCOMPLETE][10] ([fdo#110741])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-skl6/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-skl8/igt@[email protected]
* igt@kms_flip@plain-flip-fb-recreate:
- shard-skl: [PASS][11] -> [FAIL][12] ([fdo#100368])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-skl4/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-skl1/igt@[email protected]
* igt@kms_flip_tiling@flip-to-x-tiled:
- shard-skl: [PASS][13] -> [FAIL][14] ([fdo#108134])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-skl10/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-skl1/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render:
- shard-iclb: [PASS][15] -> [FAIL][16] ([fdo#103167]) +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-iclb1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-iclb: [PASS][17] -> [INCOMPLETE][18] ([fdo#107713])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb8/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-iclb3/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-kbl: [PASS][19] -> [INCOMPLETE][20] ([fdo#103665])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-kbl3/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-kbl3/igt@[email protected]
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-iclb: [PASS][21] -> [FAIL][22] ([fdo#103166])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb7/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-iclb4/igt@[email protected]
* igt@kms_psr2_su@page_flip:
- shard-iclb: [PASS][23] -> [SKIP][24] ([fdo#109642] / [fdo#111068])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb2/igt@kms_psr2_su@page_flip.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-iclb3/igt@kms_psr2_su@page_flip.html
* igt@kms_psr@psr2_dpms:
- shard-iclb: [PASS][25] -> [SKIP][26] ([fdo#109441])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb2/igt@kms_psr@psr2_dpms.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-iclb6/igt@kms_psr@psr2_dpms.html
* igt@kms_setmode@basic:
- shard-kbl: [PASS][27] -> [FAIL][28] ([fdo#99912])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-kbl6/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-kbl4/igt@[email protected]
* igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend:
- shard-skl: [PASS][29] -> [INCOMPLETE][30] ([fdo#104108]) +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-skl3/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-skl7/igt@[email protected]
* igt@perf@blocking:
- shard-skl: [PASS][31] -> [FAIL][32] ([fdo#110728])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-skl10/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-skl1/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_balancer@smoke:
- shard-iclb: [SKIP][33] ([fdo#110854]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb6/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-iclb2/igt@[email protected]
* igt@i915_pm_rpm@i2c:
- shard-hsw: [FAIL][35] ([fdo#104097]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-hsw4/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-hsw4/igt@[email protected]
* igt@i915_selftest@live_hangcheck:
- shard-iclb: [INCOMPLETE][37] ([fdo#107713] / [fdo#108569]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb6/igt@i915_selftest@live_hangcheck.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-iclb4/igt@i915_selftest@live_hangcheck.html
* igt@kms_flip@flip-vs-expired-vblank:
- shard-skl: [FAIL][39] ([fdo#105363]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-skl9/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-skl3/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt:
- shard-iclb: [FAIL][41] ([fdo#103167]) -> [PASS][42] +2 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb6/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-iclb6/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
- shard-apl: [DMESG-WARN][43] ([fdo#108566]) -> [PASS][44] +6 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-apl7/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-apl4/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [FAIL][45] ([fdo#108145]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-skl8/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-skl6/igt@[email protected]
* igt@kms_psr@cursor_plane_onoff:
- shard-iclb: [INCOMPLETE][47] ([fdo#107713]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb1/igt@kms_psr@cursor_plane_onoff.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-iclb4/igt@kms_psr@cursor_plane_onoff.html
* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [SKIP][49] ([fdo#109441]) -> [PASS][50] +2 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb3/igt@kms_psr@psr2_cursor_mmap_cpu.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
#### Warnings ####
* igt@gem_tiled_swapping@non-threaded:
- shard-skl: [FAIL][51] ([fdo#108686]) -> [SKIP][52] ([fdo#109271])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-skl8/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-skl6/igt@[email protected]
* igt@prime_udl:
- shard-iclb: [SKIP][53] ([fdo#109291]) -> [INCOMPLETE][54] ([fdo#107713])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb8/igt@prime_udl.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/shard-iclb7/igt@prime_udl.html
[fdo#100368]: https://bugs.freedesktop.org/show_bug.cgi?id=100368
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#104097]: https://bugs.freedesktop.org/show_bug.cgi?id=104097
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108134]: https://bugs.freedesktop.org/show_bug.cgi?id=108134
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
[fdo#110741]: https://bugs.freedesktop.org/show_bug.cgi?id=110741
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (9 -> 9)
------------------------------
No changes in participating hosts
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_6545 -> Patchwork_13736
CI-20190529: 20190529
CI_DRM_6545: a6efe73f1e086c7935d56b08342f9e1c5565fcf3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5109: e5fd509e16ec649436be31f38eaa5b85cb7f72f1 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13736: 487373549079a66faee3f96549b7cc375ced6bf8 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13736/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx