On Fri, 11 Mar 2022, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> We want to stop using connector->panel.fixed_mode directtly.
> In order to look it up in the future we'll need to have the
> requested mode around, so pass that in fully (instead of just
> passing bits of it).
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Typo in subject.
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/display/intel_sdvo.c | 18 +++++++-----------
> 1 file changed, 7 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
> index 76e1188b01d4..129f6619c3a1 100644
> --- a/drivers/gpu/drm/i915/display/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
> @@ -783,24 +783,22 @@ static bool intel_sdvo_get_input_timing(struct intel_sdvo *intel_sdvo,
> static bool
> intel_sdvo_create_preferred_input_timing(struct intel_sdvo *intel_sdvo,
> struct intel_sdvo_connector *intel_sdvo_connector,
> - u16 clock,
> - u16 width,
> - u16 height)
> + const struct drm_display_mode *mode)
> {
> struct intel_sdvo_preferred_input_timing_args args;
>
> memset(&args, 0, sizeof(args));
> - args.clock = clock;
> - args.width = width;
> - args.height = height;
> + args.clock = mode->clock / 10;
> + args.width = mode->hdisplay;
> + args.height = mode->vdisplay;
> args.interlace = 0;
Nitpick, the memset + member init looks like it really wants to be a
local variable init with designated initializers. But not really part of
this set.
>
> if (IS_LVDS(intel_sdvo_connector)) {
> const struct drm_display_mode *fixed_mode =
> intel_sdvo_connector->base.panel.fixed_mode;
>
> - if (fixed_mode->hdisplay != width ||
> - fixed_mode->vdisplay != height)
> + if (fixed_mode->hdisplay != args.width ||
> + fixed_mode->vdisplay != args.height)
> args.scaled = 1;
> }
>
> @@ -1236,9 +1234,7 @@ intel_sdvo_get_preferred_input_mode(struct intel_sdvo *intel_sdvo,
>
> if (!intel_sdvo_create_preferred_input_timing(intel_sdvo,
> intel_sdvo_connector,
> - mode->clock / 10,
> - mode->hdisplay,
> - mode->vdisplay))
> + mode))
> return false;
>
> if (!intel_sdvo_get_preferred_input_timing(intel_sdvo,
--
Jani Nikula, Intel Open Source Graphics Center
