xf86-video-intel: 2 commits - man/intel.man src/i915_pciids.h src/intel_module.c src/intel_options.c src/intel_options.h src/sna/sna_accel.c src/uxa/intel_driver.c
Chris Wilson
ickle at kemper.freedesktop.org
Thu Nov 19 02:49:49 PST 2015
man/intel.man | 8 ++++----
src/i915_pciids.h | 36 ++++++++++++++++++++++++++++++++++++
src/intel_module.c | 6 ++++++
src/intel_options.c | 2 +-
src/intel_options.h | 2 +-
src/sna/sna_accel.c | 2 +-
src/uxa/intel_driver.c | 2 +-
7 files changed, 50 insertions(+), 8 deletions(-)
New commits:
commit c446a7ccc783e3ca00b4b15d017c6e3af66dc646
Author: Wayne Boyer <wayne.boyer at intel.com>
Date: Wed Nov 18 10:39:42 2015 -0800
Add Kabylake PCI IDs
Add the Kabylake PCI IDs based on the following kernel patches:
commit d97044b661d0d56b2a2ae9b2b95ab0b359b417dc
Author: Deepak S <deepak.s at intel.com>
Date: Wed Oct 28 12:19:51 2015 -0700
drm/i915/kbl: Add Kabylake PCI ID
commit 8b10c0cf21ec84618d4bf02c73c0543500ece68d
Author: Deepak S <deepak.s at intel.com>
Date: Wed Oct 28 12:21:12 2015 -0700
drm/i915/kbl: Add Kabylake GT4 PCI ID
Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
Signed-off-by: Wayne Boyer <wayne.boyer at intel.com>
[ickle: Copy across the real i915_pciids.h from the kernel]
diff --git a/src/i915_pciids.h b/src/i915_pciids.h
index 17c4456..f1a113e 100644
--- a/src/i915_pciids.h
+++ b/src/i915_pciids.h
@@ -291,4 +291,40 @@
INTEL_VGA_DEVICE(0x1A84, info), \
INTEL_VGA_DEVICE(0x5A84, info)
+#define INTEL_KBL_GT1_IDS(info) \
+ INTEL_VGA_DEVICE(0x5913, info), /* ULT GT1.5 */ \
+ INTEL_VGA_DEVICE(0x5915, info), /* ULX GT1.5 */ \
+ INTEL_VGA_DEVICE(0x5917, info), /* DT GT1.5 */ \
+ INTEL_VGA_DEVICE(0x5906, info), /* ULT GT1 */ \
+ INTEL_VGA_DEVICE(0x590E, info), /* ULX GT1 */ \
+ INTEL_VGA_DEVICE(0x5902, info), /* DT GT1 */ \
+ INTEL_VGA_DEVICE(0x590B, info), /* Halo GT1 */ \
+ INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */
+
+#define INTEL_KBL_GT2_IDS(info) \
+ INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \
+ INTEL_VGA_DEVICE(0x5921, info), /* ULT GT2F */ \
+ INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \
+ INTEL_VGA_DEVICE(0x5912, info), /* DT GT2 */ \
+ INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \
+ INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \
+ INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */
+
+#define INTEL_KBL_GT3_IDS(info) \
+ INTEL_VGA_DEVICE(0x5926, info), /* ULT GT3 */ \
+ INTEL_VGA_DEVICE(0x592B, info), /* Halo GT3 */ \
+ INTEL_VGA_DEVICE(0x592A, info) /* SRV GT3 */
+
+#define INTEL_KBL_GT4_IDS(info) \
+ INTEL_VGA_DEVICE(0x5932, info), /* DT GT4 */ \
+ INTEL_VGA_DEVICE(0x593B, info), /* Halo GT4 */ \
+ INTEL_VGA_DEVICE(0x593A, info), /* SRV GT4 */ \
+ INTEL_VGA_DEVICE(0x593D, info) /* WKS GT4 */
+
+#define INTEL_KBL_IDS(info) \
+ INTEL_KBL_GT1_IDS(info), \
+ INTEL_KBL_GT2_IDS(info), \
+ INTEL_KBL_GT3_IDS(info), \
+ INTEL_KBL_GT4_IDS(info)
+
#endif /* _I915_PCIIDS_H */
diff --git a/src/intel_module.c b/src/intel_module.c
index d3dca83..60835b9 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -130,6 +130,10 @@ static const struct intel_device_info intel_broxton_info = {
.gen = 0111,
};
+static const struct intel_device_info intel_kabylake_info = {
+ .gen = 0112,
+};
+
static const SymTabRec intel_chipsets[] = {
{PCI_CHIP_I810, "i810"},
{PCI_CHIP_I810_DC100, "i810-dc100"},
@@ -329,6 +333,8 @@ static const struct pci_id_match intel_device_match[] = {
INTEL_BXT_IDS(&intel_broxton_info),
+ INTEL_KBL_IDS(&intel_kabylake_info),
+
INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
#endif
commit 3cdc1780e3fbd789c40487fed4fb2272002784ab
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu Nov 19 10:37:42 2015 +0000
Rename Option "NoAccel" to "Accel"
Totally cribbed from xf86-video-amdgpu/-radeon:
commit 560b7fe6dc66405762020f00e9a05918a36f3a17
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Wed Nov 11 17:31:34 2015 +0900
Rename Option "NoAccel" to "Accel"
Renaming the option removes the need for a double negation when forcing
acceleration on and is backwards compatible as the option parser
automagically handles the 'No' prefix.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/man/intel.man b/man/intel.man
index 318a5b7..8da496e 100644
--- a/man/intel.man
+++ b/man/intel.man
@@ -112,8 +112,8 @@ The default is 8192 if AGP allocable memory is < 128 MB, 16384 if < 192 MB,
24576 if higher. DRI require at least a value of 16384. Higher values may give
better 3D performance, at expense of available system memory.
.TP
-.BI "Option \*qNoAccel\*q \*q" boolean \*q
-Disable or enable acceleration.
+.BI "Option \*qAccel\*q \*q" boolean \*q
+Enable or disable acceleration.
.IP
Default: acceleration is enabled.
@@ -122,8 +122,8 @@ The following driver
.B Options
are supported for the 830M and later chipsets:
.TP
-.BI "Option \*qNoAccel\*q \*q" boolean \*q
-Disable or enable acceleration.
+.BI "Option \*qAccel\*q \*q" boolean \*q
+Enable or disable acceleration.
.IP
Default: acceleration is enabled.
.TP
diff --git a/src/intel_options.c b/src/intel_options.c
index d19736b..7f253ac 100644
--- a/src/intel_options.c
+++ b/src/intel_options.c
@@ -9,7 +9,7 @@
#include "intel_options.h"
const OptionInfoRec intel_options[] = {
- {OPTION_ACCEL_DISABLE, "NoAccel", OPTV_BOOLEAN, {0}, 0},
+ {OPTION_ACCEL_ENABLE, "Accel", OPTV_BOOLEAN, {0}, 0},
{OPTION_ACCEL_METHOD, "AccelMethod", OPTV_STRING, {0}, 0},
{OPTION_BACKLIGHT, "Backlight", OPTV_STRING, {0}, 0},
{OPTION_EDID, "CustomEDID", OPTV_STRING, {0}, 0},
diff --git a/src/intel_options.h b/src/intel_options.h
index a831c55..43635f1 100644
--- a/src/intel_options.h
+++ b/src/intel_options.h
@@ -12,7 +12,7 @@
*/
enum intel_options {
- OPTION_ACCEL_DISABLE,
+ OPTION_ACCEL_ENABLE,
OPTION_ACCEL_METHOD,
OPTION_BACKLIGHT,
OPTION_EDID,
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 7d7731b..7e20715 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -17985,7 +17985,7 @@ static bool sna_option_accel_none(struct sna *sna)
if (wedged(sna))
return true;
- if (xf86ReturnOptValBool(sna->Options, OPTION_ACCEL_DISABLE, FALSE))
+ if (xf86ReturnOptValBool(sna->Options, OPTION_ACCEL_ENABLE, TRUE))
return true;
if (sna->kgem.gen >= 0120)
diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
index 8e685bd..70bce84 100644
--- a/src/uxa/intel_driver.c
+++ b/src/uxa/intel_driver.c
@@ -364,7 +364,7 @@ static Bool can_accelerate_blt(struct intel_screen_private *intel)
if (INTEL_INFO(intel)->gen == -1)
return FALSE;
- if (xf86ReturnOptValBool(intel->Options, OPTION_ACCEL_DISABLE, FALSE) ||
+ if (xf86ReturnOptValBool(intel->Options, OPTION_ACCEL_ENABLE, TRUE) ||
!intel_option_cast_to_bool(intel->Options, OPTION_ACCEL_METHOD, TRUE)) {
xf86DrvMsg(intel->scrn->scrnIndex, X_CONFIG,
"Disabling hardware acceleration.\n");
More information about the xorg-commit
mailing list