Attachment 68897 Details for Bug 56202 – possible fix for the issue

[patch] possible fix for the issue

0001-drm-nouveau-clock-fix-missing-pll-type-addr-when-mat.patch (text/plain), 1.65 KB, created by Ben Skeggs on 2012-10-22 04:16:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Skeggs

Created: 2012-10-22 04:16:03 UTC

Size: 1.65 KB

patch

obsolete

>From 4f03ccbc4aa27e43aebf6e8490aaed6b0ce203d6 Mon Sep 17 00:00:00 2001
>From: Ben Skeggs <bskeggs@redhat.com>
>Date: Mon, 22 Oct 2012 14:10:16 +1000
>Subject: [PATCH] drm/nouveau/clock: fix missing pll type/addr when matching
> default entry
>
>fdo#56202
>
>This issue is a regression from 70790f4f819875e8f390871fd15bbbf823f28e1b,
>and causes us to miss a special-case for C51 (NV4E) chipsets and return
>the wrong reference frequency for the VPLLs.
>
>Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
>---
> drivers/gpu/drm/nouveau/core/subdev/bios/pll.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/pll.c b/drivers/gpu/drm/nouveau/core/subdev/bios/pll.c
>index 5e5f4cd..f835501 100644
>--- a/drivers/gpu/drm/nouveau/core/subdev/bios/pll.c
>+++ b/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;
>-- 
>1.7.12.3
>

Actions: View | Splinter Review

Attachments on bug 56202: 68815 | 68816 | 68829 | 68832 | 68835 | 68897 | 68901

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.