Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
gpu
/
drm
/
drm_atomic_helper.c
diff --git
a/kernel/drivers/gpu/drm/drm_atomic_helper.c
b/kernel/drivers/gpu/drm/drm_atomic_helper.c
index
e5aec45
..
1ac29d7
100644
(file)
--- a/
kernel/drivers/gpu/drm/drm_atomic_helper.c
+++ b/
kernel/drivers/gpu/drm/drm_atomic_helper.c
@@
-108,7
+108,6
@@
steal_encoder(struct drm_atomic_state *state,
struct drm_crtc_state *crtc_state;
struct drm_connector *connector;
struct drm_connector_state *connector_state;
struct drm_crtc_state *crtc_state;
struct drm_connector *connector;
struct drm_connector_state *connector_state;
- int ret;
/*
* We can only steal an encoder coming from a connector, which means we
/*
* We can only steal an encoder coming from a connector, which means we
@@
-139,9
+138,6
@@
steal_encoder(struct drm_atomic_state *state,
if (IS_ERR(connector_state))
return PTR_ERR(connector_state);
if (IS_ERR(connector_state))
return PTR_ERR(connector_state);
- ret = drm_atomic_set_crtc_for_connector(connector_state, NULL);
- if (ret)
- return ret;
connector_state->best_encoder = NULL;
}
connector_state->best_encoder = NULL;
}