drm/i915: Add CxSR support on Pineview DDR3
Subsystems (2)
PATCH v2 1/1 drm/i915: Add CxSR support on Pineview DDR3
Pineview with DDR3 memory has different latencies to enable CxSR. This patch updates CxSR latency table to add Pineview DDR3 latency configuration. It also adds one flag "is_ddr3" for checking DDR3 setting in MCHBAR.
Cc Shaohua Li <[email protected]>
Cc Zhao Yakui <[email protected]>
Signed-off-by Li Peng <[email protected]>
---
Rebase the patch against drm-intel-next in v2
drivers/gpu/drm/i915/i915_dma.c | 4 ++ drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/i915_reg.h | 4 ++ drivers/gpu/drm/i915/intel_display.c | 72 ++++++++++++++++++++------------- 4 files changed, 53 insertions(+), 29 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +4 -0
@@ -1575,6 +1575,10 @@ static void i915_get_mem_freq(struct drm_device *dev) dev_priv->mem_freq =800 ;break ; } + +/* detect pineview DDR3 setting */ + tmp =I915_READ (CSHRDDR3CTL ); + dev_priv->is_ddr3 = (tmp &CSHRDDR3CTL_DDR3 ) ?1 :0 ; }/**
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -334,7 +334,7 @@ typedef struct drm_i915_private {int fence_reg_start;/* 4 if userland hasn't ioctl'd us yet */ int num_fence_regs;/* 8 on pre-965, 16 otherwise */ -unsigned int fsb_freq, mem_freq; +unsigned int fsb_freq, mem_freq, is_ddr3;spinlock_t error_lock;struct drm_i915_error_state *first_error;
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -805,6 +805,10 @@#define DCC_CHANNEL_XOR_DISABLE (1 << 10)#define DCC_CHANNEL_XOR_BIT_17 (1 << 9) +/** Pineview MCH register contains DDR3 setting */ +#define CSHRDDR3CTL 0x101a8 +#define CSHRDDR3CTL_DDR3 (1 << 2) +/** 965 MCH register controlling DRAM channel configuration */ #define C0DRB3 0x10206#define C1DRB3 0x10606
drivers/gpu/drm/i915/intel_display.c +44 -28
108 lines not on this page · raw message
Signature · 1 line
1.6.6.1