Commit 03930e3d authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/dsi: switch mipi_exec_gpio() from dev_priv to i915 



Follow the contemporary conventions.

Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231103201831.1037416-3-andriy.shevchenko@linux.intel.com
parent 211ed0b3

drivers/gpu/drm/i915/display/intel_dsi_vbt.c

+7 −7
Original line number Diff line number Diff line
@@ -454,11 +454,11 @@ static void icl_native_gpio_set_value(struct drm_i915_private *dev_priv, 
static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data)

{

	struct drm_device *dev = intel_dsi->base.base.dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct drm_i915_private *i915 = to_i915(dev);

	struct intel_connector *connector = intel_dsi->attached_connector;

	u8 gpio_source, gpio_index = 0, gpio_number;

	bool value;

	bool native = DISPLAY_VER(dev_priv) >= 11;

	bool native = DISPLAY_VER(i915) >= 11;



	if (connector->panel.vbt.dsi.seq_version >= 3)

		gpio_index = *data++;
@@ -477,16 +477,16 @@ static const u8 *mipi_exec_gpio(struct intel_dsi *intel_dsi, const u8 *data) 
	/* pull up/down */

	value = *data++ & 1;



	drm_dbg_kms(&dev_priv->drm, "GPIO index %u, number %u, source %u, native %s, set to %s\n",

	drm_dbg_kms(&i915->drm, "GPIO index %u, number %u, source %u, native %s, set to %s\n",

		    gpio_index, gpio_number, gpio_source, str_yes_no(native), str_on_off(value));



	if (native)

		icl_native_gpio_set_value(dev_priv, gpio_number, value);

	else if (DISPLAY_VER(dev_priv) >= 11)

		icl_native_gpio_set_value(i915, gpio_number, value);

	else if (DISPLAY_VER(i915) >= 11)

		bxt_exec_gpio(connector, gpio_source, gpio_index, value);

	else if (IS_VALLEYVIEW(dev_priv))

	else if (IS_VALLEYVIEW(i915))

		vlv_exec_gpio(connector, gpio_source, gpio_number, value);

	else if (IS_CHERRYVIEW(dev_priv))

	else if (IS_CHERRYVIEW(i915))

		chv_exec_gpio(connector, gpio_source, gpio_number, value);

	else

		bxt_exec_gpio(connector, gpio_source, gpio_index, value);