diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-11-04 17:20:36 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-11-07 14:05:01 +1000 |
| commit | c2d926aacc7eeaf39edbd0ab8d5fba33acbb168d (patch) | |
| tree | dcf151cdc551419b0df8aa0cc3777ab0446301a2 /drivers/gpu/drm/nouveau/nouveau_connector.c | |
| parent | 8896ceef78265fe6ecd5bd3eaa441ecd0a3af160 (diff) | |
| download | linux-c2d926aacc7eeaf39edbd0ab8d5fba33acbb168d.tar.bz2 | |
drm/nouveau/kms/nv50: remove code to support non-atomic connector properties
Made completely unreachable by atomic commits.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_connector.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_connector.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index 790a9ac25844..5df390809f92 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -767,7 +767,6 @@ nouveau_connector_set_property(struct drm_connector *connector, struct nouveau_connector *nv_connector = nouveau_connector(connector); struct nouveau_encoder *nv_encoder = nv_connector->detected_encoder; struct drm_encoder *encoder = to_drm_encoder(nv_encoder); - struct nouveau_crtc *nv_crtc = NULL; int ret; if (connector->dev->mode_config.funcs->atomic_commit) @@ -784,24 +783,17 @@ nouveau_connector_set_property(struct drm_connector *connector, } nv_connector->scaling_mode = asyc->scaler.mode; - nv_connector->underscan = asyc->scaler.underscan.mode; - nv_connector->underscan_hborder = asyc->scaler.underscan.hborder; - nv_connector->underscan_vborder = asyc->scaler.underscan.vborder; nv_connector->dithering_mode = asyc->dither.mode; - nv_connector->dithering_depth = asyc->dither.depth; - if (connector->encoder && connector->encoder->crtc) - nv_crtc = nouveau_crtc(connector->encoder->crtc); - if (!nv_crtc) - return 0; - - nv_crtc->vibrant_hue = asyc->procamp.vibrant_hue - 90; - nv_crtc->color_vibrance = asyc->procamp.color_vibrance - 100; - - ret = drm_crtc_helper_set_mode(&nv_crtc->base, &nv_crtc->base.mode, - nv_crtc->base.x, nv_crtc->base.y, NULL); - if (!ret) - return -EINVAL; + if (connector->encoder && connector->encoder->crtc) { + ret = drm_crtc_helper_set_mode(connector->encoder->crtc, + &connector->encoder->crtc->mode, + connector->encoder->crtc->x, + connector->encoder->crtc->y, + NULL); + if (!ret) + return -EINVAL; + } return 0; } @@ -1354,7 +1346,6 @@ nouveau_connector_create(struct drm_device *dev, int index) break; default: nv_connector->dithering_mode = DITHERING_MODE_AUTO; - nv_connector->dithering_depth = DITHERING_DEPTH_AUTO; break; } |