* [PATCH 01/11] drm/rockchip: cdn-dp: get rid of drm_edid_raw() [not found] <cover.1715691257.git.jani.nikula@intel.com> @ 2024-05-14 12:55 ` Jani Nikula 2024-06-24 9:14 ` Daniel Vetter 0 siblings, 1 reply; 2+ messages in thread From: Jani Nikula @ 2024-05-14 12:55 UTC (permalink / raw) To: dri-devel Cc: jani.nikula, Sandy Huang, Heiko Stübner, Andy Yan, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, linux-arm-kernel, linux-rockchip The dimensions are available in display info, so there's no need for raw EDID access. While at it, move the debug logging to where the EDID is actually read. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- Cc: Sandy Huang <hjc@rock-chips.com> Cc: "Heiko Stübner" <heiko@sntech.de> Cc: Andy Yan <andy.yan@rock-chips.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Maxime Ripard <mripard@kernel.org> Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-rockchip@lists.infradead.org --- drivers/gpu/drm/rockchip/cdn-dp-core.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c index bd7aa891b839..90913fa26aad 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c @@ -266,15 +266,6 @@ static int cdn_dp_connector_get_modes(struct drm_connector *connector) mutex_lock(&dp->lock); - if (dp->drm_edid) { - /* FIXME: get rid of drm_edid_raw() */ - const struct edid *edid = drm_edid_raw(dp->drm_edid); - - DRM_DEV_DEBUG_KMS(dp->dev, "got edid: width[%d] x height[%d]\n", - edid->width_cm, edid->height_cm); - - } - ret = drm_edid_connector_add_modes(connector); mutex_unlock(&dp->lock); @@ -369,6 +360,7 @@ static int cdn_dp_firmware_init(struct cdn_dp_device *dp) static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp) { + const struct drm_display_info *info = &dp->connector.display_info; int ret; if (!cdn_dp_check_sink_connection(dp)) @@ -386,7 +378,11 @@ static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp) cdn_dp_get_edid_block, dp); drm_edid_connector_update(&dp->connector, dp->drm_edid); - dp->sink_has_audio = dp->connector.display_info.has_audio; + dp->sink_has_audio = info->has_audio; + + if (dp->drm_edid) + DRM_DEV_DEBUG_KMS(dp->dev, "got edid: width[%d] x height[%d]\n", + info->width_mm / 10, info->height_mm / 10); return 0; } -- 2.39.2 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 01/11] drm/rockchip: cdn-dp: get rid of drm_edid_raw() 2024-05-14 12:55 ` [PATCH 01/11] drm/rockchip: cdn-dp: get rid of drm_edid_raw() Jani Nikula @ 2024-06-24 9:14 ` Daniel Vetter 0 siblings, 0 replies; 2+ messages in thread From: Daniel Vetter @ 2024-06-24 9:14 UTC (permalink / raw) To: Jani Nikula Cc: dri-devel, Sandy Huang, Heiko Stübner, Andy Yan, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, linux-arm-kernel, linux-rockchip On Tue, May 14, 2024 at 03:55:07PM +0300, Jani Nikula wrote: > The dimensions are available in display info, so there's no need for raw > EDID access. While at it, move the debug logging to where the EDID is > actually read. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > > --- > > Cc: Sandy Huang <hjc@rock-chips.com> > Cc: "Heiko Stübner" <heiko@sntech.de> > Cc: Andy Yan <andy.yan@rock-chips.com> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Maxime Ripard <mripard@kernel.org> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-rockchip@lists.infradead.org Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/rockchip/cdn-dp-core.c | 16 ++++++---------- > 1 file changed, 6 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c > index bd7aa891b839..90913fa26aad 100644 > --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c > +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c > @@ -266,15 +266,6 @@ static int cdn_dp_connector_get_modes(struct drm_connector *connector) > > mutex_lock(&dp->lock); > > - if (dp->drm_edid) { > - /* FIXME: get rid of drm_edid_raw() */ > - const struct edid *edid = drm_edid_raw(dp->drm_edid); > - > - DRM_DEV_DEBUG_KMS(dp->dev, "got edid: width[%d] x height[%d]\n", > - edid->width_cm, edid->height_cm); > - > - } > - > ret = drm_edid_connector_add_modes(connector); > > mutex_unlock(&dp->lock); > @@ -369,6 +360,7 @@ static int cdn_dp_firmware_init(struct cdn_dp_device *dp) > > static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp) > { > + const struct drm_display_info *info = &dp->connector.display_info; > int ret; > > if (!cdn_dp_check_sink_connection(dp)) > @@ -386,7 +378,11 @@ static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp) > cdn_dp_get_edid_block, dp); > drm_edid_connector_update(&dp->connector, dp->drm_edid); > > - dp->sink_has_audio = dp->connector.display_info.has_audio; > + dp->sink_has_audio = info->has_audio; > + > + if (dp->drm_edid) > + DRM_DEV_DEBUG_KMS(dp->dev, "got edid: width[%d] x height[%d]\n", > + info->width_mm / 10, info->height_mm / 10); > > return 0; > } > -- > 2.39.2 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-06-24 9:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <cover.1715691257.git.jani.nikula@intel.com>
2024-05-14 12:55 ` [PATCH 01/11] drm/rockchip: cdn-dp: get rid of drm_edid_raw() Jani Nikula
2024-06-24 9:14 ` Daniel Vetter
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox