| Message ID | 8a6fd6de1853dbc337c5c26c65268604d3e91fe2.1724348429.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | None | expand |
On Thu, Aug 22, 2024 at 08:42:48PM +0300, Jani Nikula wrote: > Look up display dimensions from display_info instead of the EDID > directly. This will be helpful for the follow-up work. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > > --- > > Cc: Inki Dae <inki.dae@samsung.com> > Cc: Seung-Woo Kim <sw0312.kim@samsung.com> > Cc: Kyungmin Park <kyungmin.park@samsung.com> > Cc: Krzysztof Kozlowski <krzk@kernel.org> > Cc: Alim Akhtar <alim.akhtar@samsung.com> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-samsung-soc@vger.kernel.org > --- > drivers/gpu/drm/exynos/exynos_hdmi.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c > index 1e26cd4f8347..25d508b25921 100644 > --- a/drivers/gpu/drm/exynos/exynos_hdmi.c > +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c > @@ -883,6 +883,7 @@ static const struct drm_connector_funcs hdmi_connector_funcs = { > static int hdmi_get_modes(struct drm_connector *connector) > { > struct hdmi_context *hdata = connector_to_hdmi(connector); > + const struct drm_display_info *info = &connector->display_info; > struct edid *edid; > int ret; > > @@ -893,10 +894,10 @@ static int hdmi_get_modes(struct drm_connector *connector) > if (!edid) > goto no_edid; > > - hdata->dvi_mode = !connector->display_info.is_hdmi; > + hdata->dvi_mode = !info->is_hdmi; > DRM_DEV_DEBUG_KMS(hdata->dev, "%s : width[%d] x height[%d]\n", > (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"), > - edid->width_cm, edid->height_cm); > + info->width_mm / 10, info->height_mm / 10); > > drm_connector_update_edid_property(connector, edid); > cec_notifier_set_phys_addr_from_edid(hdata->notifier, edid); > -- > 2.39.2 >
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 1e26cd4f8347..25d508b25921 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -883,6 +883,7 @@ static const struct drm_connector_funcs hdmi_connector_funcs = { static int hdmi_get_modes(struct drm_connector *connector) { struct hdmi_context *hdata = connector_to_hdmi(connector); + const struct drm_display_info *info = &connector->display_info; struct edid *edid; int ret; @@ -893,10 +894,10 @@ static int hdmi_get_modes(struct drm_connector *connector) if (!edid) goto no_edid; - hdata->dvi_mode = !connector->display_info.is_hdmi; + hdata->dvi_mode = !info->is_hdmi; DRM_DEV_DEBUG_KMS(hdata->dev, "%s : width[%d] x height[%d]\n", (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"), - edid->width_cm, edid->height_cm); + info->width_mm / 10, info->height_mm / 10); drm_connector_update_edid_property(connector, edid); cec_notifier_set_phys_addr_from_edid(hdata->notifier, edid);
Look up display dimensions from display_info instead of the EDID directly. This will be helpful for the follow-up work. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- Cc: Inki Dae <inki.dae@samsung.com> Cc: Seung-Woo Kim <sw0312.kim@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Krzysztof Kozlowski <krzk@kernel.org> Cc: Alim Akhtar <alim.akhtar@samsung.com> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-samsung-soc@vger.kernel.org --- drivers/gpu/drm/exynos/exynos_hdmi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)