Skip to content

Commit 7983117

Browse files
jbarnes993danvet
authored andcommitted
drm/i915: enable display messages to GT on ValleyView
Enable the on-chip messaging between the display engine and the GT. v2: use bit definitions for DPFLIPSTAT reg Signed-off-by: Jesse Barnes <[email protected]> Signed-off-by: Daniel Vetter <[email protected]>
1 parent 31acc7f commit 7983117

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

drivers/gpu/drm/i915/i915_reg.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2653,13 +2653,13 @@
26532653
#define PIPESTAT(pipe) _PIPE(pipe, _PIPEASTAT, _PIPEBSTAT)
26542654

26552655
#define VLV_DPFLIPSTAT 0x70028
2656-
#define PIPEB_LINE_COMPARE_STATUS (1<<29)
2656+
#define PIPEB_LINE_COMPARE_INT_EN (1<<29)
26572657
#define PIPEB_HLINE_INT_EN (1<<28)
26582658
#define PIPEB_VBLANK_INT_EN (1<<27)
26592659
#define SPRITED_FLIPDONE_INT_EN (1<<26)
26602660
#define SPRITEC_FLIPDONE_INT_EN (1<<25)
26612661
#define PLANEB_FLIPDONE_INT_EN (1<<24)
2662-
#define PIPEA_LINE_COMPARE_STATUS (1<<21)
2662+
#define PIPEA_LINE_COMPARE_INT_EN (1<<21)
26632663
#define PIPEA_HLINE_INT_EN (1<<20)
26642664
#define PIPEA_VBLANK_INT_EN (1<<19)
26652665
#define SPRITEB_FLIPDONE_INT_EN (1<<18)

drivers/gpu/drm/i915/intel_pm.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3528,6 +3528,19 @@ static void valleyview_init_clock_gating(struct drm_device *dev)
35283528

35293529
I915_WRITE(CACHE_MODE_1,
35303530
_MASKED_BIT_ENABLE(PIXEL_SUBSPAN_COLLECT_OPT_DISABLE));
3531+
3532+
/*
3533+
* On ValleyView, the GUnit needs to signal the GT
3534+
* when flip and other events complete. So enable
3535+
* all the GUnit->GT interrupts here
3536+
*/
3537+
I915_WRITE(VLV_DPFLIPSTAT, PIPEB_LINE_COMPARE_INT_EN |
3538+
PIPEB_HLINE_INT_EN | PIPEB_VBLANK_INT_EN |
3539+
SPRITED_FLIPDONE_INT_EN | SPRITEC_FLIPDONE_INT_EN |
3540+
PLANEB_FLIPDONE_INT_EN | PIPEA_LINE_COMPARE_INT_EN |
3541+
PIPEA_HLINE_INT_EN | PIPEA_VBLANK_INT_EN |
3542+
SPRITEB_FLIPDONE_INT_EN | SPRITEA_FLIPDONE_INT_EN |
3543+
PLANEA_FLIPDONE_INT_EN);
35313544
}
35323545

35333546
static void g4x_init_clock_gating(struct drm_device *dev)

0 commit comments

Comments
 (0)