* [PATCH 1/2] drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen
@ 2018-03-21 14:07 Jani Nikula
2018-03-21 14:07 ` [PATCH 2/2] drm/i915: hint gen and gen_mask shouldn't be used directly Jani Nikula
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Jani Nikula @ 2018-03-21 14:07 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Fix the last two direct ->gen usages.
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/intel_device_info.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index a504281e2afa..af538c4a3aeb 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -119,7 +119,7 @@ void intel_device_info_dump(const struct intel_device_info *info,
INTEL_DEVID(dev_priv),
INTEL_REVID(dev_priv),
intel_platform_name(info->platform),
- info->gen);
+ INTEL_GEN(dev_priv));
intel_device_info_dump_flags(info, p);
}
@@ -809,7 +809,7 @@ void intel_device_info_runtime_init(struct intel_device_info *info)
gen9_sseu_info_init(dev_priv);
else if (INTEL_GEN(dev_priv) == 10)
gen10_sseu_info_init(dev_priv);
- else if (INTEL_INFO(dev_priv)->gen >= 11)
+ else if (INTEL_GEN(dev_priv) >= 11)
gen11_sseu_info_init(dev_priv);
/* Initialize command stream timestamp frequency */
--
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] 5+ messages in thread
* [PATCH 2/2] drm/i915: hint gen and gen_mask shouldn't be used directly
2018-03-21 14:07 [PATCH 1/2] drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen Jani Nikula
@ 2018-03-21 14:07 ` Jani Nikula
2018-03-21 14:10 ` [PATCH 1/2] drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen Chris Wilson
2018-03-21 14:36 ` ✗ Fi.CI.BAT: failure for series starting with [1/2] " Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2018-03-21 14:07 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Prefix gen and gen_mask in struct intel_device_info with underscores to
hint that they should not be used directly, except in special
circumstances.
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_drv.c | 5 +++--
drivers/gpu/drm/i915/i915_drv.h | 24 ++++++++++++------------
drivers/gpu/drm/i915/i915_pci.c | 2 +-
drivers/gpu/drm/i915/intel_device_info.h | 6 ++++--
drivers/gpu/drm/i915/intel_uncore.c | 2 +-
5 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 3f637ab89e51..56c367bed573 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -907,7 +907,8 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,
BUILD_BUG_ON(INTEL_MAX_PLATFORMS >
sizeof(device_info->platform_mask) * BITS_PER_BYTE);
- BUG_ON(device_info->gen > sizeof(device_info->gen_mask) * BITS_PER_BYTE);
+ BUG_ON(device_info->__gen >
+ sizeof(device_info->__gen_mask) * BITS_PER_BYTE);
spin_lock_init(&dev_priv->irq_lock);
spin_lock_init(&dev_priv->gpu_error.lock);
mutex_init(&dev_priv->backlight_lock);
@@ -1339,7 +1340,7 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent)
int ret;
/* Enable nuclear pageflip on ILK+ */
- if (!i915_modparams.nuclear_pageflip && match_info->gen < 5)
+ if (!i915_modparams.nuclear_pageflip && match_info->__gen < 5)
driver.driver_features &= ~DRIVER_ATOMIC;
ret = -ENOMEM;
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index c9c3b2ba6a86..f4a13951916c 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2294,7 +2294,7 @@ intel_info(const struct drm_i915_private *dev_priv)
#define INTEL_INFO(dev_priv) intel_info((dev_priv))
-#define INTEL_GEN(dev_priv) ((dev_priv)->info.gen)
+#define INTEL_GEN(dev_priv) ((dev_priv)->info.__gen)
#define INTEL_DEVID(dev_priv) ((dev_priv)->info.device_id)
#define REVID_FOREVER 0xff
@@ -2315,7 +2315,7 @@ intel_info(const struct drm_i915_private *dev_priv)
* Use GEN_FOREVER for unbound start and or end.
*/
#define IS_GEN(dev_priv, s, e) \
- (!!((dev_priv)->info.gen_mask & INTEL_GEN_MASK((s), (e))))
+ (!!((dev_priv)->info.__gen_mask & INTEL_GEN_MASK((s), (e))))
/*
* Return true if revision is in range [since,until] inclusive.
@@ -2463,16 +2463,16 @@ intel_info(const struct drm_i915_private *dev_priv)
* have their own (e.g. HAS_PCH_SPLIT for ILK+ display, IS_foo for particular
* chips, etc.).
*/
-#define IS_GEN2(dev_priv) (!!((dev_priv)->info.gen_mask & BIT(1)))
-#define IS_GEN3(dev_priv) (!!((dev_priv)->info.gen_mask & BIT(2)))
-#define IS_GEN4(dev_priv) (!!((dev_priv)->info.gen_mask & BIT(3)))
-#define IS_GEN5(dev_priv) (!!((dev_priv)->info.gen_mask & BIT(4)))
-#define IS_GEN6(dev_priv) (!!((dev_priv)->info.gen_mask & BIT(5)))
-#define IS_GEN7(dev_priv) (!!((dev_priv)->info.gen_mask & BIT(6)))
-#define IS_GEN8(dev_priv) (!!((dev_priv)->info.gen_mask & BIT(7)))
-#define IS_GEN9(dev_priv) (!!((dev_priv)->info.gen_mask & BIT(8)))
-#define IS_GEN10(dev_priv) (!!((dev_priv)->info.gen_mask & BIT(9)))
-#define IS_GEN11(dev_priv) (!!((dev_priv)->info.gen_mask & BIT(10)))
+#define IS_GEN2(dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(1)))
+#define IS_GEN3(dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(2)))
+#define IS_GEN4(dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(3)))
+#define IS_GEN5(dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(4)))
+#define IS_GEN6(dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(5)))
+#define IS_GEN7(dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(6)))
+#define IS_GEN8(dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(7)))
+#define IS_GEN9(dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(8)))
+#define IS_GEN10(dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(9)))
+#define IS_GEN11(dev_priv) (!!((dev_priv)->info.__gen_mask & BIT(10)))
#define IS_LP(dev_priv) (INTEL_INFO(dev_priv)->is_lp)
#define IS_GEN9_LP(dev_priv) (IS_GEN9(dev_priv) && IS_LP(dev_priv))
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 4364922e935d..e6ea0ed6f1bd 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -30,7 +30,7 @@
#include "i915_selftest.h"
#define PLATFORM(x) .platform = (x), .platform_mask = BIT(x)
-#define GEN(x) .gen = (x), .gen_mask = BIT((x) - 1)
+#define GEN(x) .__gen = (x), .__gen_mask = BIT((x) - 1)
#define GEN_DEFAULT_PIPEOFFSETS \
.pipe_offsets = { PIPE_A_OFFSET, PIPE_B_OFFSET, \
diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index 933e31669557..f488118c2eef 100644
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -144,9 +144,11 @@ typedef u8 intel_ring_mask_t;
struct intel_device_info {
u16 device_id;
- u16 gen_mask;
- u8 gen;
+ /* Prefer INTEL_GEN() and IS_GENx() over accessing these. */
+ u16 __gen_mask;
+ u8 __gen;
+
u8 gt; /* GT number, 0 if undefined */
u8 num_rings;
intel_ring_mask_t ring_mask; /* Rings supported by the HW */
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 4c616d074a97..08c9648a1e9b 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -1664,7 +1664,7 @@ int i915_reg_read_ioctl(struct drm_device *dev,
GEM_BUG_ON(entry->size > 8);
GEM_BUG_ON(entry_offset & (entry->size - 1));
- if (INTEL_INFO(dev_priv)->gen_mask & entry->gen_mask &&
+ if (INTEL_INFO(dev_priv)->__gen_mask & entry->gen_mask &&
entry_offset == (reg->offset & -entry->size))
break;
entry++;
--
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] 5+ messages in thread
* Re: [PATCH 1/2] drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen
2018-03-21 14:07 [PATCH 1/2] drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen Jani Nikula
2018-03-21 14:07 ` [PATCH 2/2] drm/i915: hint gen and gen_mask shouldn't be used directly Jani Nikula
@ 2018-03-21 14:10 ` Chris Wilson
2018-03-21 14:14 ` Jani Nikula
2018-03-21 14:36 ` ✗ Fi.CI.BAT: failure for series starting with [1/2] " Patchwork
2 siblings, 1 reply; 5+ messages in thread
From: Chris Wilson @ 2018-03-21 14:10 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Quoting Jani Nikula (2018-03-21 14:07:54)
> Fix the last two direct ->gen usages.
>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/intel_device_info.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
> index a504281e2afa..af538c4a3aeb 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.c
> +++ b/drivers/gpu/drm/i915/intel_device_info.c
> @@ -119,7 +119,7 @@ void intel_device_info_dump(const struct intel_device_info *info,
> INTEL_DEVID(dev_priv),
> INTEL_REVID(dev_priv),
> intel_platform_name(info->platform),
> - info->gen);
> + INTEL_GEN(dev_priv));
This is wrong, this should be from the local intel_device_info *info.
(Passed in from the caller, so dev_priv is very wrong here, and yes the
INTEL_foo() above are on my hit list :)
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen
2018-03-21 14:10 ` [PATCH 1/2] drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen Chris Wilson
@ 2018-03-21 14:14 ` Jani Nikula
0 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2018-03-21 14:14 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On Wed, 21 Mar 2018, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> Quoting Jani Nikula (2018-03-21 14:07:54)
>> Fix the last two direct ->gen usages.
>>
>> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
>> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> drivers/gpu/drm/i915/intel_device_info.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
>> index a504281e2afa..af538c4a3aeb 100644
>> --- a/drivers/gpu/drm/i915/intel_device_info.c
>> +++ b/drivers/gpu/drm/i915/intel_device_info.c
>> @@ -119,7 +119,7 @@ void intel_device_info_dump(const struct intel_device_info *info,
>> INTEL_DEVID(dev_priv),
>> INTEL_REVID(dev_priv),
>> intel_platform_name(info->platform),
>> - info->gen);
>> + INTEL_GEN(dev_priv));
>
> This is wrong, this should be from the local intel_device_info *info.
> (Passed in from the caller, so dev_priv is very wrong here, and yes the
> INTEL_foo() above are on my hit list :)
Contemplated that. I guess you'll need to remove them for turning
intel_device_info into a pointer rather than a copy in dev_priv?
BR,
Jani.
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen
2018-03-21 14:07 [PATCH 1/2] drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen Jani Nikula
2018-03-21 14:07 ` [PATCH 2/2] drm/i915: hint gen and gen_mask shouldn't be used directly Jani Nikula
2018-03-21 14:10 ` [PATCH 1/2] drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen Chris Wilson
@ 2018-03-21 14:36 ` Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-03-21 14:36 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen
URL : https://patchwork.freedesktop.org/series/40374/
State : failure
== Summary ==
CHK include/config/kernel.release
CHK include/generated/uapi/linux/version.h
CHK include/generated/utsrelease.h
CHK include/generated/bounds.h
CHK include/generated/timeconst.h
CHK include/generated/asm-offsets.h
CALL scripts/checksyscalls.sh
DESCEND objtool
CHK scripts/mod/devicetable-offsets.h
CHK include/generated/compile.h
CHK kernel/config_data.h
CC [M] drivers/gpu/drm/i915/i915_gem.o
In file included from drivers/gpu/drm/i915/i915_gem.c:6001:0:
drivers/gpu/drm/i915/selftests/mock_gem_device.c: In function ‘mock_gem_device’:
drivers/gpu/drm/i915/selftests/mock_gem_device.c:177:27: error: ‘struct intel_device_info’ has no member named ‘gen’; did you mean ‘__gen’?
mkwrite_device_info(i915)->gen = -1;
^~
scripts/Makefile.build:324: recipe for target 'drivers/gpu/drm/i915/i915_gem.o' failed
make[4]: *** [drivers/gpu/drm/i915/i915_gem.o] Error 1
scripts/Makefile.build:583: recipe for target 'drivers/gpu/drm/i915' failed
make[3]: *** [drivers/gpu/drm/i915] Error 2
scripts/Makefile.build:583: recipe for target 'drivers/gpu/drm' failed
make[2]: *** [drivers/gpu/drm] Error 2
scripts/Makefile.build:583: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1051: 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] 5+ messages in thread
end of thread, other threads:[~2018-03-21 14:36 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-21 14:07 [PATCH 1/2] drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen Jani Nikula
2018-03-21 14:07 ` [PATCH 2/2] drm/i915: hint gen and gen_mask shouldn't be used directly Jani Nikula
2018-03-21 14:10 ` [PATCH 1/2] drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen Chris Wilson
2018-03-21 14:14 ` Jani Nikula
2018-03-21 14:36 ` ✗ Fi.CI.BAT: failure for series starting with [1/2] " 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.