diff options
| author | Ville Syrjälä | 2015-05-22 10:22:32 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-05-29 10:15:27 +0200 |
| commit | 65cd2b3fa521d1abec13dd36bf1bfc8f2469d8bc (patch) | |
| tree | 2a339a437de8ec7bb0b731d2219db0b13e454e6c /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Fix i855 get_display_clock_speed (diff) | |
| download | kernel-qcow2-linux-65cd2b3fa521d1abec13dd36bf1bfc8f2469d8bc.tar.gz kernel-qcow2-linux-65cd2b3fa521d1abec13dd36bf1bfc8f2469d8bc.tar.xz kernel-qcow2-linux-65cd2b3fa521d1abec13dd36bf1bfc8f2469d8bc.zip | |
drm/i915: Fix 852GM/GMV cdclk
It seems 852GM/GMV uses a different HPLLCC encoding than the other
85x platforms. For 852GM/GMV cdclk is always 133MHz. Try to detect that
using the PCI revision (sinc the device ID seems useless for that). I'm
not at all sure this is a good idea, but according to the specs it
should work.
v2: Rebased to the latest
v3: Rebased to the latest
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> (v1)
Signed-off-by: Mika Kahola <mika.kahola@intel.com>
Acked-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 0b1d8d68ad2b..73a46149564a 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6826,6 +6826,14 @@ static int i85x_get_display_clock_speed(struct drm_device *dev) { u16 hpllcc = 0; + /* + * 852GM/852GMV only supports 133 MHz and the HPLLCC + * encoding is different :( + * FIXME is this the right way to detect 852GM/852GMV? + */ + if (dev->pdev->revision == 0x1) + return 133333; + pci_bus_read_config_word(dev->pdev->bus, PCI_DEVFN(0, 3), HPLLCC, &hpllcc); |