[igt-dev] [PATCH i-g-t 1/3] lib/igt_device: add igt_device_get_pci_addr by fd

Jani Nikula jani.nikula at linux.intel.com
Mon Apr 8 11:14:25 UTC 2019


On Mon, 08 Apr 2019, Petri Latvala <petri.latvala at intel.com> wrote:
> On Thu, Apr 04, 2019 at 04:17:51PM +0200, Katarzyna Dec wrote:
>> On Thu, Apr 04, 2019 at 03:18:03PM +0200, Daniel Mrzyglod wrote:
>> > From: Michał Winiarski <michal.winiarski at intel.com>
>> > 
>> > This function get us in easy way pci adress.
>> s/adress/address/
>> > It allows us to make things a little bit more generic.
>> > Also, we now require fd rather than doing guesswork when it comes to pci address.
>> > 
>> > Signed-off-by: Michał Winiarski <michal.winiarski at intel.com>
>> > Cc: Chris Wilson <chris at chris-wilson.co.uk>
>> > Signed-off-by: Daniel Mrzyglod <daniel.t.mrzyglod at intel.com>
>> > ---
>> >  lib/igt_device.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++
>> >  lib/igt_device.h |   2 +
>> >  2 files changed, 119 insertions(+)
>> > 
>> > diff --git a/lib/igt_device.c b/lib/igt_device.c
>> > index 08f39c8b..d3934efb 100644
>> > --- a/lib/igt_device.c
>> > +++ b/lib/igt_device.c
>> > @@ -21,11 +21,14 @@
>> >   * IN THE SOFTWARE.
>> >   *
>> >   */
>> > +#include <sys/types.h>
>> > +#include <fcntl.h>
>> >  
>> >  #include <sys/stat.h>
>> >  #include <sys/sysmacros.h>
>> >  #include "igt.h"
>> >  #include "igt_device.h"
>> > +#include "igt_sysfs.h"
>> >  
>> >  int __igt_device_set_master(int fd)
>> >  {
>> > @@ -103,3 +106,117 @@ int igt_device_get_card_index(int fd)
>> >  
>> >  	return minor(st.st_rdev);
>> >  }
>> > +
>> > +#define IGT_DEV_PATH_LEN 80
>> > +
>> > +static bool igt_device_is_pci(int fd)
>> > +{
>> > +	char path[IGT_DEV_PATH_LEN];
>> > +	char *subsystem;
>> > +	int sysfs;
>> > +	int len;
>> > +
>> > +	if ((sysfs = igt_sysfs_open(fd)) == -1)
>> > +		return false;
>> Even checkpatch is returning error here - 'do not use assignment in if
>> condition'
>
>
> Checkpatch is the one in the wrong here. That if statement is elegant,
> valid and readable.

Here, your call, but in the kernel I'd have that split to assignment and
condition.

BR,
Jani.


-- 
Jani Nikula, Intel Open Source Graphics Center


More information about the igt-dev mailing list