On Tue, May 31, 2016 at 02:55:43PM +0530, Shashank Sharma wrote:
> lspcon is a dp->hdmi adaptor has two modes of operation.
> ls mode: level shifter mode, passive dp->hdmi dongle
> pcon mode: protocol converter mode, active dp->hdmi 2.0
> converter.
>
> This patch adds a new file, to accommodate lspcon support
> for I915 driver. These functions probe, detect, initialize
> and configure an on-board lspcon device during the driver
> init time.
>
> Also, this patch adds a small structure for lspcon device,
> which will provide the runtime status of the device.
>
> Signed-off-by: Shashank Sharma <shashank.sharma@xxxxxxxxx>
> Signed-off-by: Akashdeep Sharma <akashdeep.sharma@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/Makefile | 1 +
> drivers/gpu/drm/i915/intel_drv.h | 13 ++-
> drivers/gpu/drm/i915/intel_lspcon.c | 159 ++++++++++++++++++++++++++++++++++++
> 3 files changed, 172 insertions(+), 1 deletion(-)
> create mode 100644 drivers/gpu/drm/i915/intel_lspcon.c
>
> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> index 7e29444..1bd6026 100644
> --- a/drivers/gpu/drm/i915/Makefile
> +++ b/drivers/gpu/drm/i915/Makefile
> @@ -93,6 +93,7 @@ i915-y += dvo_ch7017.o \
> intel_dvo.o \
> intel_hdmi.o \
> intel_i2c.o \
> + intel_lspcon.o \
> intel_lvds.o \
> intel_panel.o \
> intel_sdvo.o \
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 9b5f663..205a463 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -896,12 +896,19 @@ struct intel_dp {
> bool compliance_test_active;
> };
>
> +struct intel_lspcon {
> + bool active;
> + enum drm_lspcon_mode mode_of_op;
> + struct drm_dp_aux *aux;
> +};
> +
> struct intel_digital_port {
> struct intel_encoder base;
> enum port port;
> u32 saved_port_bits;
> struct intel_dp dp;
> struct intel_hdmi hdmi;
> + struct intel_lspcon lspcon;
> enum irqreturn (*hpd_pulse)(struct intel_digital_port *, bool);
> bool release_cl2_override;
> uint8_t max_lanes;
> @@ -1446,7 +1453,6 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder,
> struct intel_crtc_state *pipe_config);
> void intel_dp_dual_mode_set_tmds_output(struct intel_hdmi *hdmi, bool enable);
>
> -
> /* intel_lvds.c */
> void intel_lvds_init(struct drm_device *dev);
> bool intel_is_dual_link_lvds(struct drm_device *dev);
> @@ -1734,4 +1740,9 @@ int intel_color_check(struct drm_crtc *crtc, struct drm_crtc_state *state);
> void intel_color_set_csc(struct drm_crtc_state *crtc_state);
> void intel_color_load_luts(struct drm_crtc_state *crtc_state);
>
> +/* intel_lspcon.c */
> +bool lspcon_init(struct intel_digital_port *intel_dig_port);
> +enum drm_connector_status
> +lspcon_ls_mode_detect(struct drm_connector *connector, bool force);
> +bool is_lspcon_active(struct intel_digital_port *dig_port);
> #endif /* __INTEL_DRV_H__ */
> diff --git a/drivers/gpu/drm/i915/intel_lspcon.c b/drivers/gpu/drm/i915/intel_lspcon.c
> new file mode 100644
> index 0000000..dd50491
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/intel_lspcon.c
> @@ -0,0 +1,159 @@
> +/*
> + * Copyright © 2016 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> + * DEALINGS IN THE SOFTWARE.
> + *
> + *
> + */
> +#include <drm/drm_edid.h>
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_dp_dual_mode_helper.h>
> +#include "intel_drv.h"
> +
> +#define LSPCON_I2C_ADDRESS 0x80
> +#define LSPCON_ADAPTER_SIGN_OFFSET 0x00
> +#define LSPCON_IDENTIFIER_OFFSET 0x10
> +#define LSPCON_IDENTIFIER_LENGTH 0x10
Leftovers?
> +
> +bool is_lspcon_active(struct intel_digital_port *dig_port)
> +{
> + return dig_port->lspcon.active;
> +}
> +
> +enum drm_lspcon_mode lspcon_get_current_mode(struct intel_lspcon *lspcon)
> +{
> + enum drm_lspcon_mode current_mode;
> + struct i2c_adapter *adapter = &lspcon->aux->ddc;
> +
> + current_mode = drm_lspcon_get_current_mode(adapter);
> + if (current_mode == DRM_LSPCON_MODE_INVALID)
> + DRM_ERROR("Error reading LSPCON mode\n");
> + else
> + DRM_DEBUG_KMS("Current LSPCON mode %s\n",
> + current_mode == DRM_LSPCON_MODE_PCON ? "PCON" : "LS");
> + return current_mode;
> +}
This file seems to be just contain these sort of wrappers that don't
look very useful to me.
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
