Skip to content

Commit 13888d7

Browse files
pzanoni-inteldanvet
authored andcommitted
drm/i915: make the panel fitter work on pipes B and C on IVB
I actually found this problem on Haswell, but then discovered Ivy Bridge also has it by reading the spec. I don't have the hardware to test this. Cc: [email protected] Signed-off-by: Paulo Zanoni <[email protected]> Reviewed-by: Damien Lespiau <[email protected]> Signed-off-by: Daniel Vetter <[email protected]>
1 parent 79935fc commit 13888d7

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

drivers/gpu/drm/i915/i915_reg.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3339,6 +3339,8 @@
33393339
#define _PFA_CTL_1 0x68080
33403340
#define _PFB_CTL_1 0x68880
33413341
#define PF_ENABLE (1<<31)
3342+
#define PF_PIPE_SEL_MASK_IVB (3<<29)
3343+
#define PF_PIPE_SEL_IVB(pipe) ((pipe)<<29)
33423344
#define PF_FILTER_MASK (3<<23)
33433345
#define PF_FILTER_PROGRAMMED (0<<23)
33443346
#define PF_FILTER_MED_3x3 (1<<23)

drivers/gpu/drm/i915/intel_display.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3387,7 +3387,11 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc)
33873387
* as some pre-programmed values are broken,
33883388
* e.g. x201.
33893389
*/
3390-
I915_WRITE(PF_CTL(pipe), PF_ENABLE | PF_FILTER_MED_3x3);
3390+
if (IS_IVYBRIDGE(dev))
3391+
I915_WRITE(PF_CTL(pipe), PF_ENABLE | PF_FILTER_MED_3x3 |
3392+
PF_PIPE_SEL_IVB(pipe));
3393+
else
3394+
I915_WRITE(PF_CTL(pipe), PF_ENABLE | PF_FILTER_MED_3x3);
33913395
I915_WRITE(PF_WIN_POS(pipe), dev_priv->pch_pf_pos);
33923396
I915_WRITE(PF_WIN_SZ(pipe), dev_priv->pch_pf_size);
33933397
}

0 commit comments

Comments
 (0)