* [PATCH 1/3] drm: prefer inline over __inline__
@ 2018-03-27 20:47 Jani Nikula
2018-03-27 20:47 ` [PATCH 2/3] drm: remove old documentation comment cruft from drmP.h Jani Nikula
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Jani Nikula @ 2018-03-27 20:47 UTC (permalink / raw)
To: dri-devel; +Cc: Jani Nikula, intel-gfx
Remove last users of __inline__.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
include/drm/drmP.h | 5 ++---
include/drm/drm_legacy.h | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index c6666cd09347..4bbef061c9c0 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -123,8 +123,7 @@ static inline bool drm_drv_uses_atomic_modeset(struct drm_device *dev)
#define DRM_SWITCH_POWER_CHANGING 2
#define DRM_SWITCH_POWER_DYNAMIC_OFF 3
-static __inline__ int drm_core_check_feature(struct drm_device *dev,
- int feature)
+static inline int drm_core_check_feature(struct drm_device *dev, int feature)
{
return ((dev->driver->driver_features & feature) ? 1 : 0);
}
@@ -143,7 +142,7 @@ static __inline__ int drm_core_check_feature(struct drm_device *dev,
/*@}*/
/* returns true if currently okay to sleep */
-static __inline__ bool drm_can_sleep(void)
+static inline bool drm_can_sleep(void)
{
if (in_atomic() || in_dbg_master() || irqs_disabled())
return false;
diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h
index cf0e7d89bcdf..8fad66f88e4f 100644
--- a/include/drm/drm_legacy.h
+++ b/include/drm/drm_legacy.h
@@ -194,8 +194,8 @@ void drm_legacy_ioremap(struct drm_local_map *map, struct drm_device *dev);
void drm_legacy_ioremap_wc(struct drm_local_map *map, struct drm_device *dev);
void drm_legacy_ioremapfree(struct drm_local_map *map, struct drm_device *dev);
-static __inline__ struct drm_local_map *drm_legacy_findmap(struct drm_device *dev,
- unsigned int token)
+static inline struct drm_local_map *drm_legacy_findmap(struct drm_device *dev,
+ unsigned int token)
{
struct drm_map_list *_entry;
list_for_each_entry(_entry, &dev->maplist, head)
--
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* [PATCH 2/3] drm: remove old documentation comment cruft from drmP.h
2018-03-27 20:47 [PATCH 1/3] drm: prefer inline over __inline__ Jani Nikula
@ 2018-03-27 20:47 ` Jani Nikula
2018-03-27 20:47 ` [PATCH 3/3] drm: make drm_core_check_feature() bool that it is Jani Nikula
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Jani Nikula @ 2018-03-27 20:47 UTC (permalink / raw)
To: dri-devel; +Cc: Jani Nikula, intel-gfx
Throw out the leftovers.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
include/drm/drmP.h | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 4bbef061c9c0..b5d52a3d7d19 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -95,14 +95,6 @@ struct dma_buf_attachment;
struct pci_dev;
struct pci_controller;
-/***********************************************************************/
-/** \name DRM template customization defaults */
-/*@{*/
-
-/***********************************************************************/
-/** \name Internal types and structures */
-/*@{*/
-
#define DRM_IF_VERSION(maj, min) (maj << 16 | min)
/**
@@ -128,19 +120,6 @@ static inline int drm_core_check_feature(struct drm_device *dev, int feature)
return ((dev->driver->driver_features & feature) ? 1 : 0);
}
-/******************************************************************/
-/** \name Internal function definitions */
-/*@{*/
-
- /* Driver support (drm_drv.h) */
-
-/*
- * These are exported to drivers so that they can implement fencing using
- * DMA quiscent + idle. DMA quiescent usually requires the hardware lock.
- */
-
-/*@}*/
-
/* returns true if currently okay to sleep */
static inline bool drm_can_sleep(void)
{
--
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* [PATCH 3/3] drm: make drm_core_check_feature() bool that it is
2018-03-27 20:47 [PATCH 1/3] drm: prefer inline over __inline__ Jani Nikula
2018-03-27 20:47 ` [PATCH 2/3] drm: remove old documentation comment cruft from drmP.h Jani Nikula
@ 2018-03-27 20:47 ` Jani Nikula
2018-03-27 20:59 ` Chris Wilson
2018-03-27 21:50 ` ✓ Fi.CI.BAT: success for series starting with [1/3] drm: prefer inline over __inline__ Patchwork
2018-03-28 6:30 ` ✓ Fi.CI.IGT: " Patchwork
3 siblings, 1 reply; 7+ messages in thread
From: Jani Nikula @ 2018-03-27 20:47 UTC (permalink / raw)
To: dri-devel; +Cc: Jani Nikula, intel-gfx
Bool is the more appropriate return type here, use it.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
include/drm/drmP.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index b5d52a3d7d19..f5099c12c6a6 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -115,9 +115,9 @@ static inline bool drm_drv_uses_atomic_modeset(struct drm_device *dev)
#define DRM_SWITCH_POWER_CHANGING 2
#define DRM_SWITCH_POWER_DYNAMIC_OFF 3
-static inline int drm_core_check_feature(struct drm_device *dev, int feature)
+static inline bool drm_core_check_feature(struct drm_device *dev, int feature)
{
- return ((dev->driver->driver_features & feature) ? 1 : 0);
+ return dev->driver->driver_features & feature;
}
/* returns true if currently okay to sleep */
--
2.11.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 3/3] drm: make drm_core_check_feature() bool that it is
2018-03-27 20:47 ` [PATCH 3/3] drm: make drm_core_check_feature() bool that it is Jani Nikula
@ 2018-03-27 20:59 ` Chris Wilson
2018-03-28 6:36 ` Jani Nikula
0 siblings, 1 reply; 7+ messages in thread
From: Chris Wilson @ 2018-03-27 20:59 UTC (permalink / raw)
To: dri-devel; +Cc: Jani Nikula, intel-gfx
Quoting Jani Nikula (2018-03-27 21:47:22)
> Bool is the more appropriate return type here, use it.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
All 3,
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
_______________________________________________
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 3/3] drm: make drm_core_check_feature() bool that it is
2018-03-27 20:59 ` Chris Wilson
@ 2018-03-28 6:36 ` Jani Nikula
0 siblings, 0 replies; 7+ messages in thread
From: Jani Nikula @ 2018-03-28 6:36 UTC (permalink / raw)
To: Chris Wilson, dri-devel; +Cc: intel-gfx
On Tue, 27 Mar 2018, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> Quoting Jani Nikula (2018-03-27 21:47:22)
>> Bool is the more appropriate return type here, use it.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> All 3,
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Thanks, all pushed to drm-misc-next.
BR,
Jani.
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* ✓ Fi.CI.BAT: success for series starting with [1/3] drm: prefer inline over __inline__
2018-03-27 20:47 [PATCH 1/3] drm: prefer inline over __inline__ Jani Nikula
2018-03-27 20:47 ` [PATCH 2/3] drm: remove old documentation comment cruft from drmP.h Jani Nikula
2018-03-27 20:47 ` [PATCH 3/3] drm: make drm_core_check_feature() bool that it is Jani Nikula
@ 2018-03-27 21:50 ` Patchwork
2018-03-28 6:30 ` ✓ Fi.CI.IGT: " Patchwork
3 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2018-03-27 21:50 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/3] drm: prefer inline over __inline__
URL : https://patchwork.freedesktop.org/series/40760/
State : success
== Summary ==
Series 40760v1 series starting with [1/3] drm: prefer inline over __inline__
https://patchwork.freedesktop.org/api/1.0/series/40760/revisions/1/mbox/
---- Known issues:
Test prime_vgem:
Subgroup basic-fence-flip:
pass -> FAIL (fi-byt-n2820) fdo#104008
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fi-bdw-5557u total:285 pass:264 dwarn:0 dfail:0 fail:0 skip:21 time:435s
fi-bdw-gvtdvm total:285 pass:261 dwarn:0 dfail:0 fail:0 skip:24 time:441s
fi-blb-e6850 total:285 pass:220 dwarn:1 dfail:0 fail:0 skip:64 time:382s
fi-bsw-n3050 total:285 pass:239 dwarn:0 dfail:0 fail:0 skip:46 time:545s
fi-bwr-2160 total:285 pass:180 dwarn:0 dfail:0 fail:0 skip:105 time:300s
fi-bxt-j4205 total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:513s
fi-byt-j1900 total:285 pass:250 dwarn:0 dfail:0 fail:0 skip:35 time:529s
fi-byt-n2820 total:285 pass:245 dwarn:0 dfail:0 fail:1 skip:39 time:511s
fi-cfl-8700k total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:411s
fi-cfl-s3 total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:569s
fi-cfl-u total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:518s
fi-cnl-y3 total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:591s
fi-elk-e7500 total:285 pass:225 dwarn:1 dfail:0 fail:0 skip:59 time:426s
fi-gdg-551 total:285 pass:176 dwarn:0 dfail:0 fail:1 skip:108 time:322s
fi-glk-1 total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:536s
fi-hsw-4770 total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:404s
fi-ilk-650 total:285 pass:225 dwarn:0 dfail:0 fail:0 skip:60 time:423s
fi-ivb-3520m total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:475s
fi-ivb-3770 total:285 pass:252 dwarn:0 dfail:0 fail:0 skip:33 time:430s
fi-kbl-7500u total:285 pass:260 dwarn:1 dfail:0 fail:0 skip:24 time:476s
fi-kbl-7567u total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:470s
fi-kbl-r total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:517s
fi-pnv-d510 total:285 pass:219 dwarn:1 dfail:0 fail:0 skip:65 time:669s
fi-skl-6260u total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:442s
fi-skl-6600u total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:535s
fi-skl-6700k2 total:285 pass:261 dwarn:0 dfail:0 fail:0 skip:24 time:501s
fi-skl-6770hq total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:508s
fi-skl-guc total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:431s
fi-skl-gvtdvm total:285 pass:262 dwarn:0 dfail:0 fail:0 skip:23 time:444s
fi-snb-2520m total:285 pass:245 dwarn:0 dfail:0 fail:0 skip:40 time:586s
Blacklisted hosts:
fi-cnl-psr total:285 pass:256 dwarn:3 dfail:0 fail:0 skip:26 time:528s
fi-glk-j4005 total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:485s
0539b52e05cd0abe697d45f2a2373ec42af7ebcb drm-tip: 2018y-03m-27d-18h-45m-40s UTC integration manifest
7c6c58e66770 drm: make drm_core_check_feature() bool that it is
2fd0c80d2347 drm: remove old documentation comment cruft from drmP.h
a139c1128af7 drm: prefer inline over __inline__
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8507/issues.html
_______________________________________________
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.IGT: success for series starting with [1/3] drm: prefer inline over __inline__
2018-03-27 20:47 [PATCH 1/3] drm: prefer inline over __inline__ Jani Nikula
` (2 preceding siblings ...)
2018-03-27 21:50 ` ✓ Fi.CI.BAT: success for series starting with [1/3] drm: prefer inline over __inline__ Patchwork
@ 2018-03-28 6:30 ` Patchwork
3 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2018-03-28 6:30 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/3] drm: prefer inline over __inline__
URL : https://patchwork.freedesktop.org/series/40760/
State : success
== Summary ==
---- Known issues:
Test kms_cursor_crc:
Subgroup cursor-128x128-suspend:
dmesg-warn -> PASS (shard-snb) fdo#102365
Test kms_flip:
Subgroup 2x-dpms-vs-vblank-race-interruptible:
fail -> PASS (shard-hsw) fdo#103060
Subgroup 2x-flip-vs-expired-vblank-interruptible:
fail -> PASS (shard-hsw) fdo#102887 +1
Subgroup flip-vs-absolute-wf_vblank-interruptible:
pass -> FAIL (shard-hsw) fdo#100368 +1
Test kms_rotation_crc:
Subgroup sprite-rotation-180:
pass -> FAIL (shard-snb) fdo#103925
Test kms_sysfs_edid_timing:
warn -> PASS (shard-apl) fdo#100047
Test perf:
Subgroup polling:
fail -> PASS (shard-hsw) fdo#102252
fdo#102365 https://bugs.freedesktop.org/show_bug.cgi?id=102365
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
shard-apl total:3495 pass:1832 dwarn:1 dfail:0 fail:7 skip:1655 time:12938s
shard-hsw total:3495 pass:1781 dwarn:1 dfail:0 fail:3 skip:1709 time:11526s
shard-snb total:3495 pass:1373 dwarn:1 dfail:0 fail:4 skip:2117 time:6988s
Blacklisted hosts:
shard-kbl total:3475 pass:1942 dwarn:2 dfail:1 fail:8 skip:1521 time:9493s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8507/shards.html
_______________________________________________
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:[~2018-03-28 6:36 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-27 20:47 [PATCH 1/3] drm: prefer inline over __inline__ Jani Nikula
2018-03-27 20:47 ` [PATCH 2/3] drm: remove old documentation comment cruft from drmP.h Jani Nikula
2018-03-27 20:47 ` [PATCH 3/3] drm: make drm_core_check_feature() bool that it is Jani Nikula
2018-03-27 20:59 ` Chris Wilson
2018-03-28 6:36 ` Jani Nikula
2018-03-27 21:50 ` ✓ Fi.CI.BAT: success for series starting with [1/3] drm: prefer inline over __inline__ Patchwork
2018-03-28 6:30 ` ✓ Fi.CI.IGT: " Patchwork
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.