diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-12-04 11:45:59 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-12-08 18:13:51 +0300 |
| commit | 3558c112aa129ca5e4f06a33e9241611f7a9d2c7 (patch) | |
| tree | 4a175aad454843e56bffec4fbb1b96a32f24537c | |
| parent | 6fe14acd496e7ca27d6dfbeaa71b4f16656d10c2 (diff) | |
| download | linux-3558c112aa129ca5e4f06a33e9241611f7a9d2c7.tar.xz | |
drm: connector->dpms is not optional
We always register the DPMS property, it's really a fundamental
part of a display driver. So don't check whether the vfunc is there,
it's non-optional
Yes I've audited all the almost 100 drm_connector_funcs we have, no
one botched this ;-)
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449218769-16577-19-git-send-email-daniel.vetter@ffwll.ch
Reviewed-by: Thierry Reding <treding@nvidia.com>
| -rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 32dd134700bd..99e7efebedda 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -4785,9 +4785,7 @@ static int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj, /* Do DPMS ourselves */ if (property == connector->dev->mode_config.dpms_property) { - ret = 0; - if (connector->funcs->dpms) - ret = (*connector->funcs->dpms)(connector, (int)value); + ret = (*connector->funcs->dpms)(connector, (int)value); } else if (connector->funcs->set_property) ret = connector->funcs->set_property(connector, property, value); |