Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
gpu
/
drm
/
nouveau
/
dispnv04
/
hw.c
diff --git
a/kernel/drivers/gpu/drm/nouveau/dispnv04/hw.c
b/kernel/drivers/gpu/drm/nouveau/dispnv04/hw.c
index
956a833
..
57c7389
100644
(file)
--- a/
kernel/drivers/gpu/drm/nouveau/dispnv04/hw.c
+++ b/
kernel/drivers/gpu/drm/nouveau/dispnv04/hw.c
@@
-222,6
+222,7
@@
nouveau_hw_get_clock(struct drm_device *dev, enum nvbios_pll_type plltype)
uint32_t mpllP;
pci_read_config_dword(pci_get_bus_and_slot(0, 3), 0x6c, &mpllP);
uint32_t mpllP;
pci_read_config_dword(pci_get_bus_and_slot(0, 3), 0x6c, &mpllP);
+ mpllP = (mpllP >> 8) & 0xf;
if (!mpllP)
mpllP = 4;
if (!mpllP)
mpllP = 4;
@@
-232,7
+233,7
@@
nouveau_hw_get_clock(struct drm_device *dev, enum nvbios_pll_type plltype)
uint32_t clock;
pci_read_config_dword(pci_get_bus_and_slot(0, 5), 0x4c, &clock);
uint32_t clock;
pci_read_config_dword(pci_get_bus_and_slot(0, 5), 0x4c, &clock);
- return clock;
+ return clock
/ 1000
;
}
ret = nouveau_hw_get_pllvals(dev, plltype, &pllvals);
}
ret = nouveau_hw_get_pllvals(dev, plltype, &pllvals);