On 12.12.2016 22:50, Lyude wrote:
> Many GPUs have more then 3 pipes available, so hard limiting this to
> I915_MAX_PIPES prevents us from using anything that relies on
> igt_display_init() on non-intel systems (since we end up writing out of
> bounds and seg faulting). Fix this by dynamically allocating
> igt_display->pipes using the number of pipes we've detected on the GPU.
>
> Signed-off-by: Lyude <lyude@xxxxxxxxxx>
Reviewed-by: Abdiel Janulgue <abdiel.janulgue@xxxxxxxxxxxxxxx>
> ---
> lib/igt_kms.c | 2 ++
> lib/igt_kms.h | 2 +-
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/lib/igt_kms.c b/lib/igt_kms.c
> index 7d906c2..f3927fc 100644
> --- a/lib/igt_kms.c
> +++ b/lib/igt_kms.c
> @@ -1349,6 +1349,7 @@ void igt_display_init(igt_display_t *display, int drm_fd)
> * hardware and cannot change of time (for now, at least).
> */
> display->n_pipes = resources->count_crtcs;
> + display->pipes = calloc(sizeof(igt_pipe_t), display->n_pipes);
>
> drmSetClientCap(drm_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
> is_atomic = drmSetClientCap(drm_fd, DRM_CLIENT_CAP_ATOMIC, 1);
> @@ -1561,6 +1562,7 @@ void igt_display_fini(igt_display_t *display)
> for (i = 0; i < display->n_outputs; i++)
> igt_output_fini(&display->outputs[i]);
> free(display->outputs);
> + free(display->pipes);
> display->outputs = NULL;
> }
>
> diff --git a/lib/igt_kms.h b/lib/igt_kms.h
> index dadbcdd..bb36424 100644
> --- a/lib/igt_kms.h
> +++ b/lib/igt_kms.h
> @@ -310,7 +310,7 @@ struct igt_display {
> int n_outputs;
> unsigned long pipes_in_use;
> igt_output_t *outputs;
> - igt_pipe_t pipes[I915_MAX_PIPES];
> + igt_pipe_t *pipes;
> bool has_cursor_plane;
> bool is_atomic;
> };
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
