From: Paulo Zanoni <przanoni@gmail.com>
To: intel-gfx@lists.freedesktop.org
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Subject: [PATCH 6/6] drm/i915: move set_no_fbc_reason() call out of intel_fbc_find_crtc()
Date: Tue, 7 Jul 2015 15:26:08 -0300 [thread overview]
Message-ID: <1436293568-1674-7-git-send-email-przanoni@gmail.com> (raw)
In-Reply-To: <1436293568-1674-1-git-send-email-przanoni@gmail.com>
From: Paulo Zanoni <paulo.r.zanoni@intel.com>
So now all the calls are inside __intel_fbc_update(). Consistency!
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
drivers/gpu/drm/i915/intel_fbc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c
index 790edb3..c271af7 100644
--- a/drivers/gpu/drm/i915/intel_fbc.c
+++ b/drivers/gpu/drm/i915/intel_fbc.c
@@ -509,10 +509,8 @@ static struct drm_crtc *intel_fbc_find_crtc(struct drm_i915_private *dev_priv)
break;
}
- if (!crtc || crtc->primary->fb == NULL) {
- set_no_fbc_reason(dev_priv, FBC_NO_OUTPUT);
+ if (!crtc || crtc->primary->fb == NULL)
return NULL;
- }
return crtc;
}
@@ -720,8 +718,10 @@ static void __intel_fbc_update(struct drm_i915_private *dev_priv)
* - going to an unsupported config (interlace, pixel multiply, etc.)
*/
crtc = intel_fbc_find_crtc(dev_priv);
- if (!crtc)
+ if (!crtc) {
+ set_no_fbc_reason(dev_priv, FBC_NO_OUTPUT);
goto out_disable;
+ }
if (!multiple_pipes_ok(dev_priv)) {
set_no_fbc_reason(dev_priv, FBC_MULTIPLE_PIPES);
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-07-07 18:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-07 18:26 [PATCH 0/6] FBC bikesheds Paulo Zanoni
2015-07-07 18:26 ` [PATCH 1/6] drm/i915: move FBC vfuncs to struct i915_fbc Paulo Zanoni
2015-07-07 18:26 ` [PATCH 2/6] drm/i915: use dev_priv for the FBC functions Paulo Zanoni
2015-07-07 19:51 ` Chris Wilson
2015-07-07 18:26 ` [PATCH 3/6] drm/i915: use intel_crtc " Paulo Zanoni
2015-07-07 18:26 ` [PATCH 4/6] drm/i915: add FBC_IN_DBG_MASTER no_fbc_reason Paulo Zanoni
2015-07-08 9:38 ` Daniel Vetter
2015-07-08 9:53 ` Chris Wilson
2015-07-07 18:26 ` [PATCH 5/6] drm/i915: extract FBC_MULTIPLE_PIPES check Paulo Zanoni
2015-07-07 18:26 ` Paulo Zanoni [this message]
2015-07-07 19:53 ` [PATCH 0/6] FBC bikesheds Chris Wilson
2015-07-08 9:40 ` 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=1436293568-1674-7-git-send-email-przanoni@gmail.com \
--to=przanoni@gmail.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=paulo.r.zanoni@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