forked from Minki/linux
drm/i915/dsi: remove unnecessary dsi device callbacks
Remove all the trivial and/or dummy callbacks from intel dsi device ops. Merge send_otp_cmds into panel_reset as they're called back to back. This will be helpful for switching to use drm_panel for the callbacks. If we ever need the additional callbacks, we should add them to drm_panel funcs. Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-By: Shobhit Kumar <shobhit.kumar@intel.com> [danvet: Resolve tiny conflict with ongoing atomic work.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
7f6a6a4a19
commit
36d21f4c55
@ -70,12 +70,6 @@ static void band_gap_reset(struct drm_i915_private *dev_priv)
|
||||
mutex_unlock(&dev_priv->dpio_lock);
|
||||
}
|
||||
|
||||
static struct intel_dsi *intel_attached_dsi(struct drm_connector *connector)
|
||||
{
|
||||
return container_of(intel_attached_encoder(connector),
|
||||
struct intel_dsi, base);
|
||||
}
|
||||
|
||||
static inline bool is_vid_mode(struct intel_dsi *intel_dsi)
|
||||
{
|
||||
return intel_dsi->operation_mode == INTEL_DSI_VIDEO_MODE;
|
||||
@ -99,7 +93,6 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder,
|
||||
struct intel_connector *intel_connector = intel_dsi->attached_connector;
|
||||
struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;
|
||||
struct drm_display_mode *adjusted_mode = &config->base.adjusted_mode;
|
||||
struct drm_display_mode *mode = &config->base.mode;
|
||||
|
||||
DRM_DEBUG_KMS("\n");
|
||||
|
||||
@ -109,10 +102,6 @@ static bool intel_dsi_compute_config(struct intel_encoder *encoder,
|
||||
/* DSI uses short packets for sync events, so clear mode flags for DSI */
|
||||
adjusted_mode->flags = 0;
|
||||
|
||||
if (intel_dsi->dev.dev_ops->mode_fixup)
|
||||
return intel_dsi->dev.dev_ops->mode_fixup(&intel_dsi->dev,
|
||||
mode, adjusted_mode);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -269,9 +258,6 @@ static void intel_dsi_pre_enable(struct intel_encoder *encoder)
|
||||
if (intel_dsi->dev.dev_ops->panel_reset)
|
||||
intel_dsi->dev.dev_ops->panel_reset(&intel_dsi->dev);
|
||||
|
||||
if (intel_dsi->dev.dev_ops->send_otp_cmds)
|
||||
intel_dsi->dev.dev_ops->send_otp_cmds(&intel_dsi->dev);
|
||||
|
||||
for_each_dsi_port(port, intel_dsi->ports)
|
||||
wait_for_dsi_fifo_empty(intel_dsi, port);
|
||||
|
||||
@ -484,7 +470,6 @@ intel_dsi_mode_valid(struct drm_connector *connector,
|
||||
{
|
||||
struct intel_connector *intel_connector = to_intel_connector(connector);
|
||||
struct drm_display_mode *fixed_mode = intel_connector->panel.fixed_mode;
|
||||
struct intel_dsi *intel_dsi = intel_attached_dsi(connector);
|
||||
|
||||
DRM_DEBUG_KMS("\n");
|
||||
|
||||
@ -500,7 +485,7 @@ intel_dsi_mode_valid(struct drm_connector *connector,
|
||||
return MODE_PANEL;
|
||||
}
|
||||
|
||||
return intel_dsi->dev.dev_ops->mode_valid(&intel_dsi->dev, mode);
|
||||
return MODE_OK;
|
||||
}
|
||||
|
||||
/* return txclkesc cycles in terms of divider and duration in us */
|
||||
@ -749,20 +734,7 @@ static void intel_dsi_pre_pll_enable(struct intel_encoder *encoder)
|
||||
static enum drm_connector_status
|
||||
intel_dsi_detect(struct drm_connector *connector, bool force)
|
||||
{
|
||||
struct intel_dsi *intel_dsi = intel_attached_dsi(connector);
|
||||
struct intel_encoder *intel_encoder = &intel_dsi->base;
|
||||
enum intel_display_power_domain power_domain;
|
||||
enum drm_connector_status connector_status;
|
||||
struct drm_i915_private *dev_priv = intel_encoder->base.dev->dev_private;
|
||||
|
||||
DRM_DEBUG_KMS("\n");
|
||||
power_domain = intel_display_port_power_domain(intel_encoder);
|
||||
|
||||
intel_display_power_get(dev_priv, power_domain);
|
||||
connector_status = intel_dsi->dev.dev_ops->detect(&intel_dsi->dev);
|
||||
intel_display_power_put(dev_priv, power_domain);
|
||||
|
||||
return connector_status;
|
||||
return connector_status_connected;
|
||||
}
|
||||
|
||||
static int intel_dsi_get_modes(struct drm_connector *connector)
|
||||
|
@ -47,33 +47,13 @@ struct intel_dsi_dev_ops {
|
||||
|
||||
void (*disable_panel_power)(struct intel_dsi_device *dsi);
|
||||
|
||||
/* one time programmable commands if needed */
|
||||
void (*send_otp_cmds)(struct intel_dsi_device *dsi);
|
||||
|
||||
/* This callback must be able to assume DSI commands can be sent */
|
||||
void (*enable)(struct intel_dsi_device *dsi);
|
||||
|
||||
/* This callback must be able to assume DSI commands can be sent */
|
||||
void (*disable)(struct intel_dsi_device *dsi);
|
||||
|
||||
int (*mode_valid)(struct intel_dsi_device *dsi,
|
||||
struct drm_display_mode *mode);
|
||||
|
||||
bool (*mode_fixup)(struct intel_dsi_device *dsi,
|
||||
const struct drm_display_mode *mode,
|
||||
struct drm_display_mode *adjusted_mode);
|
||||
|
||||
void (*mode_set)(struct intel_dsi_device *dsi,
|
||||
struct drm_display_mode *mode,
|
||||
struct drm_display_mode *adjusted_mode);
|
||||
|
||||
enum drm_connector_status (*detect)(struct intel_dsi_device *dsi);
|
||||
|
||||
bool (*get_hw_state)(struct intel_dsi_device *dev);
|
||||
|
||||
struct drm_display_mode *(*get_modes)(struct intel_dsi_device *dsi);
|
||||
|
||||
void (*destroy) (struct intel_dsi_device *dsi);
|
||||
};
|
||||
|
||||
struct intel_dsi {
|
||||
|
@ -559,18 +559,6 @@ static bool generic_init(struct intel_dsi_device *dsi)
|
||||
return true;
|
||||
}
|
||||
|
||||
static int generic_mode_valid(struct intel_dsi_device *dsi,
|
||||
struct drm_display_mode *mode)
|
||||
{
|
||||
return MODE_OK;
|
||||
}
|
||||
|
||||
static bool generic_mode_fixup(struct intel_dsi_device *dsi,
|
||||
const struct drm_display_mode *mode,
|
||||
struct drm_display_mode *adjusted_mode) {
|
||||
return true;
|
||||
}
|
||||
|
||||
static void generic_panel_reset(struct intel_dsi_device *dsi)
|
||||
{
|
||||
struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);
|
||||
@ -580,6 +568,9 @@ static void generic_panel_reset(struct intel_dsi_device *dsi)
|
||||
char *sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_ASSERT_RESET];
|
||||
|
||||
generic_exec_sequence(intel_dsi, sequence);
|
||||
|
||||
sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_INIT_OTP];
|
||||
generic_exec_sequence(intel_dsi, sequence);
|
||||
}
|
||||
|
||||
static void generic_disable_panel_power(struct intel_dsi_device *dsi)
|
||||
@ -593,17 +584,6 @@ static void generic_disable_panel_power(struct intel_dsi_device *dsi)
|
||||
generic_exec_sequence(intel_dsi, sequence);
|
||||
}
|
||||
|
||||
static void generic_send_otp_cmds(struct intel_dsi_device *dsi)
|
||||
{
|
||||
struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);
|
||||
struct drm_device *dev = intel_dsi->base.base.dev;
|
||||
struct drm_i915_private *dev_priv = dev->dev_private;
|
||||
|
||||
char *sequence = dev_priv->vbt.dsi.sequence[MIPI_SEQ_INIT_OTP];
|
||||
|
||||
generic_exec_sequence(intel_dsi, sequence);
|
||||
}
|
||||
|
||||
static void generic_enable(struct intel_dsi_device *dsi)
|
||||
{
|
||||
struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);
|
||||
@ -626,16 +606,6 @@ static void generic_disable(struct intel_dsi_device *dsi)
|
||||
generic_exec_sequence(intel_dsi, sequence);
|
||||
}
|
||||
|
||||
static enum drm_connector_status generic_detect(struct intel_dsi_device *dsi)
|
||||
{
|
||||
return connector_status_connected;
|
||||
}
|
||||
|
||||
static bool generic_get_hw_state(struct intel_dsi_device *dev)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
static struct drm_display_mode *generic_get_modes(struct intel_dsi_device *dsi)
|
||||
{
|
||||
struct intel_dsi *intel_dsi = container_of(dsi, struct intel_dsi, dev);
|
||||
@ -646,20 +616,11 @@ static struct drm_display_mode *generic_get_modes(struct intel_dsi_device *dsi)
|
||||
return dev_priv->vbt.lfp_lvds_vbt_mode;
|
||||
}
|
||||
|
||||
static void generic_destroy(struct intel_dsi_device *dsi) { }
|
||||
|
||||
/* Callbacks. We might not need them all. */
|
||||
struct intel_dsi_dev_ops vbt_generic_dsi_display_ops = {
|
||||
.init = generic_init,
|
||||
.mode_valid = generic_mode_valid,
|
||||
.mode_fixup = generic_mode_fixup,
|
||||
.panel_reset = generic_panel_reset,
|
||||
.disable_panel_power = generic_disable_panel_power,
|
||||
.send_otp_cmds = generic_send_otp_cmds,
|
||||
.enable = generic_enable,
|
||||
.disable = generic_disable,
|
||||
.detect = generic_detect,
|
||||
.get_hw_state = generic_get_hw_state,
|
||||
.get_modes = generic_get_modes,
|
||||
.destroy = generic_destroy,
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user