aboutsummaryrefslogtreecommitdiff
path: root/linux-core/drmP.h
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@tungstengraphics.com>2008-02-22 11:46:22 +0000
committerAlan Hourihane <alanh@tungstengraphics.com>2008-02-26 15:19:34 +0000
commit2476cb209ebbb11edace4bbce0cfaff4e1599dca (patch)
tree00bfd22b6c271993356dee8c85d18c848c851237 /linux-core/drmP.h
parentb92e343dc46212b665f0465274ef6767882bb10c (diff)
Implement short circuit for base change only
Allow mode to be set with fb_id set to -1, meaning set the mode with the current fb (if we have one bound). Allow intelfb to hook back up it's fb if modesetting clears it (maybe temporary). Move any crtc->fb related register changes to set_base in intel_fb. General intelfb cleanups.
Diffstat (limited to 'linux-core/drmP.h')
-rw-r--r--linux-core/drmP.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 0f42d5b6..181b3a97 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -173,8 +173,6 @@ struct drm_file;
#include "drm_compat.h"
-#include "drm_crtc.h"
-
/***********************************************************************/
/** \name Macros to make printk easier */
/*@{*/
@@ -610,6 +608,7 @@ struct drm_ati_pcigart_info {
};
#include "drm_objects.h"
+#include "drm_crtc.h"
/* per-master structure */
struct drm_master {