Attachment 133951 Details for Bug 102528 – git diff between working and broken kernel commits.

git diff between working and broken kernel commits.

DIFF.txt (text/plain), 1.18 KB, created by Johan Myréen on 2017-09-03 14:22:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johan Myréen

Created: 2017-09-03 14:22:42 UTC

Size: 1.18 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
>index 0b4440ffbeae..b4a99aba4d65 100644
>--- a/drivers/gpu/drm/nouveau/nv50_display.c
>+++ b/drivers/gpu/drm/nouveau/nv50_display.c
>@@ -3691,7 +3691,7 @@ nv50_sor_create(struct drm_connector *connector, struct dcb_output *dcbe)
> 		struct nvkm_i2c_aux *aux =
> 			nvkm_i2c_aux_find(i2c, dcbe->i2c_index);
> 		if (aux) {
>-			nv_encoder->i2c = &aux->i2c;
>+			nv_encoder->i2c = &nv_connector->aux.ddc;
> 			nv_encoder->aux = aux;
> 		}
> 
>@@ -3841,6 +3841,7 @@ nv50_pior_func = {
> static int
> nv50_pior_create(struct drm_connector *connector, struct dcb_output *dcbe)
> {
>+	struct nouveau_connector *nv_connector = nouveau_connector(connector);
> 	struct nouveau_drm *drm = nouveau_drm(connector->dev);
> 	struct nvkm_i2c *i2c = nvxx_i2c(&drm->client.device);
> 	struct nvkm_i2c_bus *bus = NULL;
>@@ -3858,7 +3859,7 @@ nv50_pior_create(struct drm_connector *connector, struct dcb_output *dcbe)
> 		break;
> 	case DCB_OUTPUT_DP:
> 		aux  = nvkm_i2c_aux_find(i2c, NVKM_I2C_AUX_EXT(dcbe->extdev));
>-		ddc  = aux ? &aux->i2c : NULL;
>+		ddc  = aux ? &nv_connector->aux.ddc : NULL;
> 		type = DRM_MODE_ENCODER_TMDS;
> 		break;
> 	default:

Actions: View

Attachments on bug 102528: 133949 | 133950 | 133951

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.