UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Turn HAS_FPGA_DBG_UNCLAIMED 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>
This commit is contained in:
Damien Lespiau 2013-04-22 18:40:41 +01:00 committed by Daniel Vetter
parent e76ebff887
commit 30568c45d9
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/i915_drv.c
View File

@ -309,6 +309,7 @@ static const struct intel_device_info intel_haswell_d_info = {
GEN7_FEATURES, GEN7_FEATURES,
.is_haswell = 1, .is_haswell = 1,
.has_ddi = 1, .has_ddi = 1,
.has_fpga_dbg = 1,
}; };
static const struct intel_device_info intel_haswell_m_info = { static const struct intel_device_info intel_haswell_m_info = {
@ -316,6 +317,7 @@ static const struct intel_device_info intel_haswell_m_info = {
.is_haswell = 1, .is_haswell = 1,
.is_mobile = 1, .is_mobile = 1,
.has_ddi = 1, .has_ddi = 1,
.has_fpga_dbg = 1,
}; };
static const struct pci_device_id pciidlist[] = { /* aka */ static const struct pci_device_id pciidlist[] = { /* aka */

5
drivers/gpu/drm/i915/i915_drv.h
View File

@ -358,7 +358,8 @@ struct drm_i915_gt_funcs {
func(has_bsd_ring) sep \ func(has_bsd_ring) sep \
func(has_blt_ring) sep \ func(has_blt_ring) sep \
func(has_llc) sep \ func(has_llc) sep \
func(has_ddi) func(has_ddi) sep \
func(has_fpga_dbg)
#define DEFINE_FLAG(name) u8 name:1 #define DEFINE_FLAG(name) u8 name:1
#define SEP_SEMICOLON ; #define SEP_SEMICOLON ;
@ -1370,7 +1371,7 @@ struct drm_i915_file_private {
#define HAS_DDI(dev) (INTEL_INFO(dev)->has_ddi) #define HAS_DDI(dev) (INTEL_INFO(dev)->has_ddi)
#define HAS_POWER_WELL(dev) (IS_HASWELL(dev)) #define HAS_POWER_WELL(dev) (IS_HASWELL(dev))
#define HAS_FPGA_DBG_UNCLAIMED(dev) (IS_HASWELL(dev)) #define HAS_FPGA_DBG_UNCLAIMED(dev) (INTEL_INFO(dev)->has_fpga_dbg)
#define INTEL_PCH_DEVICE_ID_MASK 0xff00 #define INTEL_PCH_DEVICE_ID_MASK 0xff00
#define INTEL_PCH_IBX_DEVICE_ID_TYPE 0x3b00 #define INTEL_PCH_IBX_DEVICE_ID_TYPE 0x3b00