diff options
| author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2012-05-15 18:09:00 -0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-17 11:11:06 +0100 |
| commit | afea2ad53f1fef0b57d0e59fa062f54797158b14 (patch) | |
| tree | ecc489268ca805d985b71af7b74ca4f9d009e8d0 /drivers/gpu/drm/drm_crtc.c | |
| parent | 26a3481586eb1918a75d338e31c990deab06fb5b (diff) | |
| download | blackbird-op-linux-afea2ad53f1fef0b57d0e59fa062f54797158b14.tar.gz blackbird-op-linux-afea2ad53f1fef0b57d0e59fa062f54797158b14.zip | |
drm: WARN() when drm_connector_attach_property fails
Also return void instead of int. We have more than 100 callers and
no one checks for the return value.
If this function fails the property won't be exposed by the get/set
ioctls, but we should probably survive. If this starts happening,
the solution will be to increase DRM_CONNECTOR_MAX_PROPERTY and
recompile the Kernel.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Rob Clark <rob.clark@linaro.org>
Tested-by: Rob Clark <rob.clark@linaro.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 0a22ef80d28e..37bb7ab3cbb0 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -2819,7 +2819,7 @@ void drm_property_destroy(struct drm_device *dev, struct drm_property *property) } EXPORT_SYMBOL(drm_property_destroy); -int drm_connector_attach_property(struct drm_connector *connector, +void drm_connector_attach_property(struct drm_connector *connector, struct drm_property *property, uint64_t init_val) { int i; @@ -2828,13 +2828,13 @@ int drm_connector_attach_property(struct drm_connector *connector, if (connector->property_ids[i] == 0) { connector->property_ids[i] = property->base.id; connector->property_values[i] = init_val; - break; + return; } } - if (i == DRM_CONNECTOR_MAX_PROPERTY) - return -EINVAL; - return 0; + WARN(1, "Failed to attach connector property. Please increase " + "DRM_CONNECTOR_MAX_PROPERTY by 1 for each time you see this " + "message\n"); } EXPORT_SYMBOL(drm_connector_attach_property); |
