Commit 34427052 authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter

drm/i915: pass mode to ELD write vfuncs

This will be needed for setting the HDMI pixel clock for audio
config. No functional changes.

v2: Now with a commit message.
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c75b505d
...@@ -379,7 +379,8 @@ struct drm_i915_display_funcs { ...@@ -379,7 +379,8 @@ struct drm_i915_display_funcs {
void (*crtc_disable)(struct drm_crtc *crtc); void (*crtc_disable)(struct drm_crtc *crtc);
void (*off)(struct drm_crtc *crtc); void (*off)(struct drm_crtc *crtc);
void (*write_eld)(struct drm_connector *connector, void (*write_eld)(struct drm_connector *connector,
struct drm_crtc *crtc); struct drm_crtc *crtc,
struct drm_display_mode *mode);
void (*fdi_link_train)(struct drm_crtc *crtc); void (*fdi_link_train)(struct drm_crtc *crtc);
void (*init_clock_gating)(struct drm_device *dev); void (*init_clock_gating)(struct drm_device *dev);
int (*queue_flip)(struct drm_device *dev, struct drm_crtc *crtc, int (*queue_flip)(struct drm_device *dev, struct drm_crtc *crtc,
......
...@@ -6753,7 +6753,8 @@ static bool intel_eld_uptodate(struct drm_connector *connector, ...@@ -6753,7 +6753,8 @@ static bool intel_eld_uptodate(struct drm_connector *connector,
} }
static void g4x_write_eld(struct drm_connector *connector, static void g4x_write_eld(struct drm_connector *connector,
struct drm_crtc *crtc) struct drm_crtc *crtc,
struct drm_display_mode *mode)
{ {
struct drm_i915_private *dev_priv = connector->dev->dev_private; struct drm_i915_private *dev_priv = connector->dev->dev_private;
uint8_t *eld = connector->eld; uint8_t *eld = connector->eld;
...@@ -6793,7 +6794,8 @@ static void g4x_write_eld(struct drm_connector *connector, ...@@ -6793,7 +6794,8 @@ static void g4x_write_eld(struct drm_connector *connector,
} }
static void haswell_write_eld(struct drm_connector *connector, static void haswell_write_eld(struct drm_connector *connector,
struct drm_crtc *crtc) struct drm_crtc *crtc,
struct drm_display_mode *mode)
{ {
struct drm_i915_private *dev_priv = connector->dev->dev_private; struct drm_i915_private *dev_priv = connector->dev->dev_private;
uint8_t *eld = connector->eld; uint8_t *eld = connector->eld;
...@@ -6880,7 +6882,8 @@ static void haswell_write_eld(struct drm_connector *connector, ...@@ -6880,7 +6882,8 @@ static void haswell_write_eld(struct drm_connector *connector,
} }
static void ironlake_write_eld(struct drm_connector *connector, static void ironlake_write_eld(struct drm_connector *connector,
struct drm_crtc *crtc) struct drm_crtc *crtc,
struct drm_display_mode *mode)
{ {
struct drm_i915_private *dev_priv = connector->dev->dev_private; struct drm_i915_private *dev_priv = connector->dev->dev_private;
uint8_t *eld = connector->eld; uint8_t *eld = connector->eld;
...@@ -6975,7 +6978,7 @@ void intel_write_eld(struct drm_encoder *encoder, ...@@ -6975,7 +6978,7 @@ void intel_write_eld(struct drm_encoder *encoder,
connector->eld[6] = drm_av_sync_delay(connector, mode) / 2; connector->eld[6] = drm_av_sync_delay(connector, mode) / 2;
if (dev_priv->display.write_eld) if (dev_priv->display.write_eld)
dev_priv->display.write_eld(connector, crtc); dev_priv->display.write_eld(connector, crtc, mode);
} }
static void i845_update_cursor(struct drm_crtc *crtc, u32 base) static void i845_update_cursor(struct drm_crtc *crtc, u32 base)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment