Am 19.04.2018 um 15:06 schrieb xiyuan:
> Hi Christian,
>
> The problem I encountered is that amdgpu_test throws segment fault on
> a platform with 1 iGPU + 4 dGPU. The root cause is that 'drm_count'
> returned by drmGetDevices() is 5 which exceeds MAX_CARDS_SUPPORTED, so
> I decided to make it more flexible to get the actual number of drm
> devices.
>
> Setting MAX_CARDS_SUPPORTED to 128 is fine to solve my problem but is
> it a bit large for traversal?
No, not really. MAX_CARDS_SUPPORTED only affects the size of drm_amdgpu
array. And so we would use 128*4=512 bytes at most.
128 is the maximum the kernel can support at the moment, so that should
work for a while.
Christian.
>
> Regards,
> Xiaojie
>
>
> On 04/19/2018 07:06 PM, Christian König wrote:
>> Wouldn't it be simpler to just set MAX_CARDS_SUPPORTED to 128?
>>
>> Regards,
>> Christian.
>>
>> Am 19.04.2018 um 12:12 schrieb Xiaojie Yuan:
>>> Change-Id: I36764951bebbcbf06cf84dd43ee946a34ec7b100
>>> Signed-off-by: Xiaojie Yuan <Xiaojie.Yuan at amd.com>
>>> ---
>>> Â tests/amdgpu/amdgpu_test.c | 44
>>> ++++++++++++++++++++++++++++----------
>>> Â tests/amdgpu/amdgpu_test.h |Â 7 +-----
>>> Â 2 files changed, 34 insertions(+), 17 deletions(-)
>>>
>>> diff --git a/tests/amdgpu/amdgpu_test.c b/tests/amdgpu/amdgpu_test.c
>>> index 96fcd687..f7ac4ab4 100644
>>> --- a/tests/amdgpu/amdgpu_test.c
>>> +++ b/tests/amdgpu/amdgpu_test.c
>>> @@ -61,7 +61,8 @@
>>> Â Â *Â Open handles for amdgpu devices
>>> Â Â *
>>> Â Â */
>>> -int drm_amdgpu[MAX_CARDS_SUPPORTED];
>>> +int *drm_amdgpu;
>>> +size_t num_drm_devices;
>>> Â Â /** Open render node to test */
>>> Â int open_render_node = 0;Â Â Â /* By default run most tests on
>>> primary node */
>>> @@ -238,16 +239,16 @@ static const char options[]Â Â = "hlrps:t:b:d:f";
>>> Â Â */
>>> Â static int amdgpu_open_devices(int open_render_node)
>>> Â {
>>> -Â Â Â drmDevicePtr devices[MAX_CARDS_SUPPORTED];
>>> +Â Â Â drmDevicePtr *devices;
>>> Â Â Â Â Â int i;
>>> Â Â Â Â Â int drm_node;
>>> Â Â Â Â Â int amd_index = 0;
>>> Â Â Â Â Â int drm_count;
>>> +Â Â Â int drm_count2;
>>> Â Â Â Â Â int fd;
>>> Â Â Â Â Â drmVersionPtr version;
>>> Â -Â Â Â drm_count = drmGetDevices2(0, devices, MAX_CARDS_SUPPORTED);
>>> -
>>> +Â Â Â drm_count = drmGetDevices2(0, NULL, 0);
>>> Â Â Â Â Â if (drm_count < 0) {
>>> Â Â Â Â Â Â Â Â Â fprintf(stderr,
>>> Â Â Â Â Â Â Â Â Â Â Â Â Â "drmGetDevices2() returned an error %d\n",
>>> @@ -255,6 +256,27 @@ static int amdgpu_open_devices(int
>>> open_render_node)
>>> Â Â Â Â Â Â Â Â Â return 0;
>>> Â Â Â Â Â }
>>> Â +Â Â Â devices = calloc(drm_count, sizeof(drmDevicePtr));
>>> +Â Â Â if (!devices) {
>>> +Â Â Â Â Â Â Â goto end;
>>> +Â Â Â }
>>> +
>>> +Â Â Â drm_amdgpu = calloc(drm_count, sizeof(int));
>>> +Â Â Â if (!drm_amdgpu) {
>>> +Â Â Â Â Â Â Â goto end;
>>> +Â Â Â }
>>> +
>>> +Â Â Â for (i = 0; i < drm_count; i++)
>>> +Â Â Â Â Â Â Â drm_amdgpu[i] = -1;
>>> +
>>> +Â Â Â drm_count2 = drmGetDevices2(0, devices, drm_count);
>>> +Â Â Â if (drm_count2 != drm_count) {
>>> +Â Â Â Â Â Â Â fprintf(stderr, "number of drm devices changed");
>>> +Â Â Â Â Â Â Â goto end;
>>> +Â Â Â }
>>> +
>>> +Â Â Â num_drm_devices = drm_count;
>>> +
>>> Â Â Â Â Â for (i = 0; i < drm_count; i++) {
>>> Â Â Â Â Â Â Â Â Â /* If this is not PCI device, skip*/
>>> Â Â Â Â Â Â Â Â Â if (devices[i]->bustype != DRM_BUS_PCI)
>>> @@ -302,7 +324,9 @@ static int amdgpu_open_devices(int
>>> open_render_node)
>>> Â Â Â Â Â Â Â Â Â amd_index++;
>>> Â Â Â Â Â }
>>> Â +end:
>>> Â Â Â Â Â drmFreeDevices(devices, drm_count);
>>> +Â Â Â free(devices);
>>> Â Â Â Â Â return amd_index;
>>> Â }
>>> Â @@ -311,9 +335,11 @@ static int amdgpu_open_devices(int
>>> open_render_node)
>>> Â static void amdgpu_close_devices()
>>> Â {
>>> Â Â Â Â Â int i;
>>> -Â Â Â for (i = 0; i < MAX_CARDS_SUPPORTED; i++)
>>> +Â Â Â for (i = 0; i < num_drm_devices; i++)
>>> Â Â Â Â Â Â Â Â Â if (drm_amdgpu[i] >=0)
>>> Â Â Â Â Â Â Â Â Â Â Â Â Â close(drm_amdgpu[i]);
>>> +
>>> +Â Â Â free(drm_amdgpu);
>>> Â }
>>> Â Â /* Print AMD devices information */
>>> @@ -339,7 +365,7 @@ static void amdgpu_print_devices()
>>> Â Â Â Â Â Â /* Display information of AMD devices */
>>> Â Â Â Â Â printf("Devices:\n");
>>> -Â Â Â for (i = 0; i < MAX_CARDS_SUPPORTED && drm_amdgpu[i] >=0; i++)
>>> +Â Â Â for (i = 0; i < num_drm_devices && drm_amdgpu[i] >=0; i++)
>>> Â Â Â Â Â Â Â Â Â if (drmGetDevice2(drm_amdgpu[i],
>>> Â Â Â Â Â Â Â Â Â Â Â Â Â DRM_DEVICE_GET_PCI_REVISION,
>>> Â Â Â Â Â Â Â Â Â Â Â Â Â &device) == 0) {
>>> @@ -377,7 +403,7 @@ static int amdgpu_find_device(uint8_t bus,
>>> uint16_t dev)
>>> Â Â Â Â Â int i;
>>> Â Â Â Â Â drmDevicePtr device;
>>> Â -Â Â Â for (i = 0; i < MAX_CARDS_SUPPORTED && drm_amdgpu[i] >= 0;
>>> i++) {
>>> +Â Â Â for (i = 0; i < num_drm_devices && drm_amdgpu[i] >= 0; i++) {
>>> Â Â Â Â Â Â Â Â Â if (drmGetDevice2(drm_amdgpu[i],
>>> Â Â Â Â Â Â Â Â Â Â Â Â Â DRM_DEVICE_GET_PCI_REVISION,
>>> Â Â Â Â Â Â Â Â Â Â Â Â Â &device) == 0) {
>>> @@ -456,10 +482,6 @@ int main(int argc, char **argv)
>>> Â Â Â Â Â int display_list = 0;
>>> Â Â Â Â Â int force_run = 0;
>>> Â -Â Â Â for (i = 0; i < MAX_CARDS_SUPPORTED; i++)
>>> -Â Â Â Â Â Â Â drm_amdgpu[i] = -1;
>>> -
>>> -
>>> Â Â Â Â Â /* Parse command line string */
>>> Â Â Â Â Â opterr = 0;Â Â Â Â Â Â Â /* Do not print error messages from getopt */
>>> Â Â Â Â Â while ((c = getopt(argc, argv, options)) != -1) {
>>> diff --git a/tests/amdgpu/amdgpu_test.h b/tests/amdgpu/amdgpu_test.h
>>> index 62875736..8a604fe4 100644
>>> --- a/tests/amdgpu/amdgpu_test.h
>>> +++ b/tests/amdgpu/amdgpu_test.h
>>> @@ -27,13 +27,8 @@
>>> Â #include "amdgpu.h"
>>> Â #include "amdgpu_drm.h"
>>> Â -/**
>>> - * Define max. number of card in system which we are able to handle
>>> - */
>>> -#define MAX_CARDS_SUPPORTEDÂ Â Â Â 4
>>> -
>>> Â /* Forward reference for array to keep "drm" handles */
>>> -extern int drm_amdgpu[MAX_CARDS_SUPPORTED];
>>> +extern int *drm_amdgpu;
>>> Â Â /* Global variables */
>>> Â extern int open_render_node;
>>
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
