On Thu, Nov 20, 2014 at 09:53:35AM +0100, Daniel Vetter wrote:

This is an oversight from

commit f52b69f1ecfdd7ef6867a257620258c09e569552 Author: Daniel Vetter daniel.vetter@ffwll.ch Date: Wed Nov 19 18:38:08 2014 +0100

drm/atomic: Don't overrun the connector array when hotplugging

Cc: Dave Airlie airlied@redhat.com Cc: Rob Clark robdclark@gmail.com Signed-off-by: Daniel Vetter daniel.vetter@intel.com

---

drivers/gpu/drm/drm_atomic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 3624632084e2..d3b46746b611 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -318,7 +318,7 @@ drm_atomic_get_connector_state(struct drm_atomic_state *state, */ if (index >= state->num_connector) { DRM_DEBUG_KMS("Hot-added connector would overflow state array, restarting\n");

• return -EAGAIN;
  

• return ERR_PTR(-EAGAIN);
  

  }

  if (state->connector_states[index])

=)

Reviewed-by: Thierry Reding treding@nvidia.com