OSDN Git Service

drm/i915: Turn HAS_DDI() into a device_info flag
authorDamien Lespiau <damien.lespiau@intel.com>
Mon, 22 Apr 2013 17:40:39 +0000 (18:40 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 23 Apr 2013 15:46:01 +0000 (17:46 +0200)
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>
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h

index 9ebe895..564d4c6 100644 (file)
@@ -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 */
index ec8eadd..5407714 100644 (file)
@@ -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 ;
@@ -1367,7 +1368,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