| Message ID | 1447444424-17168-8-git-send-email-paulo.r.zanoni@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Nov 13, 2015 at 05:53:39PM -0200, Paulo Zanoni wrote: > This moves the pre-gen4 check from update() to enable(). The HAS_DDI > in the original code is not needed since only gen 2/3 have the plane > swapping code. > > v2: Rebase. > > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> > --- > drivers/gpu/drm/i915/intel_fbc.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c > index d496a7a..a0784d0 100644 > --- a/drivers/gpu/drm/i915/intel_fbc.c > +++ b/drivers/gpu/drm/i915/intel_fbc.c > @@ -514,6 +514,9 @@ static bool crtc_can_fbc(struct intel_crtc *crtc) > if (fbc_on_pipe_a_only(dev_priv) && crtc->pipe != PIPE_A) > return false; > > + if (INTEL_INFO(dev_priv)->gen < 4 && crtc->plane != PLANE_A) > + return false; Nit: you know what would really put the icing on the cake here, if (fbc_on_plane_a_only(dev_priv) && crtc->plane != PLANE_A) return false; -Chris
diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c index d496a7a..a0784d0 100644 --- a/drivers/gpu/drm/i915/intel_fbc.c +++ b/drivers/gpu/drm/i915/intel_fbc.c @@ -514,6 +514,9 @@ static bool crtc_can_fbc(struct intel_crtc *crtc) if (fbc_on_pipe_a_only(dev_priv) && crtc->pipe != PIPE_A) return false; + if (INTEL_INFO(dev_priv)->gen < 4 && crtc->plane != PLANE_A) + return false; + return true; } @@ -802,12 +805,6 @@ static void __intel_fbc_update(struct intel_crtc *crtc) goto out_disable; } - if ((INTEL_INFO(dev_priv)->gen < 4 || HAS_DDI(dev_priv)) && - crtc->plane != PLANE_A) { - set_no_fbc_reason(dev_priv, "FBC unsupported on plane"); - goto out_disable; - } - /* The use of a CPU fence is mandatory in order to detect writes * by the CPU to the scanout and trigger updates to the FBC. */
This moves the pre-gen4 check from update() to enable(). The HAS_DDI in the original code is not needed since only gen 2/3 have the plane swapping code. v2: Rebase. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> --- drivers/gpu/drm/i915/intel_fbc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)