Attachment 32206 Details for Bug 24996 – nv43_tvdac_load_2.patch

[patch] nv43_tvdac_load_2.patch

nv43_tvdac_load_2.patch (text/plain), 9.27 KB, created by Francisco Jerez on 2009-12-20 05:30:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Francisco Jerez

Created: 2009-12-20 05:30:27 UTC

Size: 9.27 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
>index 9c9815b..7da88a9 100644
>--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
>+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
>@@ -1074,8 +1074,7 @@ extern long nouveau_compat_ioctl(struct file *file, unsigned int cmd,
> 
> /* nv04_dac.c */
> extern int nv04_dac_create(struct drm_device *dev, struct dcb_entry *entry);
>-extern enum drm_connector_status nv17_dac_detect(struct drm_encoder *encoder,
>-						 struct drm_connector *connector);
>+extern uint32_t nv17_dac_sample_load(struct drm_encoder *encoder);
> extern int nv04_dac_output_offset(struct drm_encoder *encoder);
> extern void nv04_dac_update_dacclk(struct drm_encoder *encoder, bool enable);
> 
>@@ -1093,9 +1092,6 @@ extern int nv04_tv_create(struct drm_device *dev, struct dcb_entry *entry);
> 
> /* nv17_tv.c */
> extern int nv17_tv_create(struct drm_device *dev, struct dcb_entry *entry);
>-extern enum drm_connector_status nv17_tv_detect(struct drm_encoder *encoder,
>-						struct drm_connector *connector,
>-						uint32_t pin_mask);
> 
> /* nv04_display.c */
> extern int nv04_display_create(struct drm_device *);
>diff --git a/drivers/gpu/drm/nouveau/nv04_dac.c b/drivers/gpu/drm/nouveau/nv04_dac.c
>index d9f3287..fe31741 100644
>--- a/drivers/gpu/drm/nouveau/nv04_dac.c
>+++ b/drivers/gpu/drm/nouveau/nv04_dac.c
>@@ -212,16 +212,16 @@ out:
> 	return connector_status_disconnected;
> }
> 
>-enum drm_connector_status nv17_dac_detect(struct drm_encoder *encoder,
>-					  struct drm_connector *connector)
>+uint32_t
>+nv17_dac_sample_load(struct drm_encoder *encoder)
> {
> 	struct drm_device *dev = encoder->dev;
> 	struct drm_nouveau_private *dev_priv = dev->dev_private;
> 	struct dcb_entry *dcb = nouveau_encoder(encoder)->dcb;
>-	uint32_t testval, regoffset = nv04_dac_output_offset(encoder);
>+	uint32_t sample, testval, regoffset = nv04_dac_output_offset(encoder);
> 	uint32_t saved_powerctrl_2 = 0, saved_powerctrl_4 = 0, saved_routput,
> 		saved_rtest_ctrl, saved_gpio0, saved_gpio1, temp, routput;
>-	int head, present = 0;
>+	int head;
> 
> #define RGB_TEST_DATA(r, g, b) (r << 0 | g << 10 | b << 20)
> 	if (dcb->type == OUTPUT_TV) {
>@@ -287,13 +287,7 @@ enum drm_connector_status nv17_dac_detect(struct drm_encoder *encoder,
> 		      temp | NV_PRAMDAC_TEST_CONTROL_TP_INS_EN_ASSERTED);
> 	msleep(5);
> 
>-	temp = NVReadRAMDAC(dev, 0, NV_PRAMDAC_TEST_CONTROL + regoffset);
>-
>-	if (dcb->type == OUTPUT_TV)
>-		present = (nv17_tv_detect(encoder, connector, temp)
>-			   == connector_status_connected);
>-	else
>-		present = temp & NV_PRAMDAC_TEST_CONTROL_SENSEB_ALLHI;
>+	sample = NVReadRAMDAC(dev, 0, NV_PRAMDAC_TEST_CONTROL + regoffset);
> 
> 	temp = NVReadRAMDAC(dev, head, NV_PRAMDAC_TEST_CONTROL);
> 	NVWriteRAMDAC(dev, head, NV_PRAMDAC_TEST_CONTROL,
>@@ -310,15 +304,24 @@ enum drm_connector_status nv17_dac_detect(struct drm_encoder *encoder,
> 	nv17_gpio_set(dev, DCB_GPIO_TVDAC1, saved_gpio1);
> 	nv17_gpio_set(dev, DCB_GPIO_TVDAC0, saved_gpio0);
> 
>-	if (present) {
>+	return sample;
>+}
>+
>+static enum drm_connector_status
>+nv17_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector)
>+{
>+	struct drm_device *dev = encoder->dev;
>+	struct dcb_entry *dcb = nouveau_encoder(encoder)->dcb;
>+	uint32_t sample = nv17_dac_sample_load(encoder);
>+
>+	if (sample & NV_PRAMDAC_TEST_CONTROL_SENSEB_ALLHI) {
> 		NV_INFO(dev, "Load detected on output %c\n", '@' + ffs(dcb->or));
> 		return connector_status_connected;
>+	} else {
>+		return connector_status_disconnected;
> 	}
>-
>-	return connector_status_disconnected;
> }
> 
>-
> static bool nv04_dac_mode_fixup(struct drm_encoder *encoder,
> 				struct drm_display_mode *mode,
> 				struct drm_display_mode *adjusted_mode)
>diff --git a/drivers/gpu/drm/nouveau/nv17_tv.c b/drivers/gpu/drm/nouveau/nv17_tv.c
>index 81c0135..186170e 100644
>--- a/drivers/gpu/drm/nouveau/nv17_tv.c
>+++ b/drivers/gpu/drm/nouveau/nv17_tv.c
>@@ -33,13 +33,106 @@
> #include "nouveau_hw.h"
> #include "nv17_tv.h"
> 
>-enum drm_connector_status nv17_tv_detect(struct drm_encoder *encoder,
>-					 struct drm_connector *connector,
>-					 uint32_t pin_mask)
>+static uint32_t
>+nv43_tv_sample_load(struct drm_encoder *encoder)
> {
>+	struct drm_device *dev = encoder->dev;
>+	struct drm_nouveau_private *dev_priv = dev->dev_private;
>+	uint32_t testval, regoffset = nv04_dac_output_offset(encoder);
>+	uint32_t gpio0, gpio1, fp_htotal, fp_hsync_start, fp_hsync_end,
>+		fp_control, test_ctrl, dacclk, ctv_14, ctv_1c, ctv_6c,
>+		temp;
>+	uint32_t sample = 0;
>+	int head;
>+
>+#define RGB_TEST_DATA(r, g, b) (r << 0 | g << 10 | b << 20)
>+	testval = RGB_TEST_DATA(0x82, 0xeb, 0x82);
>+	if (dev_priv->vbios->tvdactestval)
>+		testval = dev_priv->vbios->tvdactestval;
>+
>+	dacclk = NVReadRAMDAC(dev, 0, NV_PRAMDAC_DACCLK + regoffset);
>+	head = (dacclk & 0x100) >> 8;
>+
>+	/* Save the previous state. */
>+	gpio1 = nv17_gpio_get(dev, DCB_GPIO_TVDAC1);
>+	gpio0 = nv17_gpio_get(dev, DCB_GPIO_TVDAC0);
>+	fp_htotal = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_HTOTAL);
>+	fp_hsync_start = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_START);
>+	fp_hsync_end = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_END);
>+	fp_control = NVReadRAMDAC(dev, head, NV_PRAMDAC_FP_TG_CONTROL);
>+	test_ctrl = NVReadRAMDAC(dev, 0, NV_PRAMDAC_TEST_CONTROL + regoffset);
>+	ctv_1c = NVReadRAMDAC(dev, head, 0x680c1c);
>+	ctv_14 = NVReadRAMDAC(dev, head, 0x680c14);
>+	ctv_6c = NVReadRAMDAC(dev, head, 0x680c6c);
>+
>+	/* Prepare the DAC for load detection.  */
>+	nv17_gpio_set(dev, DCB_GPIO_TVDAC1, true);
>+	nv17_gpio_set(dev, DCB_GPIO_TVDAC0, true);
>+
>+	NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HTOTAL, 1343);
>+	NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_START, 1047);
>+	NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_END, 1183);
>+	NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_TG_CONTROL,
>+		      NV_PRAMDAC_FP_TG_CONTROL_DISPEN_POS |
>+		      NV_PRAMDAC_FP_TG_CONTROL_WIDTH_12 |
>+		      NV_PRAMDAC_FP_TG_CONTROL_READ_PROG |
>+		      NV_PRAMDAC_FP_TG_CONTROL_HSYNC_POS |
>+		      NV_PRAMDAC_FP_TG_CONTROL_VSYNC_POS);
>+
>+	NVWriteRAMDAC(dev, 0, NV_PRAMDAC_TEST_CONTROL + regoffset, 0);
>+
>+	NVWriteRAMDAC(dev, 0, NV_PRAMDAC_DACCLK + regoffset,
>+		      (dacclk & ~0xff) | 0x22);
>+	msleep(1);
>+	NVWriteRAMDAC(dev, 0, NV_PRAMDAC_DACCLK + regoffset,
>+		      (dacclk & ~0xff) | 0x21);
>+
>+	NVWriteRAMDAC(dev, head, 0x680c1c, 1 << 20);
>+	NVWriteRAMDAC(dev, head, 0x680c14, 4 << 16);
>+
>+	/* Sample pin 0x4 (usually S-video luma). */
>+	NVWriteRAMDAC(dev, head, 0x680c6c, testval >> 10 & 0x3ff);
>+	msleep(20);
>+	temp = NVReadRAMDAC(dev, 0, NV_PRAMDAC_TEST_CONTROL + regoffset);
>+	sample |= temp & 0x4 << 28;
>+	printk("PRAMDAC_TEST_CONTROL: %x\n", temp);
>+
>+	/* Sample the remaining pins. */
>+	NVWriteRAMDAC(dev, head, 0x680c6c, testval & 0x3ff);
>+	msleep(20);
>+	temp = NVReadRAMDAC(dev, 0, NV_PRAMDAC_TEST_CONTROL + regoffset);
>+	sample |= temp & 0xa << 28;
>+	printk("PRAMDAC_TEST_CONTROL: %x\n", temp);
>+
>+	/* Restore the previous state. */
>+	NVWriteRAMDAC(dev, head, 0x680c6c, ctv_6c);
>+	NVWriteRAMDAC(dev, head, 0x680c14, ctv_14);
>+	NVWriteRAMDAC(dev, head, 0x680c1c, ctv_1c);
>+	NVWriteRAMDAC(dev, 0, NV_PRAMDAC_DACCLK + regoffset, dacclk);
>+	NVWriteRAMDAC(dev, 0, NV_PRAMDAC_TEST_CONTROL + regoffset, test_ctrl);
>+	NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_TG_CONTROL, fp_control);
>+	NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_END, fp_hsync_end);
>+	NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HSYNC_START, fp_hsync_start);
>+	NVWriteRAMDAC(dev, head, NV_PRAMDAC_FP_HTOTAL, fp_htotal);
>+	nv17_gpio_set(dev, DCB_GPIO_TVDAC0, gpio0);
>+	nv17_gpio_set(dev, DCB_GPIO_TVDAC1, gpio1);
>+
>+	return sample;
>+}
>+
>+static enum drm_connector_status
>+nv17_tv_detect(struct drm_encoder *encoder, struct drm_connector *connector)
>+{
>+	struct drm_device *dev = encoder->dev;
>+	struct drm_nouveau_private *dev_priv = dev->dev_private;
>+	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;
> 
>-	tv_enc->pin_mask = pin_mask >> 28 & 0xe;
>+	if (dev_priv->chipset == 0x43)
>+		tv_enc->pin_mask = nv43_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:
>@@ -50,7 +143,7 @@ enum drm_connector_status nv17_tv_detect(struct drm_encoder *encoder,
> 		tv_enc->subconnector = DRM_MODE_SUBCONNECTOR_SVIDEO;
> 		break;
> 	case 0xe:
>-		if (nouveau_encoder(encoder)->dcb->tvconf.has_component_output)
>+		if (dcb->tvconf.has_component_output)
> 			tv_enc->subconnector = DRM_MODE_SUBCONNECTOR_Component;
> 		else
> 			tv_enc->subconnector = DRM_MODE_SUBCONNECTOR_SCART;
>@@ -61,11 +154,15 @@ enum drm_connector_status nv17_tv_detect(struct drm_encoder *encoder,
> 	}
> 
> 	drm_connector_property_set_value(connector,
>-			encoder->dev->mode_config.tv_subconnector_property,
>-							tv_enc->subconnector);
>+					 conf->tv_subconnector_property,
>+					 tv_enc->subconnector);
> 
>-	return tv_enc->subconnector ? connector_status_connected :
>-					connector_status_disconnected;
>+	if (tv_enc->subconnector) {
>+		NV_INFO(dev, "Load detected on output %c\n", '@' + ffs(dcb->or));
>+		return connector_status_connected;
>+	} else {
>+		return connector_status_disconnected;
>+	}
> }
> 
> static const struct {
>@@ -633,7 +730,7 @@ static struct drm_encoder_helper_funcs nv17_tv_helper_funcs = {
> 	.prepare = nv17_tv_prepare,
> 	.commit = nv17_tv_commit,
> 	.mode_set = nv17_tv_mode_set,
>-	.detect = nv17_dac_detect,
>+	.detect = nv17_tv_detect,
> };
> 
> static struct drm_encoder_slave_funcs nv17_tv_slave_funcs = {

Actions: View | Splinter Review

Attachments on bug 24996: 31062 | 31063 | 31065 | 31117 | 31253 | 31286 | 31294 | 31307 | 31308 | 32204 | 32206 | 32207

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.