* [PATCH] drm/i915: Use drm_i915_private directly from debugfs
@ 2017-04-07 18:48 Chris Wilson
2017-04-07 19:08 ` ✗ Fi.CI.BAT: failure for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Chris Wilson @ 2017-04-07 18:48 UTC (permalink / raw)
To: intel-gfx
The void *data passed to debugfs callbacks is actually the
drm_i915_private pointer, so use it thusly and avoid the to_i915(dev)
indirection.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/i915_debugfs.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index fba29e61cef5..ef8153aaac8b 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2505,8 +2505,7 @@ static int i915_guc_log_dump(struct seq_file *m, void *data)
static int i915_guc_log_control_get(void *data, u64 *val)
{
- struct drm_device *dev = data;
- struct drm_i915_private *dev_priv = to_i915(dev);
+ struct drm_i915_private *dev_priv = data;
if (!dev_priv->guc.log.vma)
return -EINVAL;
@@ -2518,8 +2517,7 @@ static int i915_guc_log_control_get(void *data, u64 *val)
static int i915_guc_log_control_set(void *data, u64 val)
{
- struct drm_device *dev = data;
- struct drm_i915_private *dev_priv = to_i915(dev);
+ struct drm_i915_private *dev_priv = data;
int ret;
if (!dev_priv->guc.log.vma)
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915: Use drm_i915_private directly from debugfs
2017-04-07 18:48 [PATCH] drm/i915: Use drm_i915_private directly from debugfs Chris Wilson
@ 2017-04-07 19:08 ` Patchwork
2017-04-07 19:42 ` [PATCH] " Chris Wilson
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2017-04-07 19:08 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Use drm_i915_private directly from debugfs
URL : https://patchwork.freedesktop.org/series/22695/
State : failure
== Summary ==
LD [M] drivers/ssb/ssb.o
LD drivers/rtc/built-in.o
LD [M] drivers/usb/serial/usbserial.o
LD lib/raid6/raid6_pq.o
LD lib/raid6/built-in.o
LD drivers/acpi/built-in.o
AR lib/lib.a
LD drivers/usb/storage/usb-storage.o
LD drivers/pci/pcie/pcieportdrv.o
EXPORTS lib/lib-ksyms.o
LD drivers/usb/storage/built-in.o
LD drivers/tty/serial/8250/8250.o
LD lib/built-in.o
LD kernel/sched/built-in.o
LD kernel/built-in.o
LD [M] sound/pci/hda/snd-hda-codec-generic.o
LD [M] drivers/net/ethernet/broadcom/genet/genet.o
LD sound/pci/built-in.o
LD net/ipv6/ipv6.o
LD sound/built-in.o
LD net/ipv6/built-in.o
LD drivers/thermal/thermal_sys.o
LD drivers/pci/pcie/aer/aerdriver.o
LD drivers/thermal/built-in.o
LD drivers/pci/pcie/aer/built-in.o
LD drivers/pci/pcie/built-in.o
LD drivers/video/fbdev/core/fb.o
In file included from ./include/linux/fs.h:19:0,
from ./include/linux/debugfs.h:18,
from drivers/gpu/drm/i915/i915_debugfs.c:29:
drivers/gpu/drm/i915/i915_debugfs.c: In function ‘i915_guc_log_control_set’:
drivers/gpu/drm/i915/i915_debugfs.c:2589:34: error: ‘dev’ undeclared (first use in this function)
ret = mutex_lock_interruptible(&dev->struct_mutex);
^
./include/linux/mutex.h:165:72: note: in definition of macro ‘mutex_lock_interruptible’
#define mutex_lock_interruptible(lock) mutex_lock_interruptible_nested(lock, 0)
^
drivers/gpu/drm/i915/i915_debugfs.c:2589:34: note: each undeclared identifier is reported only once for each function it appears in
ret = mutex_lock_interruptible(&dev->struct_mutex);
^
./include/linux/mutex.h:165:72: note: in definition of macro ‘mutex_lock_interruptible’
#define mutex_lock_interruptible(lock) mutex_lock_interruptible_nested(lock, 0)
^
LD drivers/video/fbdev/core/built-in.o
LD drivers/scsi/scsi_mod.o
LD drivers/pci/built-in.o
LD drivers/gpu/drm/drm.o
scripts/Makefile.build:294: recipe for target 'drivers/gpu/drm/i915/i915_debugfs.o' failed
make[4]: *** [drivers/gpu/drm/i915/i915_debugfs.o] Error 1
make[4]: *** Waiting for unfinished jobs....
LD net/xfrm/built-in.o
LD [M] drivers/net/ethernet/intel/igbvf/igbvf.o
LD drivers/video/fbdev/built-in.o
LD net/ipv4/built-in.o
LD drivers/iommu/built-in.o
LD drivers/tty/serial/8250/8250_base.o
LD drivers/tty/serial/8250/built-in.o
LD drivers/tty/serial/built-in.o
LD drivers/spi/built-in.o
LD drivers/video/console/built-in.o
LD drivers/usb/gadget/libcomposite.o
LD drivers/video/built-in.o
LD drivers/scsi/sd_mod.o
LD fs/btrfs/btrfs.o
LD drivers/scsi/built-in.o
LD [M] drivers/net/ethernet/intel/e1000/e1000.o
LD fs/btrfs/built-in.o
LD drivers/usb/gadget/udc/udc-core.o
LD drivers/usb/gadget/udc/built-in.o
LD drivers/usb/gadget/built-in.o
LD drivers/usb/core/usbcore.o
LD drivers/usb/core/built-in.o
LD [M] drivers/net/ethernet/intel/igb/igb.o
CC arch/x86/kernel/cpu/capflags.o
LD drivers/usb/host/xhci-hcd.o
LD arch/x86/kernel/cpu/built-in.o
LD arch/x86/kernel/built-in.o
LD drivers/tty/vt/built-in.o
LD drivers/tty/built-in.o
LD net/core/built-in.o
LD arch/x86/built-in.o
LD net/built-in.o
LD drivers/usb/host/built-in.o
LD drivers/usb/built-in.o
LD drivers/md/md-mod.o
LD drivers/md/built-in.o
LD fs/ext4/ext4.o
LD [M] drivers/net/ethernet/intel/e1000e/e1000e.o
LD fs/ext4/built-in.o
LD fs/built-in.o
LD drivers/net/ethernet/built-in.o
LD drivers/net/built-in.o
scripts/Makefile.build:553: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2
scripts/Makefile.build:553: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2
scripts/Makefile.build:553: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1002: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] drm/i915: Use drm_i915_private directly from debugfs
2017-04-07 18:48 [PATCH] drm/i915: Use drm_i915_private directly from debugfs Chris Wilson
2017-04-07 19:08 ` ✗ Fi.CI.BAT: failure for " Patchwork
@ 2017-04-07 19:42 ` Chris Wilson
2017-04-10 10:42 ` Joonas Lahtinen
2017-04-07 20:09 ` ✓ Fi.CI.BAT: success for drm/i915: Use drm_i915_private directly from debugfs (rev2) Patchwork
2017-04-08 12:55 ` [PATCH] drm/i915: Use drm_i915_private directly from debugfs kbuild test robot
3 siblings, 1 reply; 7+ messages in thread
From: Chris Wilson @ 2017-04-07 19:42 UTC (permalink / raw)
To: intel-gfx
The void *data passed to debugfs callbacks is actually the
drm_i915_private pointer, so use it thusly and avoid the to_i915(dev)
indirection.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/i915_debugfs.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index fba29e61cef5..130fddf458a0 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2505,8 +2505,7 @@ static int i915_guc_log_dump(struct seq_file *m, void *data)
static int i915_guc_log_control_get(void *data, u64 *val)
{
- struct drm_device *dev = data;
- struct drm_i915_private *dev_priv = to_i915(dev);
+ struct drm_i915_private *dev_priv = data;
if (!dev_priv->guc.log.vma)
return -EINVAL;
@@ -2518,14 +2517,13 @@ static int i915_guc_log_control_get(void *data, u64 *val)
static int i915_guc_log_control_set(void *data, u64 val)
{
- struct drm_device *dev = data;
- struct drm_i915_private *dev_priv = to_i915(dev);
+ struct drm_i915_private *dev_priv = data;
int ret;
if (!dev_priv->guc.log.vma)
return -EINVAL;
- ret = mutex_lock_interruptible(&dev->struct_mutex);
+ ret = mutex_lock_interruptible(&dev_priv->drm.struct_mutex);
if (ret)
return ret;
@@ -2533,7 +2531,7 @@ static int i915_guc_log_control_set(void *data, u64 val)
ret = i915_guc_log_control(dev_priv, val);
intel_runtime_pm_put(dev_priv);
- mutex_unlock(&dev->struct_mutex);
+ mutex_unlock(&dev_priv->drm.struct_mutex);
return ret;
}
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/i915: Use drm_i915_private directly from debugfs
2017-04-07 19:42 ` [PATCH] " Chris Wilson
@ 2017-04-10 10:42 ` Joonas Lahtinen
2017-04-10 11:07 ` Chris Wilson
0 siblings, 1 reply; 7+ messages in thread
From: Joonas Lahtinen @ 2017-04-10 10:42 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On pe, 2017-04-07 at 20:42 +0100, Chris Wilson wrote:
> The void *data passed to debugfs callbacks is actually the
> drm_i915_private pointer, so use it thusly and avoid the to_i915(dev)
> indirection.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Regards, Joonas
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/i915: Use drm_i915_private directly from debugfs
2017-04-10 10:42 ` Joonas Lahtinen
@ 2017-04-10 11:07 ` Chris Wilson
0 siblings, 0 replies; 7+ messages in thread
From: Chris Wilson @ 2017-04-10 11:07 UTC (permalink / raw)
To: Joonas Lahtinen; +Cc: intel-gfx
On Mon, Apr 10, 2017 at 01:42:46PM +0300, Joonas Lahtinen wrote:
> On pe, 2017-04-07 at 20:42 +0100, Chris Wilson wrote:
> > The void *data passed to debugfs callbacks is actually the
> > drm_i915_private pointer, so use it thusly and avoid the to_i915(dev)
> > indirection.
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>
> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Pushed the trivial patch before drm_device starts making a comeback.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Use drm_i915_private directly from debugfs (rev2)
2017-04-07 18:48 [PATCH] drm/i915: Use drm_i915_private directly from debugfs Chris Wilson
2017-04-07 19:08 ` ✗ Fi.CI.BAT: failure for " Patchwork
2017-04-07 19:42 ` [PATCH] " Chris Wilson
@ 2017-04-07 20:09 ` Patchwork
2017-04-08 12:55 ` [PATCH] drm/i915: Use drm_i915_private directly from debugfs kbuild test robot
3 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2017-04-07 20:09 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Use drm_i915_private directly from debugfs (rev2)
URL : https://patchwork.freedesktop.org/series/22695/
State : success
== Summary ==
Series 22695v2 drm/i915: Use drm_i915_private directly from debugfs
https://patchwork.freedesktop.org/api/1.0/series/22695/revisions/2/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
fail -> PASS (fi-snb-2600) fdo#100007
Test kms_frontbuffer_tracking:
Subgroup basic:
none -> INCOMPLETE (fi-byt-n2820)
none -> INCOMPLETE (fi-bxt-j4205)
fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fi-bdw-5557u total:215 pass:206 dwarn:0 dfail:0 fail:0 skip:8
fi-bdw-gvtdvm total:215 pass:203 dwarn:2 dfail:0 fail:0 skip:9
fi-bsw-n3050 total:215 pass:194 dwarn:0 dfail:0 fail:0 skip:20
fi-bxt-j4205 total:215 pass:198 dwarn:0 dfail:0 fail:0 skip:16
fi-byt-j1900 total:215 pass:199 dwarn:0 dfail:0 fail:0 skip:15
fi-byt-n2820 total:215 pass:195 dwarn:0 dfail:0 fail:0 skip:19
fi-hsw-4770 total:215 pass:201 dwarn:0 dfail:0 fail:0 skip:13
fi-hsw-4770r total:215 pass:201 dwarn:0 dfail:0 fail:0 skip:13
fi-ilk-650 total:215 pass:177 dwarn:0 dfail:0 fail:0 skip:37
fi-ivb-3520m total:215 pass:201 dwarn:0 dfail:0 fail:0 skip:13
fi-ivb-3770 total:215 pass:201 dwarn:0 dfail:0 fail:0 skip:13
fi-kbl-7500u total:215 pass:199 dwarn:0 dfail:0 fail:0 skip:15
fi-kbl-7560u total:215 pass:207 dwarn:0 dfail:0 fail:0 skip:7
fi-skl-6260u total:215 pass:207 dwarn:0 dfail:0 fail:0 skip:7
fi-skl-6700hq total:215 pass:199 dwarn:0 dfail:0 fail:0 skip:15
fi-skl-6700k total:215 pass:199 dwarn:0 dfail:0 fail:0 skip:15
fi-skl-6770hq total:215 pass:207 dwarn:0 dfail:0 fail:0 skip:7
fi-skl-gvtdvm total:215 pass:206 dwarn:0 dfail:0 fail:0 skip:8
fi-snb-2520m total:215 pass:196 dwarn:0 dfail:0 fail:0 skip:18
fi-snb-2600 total:215 pass:196 dwarn:0 dfail:0 fail:0 skip:18
fi-bxt-t5700 failed to connect after reboot
c9c537bbdea40e52ffd1e144edd3a915f8e8572f drm-tip: 2017y-04m-07d-17h-50m-41s UTC integration manifest
d2e7784 drm/i915: Use drm_i915_private directly from debugfs
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4448/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/i915: Use drm_i915_private directly from debugfs
2017-04-07 18:48 [PATCH] drm/i915: Use drm_i915_private directly from debugfs Chris Wilson
` (2 preceding siblings ...)
2017-04-07 20:09 ` ✓ Fi.CI.BAT: success for drm/i915: Use drm_i915_private directly from debugfs (rev2) Patchwork
@ 2017-04-08 12:55 ` kbuild test robot
3 siblings, 0 replies; 7+ messages in thread
From: kbuild test robot @ 2017-04-08 12:55 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx, kbuild-all
[-- Attachment #1: Type: text/plain, Size: 3916 bytes --]
Hi Chris,
[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on v4.11-rc5 next-20170407]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Chris-Wilson/drm-i915-Use-drm_i915_private-directly-from-debugfs/20170408-185408
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: i386-randconfig-x073-201714 (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
# save the attached .config to linux build tree
make ARCH=i386
All errors (new ones prefixed by >>):
In file included from include/linux/fs.h:19:0,
from include/linux/debugfs.h:18,
from drivers/gpu//drm/i915/i915_debugfs.c:29:
drivers/gpu//drm/i915/i915_debugfs.c: In function 'i915_guc_log_control_set':
>> drivers/gpu//drm/i915/i915_debugfs.c:2589:34: error: 'dev' undeclared (first use in this function)
ret = mutex_lock_interruptible(&dev->struct_mutex);
^
include/linux/mutex.h:165:72: note: in definition of macro 'mutex_lock_interruptible'
#define mutex_lock_interruptible(lock) mutex_lock_interruptible_nested(lock, 0)
^~~~
drivers/gpu//drm/i915/i915_debugfs.c:2589:34: note: each undeclared identifier is reported only once for each function it appears in
ret = mutex_lock_interruptible(&dev->struct_mutex);
^
include/linux/mutex.h:165:72: note: in definition of macro 'mutex_lock_interruptible'
#define mutex_lock_interruptible(lock) mutex_lock_interruptible_nested(lock, 0)
^~~~
vim +/dev +2589 drivers/gpu//drm/i915/i915_debugfs.c
685534ef Sagar Arun Kamble 2016-10-12 2573 if (!dev_priv->guc.log.vma)
685534ef Sagar Arun Kamble 2016-10-12 2574 return -EINVAL;
685534ef Sagar Arun Kamble 2016-10-12 2575
685534ef Sagar Arun Kamble 2016-10-12 2576 *val = i915.guc_log_level;
685534ef Sagar Arun Kamble 2016-10-12 2577
685534ef Sagar Arun Kamble 2016-10-12 2578 return 0;
685534ef Sagar Arun Kamble 2016-10-12 2579 }
685534ef Sagar Arun Kamble 2016-10-12 2580
685534ef Sagar Arun Kamble 2016-10-12 2581 static int i915_guc_log_control_set(void *data, u64 val)
685534ef Sagar Arun Kamble 2016-10-12 2582 {
82580d06 Chris Wilson 2017-04-07 2583 struct drm_i915_private *dev_priv = data;
685534ef Sagar Arun Kamble 2016-10-12 2584 int ret;
685534ef Sagar Arun Kamble 2016-10-12 2585
685534ef Sagar Arun Kamble 2016-10-12 2586 if (!dev_priv->guc.log.vma)
685534ef Sagar Arun Kamble 2016-10-12 2587 return -EINVAL;
685534ef Sagar Arun Kamble 2016-10-12 2588
685534ef Sagar Arun Kamble 2016-10-12 @2589 ret = mutex_lock_interruptible(&dev->struct_mutex);
685534ef Sagar Arun Kamble 2016-10-12 2590 if (ret)
685534ef Sagar Arun Kamble 2016-10-12 2591 return ret;
685534ef Sagar Arun Kamble 2016-10-12 2592
685534ef Sagar Arun Kamble 2016-10-12 2593 intel_runtime_pm_get(dev_priv);
685534ef Sagar Arun Kamble 2016-10-12 2594 ret = i915_guc_log_control(dev_priv, val);
685534ef Sagar Arun Kamble 2016-10-12 2595 intel_runtime_pm_put(dev_priv);
685534ef Sagar Arun Kamble 2016-10-12 2596
685534ef Sagar Arun Kamble 2016-10-12 2597 mutex_unlock(&dev->struct_mutex);
:::::: The code at line 2589 was first introduced by commit
:::::: 685534ef4c8faff1f69c9962ad3013e17354ff8b drm/i915: Debugfs support for GuC logging control
:::::: TO: Sagar Arun Kamble <sagar.a.kamble@intel.com>
:::::: CC: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 25035 bytes --]
[-- Attachment #3: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-04-10 11:07 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-07 18:48 [PATCH] drm/i915: Use drm_i915_private directly from debugfs Chris Wilson
2017-04-07 19:08 ` ✗ Fi.CI.BAT: failure for " Patchwork
2017-04-07 19:42 ` [PATCH] " Chris Wilson
2017-04-10 10:42 ` Joonas Lahtinen
2017-04-10 11:07 ` Chris Wilson
2017-04-07 20:09 ` ✓ Fi.CI.BAT: success for drm/i915: Use drm_i915_private directly from debugfs (rev2) Patchwork
2017-04-08 12:55 ` [PATCH] drm/i915: Use drm_i915_private directly from debugfs kbuild test robot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.