diff options
| author | Paulo Zanoni | 2015-06-12 19:36:21 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-06-15 18:36:42 +0200 |
| commit | d8514d6306ea023f144ac922c4e6e6b283d5b78d (patch) | |
| tree | 13c45ec6061579c7aea86c47528d6395d5278bdb /drivers/gpu/drm/i915/intel_fbc.c | |
| parent | drm/i915: unify no_fbc_reason message printing (diff) | |
| download | kernel-qcow2-linux-d8514d6306ea023f144ac922c4e6e6b283d5b78d.tar.gz kernel-qcow2-linux-d8514d6306ea023f144ac922c4e6e6b283d5b78d.tar.xz kernel-qcow2-linux-d8514d6306ea023f144ac922c4e6e6b283d5b78d.zip | |
drm/i915: don't set the FBC plane select bits on HSW+
This commit is just to make the intentions explicit: on HSW+ these
bits are MBZ, but since we only support plane A and the macro
evaluates to zero when plane A is the parameter, we're not fixing any
bug.
v2:
- Remove useless extra blank like (Chris).
- Init dpfc_ctl in another place (Chris).
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fbc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_fbc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c index 1ff288ce84d8..50ed3332def1 100644 --- a/drivers/gpu/drm/i915/intel_fbc.c +++ b/drivers/gpu/drm/i915/intel_fbc.c @@ -262,7 +262,10 @@ static void gen7_fbc_enable(struct drm_crtc *crtc) dev_priv->fbc.enabled = true; - dpfc_ctl = IVB_DPFC_CTL_PLANE(intel_crtc->plane); + dpfc_ctl = 0; + if (IS_IVYBRIDGE(dev)) + dpfc_ctl |= IVB_DPFC_CTL_PLANE(intel_crtc->plane); + if (drm_format_plane_cpp(fb->pixel_format, 0) == 2) dev_priv->fbc.threshold++; |