Re: [Intel-gfx] [PATCH v2 06/24] drm/i915/display: Move lvds_channel_mode module parameter under display

2023-10-23 Thread Luca Coelho 
On Mon, 2023-10-16 at 14:16 +0300, Jouni Högander wrote:
> Signed-off-by: Jouni Högander 
> ---
>  drivers/gpu/drm/i915/display/intel_display_params.c | 4 
>  drivers/gpu/drm/i915/display/intel_display_params.h | 3 ++-
>  drivers/gpu/drm/i915/display/intel_lvds.c   | 4 ++--
>  drivers/gpu/drm/i915/i915_params.c  | 4 
>  drivers/gpu/drm/i915/i915_params.h  | 1 -
>  5 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c 
> b/drivers/gpu/drm/i915/display/intel_display_params.c
> index 72f1782e27fe..cdc42bc575b8 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_params.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_params.c
> @@ -30,6 +30,10 @@ static struct intel_display_params intel_display_modparams 
> __read_mostly = {
>  intel_display_param_named_unsafe(vbt_firmware, charp, 0400,
>   "Load VBT from specified file under /lib/firmware");
>  
> +intel_display_param_named_unsafe(lvds_channel_mode, int, 0400,
> +  "Specify LVDS channel mode "
> +  "(0=probe BIOS [default], 1=single-channel, 2=dual-channel)");
> +
>  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 a6f37c55523d..a4988ef44837 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_params.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_params.h
> @@ -25,7 +25,8 @@ struct drm_i915_private;
>   */
>  #define INTEL_DISPLAY_PARAMS_FOR_EACH(param) \
>   param(char *, vbt_firmware, NULL, 0400) \
> - param(int, enable_fbc, -1, 0600) \
> + param(int, lvds_channel_mode, 0, 0400) \
> + param(int, enable_fbc, -1, 0600)\

The enable_fbc line shouldn't be changed here.  Was there some missing
spaces? If so, it should be fixed in the patch that added enable_fbc.



With this fixed:

Reviewed-by: Luca Coelho 

--
Cheers,
Luca.

[Intel-gfx] [PATCH v2 06/24] drm/i915/display: Move lvds_channel_mode module parameter under display

2023-10-16 Thread Jouni Högander 
Signed-off-by: Jouni Högander 
---
 drivers/gpu/drm/i915/display/intel_display_params.c | 4 
 drivers/gpu/drm/i915/display/intel_display_params.h | 3 ++-
 drivers/gpu/drm/i915/display/intel_lvds.c   | 4 ++--
 drivers/gpu/drm/i915/i915_params.c  | 4 
 drivers/gpu/drm/i915/i915_params.h  | 1 -
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c 
b/drivers/gpu/drm/i915/display/intel_display_params.c
index 72f1782e27fe..cdc42bc575b8 100644
--- a/drivers/gpu/drm/i915/display/intel_display_params.c
+++ b/drivers/gpu/drm/i915/display/intel_display_params.c
@@ -30,6 +30,10 @@ static struct intel_display_params intel_display_modparams 
__read_mostly = {
 intel_display_param_named_unsafe(vbt_firmware, charp, 0400,
"Load VBT from specified file under /lib/firmware");
 
+intel_display_param_named_unsafe(lvds_channel_mode, int, 0400,
+"Specify LVDS channel mode "
+"(0=probe BIOS [default], 1=single-channel, 2=dual-channel)");
+
 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 a6f37c55523d..a4988ef44837 100644
--- a/drivers/gpu/drm/i915/display/intel_display_params.h
+++ b/drivers/gpu/drm/i915/display/intel_display_params.h
@@ -25,7 +25,8 @@ struct drm_i915_private;
  */
 #define INTEL_DISPLAY_PARAMS_FOR_EACH(param) \
param(char *, vbt_firmware, NULL, 0400) \
-   param(int, enable_fbc, -1, 0600) \
+   param(int, lvds_channel_mode, 0, 0400) \
+   param(int, enable_fbc, -1, 0600)\
param(int, enable_psr, -1, 0600) \
param(bool, psr_safest_params, false, 0400) \
param(bool, enable_psr2_sel_fetch, true, 0400) \
diff --git a/drivers/gpu/drm/i915/display/intel_lvds.c 
b/drivers/gpu/drm/i915/display/intel_lvds.c
index 2a4ca7e65775..4b114fde57b1 100644
--- a/drivers/gpu/drm/i915/display/intel_lvds.c
+++ b/drivers/gpu/drm/i915/display/intel_lvds.c
@@ -794,8 +794,8 @@ static bool compute_is_dual_link_lvds(struct 
intel_lvds_encoder *lvds_encoder)
unsigned int val;
 
/* use the module option value if specified */
-   if (i915->params.lvds_channel_mode > 0)
-   return i915->params.lvds_channel_mode == 2;
+   if (i915->display.params.lvds_channel_mode > 0)
+   return i915->display.params.lvds_channel_mode == 2;
 
/* single channel LVDS is limited to 112 MHz */
if (fixed_mode->clock > 112999)
diff --git a/drivers/gpu/drm/i915/i915_params.c 
b/drivers/gpu/drm/i915/i915_params.c
index 9d0535d774c9..ea55cc2c4854 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -72,10 +72,6 @@ i915_param_named_unsafe(enable_dc, int, 0400,
"(-1=auto [default]; 0=disable; 1=up to DC5; 2=up to DC6; "
"3=up to DC5 with DC3CO; 4=up to DC6 with DC3CO)");
 
-i915_param_named_unsafe(lvds_channel_mode, int, 0400,
-"Specify LVDS channel mode "
-"(0=probe BIOS [default], 1=single-channel, 2=dual-channel)");
-
 i915_param_named_unsafe(panel_use_ssc, int, 0400,
"Use Spread Spectrum Clock with panels [LVDS/eDP] "
"(default: auto from VBT)");
diff --git a/drivers/gpu/drm/i915/i915_params.h 
b/drivers/gpu/drm/i915/i915_params.h
index 37a1d31a233c..03ec2c2b589d 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -47,7 +47,6 @@ struct drm_printer;
  */
 #define I915_PARAMS_FOR_EACH(param) \
param(int, modeset, -1, 0400) \
-   param(int, lvds_channel_mode, 0, 0400) \
param(int, panel_use_ssc, -1, 0600) \
param(int, vbt_sdvo_panel_type, -1, 0400) \
param(int, enable_dc, -1, 0400) \
-- 
2.34.1