[igt-dev] [PATCH i-g-t 1/1] meson: Fixup gem_mocs_settings

[igt-dev] [PATCH i-g-t 1/1] meson: Fixup gem_mocs_settings

[Petri Latvala]

Arek's rpath fixes coincided with commit ff91dbc87eec
("igt/gem_mocs_settings: Use i915_pmu to measure rc6
residency"). Include the relevant change there too.

Fixes: ff91dbc87eec ("igt/gem_mocs_settings: Use i915_pmu to measure
rc6 residency")
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Petri Latvala <petri.latvala@intel.com>
---
 tests/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/meson.build b/tests/meson.build
index 83b2732f..bb6c7627 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -281,7 +281,7 @@ test_progs += 'gem_eio'
 test_executables += executable('gem_mocs_settings', 'gem_mocs_settings.c',
 	   dependencies : test_deps + [ lib_igt_perf ],
 	   install_dir : libexecdir,
-	   install_rpath : rpathdir,
+	   install_rpath : libexecdir_rpathdir,
 	   install : true)
 test_progs += 'gem_mocs_settings'
 
-- 
2.14.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/1] meson: Fixup gem_mocs_settings

[Patchwork]

== Series Details ==

Series: series starting with [i-g-t,1/1] meson: Fixup gem_mocs_settings
URL   : https://patchwork.freedesktop.org/series/47345/
State : failure

== Summary ==

Applying: meson: Fixup gem_mocs_settings
Using index info to reconstruct a base tree...
M	tests/meson.build
Falling back to patching base and 3-way merge...
Auto-merging tests/meson.build
CONFLICT (content): Merge conflict in tests/meson.build
Patch failed at 0001 meson: Fixup gem_mocs_settings
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t 1/1] meson: Fixup gem_mocs_settings

[Arkadiusz Hiler]

On Fri, Jul 27, 2018 at 04:39:48PM +0300, Petri Latvala wrote:
> Arek's rpath fixes coincided with commit ff91dbc87eec
> ("igt/gem_mocs_settings: Use i915_pmu to measure rc6
> residency"). Include the relevant change there too.
> 
> Fixes: ff91dbc87eec ("igt/gem_mocs_settings: Use i915_pmu to measure
> rc6 residency")
> Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Petri Latvala <petri.latvala@intel.com>
Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t 1/1] meson: Fixup gem_mocs_settings

[Petri Latvala]

On Fri, Jul 27, 2018 at 04:43:32PM +0300, Arkadiusz Hiler wrote:
> On Fri, Jul 27, 2018 at 04:39:48PM +0300, Petri Latvala wrote:
> > Arek's rpath fixes coincided with commit ff91dbc87eec
> > ("igt/gem_mocs_settings: Use i915_pmu to measure rc6
> > residency"). Include the relevant change there too.
> > 
> > Fixes: ff91dbc87eec ("igt/gem_mocs_settings: Use i915_pmu to measure
> > rc6 residency")
> > Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
> > Cc: Chris Wilson <chris@chris-wilson.co.uk>
> > Signed-off-by: Petri Latvala <petri.latvala@intel.com>
> Reviewed-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>


Thanks. Pushed before CI results, so CI can build again.


-- 
Petri Latvala
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev