Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-18 17:12:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau: Workaround broken TV load detection on a "Zotac FX5200".

Browse Source 
The blob seems to have the same problem so it's probably a hardware
issue (bug 28810).

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Francisco Jerez 2010-07-04 16:46:01 +02:00 committed by Ben Skeggs
parent 311ab6943f
commit 4664c67b5d
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/gpu/drm/nouveau/nv17_tv.c
View File

@ -116,6 +116,20 @@ static uint32_t nv42_tv_sample_load(struct drm_encoder *encoder)
return sample; return sample;
} }
static bool
get_tv_detect_quirks(struct drm_device *dev, uint32_t *pin_mask)
{
/* Zotac FX5200 */
if ((dev->pdev->device == 0x0322) &&
(dev->pdev->subsystem_vendor == 0x19da) &&
(dev->pdev->subsystem_device == 0x2035)) {
*pin_mask = 0xc;
return false;
}
return true;
}
static enum drm_connector_status static enum drm_connector_status
nv17_tv_detect(struct drm_encoder *encoder, struct drm_connector *connector) nv17_tv_detect(struct drm_encoder *encoder, struct drm_connector *connector)
{ {
@ -124,15 +138,20 @@ nv17_tv_detect(struct drm_encoder *encoder, struct drm_connector *connector)
struct drm_mode_config *conf = &dev->mode_config; struct drm_mode_config *conf = &dev->mode_config;
struct nv17_tv_encoder *tv_enc = to_tv_enc(encoder); struct nv17_tv_encoder *tv_enc = to_tv_enc(encoder);
struct dcb_entry *dcb = tv_enc->base.dcb; struct dcb_entry *dcb = tv_enc->base.dcb;
bool reliable = get_tv_detect_quirks(dev, &tv_enc->pin_mask);
if (nv04_dac_in_use(encoder)) if (nv04_dac_in_use(encoder))
return connector_status_disconnected; return connector_status_disconnected;
if (dev_priv->chipset == 0x42 || if (reliable) {
dev_priv->chipset == 0x43) if (dev_priv->chipset == 0x42 ||
tv_enc->pin_mask = nv42_tv_sample_load(encoder) >> 28 & 0xe; dev_priv->chipset == 0x43)
else tv_enc->pin_mask =
tv_enc->pin_mask = nv17_dac_sample_load(encoder) >> 28 & 0xe; nv42_tv_sample_load(encoder) >> 28 & 0xe;
else
tv_enc->pin_mask =
nv17_dac_sample_load(encoder) >> 28 & 0xe;
}
switch (tv_enc->pin_mask) { switch (tv_enc->pin_mask) {
case 0x2: case 0x2:
@ -157,7 +176,9 @@ nv17_tv_detect(struct drm_encoder *encoder, struct drm_connector *connector)
conf->tv_subconnector_property, conf->tv_subconnector_property,
tv_enc->subconnector); tv_enc->subconnector);
if (tv_enc->subconnector) { if (!reliable) {
return connector_status_unknown;
} else if (tv_enc->subconnector) {
NV_INFO(dev, "Load detected on output %c\n", NV_INFO(dev, "Load detected on output %c\n",
'@' + ffs(dcb->or)); '@' + ffs(dcb->or));
return connector_status_connected; return connector_status_connected;