On 08/09/2024 15:28, Jonas Karlman wrote:
> With the use of adjusted_mode directly from the crtc_state there is no
> longer a need to store a copy in previous_mode, remove it and the now
> unneeded mode_set ops.
>
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
> ---
> v2: No change
> ---
> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 19 +------------------
> 1 file changed, 1 insertion(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> index 1eefa633ff78..6a94376a3da3 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> @@ -154,8 +154,6 @@ struct dw_hdmi {
> bool enabled;
> } phy;
>
> - struct drm_display_mode previous_mode;
> -
> struct i2c_adapter *ddc;
> void __iomem *regs;
> bool sink_is_hdmi;
> @@ -165,7 +163,7 @@ struct dw_hdmi {
> struct pinctrl_state *default_state;
> struct pinctrl_state *unwedge_state;
>
> - struct mutex mutex; /* for state below and previous_mode */
> + struct mutex mutex; /* for state below */
> enum drm_connector_force force; /* mutex-protected force state */
> struct drm_connector *curr_conn;/* current connector (only valid when !disabled) */
> bool disabled; /* DRM has disabled our bridge */
> @@ -2894,20 +2892,6 @@ dw_hdmi_bridge_mode_valid(struct drm_bridge *bridge,
> return mode_status;
> }
>
> -static void dw_hdmi_bridge_mode_set(struct drm_bridge *bridge,
> - const struct drm_display_mode *orig_mode,
> - const struct drm_display_mode *mode)
> -{
> - struct dw_hdmi *hdmi = bridge->driver_private;
> -
> - mutex_lock(&hdmi->mutex);
> -
> - /* Store the display mode for plugin/DKMS poweron events */
> - drm_mode_copy(&hdmi->previous_mode, mode);
> -
> - mutex_unlock(&hdmi->mutex);
> -}
> -
> static void dw_hdmi_bridge_atomic_disable(struct drm_bridge *bridge,
> struct drm_bridge_state *old_state)
> {
> @@ -2971,7 +2955,6 @@ static const struct drm_bridge_funcs dw_hdmi_bridge_funcs = {
> .atomic_get_input_bus_fmts = dw_hdmi_bridge_atomic_get_input_bus_fmts,
> .atomic_enable = dw_hdmi_bridge_atomic_enable,
> .atomic_disable = dw_hdmi_bridge_atomic_disable,
> - .mode_set = dw_hdmi_bridge_mode_set,
> .mode_valid = dw_hdmi_bridge_mode_valid,
> .detect = dw_hdmi_bridge_detect,
> .edid_read = dw_hdmi_bridge_edid_read,
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>