drm/i915/bios: calculate panel type as per child device index in VBT

Each LFP may have different panel type which is stored in LFP data
data block. Based on the child device index respective panel-type/
panel-type2 field will be used.

v1: Initial rfc verion.
v2: Based on review comments from Jani,
- Used panel-type instead addition panel-index variable.
- DEVICE_HANDLE_* name changed and placed before DEVICE_TYPE_*
macro.
v3:
- passing intel_bios_encoder_data as argument of
intel_bios_init_panel(). Passing NULL to indicate encoder is not
initialized yet for dsi as current focus is to enable dual EDP. [Jani]
v4:
- encoder->devdata used which is initialized before from vbt
structure. [Jani]

Signed-off-by: Animesh Manna <animesh.manna@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220620065138.5126-1-animesh.manna@intel.com

diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
index 996bd3fdda6bdb098fe8d0047fad87a1dae3a409..712e371a2bf758a2c8ea405883b214fbcb4b418b 100644 (file)
--- a/drivers/gpu/drm/i915/display/icl_dsi.c
+++ b/drivers/gpu/drm/i915/display/icl_dsi.c
@@ -2049,7 +2049,7 @@ void icl_dsi_init(struct drm_i915_private *dev_priv)
        /* attach connector to encoder */
        intel_connector_attach_encoder(intel_connector, encoder);
 
-       intel_bios_init_panel(dev_priv, &intel_connector->panel, NULL);
+       intel_bios_init_panel(dev_priv, &intel_connector->panel, NULL, NULL);
 
        mutex_lock(&dev->mode_config.mutex);
        intel_panel_add_vbt_lfp_fixed_mode(intel_connector);

diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
index 82eef3b1ca879a8c549fa6425737b77e2c93c483..e89bc1d665f46d24db951c482bccdfe572104dd6 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bios.c
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
@@ -603,12 +603,14 @@ get_lfp_data_tail(const struct bdb_lvds_lfp_data *data,
 }
 
 static int opregion_get_panel_type(struct drm_i915_private *i915,
+                                  const struct intel_bios_encoder_data *devdata,
                                   const struct edid *edid)
 {
        return intel_opregion_get_panel_type(i915);
 }
 
 static int vbt_get_panel_type(struct drm_i915_private *i915,
+                             const struct intel_bios_encoder_data *devdata,
                              const struct edid *edid)
 {
        const struct bdb_lvds_options *lvds_options;
@@ -624,10 +626,16 @@ static int vbt_get_panel_type(struct drm_i915_private *i915,
                return -1;
        }
 
+       if (devdata && devdata->child.handle == DEVICE_HANDLE_LFP2)
+               return lvds_options->panel_type2;
+
+       drm_WARN_ON(&i915->drm, devdata && devdata->child.handle != DEVICE_HANDLE_LFP1);
+
        return lvds_options->panel_type;
 }
 
 static int pnpid_get_panel_type(struct drm_i915_private *i915,
+                               const struct intel_bios_encoder_data *devdata,
                                const struct edid *edid)
 {
        const struct bdb_lvds_lfp_data *data;
@@ -674,6 +682,7 @@ static int pnpid_get_panel_type(struct drm_i915_private *i915,
 }
 
 static int fallback_get_panel_type(struct drm_i915_private *i915,
+                                  const struct intel_bios_encoder_data *devdata,
                                   const struct edid *edid)
 {
        return 0;
@@ -687,11 +696,13 @@ enum panel_type {
 };
 
 static int get_panel_type(struct drm_i915_private *i915,
+                         const struct intel_bios_encoder_data *devdata,
                          const struct edid *edid)
 {
        struct {
                const char *name;
                int (*get_panel_type)(struct drm_i915_private *i915,
+                                     const struct intel_bios_encoder_data *devdata,
                                      const struct edid *edid);
                int panel_type;
        } panel_types[] = {
@@ -715,7 +726,7 @@ static int get_panel_type(struct drm_i915_private *i915,
        int i;
 
        for (i = 0; i < ARRAY_SIZE(panel_types); i++) {
-               panel_types[i].panel_type = panel_types[i].get_panel_type(i915, edid);
+               panel_types[i].panel_type = panel_types[i].get_panel_type(i915, devdata, edid);
 
                drm_WARN_ON(&i915->drm, panel_types[i].panel_type > 0xf &&
                            panel_types[i].panel_type != 0xff);
@@ -3126,11 +3137,12 @@ out:
 
 void intel_bios_init_panel(struct drm_i915_private *i915,
                           struct intel_panel *panel,
+                          const struct intel_bios_encoder_data *devdata,
                           const struct edid *edid)
 {
        init_vbt_panel_defaults(panel);
 
-       panel->vbt.panel_type = get_panel_type(i915, edid);
+       panel->vbt.panel_type = get_panel_type(i915, devdata, edid);
 
        parse_panel_options(i915, panel);
        parse_generic_dtd(i915, panel);

diff --git a/drivers/gpu/drm/i915/display/intel_bios.h b/drivers/gpu/drm/i915/display/intel_bios.h
index b112200ae0a0b4c68215165acb67ec8463eb13bc..e47582b0de0a17cdcad296bf08683f040605aab2 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bios.h
+++ b/drivers/gpu/drm/i915/display/intel_bios.h
@@ -234,6 +234,7 @@ struct mipi_pps_data {
 void intel_bios_init(struct drm_i915_private *dev_priv);
 void intel_bios_init_panel(struct drm_i915_private *dev_priv,
                           struct intel_panel *panel,
+                          const struct intel_bios_encoder_data *devdata,
                           const struct edid *edid);
 void intel_bios_fini_panel(struct intel_panel *panel);
 void intel_bios_driver_remove(struct drm_i915_private *dev_priv);

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 94ffbd7d807a470fd5df0cbb85aeb0dad953593f..728a44263b5f1cd91d5364654f894a3d63caabdc 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -5193,6 +5193,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
        struct drm_device *dev = &dev_priv->drm;
        struct drm_connector *connector = &intel_connector->base;
        struct drm_display_mode *fixed_mode;
+       struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
        bool has_dpcd;
        enum pipe pipe = INVALID_PIPE;
        struct edid *edid;
@@ -5250,7 +5251,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
        intel_connector->edid = edid;
 
        intel_bios_init_panel(dev_priv, &intel_connector->panel,
-                             IS_ERR(edid) ? NULL : edid);
+                             encoder->devdata, IS_ERR(edid) ? NULL : edid);
 
        intel_panel_add_edid_fixed_modes(intel_connector,
                                         intel_connector->panel.vbt.drrs_type != DRRS_TYPE_NONE,

diff --git a/drivers/gpu/drm/i915/display/intel_lvds.c b/drivers/gpu/drm/i915/display/intel_lvds.c
index e55802b454613fb8267955ca8b1e10e1af666b52..730480ac3300ddaa5096decc59afd5a0bd4865de 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_lvds.c
+++ b/drivers/gpu/drm/i915/display/intel_lvds.c
@@ -967,7 +967,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
        }
        intel_connector->edid = edid;
 
-       intel_bios_init_panel(dev_priv, &intel_connector->panel,
+       intel_bios_init_panel(dev_priv, &intel_connector->panel, NULL,
                              IS_ERR(edid) ? NULL : edid);
 
        /* Try EDID first */

diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c
index 81f700517e894bbbe3904f81ff1ae1e064a7ce2f..30c752d02d7c27ee5bbd1e3d82d3f2535f316762 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -2900,7 +2900,7 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device)
        if (!intel_sdvo_create_enhance_property(intel_sdvo, intel_sdvo_connector))
                goto err;
 
-       intel_bios_init_panel(i915, &intel_connector->panel, NULL);
+       intel_bios_init_panel(i915, &intel_connector->panel, NULL, NULL);
 
        /*
         * Fetch modes from VBT. For SDVO prefer the VBT mode since some

diff --git a/drivers/gpu/drm/i915/display/intel_vbt_defs.h b/drivers/gpu/drm/i915/display/intel_vbt_defs.h
index 3766c09bd65d9b432aed083175fdf35f5bf49404..509b0a419c20ac9fe43998b4d77493ee7b9761b3 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vbt_defs.h
+++ b/drivers/gpu/drm/i915/display/intel_vbt_defs.h
@@ -182,6 +182,10 @@ struct bdb_general_features {
 #define GPIO_PIN_ADD_DDC       0x04 /* "ADDCARD DDC GPIO pins" */
 #define GPIO_PIN_ADD_DDC_I2C   0x06 /* "ADDCARD DDC/I2C GPIO pins" */
 
+/* Device handle */
+#define DEVICE_HANDLE_LFP1     0x0008
+#define DEVICE_HANDLE_LFP2     0x0080
+
 /* Pre 915 */
 #define DEVICE_TYPE_NONE       0x00
 #define DEVICE_TYPE_CRT                0x01

diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
index abda0888c8d411d0093595d39f5856d4a7f7966b..b9b1fed998740bb446afa02a29ea5172ede722e9 100644 (file)
--- a/drivers/gpu/drm/i915/display/vlv_dsi.c
+++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
@@ -1926,7 +1926,7 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv)
 
        intel_dsi->panel_power_off_time = ktime_get_boottime();
 
-       intel_bios_init_panel(dev_priv, &intel_connector->panel, NULL);
+       intel_bios_init_panel(dev_priv, &intel_connector->panel, NULL, NULL);
 
        if (intel_connector->panel.vbt.dsi.config->dual_link)
                intel_dsi->ports = BIT(PORT_A) | BIT(PORT_C);