summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSatheeshakrishna M <satheeshakrishna.m@intel.com>2014-04-08 15:46:54 +0530
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-09-24 14:52:02 +0200
commit02c292596af4785091a851df441f3c6c27099a29 (patch)
tree4e6dba270e16bb7161612884149e91457aa2c7b4
parent3cdf122ccfd150e022247c2709c0737b9fb235f1 (diff)
downloadlinux-stable-02c292596af4785091a851df441f3c6c27099a29.tar.gz
linux-stable-02c292596af4785091a851df441f3c6c27099a29.tar.bz2
linux-stable-02c292596af4785091a851df441f3c6c27099a29.zip
drm/i915/skl: vfuncs for skl eld and global resource
Set gen 9 function pointers for eld write and global resource. Implementation remains same as HSW. v2: Rebase on top of Sonika's untangling of the if/else ladder (Damien) Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Satheeshakrishna M <satheeshakrishna.m@intel.com> (v1) Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 901c035514ac..2087e8baa3f9 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12758,6 +12758,10 @@ static void intel_init_display(struct drm_device *dev)
dev_priv->display.modeset_global_resources =
valleyview_modeset_global_resources;
dev_priv->display.write_eld = ironlake_write_eld;
+ } else if (INTEL_INFO(dev)->gen >= 9) {
+ dev_priv->display.write_eld = haswell_write_eld;
+ dev_priv->display.modeset_global_resources =
+ haswell_modeset_global_resources;
}
/* Default just returns -ENODEV to indicate unsupported */