|
@@ -1,6 +1,6 @@
|
|
|
-From f6b67dd65aba715d50c388f6bfd3ac9260880e38 Mon Sep 17 00:00:00 2001
|
|
|
+From f756d362f0445d8417e0e098bbb32e3326e91097 Mon Sep 17 00:00:00 2001
|
|
|
From: Jake Day <jake@ninebysix.com>
|
|
|
-Date: Mon, 18 Feb 2019 13:17:11 -0500
|
|
|
+Date: Thu, 7 Mar 2019 12:02:08 -0500
|
|
|
Subject: [PATCH 05/11] ipts
|
|
|
|
|
|
---
|
|
@@ -205,7 +205,7 @@ index 29877969310d..f98fdb5fc282 100644
|
|
|
GT_RENDER_USER_INTERRUPT << GEN8_BCS_IRQ_SHIFT |
|
|
|
GT_CONTEXT_SWITCH_INTERRUPT << GEN8_BCS_IRQ_SHIFT,
|
|
|
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
|
|
|
-index 295e981e4a39..80cd47fd8c09 100644
|
|
|
+index 295e981e4a39..84415814c007 100644
|
|
|
--- a/drivers/gpu/drm/i915/i915_params.c
|
|
|
+++ b/drivers/gpu/drm/i915/i915_params.c
|
|
|
@@ -145,7 +145,10 @@ i915_param_named_unsafe(edp_vswing, int, 0400,
|
|
@@ -213,7 +213,7 @@ index 295e981e4a39..80cd47fd8c09 100644
|
|
|
"Enable GuC load for GuC submission and/or HuC load. "
|
|
|
"Required functionality can be selected using bitmask values. "
|
|
|
- "(-1=auto, 0=disable [default], 1=GuC submission, 2=HuC load)");
|
|
|
-+ "(-1=auto, 0=disable, 1=GuC submission [default], 2=HuC load)");
|
|
|
++ "(-1=auto [default], 0=disable, 1=GuC submission, 2=HuC load)");
|
|
|
+
|
|
|
+i915_param_named_unsafe(enable_ipts, int, 0400,
|
|
|
+ "Enable IPTS Touchscreen and Pen support (default: 1)");
|
|
@@ -221,7 +221,7 @@ index 295e981e4a39..80cd47fd8c09 100644
|
|
|
i915_param_named(guc_log_level, int, 0400,
|
|
|
"GuC firmware logging level. Requires GuC to be loaded. "
|
|
|
diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
|
|
|
-index 6c4d4a21474b..b15f81d55d70 100644
|
|
|
+index 6c4d4a21474b..4ab800c3de6d 100644
|
|
|
--- a/drivers/gpu/drm/i915/i915_params.h
|
|
|
+++ b/drivers/gpu/drm/i915/i915_params.h
|
|
|
@@ -46,7 +46,7 @@ struct drm_printer;
|
|
@@ -229,7 +229,7 @@ index 6c4d4a21474b..b15f81d55d70 100644
|
|
|
param(int, enable_ips, 1) \
|
|
|
param(int, invert_brightness, 0) \
|
|
|
- param(int, enable_guc, 0) \
|
|
|
-+ param(int, enable_guc, 1) \
|
|
|
++ param(int, enable_guc, -1) \
|
|
|
param(int, guc_log_level, -1) \
|
|
|
param(char *, guc_firmware_path, NULL) \
|
|
|
param(char *, huc_firmware_path, NULL) \
|