Move the drm drivers over from:

vga1 at pci0
inteldrm0 at vga1

to

vga1 at pci0
inteldrm0 at vga1
drm0 at inteldrm0

i.e. a similar scheme to audio(4) where the interface attaches on top of
the wildly different drivers. This helps to clean up the code a lot
(more is coming) and help me start to move drm to being essentially bus
independent, which will help in the future.

1 files changed, 6 insertions, 3 deletions

diff --git a/sys/dev/pci/drm/r128_state.c b/sys/dev/pci/drm/r128_state.c
index 47657c6f79c..a79f44ae467 100644
--- a/sys/dev/pci/drm/r128_state.c
+++ b/sys/dev/pci/drm/r128_state.c
@@ -336,7 +336,8 @@ static void r128_cce_performance_boxes(drm_r128_private_t * dev_priv)
  * CCE command dispatch functions
  */
 
-static void r128_print_dirty(const char *msg, unsigned int flags)
+static void r128_print_dirty(drm_r128_private_t *dev_priv, const char *msg,
+    unsigned int flags)
 {
 	DRM_INFO("%s: (0x%x) %s%s%s%s%s%s%s%s%s\n",
 		 msg,
@@ -580,7 +581,8 @@ static void r128_cce_dispatch_vertex(struct drm_device * dev, struct drm_buf * b
 	DRM_DEBUG("buf=%d nbox=%d\n", buf->idx, sarea_priv->nbox);
 
 	if (0)
-		r128_print_dirty("dispatch_vertex", sarea_priv->dirty);
+		r128_print_dirty(dev_priv, "dispatch_vertex",
+		    sarea_priv->dirty);
 
 	if (buf->used) {
 		buf_priv->dispatched = 1;
@@ -708,7 +710,8 @@ static void r128_cce_dispatch_indices(struct drm_device * dev,
 	DRM_DEBUG("indices: s=%d e=%d c=%d\n", start, end, count);
 
 	if (0)
-		r128_print_dirty("dispatch_indices", sarea_priv->dirty);
+		r128_print_dirty(dev_priv, "dispatch_indices",
+		    sarea_priv->dirty);
 
 	if (start != end) {
 		buf_priv->dispatched = 1;