korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-31 23:15:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Always define GEN as part of GENx_FEATURES

Browse Source 
Be consistent and define the device's GEN as part of the GENx_FEATURE.
It will be overridden by the next gen upon inheriting, as per usual.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180215081930.11477-2-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2018-02-15 08:19:29 +00:00
parent bc76298e68
commit a6e1c5ace4
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/i915/i915_pci.c
View File

@ -383,6 +383,7 @@ static const struct intel_device_info intel_haswell_gt3_info = {
#define GEN8_FEATURES \
G75_FEATURES, \
GEN(8), \
BDW_COLORS, \
.page_sizes = I915_GTT_PAGE_SIZE_4K | \
I915_GTT_PAGE_SIZE_2M, \
@ -393,7 +394,6 @@ static const struct intel_device_info intel_haswell_gt3_info = {
#define BDW_PLATFORM \
GEN8_FEATURES, \
GEN(8), \
.platform = INTEL_BROADWELL
static const struct intel_device_info intel_broadwell_gt1_info = {
@ -452,6 +452,7 @@ static const struct intel_device_info intel_cherryview_info = {
#define GEN9_FEATURES \
GEN8_FEATURES, \
GEN(9), \
GEN9_DEFAULT_PAGE_SIZES, \
.has_logical_ring_preemption = 1, \
.has_csr = 1, \
@ -461,7 +462,6 @@ static const struct intel_device_info intel_cherryview_info = {
#define SKL_PLATFORM \
GEN9_FEATURES, \
GEN(9), \
.platform = INTEL_SKYLAKE
static const struct intel_device_info intel_skylake_gt1_info = {
@ -535,7 +535,6 @@ static const struct intel_device_info intel_geminilake_info = {
#define KBL_PLATFORM \
GEN9_FEATURES, \
GEN(9), \
.platform = INTEL_KABYLAKE
static const struct intel_device_info intel_kabylake_gt1_info = {
@ -556,7 +555,6 @@ static const struct intel_device_info intel_kabylake_gt3_info = {
#define CFL_PLATFORM \
GEN9_FEATURES, \
GEN(9), \
.platform = INTEL_COFFEELAKE
static const struct intel_device_info intel_coffeelake_gt1_info = {
@ -577,12 +575,12 @@ static const struct intel_device_info intel_coffeelake_gt3_info = {
#define GEN10_FEATURES \
GEN9_FEATURES, \
GEN(10), \
.ddb_size = 1024, \
GLK_COLORS
static const struct intel_device_info intel_cannonlake_info = {
GEN10_FEATURES,
GEN(10),
.platform = INTEL_CANNONLAKE,
.gt = 2,
};