From: Andrzej Pietrasiewicz <andrzej.p@collabora.com> To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, kernel@collabora.com, Rodrigo Vivi <rodrigo.vivi@intel.com> Subject: [PATCH] drm/i915: Provide ddc symlink in hdmi connector sysfs directory Date: Thu, 28 Nov 2019 14:51:06 +0100 [thread overview] Message-ID: <20191128135106.21985-1-andrzej.p@collabora.com> (raw) In-Reply-To: <874kyonvpd.fsf@intel.com> Use the ddc pointer provided by the generic connector. Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> --- Rebased onto drm-misc-next as of 28 Nov 2019 drivers/gpu/drm/i915/display/intel_hdmi.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index b54ccbb5aad5..40f32f2d8af1 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -3128,6 +3128,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, struct intel_encoder *intel_encoder = &intel_dig_port->base; struct drm_device *dev = intel_encoder->base.dev; struct drm_i915_private *dev_priv = to_i915(dev); + struct i2c_adapter *ddc; enum port port = intel_encoder->port; struct cec_connector_info conn_info; @@ -3140,8 +3141,13 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, intel_encoder->base.name)) return; - drm_connector_init(dev, connector, &intel_hdmi_connector_funcs, - DRM_MODE_CONNECTOR_HDMIA); + intel_hdmi->ddc_bus = intel_hdmi_ddc_pin(dev_priv, port); + ddc = intel_gmbus_get_adapter(dev_priv, intel_hdmi->ddc_bus); + + drm_connector_init_with_ddc(dev, connector, + &intel_hdmi_connector_funcs, + DRM_MODE_CONNECTOR_HDMIA, + ddc); drm_connector_helper_add(connector, &intel_hdmi_connector_helper_funcs); connector->interlace_allowed = 1; @@ -3151,8 +3157,6 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) connector->ycbcr_420_allowed = true; - intel_hdmi->ddc_bus = intel_hdmi_ddc_pin(dev_priv, port); - if (WARN_ON(port == PORT_A)) return; intel_encoder->hpd_pin = intel_hpd_pin_default(dev_priv, port); -- 2.17.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Andrzej Pietrasiewicz <andrzej.p@collabora.com> To: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, kernel@collabora.com Subject: [Intel-gfx] [PATCH] drm/i915: Provide ddc symlink in hdmi connector sysfs directory Date: Thu, 28 Nov 2019 14:51:06 +0100 [thread overview] Message-ID: <20191128135106.21985-1-andrzej.p@collabora.com> (raw) Message-ID: <20191128135106.5eLlv4oartnQLDO8XE2OFa38n1VZzS5Z_CtzdkWVikM@z> (raw) In-Reply-To: <874kyonvpd.fsf@intel.com> Use the ddc pointer provided by the generic connector. Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> --- Rebased onto drm-misc-next as of 28 Nov 2019 drivers/gpu/drm/i915/display/intel_hdmi.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index b54ccbb5aad5..40f32f2d8af1 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -3128,6 +3128,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, struct intel_encoder *intel_encoder = &intel_dig_port->base; struct drm_device *dev = intel_encoder->base.dev; struct drm_i915_private *dev_priv = to_i915(dev); + struct i2c_adapter *ddc; enum port port = intel_encoder->port; struct cec_connector_info conn_info; @@ -3140,8 +3141,13 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, intel_encoder->base.name)) return; - drm_connector_init(dev, connector, &intel_hdmi_connector_funcs, - DRM_MODE_CONNECTOR_HDMIA); + intel_hdmi->ddc_bus = intel_hdmi_ddc_pin(dev_priv, port); + ddc = intel_gmbus_get_adapter(dev_priv, intel_hdmi->ddc_bus); + + drm_connector_init_with_ddc(dev, connector, + &intel_hdmi_connector_funcs, + DRM_MODE_CONNECTOR_HDMIA, + ddc); drm_connector_helper_add(connector, &intel_hdmi_connector_helper_funcs); connector->interlace_allowed = 1; @@ -3151,8 +3157,6 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) connector->ycbcr_420_allowed = true; - intel_hdmi->ddc_bus = intel_hdmi_ddc_pin(dev_priv, port); - if (WARN_ON(port == PORT_A)) return; intel_encoder->hpd_pin = intel_hpd_pin_default(dev_priv, port); -- 2.17.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-11-28 13:51 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-22 11:57 Next round of associating ddc adapters with connectors Andrzej Pietrasiewicz 2019-11-28 10:26 ` Jani Nikula 2019-11-28 13:51 ` Andrzej Pietrasiewicz [this message] 2019-11-28 13:51 ` [Intel-gfx] [PATCH] drm/i915: Provide ddc symlink in hdmi connector sysfs directory Andrzej Pietrasiewicz 2019-11-28 13:57 ` Jani Nikula 2019-11-28 13:57 ` [Intel-gfx] " Jani Nikula 2019-11-28 15:01 ` Andrzej Pietrasiewicz 2019-11-28 15:01 ` [Intel-gfx] " Andrzej Pietrasiewicz 2019-11-28 15:01 ` Andrzej Pietrasiewicz 2019-12-13 16:10 ` Andrzej Pietrasiewicz 2019-12-13 16:10 ` [Intel-gfx] " Andrzej Pietrasiewicz 2019-12-19 13:20 ` Jani Nikula 2019-12-19 13:20 ` [Intel-gfx] " Jani Nikula 2019-11-28 14:42 ` ✗ Fi.CI.BUILD: failure for " Patchwork 2019-11-28 14:42 ` [Intel-gfx] " Patchwork 2019-11-28 17:15 ` ✓ Fi.CI.BAT: success for drm/i915: Provide ddc symlink in hdmi connector sysfs directory (rev2) Patchwork 2019-11-28 17:15 ` [Intel-gfx] " Patchwork 2019-11-29 22:57 ` ✗ Fi.CI.IGT: failure " Patchwork 2019-11-29 22:57 ` [Intel-gfx] " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191128135106.21985-1-andrzej.p@collabora.com \ --to=andrzej.p@collabora.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=kernel@collabora.com \ --cc=rodrigo.vivi@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.