PATCH i-g-t 0/2] lib/igt_kms: Add support for display with
Add support for non-contiguous pipe display by allocating upper bound pipes array for display. Set the pipe enum name to igt pipe for enabled pipes in drm.
Mohammed Khajapasha (1):
lib/igt_kms: Add support for display with non-contiguous pipes
Petri Latvala (1):
lib/drmtest: Don't write ffffffff to a numeric param
lib/drmtest.c | 2 +- lib/igt_kms.c | 30 +++++++++++++++++++++++++----- lib/igt_kms.h | 15 +++++++++------ 3 files changed, 35 insertions(+), 12 deletions(-)
Signature · 6 lines
2.24.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
RFC 1/1 PATCH i-g-t 1/2] lib/drmtest: Don't write ffffffff to a numeric param
From: Petri Latvala <[email protected]>
__cancel_work_at_exit writes -1 to param "reset", with the intention that it's "any available method". Hex values to numeric params should be prefixed with 0x to be parsed as a number. Use the convention of %u with -1 as is used elsewhere with the "reset" param.
--- lib/drmtest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/drmtest.c +1 -1
@@ -478,7 +478,7 @@ static void __cancel_work_at_exit(int fd) {igt_terminate_spins ();/* for older kernels */ -igt_params_set (fd,"reset" ,"%x" ,-1u /* any method */ ); +igt_params_set (fd,"reset" ,"%u" ,-1u /* any method */ ); igt_drop_caches_set(fd, /* cancel everything */ DROP_RESET_ACTIVE | DROP_RESET_SEQNO |
Signature · 6 lines
2.24.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
RFC 1/1 PATCH i-g-t 2/2] lib/igt_kms: Add support for display with non-contiguous pipes
In reply to Mohammed KhajapashaAdd support for non-contiguous pipe display by allocating upper bound pipes array for display. Set the pipe enum name to igt pipe for enabled pipes in drm.
--- lib/igt_kms.c | 30 +++++++++++++++++++++++++----- lib/igt_kms.h | 15 +++++++++------ 2 files changed, 34 insertions(+), 11 deletions(-)
lib/igt_kms.c +25 -5
@@ -1921,10 +1921,26 @@ void igt_display_require(igt_display_t *display, int drm_fd)* We cache the number of pipes, that number is a physical limit of the * 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); + display->n_pipes =IGT_MAX_PIPES ; + display->pipes =calloc (sizeof (igt_pipe_t),IGT_MAX_PIPES );igt_assert_f (display->pipes,"Failed to allocate memory for %d pipes\n" , display->n_pipes); +for (i =0 ; i < resources->count_crtcs; i++) { +igt_pipe_t *pipe; +struct drm_i915_get_pipe_from_crtc_id get_pipe; + +/* Get right pipe enum from kernel for a pipe */ + get_pipe.pipe =0 ; + get_pipe.crtc_id = resources->crtcs[i]; +do_ioctl (display->drm_fd, +DRM_IOCTL_I915_GET_PIPE_FROM_CRTC_ID , &get_pipe); + + pipe = &display->pipes[get_pipe.pipe]; + pipe->pipe = get_pipe.pipe; + pipe->enabled = true; + pipe->crtc_id = resources->crtcs[i]; + } +drmSetClientCap (drm_fd,DRM_CLIENT_CAP_UNIVERSAL_PLANES ,1 );if (drmSetClientCap (drm_fd,DRM_CLIENT_CAP_ATOMIC ,1 ) ==0 ) display->is_atomic =1 ;
@@ -1959,9 +1975,7 @@ void igt_display_require(igt_display_t *display, int drm_fd)int j, type;uint8_t last_plane =0 , n_planes =0 ; - pipe->crtc_id = resources->crtcs[i]; pipe->display = display; - pipe->pipe = i; pipe->plane_cursor =-1 ; pipe->plane_primary =-1 ; pipe->planes =NULL ;
@@ -2409,12 +2423,18 @@ static bool output_is_internal_panel(igt_output_t *output)igt_output_t **__igt_pipe_populate_outputs (igt_display_t *display,igt_output_t **chosen_outputs) { -unsigned full_pipe_mask = (1 << (display->n_pipes)) -1 , assigned_pipes =0 ; +unsigned full_pipe_mask, assigned_pipes =0 ;igt_output_t *output;int i, j;memset (chosen_outputs,0 ,sizeof (*chosen_outputs) * display->n_pipes); +for ( i =0 ; i < display->n_pipes; i++) { +igt_pipe_t *pipe = &display->pipes[i]; +if (pipe->enabled) + full_pipe_mask |= (1 << pipe->pipe); + } +/* * Try to assign all outputs to the first available CRTC for * it, start with the outputs restricted to 1 pipe, then increase
lib/igt_kms.h +9 -6
@@ -341,6 +341,7 @@ typedef struct igt_plane {struct igt_pipe {igt_display_t *display;enum pipe pipe; +bool enabled;int n_planes;int plane_cursor;
@@ -497,7 +498,8 @@ static inline bool igt_output_is_connected(igt_output_t *output)* depencies. */ #define for_each_pipe_static (pipe) \ - for (pipe = 0; pipe < IGT_MAX_PIPES; pipe++) + for (pipe = 0; pipe < IGT_MAX_PIPES; pipe++) \ + for_each_if((display)->pipes[(pipe)].enabled)/** * for_each_pipe:
@@ -510,8 +512,8 @@ static inline bool igt_output_is_connected(igt_output_t *output)* depends upon runtime probing of the actual kms driver that is being tested. * Use #for_each_pipe_static instead. */ -#define for_each_pipe (display, pipe) \ - for (pipe = 0; assert(igt_can_fail()), pipe < igt_display_get_n_pipes(display); pipe++) +#define for_each_pipe (display, pipe) \ + for_each_pipe_static(pipe)/** * for_each_pipe_with_valid_output:
@@ -530,8 +532,9 @@ static inline bool igt_output_is_connected(igt_output_t *output)for (int con__ = (pipe) =0 ; \assert (igt_can_fail ()), (pipe) <igt_display_get_n_pipes ((display)) && con__ < (display)->n_outputs; \ con__ = (con__ +1 < (display)->n_outputs) ? con__ +1 : (pipe = pipe +1 ,0 )) \ -for_each_if ((((output) = &(display)->outputs[con__]), \ - igt_pipe_connector_valid((pipe), (output)))) + for_each_if((display)->pipes[pipe].enabled) \ +for_each_if ((((output) = &(display)->outputs[con__]), \ + igt_pipe_connector_valid((pipe), (output))))igt_output_t **__igt_pipe_populate_outputs (igt_display_t *display,igt_output_t **chosen_outputs);
@@ -549,7 +552,7 @@ igt_output_t **__igt_pipe_populate_outputs(igt_display_t *display,#define for_each_pipe_with_single_output (display, pipe, output) \ for (igt_output_t *__outputs[(display)->n_pipes], \ **__output = __igt_pipe_populate_outputs((display), __outputs); \ - __output < &__outputs[(display)->n_pipes]; __output++) \ + __output < &__outputs[(display)->n_pipes]; __output++) \ for_each_if (*__output && \ ((pipe) = (__output - __outputs), (output) = *__output, 1))
Signature · 6 lines
2.24.1 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✗ Fi.CI.BAT: failure for PATCH i-g-t 2/2] lib/igt_kms: Add support for display with non-contiguous pipes
In reply to Mohammed Khajapasha== Series Details ==
== Series Details ==
Series: PATCH i-g-t 2/2] lib/igt_kms: Add support for display with non-contiguous pipes
URL : https://patchwork.freedesktop.org/series/78196/
State : failure
== Summary ==
Series 78196 revision 1 was fully merged or fully failed: no git log
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev