lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/i915: Mark the static memory latency tables const.

Browse Source 
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Chris Wilson
2010-08-04 15:25:31 +01:00
committed by Eric Anholt
parent 88f356b725
commit 403c89ff39
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/i915/intel_display.c
View File

@@ -2882,7 +2882,7 @@ struct cxsr_latency {
unsigned long cursor_hpll_disable; unsigned long cursor_hpll_disable;
}; };
static struct cxsr_latency cxsr_latency_table[] = { static const struct cxsr_latency cxsr_latency_table[] = {
{1, 0, 800, 400, 3382, 33382, 3983, 33983}, /* DDR2-400 SC */ {1, 0, 800, 400, 3382, 33382, 3983, 33983}, /* DDR2-400 SC */
{1, 0, 800, 667, 3354, 33354, 3807, 33807}, /* DDR2-667 SC */ {1, 0, 800, 667, 3354, 33354, 3807, 33807}, /* DDR2-667 SC */
{1, 0, 800, 800, 3347, 33347, 3763, 33763}, /* DDR2-800 SC */ {1, 0, 800, 800, 3347, 33347, 3763, 33763}, /* DDR2-800 SC */
@@ -2920,11 +2920,13 @@ static struct cxsr_latency cxsr_latency_table[] = {
{0, 1, 400, 800, 6042, 36042, 6584, 36584}, /* DDR3-800 SC */ {0, 1, 400, 800, 6042, 36042, 6584, 36584}, /* DDR3-800 SC */
}; };
static struct cxsr_latency *intel_get_cxsr_latency(int is_desktop, int is_ddr3, static const struct cxsr_latency *intel_get_cxsr_latency(int is_desktop,
int fsb, int mem) int is_ddr3,
int fsb,
int mem)
{ {
const struct cxsr_latency *latency;
int i; int i;
struct cxsr_latency *latency;
if (fsb == 0 || mem == 0) if (fsb == 0 || mem == 0)
return NULL; return NULL;
@@ -3035,9 +3037,9 @@ static void pineview_update_wm(struct drm_device *dev, int planea_clock,
int pixel_size) int pixel_size)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
const struct cxsr_latency *latency;
u32 reg; u32 reg;
unsigned long wm; unsigned long wm;
struct cxsr_latency *latency;
int sr_clock; int sr_clock;
latency = intel_get_cxsr_latency(IS_PINEVIEW_G(dev), dev_priv->is_ddr3, latency = intel_get_cxsr_latency(IS_PINEVIEW_G(dev), dev_priv->is_ddr3,