| From 727bb9225198092ea1906c6484ffbb737aba5efd Mon Sep 17 00:00:00 2001 |
| From: Damien Lespiau <damien.lespiau@intel.com> |
| Date: Mon, 22 Apr 2013 18:40:39 +0100 |
| Subject: drm/i915: Turn HAS_DDI() into a device_info flag |
| |
| Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> |
| Reviewed-by: Jani Nikula <jani.nikula@intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit dd93be584099b157039c43c7b48eac56223ac94d) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/i915_drv.c | 2 ++ |
| drivers/gpu/drm/i915/i915_drv.h | 5 +++-- |
| 2 files changed, 5 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c |
| index bc6cd3117ac3..7d4a284487ee 100644 |
| --- a/drivers/gpu/drm/i915/i915_drv.c |
| +++ b/drivers/gpu/drm/i915/i915_drv.c |
| @@ -308,12 +308,14 @@ static const struct intel_device_info intel_valleyview_d_info = { |
| static const struct intel_device_info intel_haswell_d_info = { |
| GEN7_FEATURES, |
| .is_haswell = 1, |
| + .has_ddi = 1, |
| }; |
| |
| static const struct intel_device_info intel_haswell_m_info = { |
| GEN7_FEATURES, |
| .is_haswell = 1, |
| .is_mobile = 1, |
| + .has_ddi = 1, |
| }; |
| |
| static const struct pci_device_id pciidlist[] = { /* aka */ |
| diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h |
| index cd1144e68d3c..15951914a65b 100644 |
| --- a/drivers/gpu/drm/i915/i915_drv.h |
| +++ b/drivers/gpu/drm/i915/i915_drv.h |
| @@ -357,7 +357,8 @@ struct drm_i915_gt_funcs { |
| func(supports_tv) sep \ |
| func(has_bsd_ring) sep \ |
| func(has_blt_ring) sep \ |
| - func(has_llc) |
| + func(has_llc) sep \ |
| + func(has_ddi) |
| |
| #define DEFINE_FLAG(name) u8 name:1 |
| #define SEP_SEMICOLON ; |
| @@ -1368,7 +1369,7 @@ struct drm_i915_file_private { |
| |
| #define HAS_PIPE_CONTROL(dev) (INTEL_INFO(dev)->gen >= 5) |
| |
| -#define HAS_DDI(dev) (IS_HASWELL(dev)) |
| +#define HAS_DDI(dev) (INTEL_INFO(dev)->has_ddi) |
| #define HAS_POWER_WELL(dev) (IS_HASWELL(dev)) |
| |
| #define INTEL_PCH_DEVICE_ID_MASK 0xff00 |
| -- |
| 1.8.5.rc3 |
| |
