disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/gpu/drm/nouveau/dispnv04/dac.c
..
..
@@ -24,7 +24,6 @@
24
24
  * DEALINGS IN THE SOFTWARE.
25
25
  */
26
26
 
27
-#include <drm/drmP.h>
28
27
 #include <drm/drm_crtc_helper.h>
29
28
 
30
29
 #include "nouveau_drv.h"
..
..
@@ -36,7 +35,8 @@
36
35
 
37
36
 #include <subdev/bios/gpio.h>
38
37
 #include <subdev/gpio.h>
39
-#include <subdev/timer.h>
38
+
39
+#include <nvif/timer.h>
40
40
 
41
41
 int nv04_dac_output_offset(struct drm_encoder *encoder)
42
42
 {
..
..
@@ -419,7 +419,7 @@
419
419
 	helper->dpms(encoder, DRM_MODE_DPMS_ON);
420
420
 
421
421
 	NV_DEBUG(drm, "Output %s is running on CRTC %d using output %c\n",
422
-		 nouveau_encoder_connector_get(nv_encoder)->base.name,
422
+		 nv04_encoder_get_connector(nv_encoder)->base.name,
423
423
 		 nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
424
424
 }
425
425