diff options
author | 2013-11-15 10:02:39 +0100 | |
---|---|---|
committer | 2013-11-15 10:02:39 +0100 | |
commit | c09cd6e9691ec6fce8cb90b65929cad389d39c84 (patch) | |
tree | d76104420f72172b21b8fb5ca512baa016ac892b /drivers/gpu/drm/i915/intel_hdmi.c | |
parent | drm/i915: Reject opening of pipe crc files for invalid pipes (diff) | |
parent | Merge branch 'bdw-fixes' into backlight-rework (diff) | |
download | linux-c09cd6e9691ec6fce8cb90b65929cad389d39c84.tar.gz linux-c09cd6e9691ec6fce8cb90b65929cad389d39c84.tar.bz2 linux-c09cd6e9691ec6fce8cb90b65929cad389d39c84.zip |
Merge branch 'backlight-rework' into drm-intel-next-queued
Pull in Jani's backlight rework branch. This was merged through a
separate branch to be able to sort out the Broadwell conflicts
properly before pulling it into the main development branch.
Conflicts:
drivers/gpu/drm/i915/intel_display.c
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_hdmi.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_hdmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index 61cff670ff3f..d0c81b170149 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c @@ -847,7 +847,7 @@ static int hdmi_portclock_limit(struct intel_hdmi *hdmi) if (IS_G4X(dev)) return 165000; - else if (IS_HASWELL(dev)) + else if (IS_HASWELL(dev) || INTEL_INFO(dev)->gen >= 8) return 300000; else return 225000; |