From: Damien Lespiau <damien.lespiau@intel.com>
To: ville.syrjala@linux.intel.com
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 04/14] drm/i915: Use adjusted_mode in intel_update_fbc()
Date: Tue, 10 Sep 2013 15:45:40 +0100 [thread overview]
Message-ID: <20130910144540.GD16273@strange.amr.corp.intel.com> (raw)
In-Reply-To: <1378308331-21388-5-git-send-email-ville.syrjala@linux.intel.com>
On Wed, Sep 04, 2013 at 06:25:21PM +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Check the mode flags from the adjusted_mode, not user requested mode.
> The hdisplay/vdisplay check actually checkes the primary plane size,
> so those still need to come from the user requested mode.
>
> Extract both modes from pipe config instead of the drm_crtc.
>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
--
Damien
> ---
> drivers/gpu/drm/i915/intel_pm.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 0c115cc..af1f4de 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -458,6 +458,8 @@ void intel_update_fbc(struct drm_device *dev)
> struct drm_framebuffer *fb;
> struct intel_framebuffer *intel_fb;
> struct drm_i915_gem_object *obj;
> + const struct drm_display_mode *mode;
> + const struct drm_display_mode *adjusted_mode;
> unsigned int max_hdisplay, max_vdisplay;
>
> if (!I915_HAS_FBC(dev)) {
> @@ -502,6 +504,8 @@ void intel_update_fbc(struct drm_device *dev)
> fb = crtc->fb;
> intel_fb = to_intel_framebuffer(fb);
> obj = intel_fb->obj;
> + mode = &intel_crtc->config.requested_mode;
> + adjusted_mode = &intel_crtc->config.adjusted_mode;
>
> if (i915_enable_fbc < 0 &&
> INTEL_INFO(dev)->gen <= 7 && !IS_HASWELL(dev)) {
> @@ -514,8 +518,8 @@ void intel_update_fbc(struct drm_device *dev)
> DRM_DEBUG_KMS("fbc disabled per module param\n");
> goto out_disable;
> }
> - if ((crtc->mode.flags & DRM_MODE_FLAG_INTERLACE) ||
> - (crtc->mode.flags & DRM_MODE_FLAG_DBLSCAN)) {
> + if ((adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) ||
> + (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)) {
> if (set_no_fbc_reason(dev_priv, FBC_UNSUPPORTED_MODE))
> DRM_DEBUG_KMS("mode incompatible with compression, "
> "disabling\n");
> @@ -529,8 +533,8 @@ void intel_update_fbc(struct drm_device *dev)
> max_hdisplay = 2048;
> max_vdisplay = 1536;
> }
> - if ((crtc->mode.hdisplay > max_hdisplay) ||
> - (crtc->mode.vdisplay > max_vdisplay)) {
> + if ((mode->hdisplay > max_hdisplay) ||
> + (mode->vdisplay > max_vdisplay)) {
> if (set_no_fbc_reason(dev_priv, FBC_MODE_TOO_LARGE))
> DRM_DEBUG_KMS("mode too large for compression, disabling\n");
> goto out_disable;
> --
> 1.8.1.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2013-09-10 14:45 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-04 15:25 [PATCH 0/14] drm/i915: pipe_config, adjusted_mode vs. requested_mode, etc. v2 ville.syrjala
2013-09-04 15:25 ` [PATCH v2 01/14] drm/i915: Grab the pixel clock from adjusted_mode not requested_mode ville.syrjala
2013-09-10 14:27 ` Damien Lespiau
2013-09-04 15:25 ` [PATCH 02/14] drm/i915: Use adjusted_mode->clock in lpt_program_iclkip ville.syrjala
2013-09-10 14:41 ` Damien Lespiau
2013-09-04 15:25 ` [PATCH 03/14] drm/i915: Use adjusted_mode in HDMI 12bpc clock check ville.syrjala
2013-09-10 14:42 ` Damien Lespiau
2013-09-04 15:25 ` [PATCH 04/14] drm/i915: Use adjusted_mode in intel_update_fbc() ville.syrjala
2013-09-10 14:45 ` Damien Lespiau [this message]
2013-09-04 15:25 ` [PATCH 05/14] drm/i915: Use adjusted_mode appropriately when computing watermarks ville.syrjala
2013-09-10 15:00 ` Damien Lespiau
2013-09-10 15:04 ` Ville Syrjälä
2013-09-10 16:08 ` Damien Lespiau
2013-09-04 15:25 ` [PATCH 06/14] drm/i915: Check the clock from adjusted mode in intel_crtc_active() ville.syrjala
2013-09-10 15:00 ` Damien Lespiau
2013-09-04 15:25 ` [PATCH 07/14] drm/i915: Use adjusted_mode when checking conditions for PSR ville.syrjala
2013-09-10 16:42 ` Damien Lespiau
2013-09-04 15:25 ` [PATCH v2 08/14] drm/i915: Make intel_crtc_active() available outside intel_pm.c ville.syrjala
2013-09-10 16:43 ` Damien Lespiau
2013-09-04 15:25 ` [PATCH 09/14] drm/i915: Use pipe config in sprite code ville.syrjala
2013-09-10 16:44 ` Damien Lespiau
2013-09-04 15:25 ` [PATCH 10/14] drm/i915: Use adjusted_mode in DSI PLL calculations ville.syrjala
2013-09-10 16:45 ` Damien Lespiau
2013-09-04 15:25 ` [PATCH v2 11/14] drm/i915: Add explicit pipe src size to pipe config ville.syrjala
2013-09-10 17:02 ` Damien Lespiau
2013-09-04 15:25 ` [PATCH 12/14] drm/i915: Document the inteded use of requested_mode ville.syrjala
2013-09-10 17:07 ` Damien Lespiau
2013-09-10 17:17 ` Ville Syrjälä
2013-09-10 17:49 ` Daniel Vetter
2013-09-10 17:10 ` Damien Lespiau
2013-09-04 15:25 ` [PATCH 13/14] drm/i915: Fix cursor visibility check with negative coordinates ville.syrjala
2013-09-04 15:25 ` [PATCH 14/14] drm/i915: Fix cursor visibility checks also for the right/bottom screen edges ville.syrjala
2013-09-16 21:52 ` Daniel Vetter
2013-09-17 9:56 ` Ville Syrjälä
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=20130910144540.GD16273@strange.amr.corp.intel.com \
--to=damien.lespiau@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=ville.syrjala@linux.intel.com \
/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