aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-08-12 04:42:51 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2010-09-08 05:23:42 -0400
commit31578148b2c62612f9516fdcf5ebb64ab32ed12d (patch)
tree0ed59f332fc2b02088dc17511ff0b4808502bbd5 /drivers/gpu/drm/i915/i915_drv.c
parent0ddc1289f3ffd779779ddd3922f26ae7d0a21604 (diff)
drm/i915/overlay: Move capabilities bits to common info block.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 2879a768d65c..dffc1bcf7b79 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -62,49 +62,60 @@ extern int intel_agp_enabled;
62 62
63static const struct intel_device_info intel_i830_info = { 63static const struct intel_device_info intel_i830_info = {
64 .gen = 2, .is_i8xx = 1, .is_mobile = 1, .cursor_needs_physical = 1, 64 .gen = 2, .is_i8xx = 1, .is_mobile = 1, .cursor_needs_physical = 1,
65 .has_overlay = 1, .overlay_needs_physical = 1,
65}; 66};
66 67
67static const struct intel_device_info intel_845g_info = { 68static const struct intel_device_info intel_845g_info = {
68 .gen = 2, .is_i8xx = 1, 69 .gen = 2, .is_i8xx = 1,
70 .has_overlay = 1, .overlay_needs_physical = 1,
69}; 71};
70 72
71static const struct intel_device_info intel_i85x_info = { 73static const struct intel_device_info intel_i85x_info = {
72 .gen = 2, .is_i8xx = 1, .is_i85x = 1, .is_mobile = 1, 74 .gen = 2, .is_i8xx = 1, .is_i85x = 1, .is_mobile = 1,
73 .cursor_needs_physical = 1, 75 .cursor_needs_physical = 1,
76 .has_overlay = 1, .overlay_needs_physical = 1,
74}; 77};
75 78
76static const struct intel_device_info intel_i865g_info = { 79static const struct intel_device_info intel_i865g_info = {
77 .gen = 2, .is_i8xx = 1, 80 .gen = 2, .is_i8xx = 1,
81 .has_overlay = 1, .overlay_needs_physical = 1,
78}; 82};
79 83
80static const struct intel_device_info intel_i915g_info = { 84static const struct intel_device_info intel_i915g_info = {
81 .gen = 3, .is_i915g = 1, .is_i9xx = 1, .cursor_needs_physical = 1, 85 .gen = 3, .is_i915g = 1, .is_i9xx = 1, .cursor_needs_physical = 1,
86 .has_overlay = 1, .overlay_needs_physical = 1,
82}; 87};
83static const struct intel_device_info intel_i915gm_info = { 88static const struct intel_device_info intel_i915gm_info = {
84 .gen = 3, .is_i9xx = 1, .is_mobile = 1, 89 .gen = 3, .is_i9xx = 1, .is_mobile = 1,
85 .cursor_needs_physical = 1, 90 .cursor_needs_physical = 1,
91 .has_overlay = 1, .overlay_needs_physical = 1,
86}; 92};
87static const struct intel_device_info intel_i945g_info = { 93static const struct intel_device_info intel_i945g_info = {
88 .gen = 3, .is_i9xx = 1, .has_hotplug = 1, .cursor_needs_physical = 1, 94 .gen = 3, .is_i9xx = 1, .has_hotplug = 1, .cursor_needs_physical = 1,
95 .has_overlay = 1, .overlay_needs_physical = 1,
89}; 96};
90static const struct intel_device_info intel_i945gm_info = { 97static const struct intel_device_info intel_i945gm_info = {
91 .gen = 3, .is_i945gm = 1, .is_i9xx = 1, .is_mobile = 1, 98 .gen = 3, .is_i945gm = 1, .is_i9xx = 1, .is_mobile = 1,
92 .has_hotplug = 1, .cursor_needs_physical = 1, 99 .has_hotplug = 1, .cursor_needs_physical = 1,
100 .has_overlay = 1, .overlay_needs_physical = 1,
93}; 101};
94 102
95static const struct intel_device_info intel_i965g_info = { 103static const struct intel_device_info intel_i965g_info = {
96 .gen = 4, .is_broadwater = 1, .is_i965g = 1, .is_i9xx = 1, 104 .gen = 4, .is_broadwater = 1, .is_i965g = 1, .is_i9xx = 1,
97 .has_hotplug = 1, 105 .has_hotplug = 1,
106 .has_overlay = 1,
98}; 107};
99 108
100static const struct intel_device_info intel_i965gm_info = { 109static const struct intel_device_info intel_i965gm_info = {
101 .gen = 4, .is_crestline = 1, .is_i965g = 1, .is_i965gm = 1, .is_i9xx = 1, 110 .gen = 4, .is_crestline = 1, .is_i965g = 1, .is_i965gm = 1, .is_i9xx = 1,
102 .is_mobile = 1, .has_fbc = 1, .has_rc6 = 1, .has_hotplug = 1, 111 .is_mobile = 1, .has_fbc = 1, .has_rc6 = 1, .has_hotplug = 1,
112 .has_overlay = 1,
103}; 113};
104 114
105static const struct intel_device_info intel_g33_info = { 115static const struct intel_device_info intel_g33_info = {
106 .gen = 3, .is_g33 = 1, .is_i9xx = 1, 116 .gen = 3, .is_g33 = 1, .is_i9xx = 1,
107 .need_gfx_hws = 1, .has_hotplug = 1, 117 .need_gfx_hws = 1, .has_hotplug = 1,
118 .has_overlay = 1,
108}; 119};
109 120
110static const struct intel_device_info intel_g45_info = { 121static const struct intel_device_info intel_g45_info = {
@@ -121,6 +132,7 @@ static const struct intel_device_info intel_gm45_info = {
121static const struct intel_device_info intel_pineview_info = { 132static const struct intel_device_info intel_pineview_info = {
122 .gen = 3, .is_g33 = 1, .is_pineview = 1, .is_mobile = 1, .is_i9xx = 1, 133 .gen = 3, .is_g33 = 1, .is_pineview = 1, .is_mobile = 1, .is_i9xx = 1,
123 .need_gfx_hws = 1, .has_hotplug = 1, 134 .need_gfx_hws = 1, .has_hotplug = 1,
135 .has_overlay = 1,
124}; 136};
125 137
126static const struct intel_device_info intel_ironlake_d_info = { 138static const struct intel_device_info intel_ironlake_d_info = {