| Message ID | 20181112170000.27531-13-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Fix TV encoder support | expand |
On Mon, Nov 12, 2018 at 06:59:56PM +0200, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > 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: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Imre Deak <imre.deak@intel.com> > --- > drivers/gpu/drm/i915/intel_tv.c | 22 +--------------------- > 1 file changed, 1 insertion(+), 21 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c > index 32a8786fe0da..c39e9a5b43db 100644 > --- a/drivers/gpu/drm/i915/intel_tv.c > +++ b/drivers/gpu/drm/i915/intel_tv.c > @@ -1130,23 +1130,6 @@ static void intel_tv_pre_enable(struct intel_encoder *encoder, > 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 > intel_tv_detect_type(struct intel_tv *intel_tv, > struct drm_connector *connector) > @@ -1276,7 +1259,6 @@ intel_tv_detect(struct drm_connector *connector, > struct drm_modeset_acquire_ctx *ctx, > bool force) > { > - struct drm_display_mode mode; > struct intel_tv *intel_tv = intel_attached_tv(connector); > enum drm_connector_status status; > int type; > @@ -1285,13 +1267,11 @@ intel_tv_detect(struct drm_connector *connector, > connector->base.id, connector->name, > force); > > - mode = reported_modes[0]; > - > if (force) { > struct intel_load_detect_pipe tmp; > 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) > return ret; > > -- > 2.18.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c index 32a8786fe0da..c39e9a5b43db 100644 --- a/drivers/gpu/drm/i915/intel_tv.c +++ b/drivers/gpu/drm/i915/intel_tv.c @@ -1130,23 +1130,6 @@ static void intel_tv_pre_enable(struct intel_encoder *encoder, 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 intel_tv_detect_type(struct intel_tv *intel_tv, struct drm_connector *connector) @@ -1276,7 +1259,6 @@ intel_tv_detect(struct drm_connector *connector, struct drm_modeset_acquire_ctx *ctx, bool force) { - struct drm_display_mode mode; struct intel_tv *intel_tv = intel_attached_tv(connector); enum drm_connector_status status; int type; @@ -1285,13 +1267,11 @@ intel_tv_detect(struct drm_connector *connector, connector->base.id, connector->name, force); - mode = reported_modes[0]; - if (force) { struct intel_load_detect_pipe tmp; 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) return ret;