Skip to contentSkip to conversation

drm/nouveau/dispnv04: Remove dead code

PATCH In review Souptick Joarder 2 participants 4 messages Apr 30, 2020 – May 1, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/nouveau/dispnv04: Remove dead code

These are dead code since 3.10. If there is no plan to use it further, these can be removed forever.

---
 drivers/gpu/drm/nouveau/dispnv04/crtc.c | 28 ----------------------------
 1 file changed, 28 deletions(-)
drivers/gpu/drm/nouveau/dispnv04/crtc.c +0 -28
index 1f08de4..ad0ef7d 100644
@@ -269,31 +269,11 @@ static void nv_crtc_calc_state_ext(struct drm_crtc *crtc, struct drm_display_mod
 		horizStart = horizTotal - 5;
 		horizEnd = horizTotal - 2;
 		horizBlankEnd = horizTotal + 4;
-#if 0
-		if (dev->overlayAdaptor && drm->client.device.info.family >= NV_DEVICE_INFO_V0_CELSIUS)
-			/* This reportedly works around some video overlay bandwidth problems */
-			horizTotal += 2;
-#endif
 	}
 
 	if (mode->flags & DRM_MODE_FLAG_INTERLACE)
 		vertTotal |= 1;
 
-#if 0
-	ErrorF("horizDisplay: 0x%X \n", horizDisplay);
-	ErrorF("horizStart: 0x%X \n", horizStart);
-	ErrorF("horizEnd: 0x%X \n", horizEnd);
-	ErrorF("horizTotal: 0x%X \n", horizTotal);
-	ErrorF("horizBlankStart: 0x%X \n", horizBlankStart);
-	ErrorF("horizBlankEnd: 0x%X \n", horizBlankEnd);
-	ErrorF("vertDisplay: 0x%X \n", vertDisplay);
-	ErrorF("vertStart: 0x%X \n", vertStart);
-	ErrorF("vertEnd: 0x%X \n", vertEnd);
-	ErrorF("vertTotal: 0x%X \n", vertTotal);
-	ErrorF("vertBlankStart: 0x%X \n", vertBlankStart);
-	ErrorF("vertBlankEnd: 0x%X \n", vertBlankEnd);
-#endif
-
 	/*
 	* compute correct Hsync & Vsync polarity
 	*/
@@ -492,14 +472,6 @@ static void nv_crtc_calc_state_ext(struct drm_crtc *crtc, struct drm_display_mod
 	/* Except for rare conditions I2C is enabled on the primary crtc */
 	if (nv_crtc->index == 0)
 		regp->crtc_eng_ctrl |= NV_CRTC_FSEL_I2C;
-#if 0
-	/* Set overlay to desired crtc. */
-	if (dev->overlayAdaptor) {
-		NVPortPrivPtr pPriv = GET_OVERLAY_PRIVATE(dev);
-		if (pPriv->overlayCRTC == nv_crtc->index)
-			regp->crtc_eng_ctrl |= NV_CRTC_FSEL_OVERLAY;
-	}
-#endif
 
 	/* ADDRESS_SPACE_PNVM is the same as setting HCUR_ASI */
 	regp->cursor_cfg = NV_PCRTC_CURSOR_CONFIG_CUR_LINES_64 |
Signature · 1 line
1.9.1
#1 lore raw

Interesting. I do remember seeing some snow on NV5's overlay at high resolutions. Wonder if it was because of this missing code...

Quoted 67 lines · Souptick Joarder

These are dead code since 3.10. If there is no plan to use it further, these can be removed forever.

---
 drivers/gpu/drm/nouveau/dispnv04/crtc.c | 28 ----------------------------
 1 file changed, 28 deletions(-)
drivers/gpu/drm/nouveau/dispnv04/crtc.c +0 -29
index 1f08de4..ad0ef7d 100644
@@ -269,31 +269,11 @@ static void nv_crtc_calc_state_ext(struct drm_crtc *crtc, struct drm_display_mod
                horizStart = horizTotal - 5;
                horizEnd = horizTotal - 2;
                horizBlankEnd = horizTotal + 4;
-#if 0
-               if (dev->overlayAdaptor && drm->client.device.info.family >= NV_DEVICE_INFO_V0_CELSIUS)
-                       /* This reportedly works around some video overlay bandwidth problems */
-                       horizTotal += 2;
-#endif
        }
 
        if (mode->flags & DRM_MODE_FLAG_INTERLACE)
                vertTotal |= 1;
 
-#if 0
-       ErrorF("horizDisplay: 0x%X \n", horizDisplay);
-       ErrorF("horizStart: 0x%X \n", horizStart);
-       ErrorF("horizEnd: 0x%X \n", horizEnd);
-       ErrorF("horizTotal: 0x%X \n", horizTotal);
-       ErrorF("horizBlankStart: 0x%X \n", horizBlankStart);
-       ErrorF("horizBlankEnd: 0x%X \n", horizBlankEnd);
-       ErrorF("vertDisplay: 0x%X \n", vertDisplay);
-       ErrorF("vertStart: 0x%X \n", vertStart);
-       ErrorF("vertEnd: 0x%X \n", vertEnd);
-       ErrorF("vertTotal: 0x%X \n", vertTotal);
-       ErrorF("vertBlankStart: 0x%X \n", vertBlankStart);
-       ErrorF("vertBlankEnd: 0x%X \n", vertBlankEnd);
-#endif
-
        /*
        * compute correct Hsync & Vsync polarity
        */
@@ -492,14 +472,6 @@ static void nv_crtc_calc_state_ext(struct drm_crtc *crtc, struct drm_display_mod
        /* Except for rare conditions I2C is enabled on the primary crtc */
        if (nv_crtc->index == 0)
                regp->crtc_eng_ctrl |= NV_CRTC_FSEL_I2C;
-#if 0
-       /* Set overlay to desired crtc. */
-       if (dev->overlayAdaptor) {
-               NVPortPrivPtr pPriv = GET_OVERLAY_PRIVATE(dev);
-               if (pPriv->overlayCRTC == nv_crtc->index)
-                       regp->crtc_eng_ctrl |= NV_CRTC_FSEL_OVERLAY;
-       }
-#endif
 
        /* ADDRESS_SPACE_PNVM is the same as setting HCUR_ASI */
        regp->cursor_cfg = NV_PCRTC_CURSOR_CONFIG_CUR_LINES_64 |
--

1.9.1

_______________________________________________
Nouveau mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau

#2 lore raw
Quoted 3 lines · Ilia Mirkin

Interesting. I do remember seeing some snow on NV5's overlay at high resolutions. Wonder if it was because of this missing code...

What was the problem ? Does enabling this dead code will fix the problem ?

Quoted 69 lines · Souptick Joarder
Quoted 67 lines

These are dead code since 3.10. If there is no plan to use it further, these can be removed forever.

---
 drivers/gpu/drm/nouveau/dispnv04/crtc.c | 28 ----------------------------
 1 file changed, 28 deletions(-)
drivers/gpu/drm/nouveau/dispnv04/crtc.c +0 -29
index 1f08de4..ad0ef7d 100644
@@ -269,31 +269,11 @@ static void nv_crtc_calc_state_ext(struct drm_crtc *crtc, struct drm_display_mod
                horizStart = horizTotal - 5;
                horizEnd = horizTotal - 2;
                horizBlankEnd = horizTotal + 4;
-#if 0
-               if (dev->overlayAdaptor && drm->client.device.info.family >= NV_DEVICE_INFO_V0_CELSIUS)
-                       /* This reportedly works around some video overlay bandwidth problems */
-                       horizTotal += 2;
-#endif
        }
 
        if (mode->flags & DRM_MODE_FLAG_INTERLACE)
                vertTotal |= 1;
 
-#if 0
-       ErrorF("horizDisplay: 0x%X \n", horizDisplay);
-       ErrorF("horizStart: 0x%X \n", horizStart);
-       ErrorF("horizEnd: 0x%X \n", horizEnd);
-       ErrorF("horizTotal: 0x%X \n", horizTotal);
-       ErrorF("horizBlankStart: 0x%X \n", horizBlankStart);
-       ErrorF("horizBlankEnd: 0x%X \n", horizBlankEnd);
-       ErrorF("vertDisplay: 0x%X \n", vertDisplay);
-       ErrorF("vertStart: 0x%X \n", vertStart);
-       ErrorF("vertEnd: 0x%X \n", vertEnd);
-       ErrorF("vertTotal: 0x%X \n", vertTotal);
-       ErrorF("vertBlankStart: 0x%X \n", vertBlankStart);
-       ErrorF("vertBlankEnd: 0x%X \n", vertBlankEnd);
-#endif
-
        /*
        * compute correct Hsync & Vsync polarity
        */
@@ -492,14 +472,6 @@ static void nv_crtc_calc_state_ext(struct drm_crtc *crtc, struct drm_display_mod
        /* Except for rare conditions I2C is enabled on the primary crtc */
        if (nv_crtc->index == 0)
                regp->crtc_eng_ctrl |= NV_CRTC_FSEL_I2C;
-#if 0
-       /* Set overlay to desired crtc. */
-       if (dev->overlayAdaptor) {
-               NVPortPrivPtr pPriv = GET_OVERLAY_PRIVATE(dev);
-               if (pPriv->overlayCRTC == nv_crtc->index)
-                       regp->crtc_eng_ctrl |= NV_CRTC_FSEL_OVERLAY;
-       }
-#endif
 
        /* ADDRESS_SPACE_PNVM is the same as setting HCUR_ASI */
        regp->cursor_cfg = NV_PCRTC_CURSOR_CONFIG_CUR_LINES_64 |
--

1.9.1

_______________________________________________
Nouveau mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau

#3 lore raw
Quoted 7 lines · Souptick Joarder
Quoted 3 lines · Ilia Mirkin

Interesting. I do remember seeing some snow on NV5's overlay at high resolutions. Wonder if it was because of this missing code...

What was the problem ? Does enabling this dead code will fix the problem ?

This "dead" code is essentially documentation. It's from the xf86-video-nv driver which was the base of the dispnv04 code. It won't compile as-is, which is why it's #if 0'd out.

-ilia