diff options
author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2012-06-12 10:27:01 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-06-12 10:36:31 -0400 |
commit | fe4561680519019cc15d660862dce513ded2f3a7 (patch) | |
tree | bb86248310ca04a12bcfa2bb26dbe9bc241b128d /include/drm | |
parent | d26098759cf6d32148649c165f87a7590bc25b89 (diff) |
drm: increase DRM_OBJECT_MAX_PROPERTY to 24
Before Kernel 3.5, no one was checking for the return value of
drm_connector_attach_property, so we never noticed that we were unable
to create some properties. Commit "drm: WARN() when
drm_connector_attach_property fails" added a WARN when we fail to
create a property, and the transition from "connector properties" to
"object properties" changed the warning message a little bit.
On i915 machines with many TV connectors we hit the maximum number of
properties (since each TV connector uses a lot of properties), so we
get a few backtraces in our logs. This commit increases the maximum
number of properties to 24 hoping we'll have enough room for
everybody.
Chris suggested that we convert this code to "lists", but I believe
this conversion can come after we make sure people's dmesgs are not
spammed by our driver.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reported-by: Dave Jones <davej@redhat.com>
Tested-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drm_crtc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 73e45600f95d..bac55c215113 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h | |||
@@ -54,7 +54,7 @@ struct drm_mode_object { | |||
54 | struct drm_object_properties *properties; | 54 | struct drm_object_properties *properties; |
55 | }; | 55 | }; |
56 | 56 | ||
57 | #define DRM_OBJECT_MAX_PROPERTY 16 | 57 | #define DRM_OBJECT_MAX_PROPERTY 24 |
58 | struct drm_object_properties { | 58 | struct drm_object_properties { |
59 | int count; | 59 | int count; |
60 | uint32_t ids[DRM_OBJECT_MAX_PROPERTY]; | 60 | uint32_t ids[DRM_OBJECT_MAX_PROPERTY]; |