Message ID | 20240908132823.3308029-5-jonas@kwiboo.se (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | drm: bridge: dw_hdmi: Misc enable/disable, CEC and EDID cleanup | expand |
On 08/09/2024 15:28, Jonas Karlman wrote: > Use the passed mode instead of mixing use of passed mode and the stored > previous_mode. The passed mode is currenly always the previous_mode. > > Also fix a small typo and add a variable to help shorten a code line. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> > --- > v2: Update commit message, s/type/typo/ > --- > drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > index 5b67640b1d0a..87fb6fd5cffd 100644 > --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > @@ -2240,6 +2240,7 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, > const struct drm_connector *connector, > const struct drm_display_mode *mode) > { > + const struct drm_display_info *display = &connector->display_info; > int ret; > > hdmi_disable_overflow_interrupts(hdmi); > @@ -2285,12 +2286,10 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, > hdmi->hdmi_data.video_mode.mdataenablepolarity = true; > > /* HDMI Initialization Step B.1 */ > - hdmi_av_composer(hdmi, &connector->display_info, mode); > + hdmi_av_composer(hdmi, display, mode); > > - /* HDMI Initializateion Step B.2 */ > - ret = hdmi->phy.ops->init(hdmi, hdmi->phy.data, > - &connector->display_info, > - &hdmi->previous_mode); > + /* HDMI Initialization Step B.2 */ > + ret = hdmi->phy.ops->init(hdmi, hdmi->phy.data, display, mode); > if (ret) > return ret; > hdmi->phy.enabled = true; Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index 5b67640b1d0a..87fb6fd5cffd 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -2240,6 +2240,7 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, const struct drm_connector *connector, const struct drm_display_mode *mode) { + const struct drm_display_info *display = &connector->display_info; int ret; hdmi_disable_overflow_interrupts(hdmi); @@ -2285,12 +2286,10 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, hdmi->hdmi_data.video_mode.mdataenablepolarity = true; /* HDMI Initialization Step B.1 */ - hdmi_av_composer(hdmi, &connector->display_info, mode); + hdmi_av_composer(hdmi, display, mode); - /* HDMI Initializateion Step B.2 */ - ret = hdmi->phy.ops->init(hdmi, hdmi->phy.data, - &connector->display_info, - &hdmi->previous_mode); + /* HDMI Initialization Step B.2 */ + ret = hdmi->phy.ops->init(hdmi, hdmi->phy.data, display, mode); if (ret) return ret; hdmi->phy.enabled = true;
Use the passed mode instead of mixing use of passed mode and the stored previous_mode. The passed mode is currenly always the previous_mode. Also fix a small typo and add a variable to help shorten a code line. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- v2: Update commit message, s/type/typo/ --- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)