forked from Minki/linux
drm/i915: select TV format according to connector type
For integrated TV there are 3 connector types: S-VIDEO, Composite and Component(YprPb). Those tv formats whose component flag is true should be assigned to Component connector, others are for S-VIDEO and Composite. The patch intends to find appropriate tv format for each connector. In such case it will return the correct modeline to user space. Otherwise it will return the incorrect modeline when S-video/composite is connected. Signed-off-by: Ma Ling <ling.ma@intel.com> reviewed-by: Zhao Yakui <yakui.zhao@intel.com> Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
parent
5f6a169598
commit
213c2e6431
@ -1437,6 +1437,35 @@ intel_tv_detect_type (struct drm_crtc *crtc, struct intel_output *intel_output)
|
|||||||
return type;
|
return type;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Here we set accurate tv format according to connector type
|
||||||
|
* i.e Component TV should not be assigned by NTSC or PAL
|
||||||
|
*/
|
||||||
|
static void intel_tv_find_better_format(struct drm_connector *connector)
|
||||||
|
{
|
||||||
|
struct intel_output *intel_output = to_intel_output(connector);
|
||||||
|
struct intel_tv_priv *tv_priv = intel_output->dev_priv;
|
||||||
|
const struct tv_mode *tv_mode = intel_tv_mode_find(intel_output);
|
||||||
|
int i;
|
||||||
|
|
||||||
|
if ((tv_priv->type == DRM_MODE_CONNECTOR_Component) ==
|
||||||
|
tv_mode->component_only)
|
||||||
|
return;
|
||||||
|
|
||||||
|
|
||||||
|
for (i = 0; i < sizeof(tv_modes) / sizeof(*tv_modes); i++) {
|
||||||
|
tv_mode = tv_modes + i;
|
||||||
|
|
||||||
|
if ((tv_priv->type == DRM_MODE_CONNECTOR_Component) ==
|
||||||
|
tv_mode->component_only)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
tv_priv->tv_format = tv_mode->name;
|
||||||
|
drm_connector_property_set_value(connector,
|
||||||
|
connector->dev->mode_config.tv_mode_property, i);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Detect the TV connection.
|
* Detect the TV connection.
|
||||||
*
|
*
|
||||||
@ -1473,6 +1502,7 @@ intel_tv_detect(struct drm_connector *connector)
|
|||||||
if (type < 0)
|
if (type < 0)
|
||||||
return connector_status_disconnected;
|
return connector_status_disconnected;
|
||||||
|
|
||||||
|
intel_tv_find_better_format(connector);
|
||||||
return connector_status_connected;
|
return connector_status_connected;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user