Commit 528132a3 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915/tv: Nuke reported_modes[]

Remove the silly reported_modes[] array. I suppse once upon a time
this actually had something to do with modes we reported to userspace.
Now it is just the placeholder for the mode we use for load detection.
We don't need it even for that, and instead we can just rely on
the fallback mode in intel_get_load_detect_pipe().
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181112170000.27531-13-ville.syrjala@linux.intel.comReviewed-by: default avatarImre Deak <imre.deak@intel.com>
parent e94390aa
...@@ -1129,23 +1129,6 @@ static void intel_tv_pre_enable(struct intel_encoder *encoder, ...@@ -1129,23 +1129,6 @@ static void intel_tv_pre_enable(struct intel_encoder *encoder,
I915_WRITE(TV_CTL, tv_ctl); I915_WRITE(TV_CTL, tv_ctl);
} }
static const struct drm_display_mode reported_modes[] = {
{
.name = "NTSC 480i",
.clock = 108000,
.hdisplay = 1280,
.hsync_start = 1368,
.hsync_end = 1496,
.htotal = 1712,
.vdisplay = 1024,
.vsync_start = 1027,
.vsync_end = 1034,
.vtotal = 1104,
.type = DRM_MODE_TYPE_DRIVER,
},
};
static int static int
intel_tv_detect_type(struct intel_tv *intel_tv, intel_tv_detect_type(struct intel_tv *intel_tv,
struct drm_connector *connector) struct drm_connector *connector)
...@@ -1275,7 +1258,6 @@ intel_tv_detect(struct drm_connector *connector, ...@@ -1275,7 +1258,6 @@ intel_tv_detect(struct drm_connector *connector,
struct drm_modeset_acquire_ctx *ctx, struct drm_modeset_acquire_ctx *ctx,
bool force) bool force)
{ {
struct drm_display_mode mode;
struct intel_tv *intel_tv = intel_attached_tv(connector); struct intel_tv *intel_tv = intel_attached_tv(connector);
enum drm_connector_status status; enum drm_connector_status status;
int type; int type;
...@@ -1284,13 +1266,11 @@ intel_tv_detect(struct drm_connector *connector, ...@@ -1284,13 +1266,11 @@ intel_tv_detect(struct drm_connector *connector,
connector->base.id, connector->name, connector->base.id, connector->name,
force); force);
mode = reported_modes[0];
if (force) { if (force) {
struct intel_load_detect_pipe tmp; struct intel_load_detect_pipe tmp;
int ret; int ret;
ret = intel_get_load_detect_pipe(connector, &mode, &tmp, ctx); ret = intel_get_load_detect_pipe(connector, NULL, &tmp, ctx);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
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