From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 03/12] drm/i915: Use adjusted_mode in HDMI 12bpc clock check
Date: Mon, 2 Sep 2013 22:05:26 +0300 [thread overview]
Message-ID: <20130902190526.GX11428@intel.com> (raw)
In-Reply-To: <20130902183945.GB9374@phenom.ffwll.local>
On Mon, Sep 02, 2013 at 08:39:45PM +0200, Daniel Vetter wrote:
> On Mon, Sep 02, 2013 at 09:13:30PM +0300, ville.syrjala@linux.intel.com wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > The pixel clock should come from adjusted_mode not requested_mode.
> > In this case the two should be the same as we don't currently
> > overwrite the clock in the case of HDMI. But let's make the code
> > safe against such things happening in the future.
> >
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Atm only the encoder overrides the adjusted_mode at all, so I think I
> prefer the current code flow as clearer ...
And I'd atually prefer to kill requested_mode. It's confusing.
Only hdisplay/vdisplay are always valid. Well even that's not true
as can be seen from my double wide series.
The clock and timings can be trusted only at the very beginning of the
compute config step. And at that point adjusted_mode contains the exact
same information. Also apart from the clock, we never use the other
timings from requested_mode, so keeping the whole thing around seems
more or less pointless.
> -Daniel
>
> > ---
> > drivers/gpu/drm/i915/intel_hdmi.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
> > index 4148cc8..48e3b32 100644
> > --- a/drivers/gpu/drm/i915/intel_hdmi.c
> > +++ b/drivers/gpu/drm/i915/intel_hdmi.c
> > @@ -862,7 +862,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
> > struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
> > struct drm_device *dev = encoder->base.dev;
> > struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode;
> > - int clock_12bpc = pipe_config->requested_mode.clock * 3 / 2;
> > + int clock_12bpc = pipe_config->adjusted_mode.clock * 3 / 2;
> > int portclock_limit = hdmi_portclock_limit(intel_hdmi);
> > int desired_bpp;
> >
> > --
> > 1.8.1.5
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch
--
Ville Syrjälä
Intel OTC
next prev parent reply other threads:[~2013-09-02 19:05 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-02 18:13 [PATCH 00/12] drm/i915: pipe_config, adjusted_mode vs. requested_mode, etc ville.syrjala
2013-09-02 18:13 ` [PATCH 01/12] drm/i915: Grab the pixel clock from adjusted_mode not requested_mode ville.syrjala
2013-09-02 18:38 ` Daniel Vetter
2013-09-03 10:01 ` Ville Syrjälä
2013-09-03 11:23 ` Daniel Vetter
2013-09-03 12:08 ` Ville Syrjälä
2013-09-03 13:45 ` Daniel Vetter
2013-09-03 10:31 ` [PATCH] drm/i915: Kill IRONLAKE_FDI_FREQ check ville.syrjala
2013-09-03 11:24 ` Daniel Vetter
2013-09-02 18:13 ` [PATCH 02/12] drm/i915: Use adjusted_mode->clock in lpt_program_iclkip ville.syrjala
2013-09-02 18:13 ` [PATCH 03/12] drm/i915: Use adjusted_mode in HDMI 12bpc clock check ville.syrjala
2013-09-02 18:39 ` Daniel Vetter
2013-09-02 19:05 ` Ville Syrjälä [this message]
2013-09-03 7:50 ` Daniel Vetter
2013-09-03 9:33 ` [PATCH] drm/i915: Document the use of requested_mode, adjusted_mode, and pipe_src_{w, h} ville.syrjala
2013-09-02 18:13 ` [PATCH 04/12] drm/i915: Use adjusted_mode in intel_update_fbc() ville.syrjala
2013-09-02 18:13 ` [PATCH 05/12] drm/i915: Use adjusted_mode appropriately when computing watermarks ville.syrjala
2013-09-02 18:13 ` [PATCH 06/12] drm/i915: Check the clock from adjusted mode in intel_crtc_active() ville.syrjala
2013-09-02 18:13 ` [PATCH 07/12] drm/i915: Use adjusted_mode when checking conditions for PSR ville.syrjala
2013-09-02 18:13 ` [PATCH 08/12] drm/i915: Make intel_crtc_active() available outside intel_pm.c ville.syrjala
2013-09-02 18:42 ` Daniel Vetter
2013-09-02 19:46 ` [PATCH v2] " ville.syrjala
2013-09-02 18:13 ` [PATCH 09/12] drm/i915: Use pipe config in sprite code ville.syrjala
2013-09-02 18:13 ` [PATCH 10/12] drm/i915: Use adjusted_mode in DSI PLL calculations ville.syrjala
2013-09-02 18:13 ` [PATCH 11/12] drm/i915: Add explicit pipe src size to pipe config ville.syrjala
2013-09-02 18:46 ` Daniel Vetter
2013-09-02 19:11 ` Ville Syrjälä
2013-09-03 7:52 ` Daniel Vetter
2013-09-03 9:32 ` Ville Syrjälä
2013-09-02 18:13 ` [PATCH 12/12] drm/i915: Fix pipe config warnings when dealing with LVDS fixed mode ville.syrjala
2013-09-02 18:44 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130902190526.GX11428@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=daniel@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox