diff --git a/drivers/video/drm/include/errno-base.h b/drivers/video/drm/includes/errno-base.h
similarity index 100%
rename from drivers/video/drm/include/errno-base.h
rename to drivers/video/drm/includes/errno-base.h
diff --git a/drivers/video/drm/include/errno.h b/drivers/video/drm/includes/errno.h
similarity index 100%
rename from drivers/video/drm/include/errno.h
rename to drivers/video/drm/includes/errno.h
diff --git a/drivers/video/drm/include/linux/bitops.h b/drivers/video/drm/includes/linux/bitops.h
similarity index 100%
rename from drivers/video/drm/include/linux/bitops.h
rename to drivers/video/drm/includes/linux/bitops.h
diff --git a/drivers/video/drm/include/linux/fb.h b/drivers/video/drm/includes/linux/fb.h
similarity index 100%
rename from drivers/video/drm/include/linux/fb.h
rename to drivers/video/drm/includes/linux/fb.h
diff --git a/drivers/video/drm/include/linux/firmware.h b/drivers/video/drm/includes/linux/firmware.h
similarity index 100%
rename from drivers/video/drm/include/linux/firmware.h
rename to drivers/video/drm/includes/linux/firmware.h
diff --git a/drivers/video/drm/include/linux/i2c-algo-bit.h b/drivers/video/drm/includes/linux/i2c-algo-bit.h
similarity index 100%
rename from drivers/video/drm/include/linux/i2c-algo-bit.h
rename to drivers/video/drm/includes/linux/i2c-algo-bit.h
diff --git a/drivers/video/drm/include/linux/i2c-id.h b/drivers/video/drm/includes/linux/i2c-id.h
similarity index 100%
rename from drivers/video/drm/include/linux/i2c-id.h
rename to drivers/video/drm/includes/linux/i2c-id.h
diff --git a/drivers/video/drm/include/linux/i2c.h b/drivers/video/drm/includes/linux/i2c.h
similarity index 100%
rename from drivers/video/drm/include/linux/i2c.h
rename to drivers/video/drm/includes/linux/i2c.h
diff --git a/drivers/video/drm/include/linux/idr.h b/drivers/video/drm/includes/linux/idr.h
similarity index 100%
rename from drivers/video/drm/include/linux/idr.h
rename to drivers/video/drm/includes/linux/idr.h
diff --git a/drivers/video/drm/include/linux/kernel.h b/drivers/video/drm/includes/linux/kernel.h
similarity index 100%
rename from drivers/video/drm/include/linux/kernel.h
rename to drivers/video/drm/includes/linux/kernel.h
diff --git a/drivers/video/drm/include/linux/list.h b/drivers/video/drm/includes/linux/list.h
similarity index 100%
rename from drivers/video/drm/include/linux/list.h
rename to drivers/video/drm/includes/linux/list.h
diff --git a/drivers/video/drm/include/linux/module.h b/drivers/video/drm/includes/linux/module.h
similarity index 100%
rename from drivers/video/drm/include/linux/module.h
rename to drivers/video/drm/includes/linux/module.h
diff --git a/drivers/video/drm/include/linux/sched.h b/drivers/video/drm/includes/linux/sched.h
similarity index 100%
rename from drivers/video/drm/include/linux/sched.h
rename to drivers/video/drm/includes/linux/sched.h
diff --git a/drivers/video/drm/include/linux/seq_file.h b/drivers/video/drm/includes/linux/seq_file.h
similarity index 100%
rename from drivers/video/drm/include/linux/seq_file.h
rename to drivers/video/drm/includes/linux/seq_file.h
diff --git a/drivers/video/drm/include/linux/types.h b/drivers/video/drm/includes/linux/types.h
similarity index 100%
rename from drivers/video/drm/include/linux/types.h
rename to drivers/video/drm/includes/linux/types.h
diff --git a/drivers/video/drm/include/pci.h b/drivers/video/drm/includes/pci.h
similarity index 100%
rename from drivers/video/drm/include/pci.h
rename to drivers/video/drm/includes/pci.h
diff --git a/drivers/video/drm/include/syscall.h b/drivers/video/drm/includes/syscall.h
similarity index 93%
rename from drivers/video/drm/include/syscall.h
rename to drivers/video/drm/includes/syscall.h
index d8f0ad1b28..f3081e5ec5 100644
--- a/drivers/video/drm/include/syscall.h
+++ b/drivers/video/drm/includes/syscall.h
@@ -164,30 +164,26 @@ extern inline void usleep(u32_t delay)
 {
      if( !delay )
         delay++;
-     delay*= 128;
+     delay*= 256;
 
      while(delay--)
-     {
         __asm__ __volatile__(
         "xorl %%eax, %%eax \n\t"
         "cpuid \n\t"
-        "xorl %%eax, %%eax"
-        :::"ebx","ecx","edx");
+        :::"eax","ebx","ecx","edx");
      };
-};
 
 static inline void udelay(u32_t delay)
 {
     if(!delay) delay++;
-    delay*= 128;
+    delay*= 256;
 
     while(delay--)
     {
         __asm__ __volatile__(
         "xorl %%eax, %%eax \n\t"
-        "cpuid \n\t"
-        "xorl %%eax, %%eax"
-        :::"ebx","ecx","edx" );
+        "cpuid"
+        :::"eax","ebx","ecx","edx" );
     }
 }
 
diff --git a/drivers/video/drm/radeon/radeon_device.c b/drivers/video/drm/radeon/radeon_device.c
index 6fbced1d9c..14f820ae03 100644
--- a/drivers/video/drm/radeon/radeon_device.c
+++ b/drivers/video/drm/radeon/radeon_device.c
@@ -45,7 +45,7 @@ int radeon_agpmode   = -1;
 int radeon_gart_size = 512; /* default gart size */
 int radeon_benchmarking = 0;
 int radeon_connector_table = 0;
-int radeon_tv = 1;
+int radeon_tv = 0;
 
 
 /*
diff --git a/drivers/video/drm/radeon/radeon_fb.c b/drivers/video/drm/radeon/radeon_fb.c
index d0403d7a91..d0af92725d 100644
--- a/drivers/video/drm/radeon/radeon_fb.c
+++ b/drivers/video/drm/radeon/radeon_fb.c
@@ -532,6 +532,7 @@ bool set_mode(struct drm_device *dev, int width, int height)
                 fb->pitch = radeon_align_pitch(dev->dev_private, width, 32, false) * ((32 + 1) / 8);
 
                 crtc->fb = fb;
+                crtc->enabled = true;
 
                 ret = drm_crtc_helper_set_mode(crtc, mode, 0, 0, fb);