All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Jouni Högander" <jouni.hogander@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: "Jouni Högander" <jouni.hogander@intel.com>,
	"Jani Nikula" <jani.nikula@intel.com>,
	"Luca Coelho" <luciano.coelho@intel.com>
Subject: [Intel-xe] [PATCH 19/31] drm/i915/display: Move edp_vswing module parameter under display
Date: Fri, 27 Oct 2023 10:59:06 +0300	[thread overview]
Message-ID: <20231027075918.2206862-20-jouni.hogander@intel.com> (raw)
In-Reply-To: <20231027075918.2206862-1-jouni.hogander@intel.com>

Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231024124109.384973-16-jouni.hogander@intel.com
(cherry picked from commit 87706a67ad57725470a0512d26ea2aaca700e2d5)
---
 drivers/gpu/drm/i915/display/intel_bios.c           | 4 ++--
 drivers/gpu/drm/i915/display/intel_display_params.c | 6 ++++++
 drivers/gpu/drm/i915/display/intel_display_params.h | 1 +
 drivers/gpu/drm/i915/i915_params.c                  | 6 ------
 drivers/gpu/drm/i915/i915_params.h                  | 1 -
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 70c0491aac42..69db1a3a1499 100644
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -1514,9 +1514,9 @@ parse_edp(struct drm_i915_private *i915,
 		u8 vswing;
 
 		/* Don't read from VBT if module parameter has valid value*/
-		if (i915->params.edp_vswing) {
+		if (i915->display.params.edp_vswing) {
 			panel->vbt.edp.low_vswing =
-				i915->params.edp_vswing == 1;
+				i915->display.params.edp_vswing == 1;
 		} else {
 			vswing = (edp->edp_vswing_preemph >> (panel_type * 4)) & 0xF;
 			panel->vbt.edp.low_vswing = vswing == 0;
diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c b/drivers/gpu/drm/i915/display/intel_display_params.c
index 2d721afaba30..70a475223512 100644
--- a/drivers/gpu/drm/i915/display/intel_display_params.c
+++ b/drivers/gpu/drm/i915/display/intel_display_params.c
@@ -66,6 +66,12 @@ intel_display_param_named_unsafe(invert_brightness, int, 0400,
 	"to dri-devel@lists.freedesktop.org, if your machine needs it. "
 	"It will then be included in an upcoming module version.");
 
+/* WA to get away with the default setting in VBT for early platforms.Will be removed */
+intel_display_param_named_unsafe(edp_vswing, int, 0400,
+	"Ignore/Override vswing pre-emph table selection from VBT "
+	"(0=use value from vbt [default], 1=low power swing(200mV),"
+	"2=default swing(400mV))");
+
 intel_display_param_named_unsafe(enable_fbc, int, 0400,
 	"Enable frame buffer compression for power savings "
 	"(default: -1 (use per-chip default))");
diff --git a/drivers/gpu/drm/i915/display/intel_display_params.h b/drivers/gpu/drm/i915/display/intel_display_params.h
index 4723b4522413..10c79ce23063 100644
--- a/drivers/gpu/drm/i915/display/intel_display_params.h
+++ b/drivers/gpu/drm/i915/display/intel_display_params.h
@@ -34,6 +34,7 @@ struct drm_i915_private;
 	param(int, disable_power_well, -1, 0400) \
 	param(bool, enable_ips, true, 0600) \
 	param(int, invert_brightness, 0, 0600) \
+	param(int, edp_vswing, 0, 0400) \
 	param(int, enable_fbc, -1, 0600) \
 	param(int, enable_psr, -1, 0600) \
 	param(bool, psr_safest_params, false, 0400) \
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index 423fe54484e1..6b9df9f9d842 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -111,12 +111,6 @@ i915_param_named(verbose_state_checks, bool, 0600,
 i915_param_named_unsafe(nuclear_pageflip, bool, 0400,
 	"Force enable atomic functionality on platforms that don't have full support yet.");
 
-/* WA to get away with the default setting in VBT for early platforms.Will be removed */
-i915_param_named_unsafe(edp_vswing, int, 0400,
-	"Ignore/Override vswing pre-emph table selection from VBT "
-	"(0=use value from vbt [default], 1=low power swing(200mV),"
-	"2=default swing(400mV))");
-
 i915_param_named_unsafe(enable_guc, int, 0400,
 	"Enable GuC load for GuC submission and/or HuC load. "
 	"Required functionality can be selected using bitmask values. "
diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index ae0873443a65..c33edaee5032 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -55,7 +55,6 @@ struct drm_printer;
 	param(char *, gsc_firmware_path, NULL, 0400) \
 	param(bool, memtest, false, 0400) \
 	param(int, mmio_debug, -IS_ENABLED(CONFIG_DRM_I915_DEBUG_MMIO), 0600) \
-	param(int, edp_vswing, 0, 0400) \
 	param(unsigned int, reset, 3, 0600) \
 	param(unsigned int, inject_probe_failure, 0, 0) \
 	param(int, enable_dpcd_backlight, -1, 0600) \
-- 
2.34.1


  parent reply	other threads:[~2023-10-27  8:00 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-27  7:58 [Intel-xe] [PATCH 00/31] Backport display parameter patches Jouni Högander
2023-10-27  7:58 ` [Intel-xe] [PATCH 01/31] Revert "FIXME: drm/i915: xe doesn't have i915_modparams.verbose_state_checks" Jouni Högander
2023-10-27  7:58 ` [Intel-xe] [PATCH 02/31] drm/i915: convert INTEL_DISPLAY_ENABLED() into a function Jouni Högander
2023-10-27  7:58 ` [Intel-xe] [PATCH 03/31] drm/i915: separate display runtime info init Jouni Högander
2023-10-27  7:58 ` [Intel-xe] [PATCH 04/31] drm/i915: separate subplatform init and runtime feature init Jouni Högander
2023-10-27  7:58 ` [Intel-xe] [PATCH 05/31] drm/i915/display: Add framework to add parameters specific to display Jouni Högander
2023-10-27  7:58 ` [Intel-xe] [PATCH 06/31] drm/i915/display: Dump also display parameters Jouni Högander
2023-10-27  7:58 ` [Intel-xe] [PATCH 07/31] drm/i915/display: Move enable_fbc module parameter under display Jouni Högander
2023-10-27  7:58 ` [Intel-xe] [PATCH 08/31] drm/i915/display: Move psr related module parameters " Jouni Högander
2023-10-27  7:58 ` [Intel-xe] [PATCH 09/31] drm/i915/display: Move vbt_firmware module parameter " Jouni Högander
2023-10-27  7:58 ` [Intel-xe] [PATCH 10/31] drm/i915/display: Move lvds_channel_mode " Jouni Högander
2023-10-27  7:58 ` [Intel-xe] [PATCH 11/31] drm/i915/display: Move panel_use_ssc " Jouni Högander
2023-10-27  7:58 ` [Intel-xe] [PATCH 12/31] drm/i915/display: Move vbt_sdvo_panel_type " Jouni Högander
2023-10-27  7:59 ` [Intel-xe] [PATCH 13/31] drm/i915/display: Move enable_dc " Jouni Högander
2023-10-27  7:59 ` [Intel-xe] [PATCH 14/31] drm/i915/display: Move enable_dpt " Jouni Högander
2023-10-27  7:59 ` [Intel-xe] [PATCH 15/31] drm/i915/display: Move enable_sagv " Jouni Högander
2023-10-27  7:59 ` [Intel-xe] [PATCH 16/31] drm/i915/display: Move disable_power_well " Jouni Högander
2023-10-27  7:59 ` [Intel-xe] [PATCH 17/31] drm/i915/display: Move enable_ips " Jouni Högander
2023-10-27  7:59 ` [Intel-xe] [PATCH 18/31] drm/i915/display: Move invert_brightness " Jouni Högander
2023-10-27  7:59 ` Jouni Högander [this message]
2023-10-27  7:59 ` [Intel-xe] [PATCH 20/31] drm/i915/display: Move enable_dpcd_backlight " Jouni Högander
2023-10-27  7:59 ` [Intel-xe] [PATCH 21/31] drm/i915/display: Move load_detect_test " Jouni Högander
2023-10-27  7:59 ` [Intel-xe] [PATCH 22/31] drm/i915/display: Move force_reset_modeset_test " Jouni Högander
2023-10-27  7:59 ` [Intel-xe] [PATCH 23/31] drm/i915/display: Move disable_display " Jouni Högander
2023-10-27  7:59 ` [Intel-xe] [PATCH 24/31] drm/i915/display: Use device parameters instead of module in I915_STATE_WARN Jouni Högander
2023-10-27  7:59 ` [Intel-xe] [PATCH 25/31] drm/i915/display: Move verbose_state_checks under display Jouni Högander
2023-10-27  7:59 ` [Intel-xe] [PATCH 26/31] drm/i915/display: Move nuclear_pageflip " Jouni Högander
2023-10-27  7:59 ` [Intel-xe] [PATCH 27/31] drm/i915/display: Move enable_dp_mst " Jouni Högander
2023-10-27  7:59 ` [Intel-xe] [PATCH 28/31] fixup! drm/xe/display: Implement display support Jouni Högander
2023-10-27  7:59 ` [Intel-xe] [PATCH 29/31] " Jouni Högander
2023-10-27  7:59 ` [Intel-xe] [PATCH 30/31] " Jouni Högander
2023-10-27  7:59 ` [Intel-xe] [PATCH 31/31] " Jouni Högander
2023-10-27  8:03 ` [Intel-xe] ✓ CI.Patch_applied: success for Backport display parameter patches Patchwork
2023-10-27  8:04 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-10-27  8:05 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-10-27  8:13 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-10-27  8:13 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-10-27  8:14 ` [Intel-xe] ✗ CI.checksparse: warning " Patchwork
2023-10-27  8:42 ` [Intel-xe] ✓ CI.BAT: success " Patchwork
2023-10-27  8:47 ` [Intel-xe] [PATCH 00/31] " Jani Nikula
2023-10-30  6:50   ` Hogander, Jouni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231027075918.2206862-20-jouni.hogander@intel.com \
    --to=jouni.hogander@intel.com \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    --cc=luciano.coelho@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.