diff options
| author | Wayne Boyer <wayne.boyer@intel.com> | 2015-12-07 10:51:07 -0800 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-12-10 11:07:29 +0100 |
| commit | a7e478c76404a9146baf47981d6efe88318eec55 (patch) | |
| tree | 450605b0cc5b6ee488370853b5ac124272dbb092 /drivers/gpu/drm/i915/i915_dma.c | |
| parent | 666a45379e2c29bc16e60648e5ad8f6f8b7fa6ce (diff) | |
| download | op-kernel-dev-a7e478c76404a9146baf47981d6efe88318eec55.zip op-kernel-dev-a7e478c76404a9146baf47981d6efe88318eec55.tar.gz | |
drm/i915: Use HAS_PCH_SPLIT to determine correct devices
Do some further clean up based on the initial review of
drm/i915: Separate cherryview from valleyview.
In this case check for '(GEN7 || GEN8) && HAS_PCH_SPLIT' since we're
reading FUSE_STRAP and SFUSE_STRAP which live in the PCH.
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Wayne Boyer <wayne.boyer@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449514270-15171-3-git-send-email-wayne.boyer@intel.com
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 8ba4c7b..84e2b20 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -794,7 +794,7 @@ static void intel_device_info_runtime_init(struct drm_device *dev) info->num_pipes = 0; } else if (info->num_pipes > 0 && (INTEL_INFO(dev)->gen == 7 || INTEL_INFO(dev)->gen == 8) && - !(IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev))) { + HAS_PCH_SPLIT(dev)) { u32 fuse_strap = I915_READ(FUSE_STRAP); u32 sfuse_strap = I915_READ(SFUSE_STRAP); |
