From 20279880ac9a9ad0a9200e41ae9a327c5993517f Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 22 Oct 2012 14:10:16 +1000 Subject: [PATCH] --- yaml --- r: 334721 b: refs/heads/master c: 5e5a195ecc8cc0280d169d6da33c959df6336e9f h: refs/heads/master i: 334719: f093f316ff32eb575a29a0c723cfc74cf3b0982c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/core/subdev/bios/pll.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 178522e7c257..25c1f0ba7aa7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c25b7399570ebdcf737c5af67c9d26a1771c002 +refs/heads/master: 5e5a195ecc8cc0280d169d6da33c959df6336e9f diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/bios/pll.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/bios/pll.c index 5e5f4cddae3c..f835501203e5 100644 --- a/trunk/drivers/gpu/drm/nouveau/core/subdev/bios/pll.c +++ b/trunk/drivers/gpu/drm/nouveau/core/subdev/bios/pll.c @@ -157,11 +157,10 @@ pll_map_reg(struct nouveau_bios *bios, u32 reg, u32 *type, u8 *ver, u8 *len) while (map->reg) { if (map->reg == reg && *ver >= 0x20) { u16 addr = (data += hdr); + *type = map->type; while (cnt--) { - if (nv_ro32(bios, data) == map->reg) { - *type = map->type; + if (nv_ro32(bios, data) == map->reg) return data; - } data += *len; } return addr; @@ -200,11 +199,10 @@ pll_map_type(struct nouveau_bios *bios, u8 type, u32 *reg, u8 *ver, u8 *len) while (map->reg) { if (map->type == type && *ver >= 0x20) { u16 addr = (data += hdr); + *reg = map->reg; while (cnt--) { - if (nv_ro32(bios, data) == map->reg) { - *reg = map->reg; + if (nv_ro32(bios, data) == map->reg) return data; - } data += *len; } return addr;