drm/i915: Add CxSR support on Pineview DDR3
Subsystems (2)
PATCH 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.
--- 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 | 74 ++++++++++++++++++++------------- 4 files changed, 54 insertions(+), 30 deletions(-)
drivers/gpu/drm/i915/i915_dma.c +4 -0
@@ -1576,6 +1576,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
@@ -325,7 +325,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 +45 -29
109 lines not on this page · raw message
Signature · 1 line
1.6.1.3
Quoted 5 lines · Li Peng
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.
This is not against drm-intel-next? which has commit d4294342f to cleanup wm setup for pineview.
Signature · 3 lines
Open Source Technology Center, Intel ltd. $gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Zhenyu Wang
Quoted 5 lines · Li Peng
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.This is not against drm-intel-next? which has commit
d4294342fto cleanup wm setup for pineview.
Thanks for the reminder. The patch is against mainline. I will rebase it to drm-intel-next.
Peng
Quoted 4 lines
Signature · 3 lines
Open Source Technology Center, Intel ltd. $gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827