Attachment 36728 Details for Bug 28810 – nv34_tv_detect_quirk.patch

[patch] nv34_tv_detect_quirk.patch

nv34_tv_detect_quirk.patch (text/plain), 1.88 KB, created by Francisco Jerez on 2010-07-03 09:23:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Francisco Jerez

Created: 2010-07-03 09:23:09 UTC

Size: 1.88 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/nouveau/nv17_tv.c b/drivers/gpu/drm/nouveau/nv17_tv.c
>index 44437ff..ea27b7c 100644
>--- a/drivers/gpu/drm/nouveau/nv17_tv.c
>+++ b/drivers/gpu/drm/nouveau/nv17_tv.c
>@@ -116,6 +116,20 @@ static uint32_t nv42_tv_sample_load(struct drm_encoder *encoder)
> 	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
> nv17_tv_detect(struct drm_encoder *encoder, struct drm_connector *connector)
> {
>@@ -124,12 +138,17 @@ nv17_tv_detect(struct drm_encoder *encoder, struct drm_connector *connector)
> 	struct drm_mode_config *conf = &dev->mode_config;
> 	struct nv17_tv_encoder *tv_enc = to_tv_enc(encoder);
> 	struct dcb_entry *dcb = tv_enc->base.dcb;
>+	bool reliable = get_tv_detect_quirks(dev, &tv_enc->pin_mask);
> 
>-	if (dev_priv->chipset == 0x42 ||
>-	    dev_priv->chipset == 0x43)
>-		tv_enc->pin_mask = nv42_tv_sample_load(encoder) >> 28 & 0xe;
>-	else
>-		tv_enc->pin_mask = nv17_dac_sample_load(encoder) >> 28 & 0xe;
>+	if (reliable) {
>+		if (dev_priv->chipset == 0x42 ||
>+		    dev_priv->chipset == 0x43)
>+			tv_enc->pin_mask =
>+				nv42_tv_sample_load(encoder) >> 28 & 0xe;
>+		else
>+			tv_enc->pin_mask =
>+				nv17_dac_sample_load(encoder) >> 28 & 0xe;
>+	}
> 
> 	switch (tv_enc->pin_mask) {
> 	case 0x2:
>@@ -154,7 +173,9 @@ nv17_tv_detect(struct drm_encoder *encoder, struct drm_connector *connector)
> 					 conf->tv_subconnector_property,
> 					 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",
> 			'@' + ffs(dcb->or));
> 		return connector_status_connected;

Actions: View | Splinter Review

Attachments on bug 28810: 36597 | 36598 | 36630 | 36724 | 36728

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.