Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 293728
b: refs/heads/master
c: ddb2005
h: refs/heads/master
v: v3
  • Loading branch information
Martin Peres authored and Ben Skeggs committed Mar 13, 2012
1 parent 98b9991 commit f97028e
Show file tree
Hide file tree
Showing 5 changed files with 111 additions and 71 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 668b6c097dbaf190f5d3974798fef37aee025385
refs/heads/master: ddb2005516949dc50d117cb8381d7a3f8f0614b0
13 changes: 6 additions & 7 deletions trunk/drivers/gpu/drm/nouveau/nouveau_drv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,14 +448,14 @@ struct nouveau_pm_memtiming {
u8 WR;
};

struct nouveau_pm_tbl_header{
struct nouveau_pm_tbl_header {
u8 version;
u8 header_len;
u8 entry_cnt;
u8 entry_len;
};

struct nouveau_pm_tbl_entry{
struct nouveau_pm_tbl_entry {
u8 tWR;
u8 tUNK_1;
u8 tCL;
Expand All @@ -471,11 +471,6 @@ struct nouveau_pm_tbl_entry{
u8 tUNK_18, tUNK_19, tUNK_20, tUNK_21;
};

/* nouveau_mem.c */
void nv30_mem_timing_entry(struct drm_device *dev, struct nouveau_pm_tbl_header *hdr,
struct nouveau_pm_tbl_entry *e, uint8_t magic_number,
struct nouveau_pm_memtiming *timing);

#define NOUVEAU_PM_MAX_LEVEL 8
struct nouveau_pm_level {
struct device_attribute dev_attr;
Expand Down Expand Up @@ -918,6 +913,10 @@ extern void nv10_mem_put_tile_region(struct drm_device *dev,
struct nouveau_fence *fence);
extern const struct ttm_mem_type_manager_func nouveau_vram_manager;
extern const struct ttm_mem_type_manager_func nouveau_gart_manager;
void nv30_mem_timing_entry(struct drm_device *dev,
struct nouveau_pm_tbl_header *hdr,
struct nouveau_pm_tbl_entry *e, uint8_t magic_number,
struct nouveau_pm_memtiming *timing);

/* nouveau_notifier.c */
extern int nouveau_notifier_init_channel(struct nouveau_channel *);
Expand Down
129 changes: 81 additions & 48 deletions trunk/drivers/gpu/drm/nouveau/nouveau_mem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,16 +473,21 @@ nouveau_mem_gart_init(struct drm_device *dev)

/* XXX: For now a dummy. More samples required, possibly even a card
* Called from nouveau_perf.c */
void nv30_mem_timing_entry(struct drm_device *dev, struct nouveau_pm_tbl_header *hdr,
struct nouveau_pm_tbl_entry *e, uint8_t magic_number,
struct nouveau_pm_memtiming *timing) {
void nv30_mem_timing_entry(struct drm_device *dev,
struct nouveau_pm_tbl_header *hdr,
struct nouveau_pm_tbl_entry *e, uint8_t magic_number,
struct nouveau_pm_memtiming *timing)
{

NV_DEBUG(dev,"Timing entry format unknown, please contact nouveau developers");
NV_DEBUG(dev, "Timing entry format unknown, "
"please contact nouveau developers");
}

void nv40_mem_timing_entry(struct drm_device *dev, struct nouveau_pm_tbl_header *hdr,
struct nouveau_pm_tbl_entry *e, uint8_t magic_number,
struct nouveau_pm_memtiming *timing) {
void nv40_mem_timing_entry(struct drm_device *dev,
struct nouveau_pm_tbl_header *hdr,
struct nouveau_pm_tbl_entry *e, uint8_t magic_number,
struct nouveau_pm_memtiming *timing)
{

timing->reg_0 = (e->tRC << 24 | e->tRFC << 16 | e->tRAS << 8 | e->tRP);

Expand All @@ -492,15 +497,19 @@ void nv40_mem_timing_entry(struct drm_device *dev, struct nouveau_pm_tbl_header
1 << 16 |
(e->tUNK_1 + 2 + magic_number) << 8 |
(e->tCL + 2 - magic_number);
timing->reg_2 = (magic_number << 24 | e->tUNK_12 << 16 | e->tUNK_11 << 8 | e->tUNK_10);
timing->reg_2 = magic_number << 24 | e->tUNK_12 << 16 |
e->tUNK_11 << 8 | e->tUNK_10;
timing->reg_2 |= 0x20200000;

NV_DEBUG(dev, "Entry %d: 220: %08x %08x %08x\n", timing->id,
timing->reg_0, timing->reg_1,timing->reg_2);
timing->reg_0, timing->reg_1, timing->reg_2);
}

void nv50_mem_timing_entry(struct drm_device *dev, struct bit_entry *P, struct nouveau_pm_tbl_header *hdr,
struct nouveau_pm_tbl_entry *e, uint8_t magic_number,struct nouveau_pm_memtiming *timing) {
void nv50_mem_timing_entry(struct drm_device *dev, struct bit_entry *P,
struct nouveau_pm_tbl_header *hdr,
struct nouveau_pm_tbl_entry *e, uint8_t magic_number,
struct nouveau_pm_memtiming *timing)
{
struct drm_nouveau_private *dev_priv = dev->dev_private;

uint8_t unk18 = 1,
Expand All @@ -527,31 +536,36 @@ void nv50_mem_timing_entry(struct drm_device *dev, struct bit_entry *P, struct n
timing->reg_1 = (e->tWR + unk19 + 1 + magic_number) << 24 |
max(unk18, (u8) 1) << 16 |
(e->tUNK_1 + unk19 + 1 + magic_number) << 8;
if (dev_priv->chipset == 0xa8) {
if (dev_priv->chipset == 0xa8)
timing->reg_1 |= (e->tCL - 1);
} else {
else
timing->reg_1 |= (e->tCL + 2 - magic_number);
}

timing->reg_2 = (e->tUNK_12 << 16 | e->tUNK_11 << 8 | e->tUNK_10);

timing->reg_5 = (e->tRAS << 24 | e->tRC);
timing->reg_5 += max(e->tUNK_10, e->tUNK_11) << 16;

if (P->version == 1) {
timing->reg_2 |= magic_number << 24;

timing->reg_3 = (0x14 + e->tCL) << 24 |
0x16 << 16 |
(e->tCL - 1) << 8 |
(e->tCL - 1);
timing->reg_4 = (nv_rd32(dev,0x10022c) & 0xffff0000) | e->tUNK_13 << 8 | e->tUNK_13;
0x16 << 16 |
(e->tCL - 1) << 8 |
(e->tCL - 1);

timing->reg_4 = (nv_rd32(dev, 0x10022c) & 0xffff0000) |
e->tUNK_13 << 8 | e->tUNK_13;

timing->reg_5 |= (e->tCL + 2) << 8;

timing->reg_7 = 0x4000202 | (e->tCL - 1) << 16;
} else {
timing->reg_2 |= (unk19 - 1) << 24;
/* XXX: reg_10022c for recentish cards pretty much unknown*/
timing->reg_3 = e->tCL - 1;
timing->reg_4 = (unk20 << 24 | unk21 << 16 |
e->tUNK_13 << 8 | e->tUNK_13);
e->tUNK_13 << 8 | e->tUNK_13);
/* XXX: +6? */
timing->reg_5 |= (unk19 + 6) << 8;

Expand All @@ -569,13 +583,26 @@ void nv50_mem_timing_entry(struct drm_device *dev, struct bit_entry *P, struct n
NV_DEBUG(dev, " 240: %08x\n", timing->reg_8);
}

void nvc0_mem_timing_entry(struct drm_device *dev, struct nouveau_pm_tbl_header *hdr,
struct nouveau_pm_tbl_entry *e, struct nouveau_pm_memtiming *timing) {
timing->reg_0 = (e->tRC << 24 | (e->tRFC & 0x7f) << 17 | e->tRAS << 8 | e->tRP);
timing->reg_1 = (nv_rd32(dev,0x10f294) & 0xff000000) | (e->tUNK_11&0x0f) << 20 | (e->tUNK_19 << 7) | (e->tCL & 0x0f);
timing->reg_2 = (nv_rd32(dev,0x10f298) & 0xff0000ff) | e->tWR << 16 | e->tUNK_1 << 8;
void nvc0_mem_timing_entry(struct drm_device *dev,
struct nouveau_pm_tbl_header *hdr,
struct nouveau_pm_tbl_entry *e,
struct nouveau_pm_memtiming *timing)
{
timing->reg_0 = (e->tRC << 24 | (e->tRFC & 0x7f) << 17 |
e->tRAS << 8 | e->tRP);

timing->reg_1 = (nv_rd32(dev, 0x10f294) & 0xff000000) |
(e->tUNK_11&0x0f) << 20 | (e->tUNK_19 << 7) |
(e->tCL & 0x0f);

timing->reg_2 = (nv_rd32(dev, 0x10f298) & 0xff0000ff) |
e->tWR << 16 | e->tUNK_1 << 8;

timing->reg_3 = e->tUNK_20 << 9 | e->tUNK_13;
timing->reg_4 = (nv_rd32(dev,0x10f2a0) & 0xfff000ff) | e->tUNK_12 << 15;

timing->reg_4 = (nv_rd32(dev, 0x10f2a0) & 0xfff000ff) |
e->tUNK_12 << 15;

NV_DEBUG(dev, "Entry %d: 290: %08x %08x %08x %08x\n", timing->id,
timing->reg_0, timing->reg_1,
timing->reg_2, timing->reg_3);
Expand Down Expand Up @@ -607,13 +634,13 @@ nouveau_mem_timing_init(struct drm_device *dev)
return;

if (P.version == 1)
hdr = (struct nouveau_pm_tbl_header *) ROMPTR(dev, P.data[4]);
hdr = (struct nouveau_pm_tbl_header *) ROMPTR(dev,
P.data[4]);
else if (P.version == 2)
hdr = (struct nouveau_pm_tbl_header *) ROMPTR(dev,
P.data[8]);
else
if (P.version == 2)
hdr = (struct nouveau_pm_tbl_header *) ROMPTR(dev, P.data[8]);
else {
NV_WARN(dev, "unknown mem for BIT P %d\n", P.version);
}
} else {
NV_DEBUG(dev, "BMP version too old for memory\n");
return;
Expand All @@ -625,50 +652,58 @@ nouveau_mem_timing_init(struct drm_device *dev)
}

if (hdr->version != 0x10) {
NV_WARN(dev, "memory timing table 0x%02x unknown\n", hdr->version);
NV_WARN(dev, "memory timing table 0x%02x unknown\n",
hdr->version);
return;
}

/* validate record length */
if (hdr->entry_len < 15) {
NV_ERROR(dev, "mem timing table length unknown: %d\n", hdr->entry_len);
NV_ERROR(dev, "mem timing table length unknown: %d\n",
hdr->entry_len);
return;
}

/* parse vbios entries into common format */
memtimings->timing =
kcalloc(hdr->entry_cnt, sizeof(*memtimings->timing), GFP_KERNEL);
memtimings->timing = kcalloc(hdr->entry_cnt,
sizeof(*memtimings->timing), GFP_KERNEL);
if (!memtimings->timing)
return;

/* Get "some number" from the timing reg for NV_40 and NV_50
* Used in calculations later... source unknown */
magic_number = 0;
if (P.version == 1) {
if (P.version == 1)
magic_number = (nv_rd32(dev, 0x100228) & 0x0f000000) >> 24;
}

entry = (u8*) hdr + hdr->header_len;
entry = (u8 *) hdr + hdr->header_len;
for (i = 0; i < hdr->entry_cnt; i++, entry += hdr->entry_len) {
struct nouveau_pm_memtiming *timing = &pm->memtimings.timing[i];
struct nouveau_pm_tbl_entry *entry_struct =
(struct nouveau_pm_tbl_entry *) entry;
if (entry[0] == 0)
continue;

timing->id = i;
timing->WR = entry[0];
timing->CL = entry[2];

if(dev_priv->card_type <= NV_40) {
nv40_mem_timing_entry(dev,hdr,(struct nouveau_pm_tbl_entry*) entry,magic_number,&pm->memtimings.timing[i]);
} else if(dev_priv->card_type == NV_50){
nv50_mem_timing_entry(dev,&P,hdr,(struct nouveau_pm_tbl_entry*) entry,magic_number,&pm->memtimings.timing[i]);
} else if(dev_priv->card_type == NV_C0) {
nvc0_mem_timing_entry(dev,hdr,(struct nouveau_pm_tbl_entry*) entry,&pm->memtimings.timing[i]);
if (dev_priv->card_type <= NV_40) {
nv40_mem_timing_entry(dev, hdr, entry_struct,
magic_number,
&pm->memtimings.timing[i]);
} else if (dev_priv->card_type == NV_50) {
nv50_mem_timing_entry(dev, &P, hdr, entry_struct,
magic_number,
&pm->memtimings.timing[i]);
} else if (dev_priv->card_type == NV_C0) {
nvc0_mem_timing_entry(dev, hdr, entry_struct,
&pm->memtimings.timing[i]);
}
}

memtimings->nr_timing = hdr->entry_cnt;
memtimings->supported = P.version == 1;
memtimings->supported = (P.version == 1);
}

void
Expand All @@ -677,10 +712,8 @@ nouveau_mem_timing_fini(struct drm_device *dev)
struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_pm_memtimings *mem = &dev_priv->engine.pm.memtimings;

if(mem->timing) {
kfree(mem->timing);
mem->timing = NULL;
}
kfree(mem->timing);
mem->timing = NULL;
}

int
Expand Down
18 changes: 11 additions & 7 deletions trunk/drivers/gpu/drm/nouveau/nouveau_perf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,18 +230,20 @@ nouveau_perf_init(struct drm_device *dev)
}

if (entries > NOUVEAU_PM_MAX_LEVEL) {
NV_DEBUG(dev, "perf table has too many entries - buggy vbios?\n");
NV_DEBUG(dev,
"perf table has too many entries - buggy vbios?\n");
entries = NOUVEAU_PM_MAX_LEVEL;
}

entry = perf + headerlen;

/* For version 0x15, initialize memtiming table */
if(version == 0x15) {
memtimings->timing =
kcalloc(entries, sizeof(*memtimings->timing), GFP_KERNEL);
if (version == 0x15) {
memtimings->timing = kcalloc(entries,
sizeof(*memtimings->timing),
GFP_KERNEL);
if (!memtimings->timing) {
NV_WARN(dev,"Could not allocate memtiming table\n");
NV_WARN(dev, "Could not allocate memtiming table\n");
return;
}

Expand Down Expand Up @@ -304,7 +306,7 @@ nouveau_perf_init(struct drm_device *dev)
perflvl->dom6 = ROM16(entry[20]) * 1000;
break;
case 0x40:
#define subent(n) (ROM16(entry[perf[2] + ((n) * perf[3])]) & 0xfff) * 1000
#define subent(n) ((ROM16(entry[perf[2] + ((n) * perf[3])]) & 0xfff) * 1000)
perflvl->fanspeed = 0; /*XXX*/
perflvl->volt_min = entry[2];
if (dev_priv->card_type == NV_50) {
Expand Down Expand Up @@ -342,7 +344,9 @@ nouveau_perf_init(struct drm_device *dev)
/* get the corresponding memory timings */
if (version == 0x15) {
memtimings->timing[i].id = i;
nv30_mem_timing_entry(dev,&mt_hdr,(struct nouveau_pm_tbl_entry*) &entry[41],0,&memtimings->timing[i]);
nv30_mem_timing_entry(dev, &mt_hdr,
(struct nouveau_pm_tbl_entry *) &entry[41],
0, &memtimings->timing[i]);
perflvl->timing = &memtimings->timing[i];
} else if (version > 0x15) {
/* last 3 args are for < 0x40, ignored for >= 0x40 */
Expand Down
Loading

0 comments on commit f97028e

Please sign in to comment.