Re: [PATCH 7/9] drm/sti/sti_hdmi: convert to using is_hdmi from display info

2023-04-22 Thread Alain Volmat 
Hi Jani,

On Thu, Sep 01, 2022 at 03:47:09PM +0300, Jani Nikula wrote:
> Prefer the parsed results for is_hdmi in display info over calling
> drm_detect_hdmi_monitor(). Remove the now redundant hdmi_monitor member
> from struct sti_hdmi.
> 
> Cc: Alain Volmat 
> Signed-off-by: Jani Nikula 
> ---
>  drivers/gpu/drm/sti/sti_hdmi.c | 11 ++-
>  drivers/gpu/drm/sti/sti_hdmi.h |  2 --
>  2 files changed, 6 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
> index cb82622877d2..7e6d47c1c43b 100644
> --- a/drivers/gpu/drm/sti/sti_hdmi.c
> +++ b/drivers/gpu/drm/sti/sti_hdmi.c
> @@ -266,6 +266,7 @@ static void hdmi_active_area(struct sti_hdmi *hdmi)
>   */
>  static void hdmi_config(struct sti_hdmi *hdmi)
>  {
> + struct drm_connector *connector = hdmi->drm_connector;
>   u32 conf;
>  
>   DRM_DEBUG_DRIVER("\n");
> @@ -275,7 +276,7 @@ static void hdmi_config(struct sti_hdmi *hdmi)
>  
>   /* Select encryption type and the framing mode */
>   conf |= HDMI_CFG_ESS_NOT_OESS;
> - if (hdmi->hdmi_monitor)
> + if (connector->display_info.is_hdmi)
>   conf |= HDMI_CFG_HDMI_NOT_DVI;
>  
>   /* Set Hsync polarity */
> @@ -985,15 +986,15 @@ static int sti_hdmi_connector_get_modes(struct 
> drm_connector *connector)
>   if (!edid)
>   goto fail;
>  
> - hdmi->hdmi_monitor = drm_detect_hdmi_monitor(edid);
> - DRM_DEBUG_KMS("%s : %dx%d cm\n",
> -   (hdmi->hdmi_monitor ? "hdmi monitor" : "dvi monitor"),
> -   edid->width_cm, edid->height_cm);
>   cec_notifier_set_phys_addr_from_edid(hdmi->notifier, edid);
>  
>   count = drm_add_edid_modes(connector, edid);
>   drm_connector_update_edid_property(connector, edid);
>  
> + DRM_DEBUG_KMS("%s : %dx%d cm\n",
> +   (connector->display_info.is_hdmi ? "hdmi monitor" : "dvi 
> monitor"),
> +   edid->width_cm, edid->height_cm);
> +
>   kfree(edid);
>   return count;
>  
> diff --git a/drivers/gpu/drm/sti/sti_hdmi.h b/drivers/gpu/drm/sti/sti_hdmi.h
> index 05b2f3d0d48d..6d4c3f57bc46 100644
> --- a/drivers/gpu/drm/sti/sti_hdmi.h
> +++ b/drivers/gpu/drm/sti/sti_hdmi.h
> @@ -57,7 +57,6 @@ struct hdmi_audio_params {
>   * @reset: reset control of the hdmi phy
>   * @ddc_adapt: i2c ddc adapter
>   * @colorspace: current colorspace selected
> - * @hdmi_monitor: true if HDMI monitor detected else DVI monitor assumed
>   * @audio_pdev: ASoC hdmi-codec platform device
>   * @audio: hdmi audio parameters.
>   * @drm_connector: hdmi connector
> @@ -83,7 +82,6 @@ struct sti_hdmi {
>   struct reset_control *reset;
>   struct i2c_adapter *ddc_adapt;
>   enum hdmi_colorspace colorspace;
> - bool hdmi_monitor;
>   struct platform_device *audio_pdev;
>   struct hdmi_audio_params audio;
>   struct drm_connector *drm_connector;
> -- 

Acked-by: Alain Volmat 

Thanks.

> 2.34.1
>

[PATCH 7/9] drm/sti/sti_hdmi: convert to using is_hdmi from display info

2022-09-01 Thread Jani Nikula 
Prefer the parsed results for is_hdmi in display info over calling
drm_detect_hdmi_monitor(). Remove the now redundant hdmi_monitor member
from struct sti_hdmi.

Cc: Alain Volmat 
Signed-off-by: Jani Nikula 
---
 drivers/gpu/drm/sti/sti_hdmi.c | 11 ++-
 drivers/gpu/drm/sti/sti_hdmi.h |  2 --
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
index cb82622877d2..7e6d47c1c43b 100644
--- a/drivers/gpu/drm/sti/sti_hdmi.c
+++ b/drivers/gpu/drm/sti/sti_hdmi.c
@@ -266,6 +266,7 @@ static void hdmi_active_area(struct sti_hdmi *hdmi)
  */
 static void hdmi_config(struct sti_hdmi *hdmi)
 {
+   struct drm_connector *connector = hdmi->drm_connector;
u32 conf;
 
DRM_DEBUG_DRIVER("\n");
@@ -275,7 +276,7 @@ static void hdmi_config(struct sti_hdmi *hdmi)
 
/* Select encryption type and the framing mode */
conf |= HDMI_CFG_ESS_NOT_OESS;
-   if (hdmi->hdmi_monitor)
+   if (connector->display_info.is_hdmi)
conf |= HDMI_CFG_HDMI_NOT_DVI;
 
/* Set Hsync polarity */
@@ -985,15 +986,15 @@ static int sti_hdmi_connector_get_modes(struct 
drm_connector *connector)
if (!edid)
goto fail;
 
-   hdmi->hdmi_monitor = drm_detect_hdmi_monitor(edid);
-   DRM_DEBUG_KMS("%s : %dx%d cm\n",
- (hdmi->hdmi_monitor ? "hdmi monitor" : "dvi monitor"),
- edid->width_cm, edid->height_cm);
cec_notifier_set_phys_addr_from_edid(hdmi->notifier, edid);
 
count = drm_add_edid_modes(connector, edid);
drm_connector_update_edid_property(connector, edid);
 
+   DRM_DEBUG_KMS("%s : %dx%d cm\n",
+ (connector->display_info.is_hdmi ? "hdmi monitor" : "dvi 
monitor"),
+ edid->width_cm, edid->height_cm);
+
kfree(edid);
return count;
 
diff --git a/drivers/gpu/drm/sti/sti_hdmi.h b/drivers/gpu/drm/sti/sti_hdmi.h
index 05b2f3d0d48d..6d4c3f57bc46 100644
--- a/drivers/gpu/drm/sti/sti_hdmi.h
+++ b/drivers/gpu/drm/sti/sti_hdmi.h
@@ -57,7 +57,6 @@ struct hdmi_audio_params {
  * @reset: reset control of the hdmi phy
  * @ddc_adapt: i2c ddc adapter
  * @colorspace: current colorspace selected
- * @hdmi_monitor: true if HDMI monitor detected else DVI monitor assumed
  * @audio_pdev: ASoC hdmi-codec platform device
  * @audio: hdmi audio parameters.
  * @drm_connector: hdmi connector
@@ -83,7 +82,6 @@ struct sti_hdmi {
struct reset_control *reset;
struct i2c_adapter *ddc_adapt;
enum hdmi_colorspace colorspace;
-   bool hdmi_monitor;
struct platform_device *audio_pdev;
struct hdmi_audio_params audio;
struct drm_connector *drm_connector;
-- 
2.34.1