* [Intel-gfx] [PATCH] drm/i915/gvt: Add missing macro name changes
@ 2021-05-21 17:40 Anusha Srivatsa
2021-05-21 17:51 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Anusha Srivatsa @ 2021-05-21 17:40 UTC (permalink / raw)
To: intel-gfx; +Cc: Lucas De Marchi, intel-gvt-dev
Propogate changes to macros name containing CSR_*
to DMC_* from display side.
Fixes: 0633cdcbaa77 ("drm/i915/dmc: Rename macro names containing csr")
Cc: intel-gvt-dev@lists.freedesktop.org
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
drivers/gpu/drm/i915/gvt/handlers.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
index dda320749c65..33496397a74f 100644
--- a/drivers/gpu/drm/i915/gvt/handlers.c
+++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@ -3342,9 +3342,9 @@ static int init_skl_mmio_info(struct intel_gvt *gvt)
MMIO_D(_MMIO(_PLANE_SURF_3_A), D_SKL_PLUS);
MMIO_D(_MMIO(_PLANE_SURF_3_B), D_SKL_PLUS);
- MMIO_D(CSR_SSP_BASE, D_SKL_PLUS);
- MMIO_D(CSR_HTP_SKL, D_SKL_PLUS);
- MMIO_D(CSR_LAST_WRITE, D_SKL_PLUS);
+ MMIO_D(DMC_SSP_BASE, D_SKL_PLUS);
+ MMIO_D(DMC_HTP_SKL, D_SKL_PLUS);
+ MMIO_D(DMC_LAST_WRITE, D_SKL_PLUS);
MMIO_DFH(BDW_SCRATCH1, D_SKL_PLUS, F_CMD_ACCESS, NULL, NULL);
@@ -3655,7 +3655,7 @@ void intel_gvt_clean_mmio_info(struct intel_gvt *gvt)
* otherwise, need to update cmd_reg_handler in cmd_parser.c
*/
static struct gvt_mmio_block mmio_blocks[] = {
- {D_SKL_PLUS, _MMIO(CSR_MMIO_START_RANGE), 0x3000, NULL, NULL},
+ {D_SKL_PLUS, _MMIO(DMC_MMIO_START_RANGE), 0x3000, NULL, NULL},
{D_ALL, _MMIO(MCHBAR_MIRROR_BASE_SNB), 0x40000, NULL, NULL},
{D_ALL, _MMIO(VGT_PVINFO_PAGE), VGT_PVINFO_SIZE,
pvinfo_mmio_read, pvinfo_mmio_write},
--
2.25.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/gvt: Add missing macro name changes
2021-05-21 17:40 [Intel-gfx] [PATCH] drm/i915/gvt: Add missing macro name changes Anusha Srivatsa
@ 2021-05-21 17:51 ` Patchwork
2021-05-21 18:24 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-05-22 6:43 ` [Intel-gfx] [PATCH] " Lucas De Marchi
2 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2021-05-21 17:51 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/gvt: Add missing macro name changes
URL : https://patchwork.freedesktop.org/series/90427/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
355406594b6b drm/i915/gvt: Add missing macro name changes
-:6: WARNING:TYPO_SPELLING: 'Propogate' may be misspelled - perhaps 'Propagate'?
#6:
Propogate changes to macros name containing CSR_*
^^^^^^^^^
total: 0 errors, 1 warnings, 0 checks, 20 lines checked
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gvt: Add missing macro name changes
2021-05-21 17:40 [Intel-gfx] [PATCH] drm/i915/gvt: Add missing macro name changes Anusha Srivatsa
2021-05-21 17:51 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
@ 2021-05-21 18:24 ` Patchwork
2021-05-22 6:43 ` [Intel-gfx] [PATCH] " Lucas De Marchi
2 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2021-05-21 18:24 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 7244 bytes --]
== Series Details ==
Series: drm/i915/gvt: Add missing macro name changes
URL : https://patchwork.freedesktop.org/series/90427/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_10120 -> Patchwork_20171
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20171/index.html
Known issues
------------
Here are the changes found in Patchwork_20171 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@hangcheck:
- fi-icl-y: [PASS][1] -> [INCOMPLETE][2] ([i915#2782])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/fi-icl-y/igt@i915_selftest@live@hangcheck.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20171/fi-icl-y/igt@i915_selftest@live@hangcheck.html
#### Possible fixes ####
* igt@kms_chamelium@dp-crc-fast:
- fi-kbl-7500u: [FAIL][3] ([i915#1372]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/fi-kbl-7500u/igt@kms_chamelium@dp-crc-fast.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20171/fi-kbl-7500u/igt@kms_chamelium@dp-crc-fast.html
* igt@kms_frontbuffer_tracking@basic:
- fi-icl-u2: [FAIL][5] ([i915#49]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/fi-icl-u2/igt@kms_frontbuffer_tracking@basic.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20171/fi-icl-u2/igt@kms_frontbuffer_tracking@basic.html
#### Warnings ####
* igt@i915_selftest@live@execlists:
- fi-cfl-8109u: [INCOMPLETE][7] ([i915#3462]) -> [DMESG-FAIL][8] ([i915#3462])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/fi-cfl-8109u/igt@i915_selftest@live@execlists.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20171/fi-cfl-8109u/igt@i915_selftest@live@execlists.html
- fi-icl-u2: [INCOMPLETE][9] ([i915#2782] / [i915#3462]) -> [DMESG-FAIL][10] ([i915#3462])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/fi-icl-u2/igt@i915_selftest@live@execlists.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20171/fi-icl-u2/igt@i915_selftest@live@execlists.html
* igt@runner@aborted:
- fi-cfl-8700k: [FAIL][11] ([i915#3363]) -> [FAIL][12] ([i915#2426] / [i915#3363])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/fi-cfl-8700k/igt@runner@aborted.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20171/fi-cfl-8700k/igt@runner@aborted.html
- fi-cfl-8109u: [FAIL][13] ([i915#3363]) -> [FAIL][14] ([i915#2426] / [i915#3363])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/fi-cfl-8109u/igt@runner@aborted.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20171/fi-cfl-8109u/igt@runner@aborted.html
- fi-icl-u2: [FAIL][15] ([i915#2782] / [i915#3363]) -> [FAIL][16] ([i915#2426] / [i915#2782] / [i915#3363])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/fi-icl-u2/igt@runner@aborted.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20171/fi-icl-u2/igt@runner@aborted.html
- fi-glk-dsi: [FAIL][17] ([i915#2426] / [i915#3363] / [k.org#202321]) -> [FAIL][18] ([i915#3363] / [k.org#202321])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/fi-glk-dsi/igt@runner@aborted.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20171/fi-glk-dsi/igt@runner@aborted.html
- fi-bdw-5557u: [FAIL][19] ([i915#3462]) -> [FAIL][20] ([i915#1602] / [i915#2029])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/fi-bdw-5557u/igt@runner@aborted.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20171/fi-bdw-5557u/igt@runner@aborted.html
- fi-kbl-guc: [FAIL][21] ([i915#1436] / [i915#2426] / [i915#3363]) -> [FAIL][22] ([i915#1436] / [i915#3363])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/fi-kbl-guc/igt@runner@aborted.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20171/fi-kbl-guc/igt@runner@aborted.html
- fi-cfl-guc: [FAIL][23] ([i915#3363]) -> [FAIL][24] ([i915#2426] / [i915#3363])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/fi-cfl-guc/igt@runner@aborted.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20171/fi-cfl-guc/igt@runner@aborted.html
- fi-skl-6700k2: [FAIL][25] ([i915#1436] / [i915#2426] / [i915#3363]) -> [FAIL][26] ([i915#1436] / [i915#3363])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10120/fi-skl-6700k2/igt@runner@aborted.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20171/fi-skl-6700k2/igt@runner@aborted.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1372]: https://gitlab.freedesktop.org/drm/intel/issues/1372
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1602]: https://gitlab.freedesktop.org/drm/intel/issues/1602
[i915#2029]: https://gitlab.freedesktop.org/drm/intel/issues/2029
[i915#2082]: https://gitlab.freedesktop.org/drm/intel/issues/2082
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2782]: https://gitlab.freedesktop.org/drm/intel/issues/2782
[i915#3012]: https://gitlab.freedesktop.org/drm/intel/issues/3012
[i915#3276]: https://gitlab.freedesktop.org/drm/intel/issues/3276
[i915#3277]: https://gitlab.freedesktop.org/drm/intel/issues/3277
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3283]: https://gitlab.freedesktop.org/drm/intel/issues/3283
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3363]: https://gitlab.freedesktop.org/drm/intel/issues/3363
[i915#3462]: https://gitlab.freedesktop.org/drm/intel/issues/3462
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[k.org#202321]: https://bugzilla.kernel.org/show_bug.cgi?id=202321
Participating hosts (41 -> 39)
------------------------------
Additional (1): fi-rkl-11500t
Missing (3): fi-bsw-cyan fi-bdw-samus fi-hsw-4200u
Build changes
-------------
* Linux: CI_DRM_10120 -> Patchwork_20171
CI-20190529: 20190529
CI_DRM_10120: 9221d50d353487d2e10226318d89027037255621 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6091: a7016bde81f6e6ee9f2ded3c091c56766a6adc46 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_20171: 355406594b6b12d6587309deb33826749f6e64e2 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
355406594b6b drm/i915/gvt: Add missing macro name changes
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20171/index.html
[-- Attachment #1.2: Type: text/html, Size: 9150 bytes --]
[-- Attachment #2: 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] 8+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gvt: Add missing macro name changes
2021-05-21 17:40 [Intel-gfx] [PATCH] drm/i915/gvt: Add missing macro name changes Anusha Srivatsa
2021-05-21 17:51 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2021-05-21 18:24 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
@ 2021-05-22 6:43 ` Lucas De Marchi
2021-05-23 19:17 ` Dave Airlie
2 siblings, 1 reply; 8+ messages in thread
From: Lucas De Marchi @ 2021-05-22 6:43 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx, intel-gvt-dev
On Fri, May 21, 2021 at 10:40:47AM -0700, Anusha Srivatsa wrote:
>Propogate changes to macros name containing CSR_*
>to DMC_* from display side.
>
>Fixes: 0633cdcbaa77 ("drm/i915/dmc: Rename macro names containing csr")
>Cc: intel-gvt-dev@lists.freedesktop.org
>Cc: Jani Nikula <jani.nikula@linux.intel.com>
>Cc: Lucas De Marchi <lucas.demarchi@intel.com>
>Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Lucas De Marchi
>---
> drivers/gpu/drm/i915/gvt/handlers.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
>index dda320749c65..33496397a74f 100644
>--- a/drivers/gpu/drm/i915/gvt/handlers.c
>+++ b/drivers/gpu/drm/i915/gvt/handlers.c
>@@ -3342,9 +3342,9 @@ static int init_skl_mmio_info(struct intel_gvt *gvt)
> MMIO_D(_MMIO(_PLANE_SURF_3_A), D_SKL_PLUS);
> MMIO_D(_MMIO(_PLANE_SURF_3_B), D_SKL_PLUS);
>
>- MMIO_D(CSR_SSP_BASE, D_SKL_PLUS);
>- MMIO_D(CSR_HTP_SKL, D_SKL_PLUS);
>- MMIO_D(CSR_LAST_WRITE, D_SKL_PLUS);
>+ MMIO_D(DMC_SSP_BASE, D_SKL_PLUS);
>+ MMIO_D(DMC_HTP_SKL, D_SKL_PLUS);
>+ MMIO_D(DMC_LAST_WRITE, D_SKL_PLUS);
>
> MMIO_DFH(BDW_SCRATCH1, D_SKL_PLUS, F_CMD_ACCESS, NULL, NULL);
>
>@@ -3655,7 +3655,7 @@ void intel_gvt_clean_mmio_info(struct intel_gvt *gvt)
> * otherwise, need to update cmd_reg_handler in cmd_parser.c
> */
> static struct gvt_mmio_block mmio_blocks[] = {
>- {D_SKL_PLUS, _MMIO(CSR_MMIO_START_RANGE), 0x3000, NULL, NULL},
>+ {D_SKL_PLUS, _MMIO(DMC_MMIO_START_RANGE), 0x3000, NULL, NULL},
> {D_ALL, _MMIO(MCHBAR_MIRROR_BASE_SNB), 0x40000, NULL, NULL},
> {D_ALL, _MMIO(VGT_PVINFO_PAGE), VGT_PVINFO_SIZE,
> pvinfo_mmio_read, pvinfo_mmio_write},
>--
>2.25.0
>
>_______________________________________________
>Intel-gfx mailing list
>Intel-gfx@lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gvt: Add missing macro name changes
2021-05-22 6:43 ` [Intel-gfx] [PATCH] " Lucas De Marchi
@ 2021-05-23 19:17 ` Dave Airlie
2021-05-24 9:19 ` Jani Nikula
0 siblings, 1 reply; 8+ messages in thread
From: Dave Airlie @ 2021-05-23 19:17 UTC (permalink / raw)
To: Lucas De Marchi, Jani Nikula, Rodrigo Vivi
Cc: Intel Graphics Development, intel-gvt-dev
Can someone land this in drm-intel-next asap? it's breaking drm-tip development.
Dave.
On Sat, 22 May 2021 at 16:44, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
>
> On Fri, May 21, 2021 at 10:40:47AM -0700, Anusha Srivatsa wrote:
> >Propogate changes to macros name containing CSR_*
> >to DMC_* from display side.
> >
> >Fixes: 0633cdcbaa77 ("drm/i915/dmc: Rename macro names containing csr")
> >Cc: intel-gvt-dev@lists.freedesktop.org
> >Cc: Jani Nikula <jani.nikula@linux.intel.com>
> >Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> >Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>
>
> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
>
> Lucas De Marchi
>
> >---
> > drivers/gpu/drm/i915/gvt/handlers.c | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> >diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
> >index dda320749c65..33496397a74f 100644
> >--- a/drivers/gpu/drm/i915/gvt/handlers.c
> >+++ b/drivers/gpu/drm/i915/gvt/handlers.c
> >@@ -3342,9 +3342,9 @@ static int init_skl_mmio_info(struct intel_gvt *gvt)
> > MMIO_D(_MMIO(_PLANE_SURF_3_A), D_SKL_PLUS);
> > MMIO_D(_MMIO(_PLANE_SURF_3_B), D_SKL_PLUS);
> >
> >- MMIO_D(CSR_SSP_BASE, D_SKL_PLUS);
> >- MMIO_D(CSR_HTP_SKL, D_SKL_PLUS);
> >- MMIO_D(CSR_LAST_WRITE, D_SKL_PLUS);
> >+ MMIO_D(DMC_SSP_BASE, D_SKL_PLUS);
> >+ MMIO_D(DMC_HTP_SKL, D_SKL_PLUS);
> >+ MMIO_D(DMC_LAST_WRITE, D_SKL_PLUS);
> >
> > MMIO_DFH(BDW_SCRATCH1, D_SKL_PLUS, F_CMD_ACCESS, NULL, NULL);
> >
> >@@ -3655,7 +3655,7 @@ void intel_gvt_clean_mmio_info(struct intel_gvt *gvt)
> > * otherwise, need to update cmd_reg_handler in cmd_parser.c
> > */
> > static struct gvt_mmio_block mmio_blocks[] = {
> >- {D_SKL_PLUS, _MMIO(CSR_MMIO_START_RANGE), 0x3000, NULL, NULL},
> >+ {D_SKL_PLUS, _MMIO(DMC_MMIO_START_RANGE), 0x3000, NULL, NULL},
> > {D_ALL, _MMIO(MCHBAR_MIRROR_BASE_SNB), 0x40000, NULL, NULL},
> > {D_ALL, _MMIO(VGT_PVINFO_PAGE), VGT_PVINFO_SIZE,
> > pvinfo_mmio_read, pvinfo_mmio_write},
> >--
> >2.25.0
> >
> >_______________________________________________
> >Intel-gfx mailing list
> >Intel-gfx@lists.freedesktop.org
> >https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gvt: Add missing macro name changes
2021-05-23 19:17 ` Dave Airlie
@ 2021-05-24 9:19 ` Jani Nikula
0 siblings, 0 replies; 8+ messages in thread
From: Jani Nikula @ 2021-05-24 9:19 UTC (permalink / raw)
To: Dave Airlie, Lucas De Marchi, Rodrigo Vivi
Cc: Intel Graphics Development, intel-gvt-dev
On Mon, 24 May 2021, Dave Airlie <airlied@gmail.com> wrote:
> Can someone land this in drm-intel-next asap? it's breaking drm-tip development.
Pushed, sorry for the hiccup. Need to get CONFIG_DRM_I915_GVT=y enabled
in CI.
BR,
Jani.
>
> Dave.
>
> On Sat, 22 May 2021 at 16:44, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
>>
>> On Fri, May 21, 2021 at 10:40:47AM -0700, Anusha Srivatsa wrote:
>> >Propogate changes to macros name containing CSR_*
>> >to DMC_* from display side.
>> >
>> >Fixes: 0633cdcbaa77 ("drm/i915/dmc: Rename macro names containing csr")
>> >Cc: intel-gvt-dev@lists.freedesktop.org
>> >Cc: Jani Nikula <jani.nikula@linux.intel.com>
>> >Cc: Lucas De Marchi <lucas.demarchi@intel.com>
>> >Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>>
>>
>> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
>>
>> Lucas De Marchi
>>
>> >---
>> > drivers/gpu/drm/i915/gvt/handlers.c | 8 ++++----
>> > 1 file changed, 4 insertions(+), 4 deletions(-)
>> >
>> >diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
>> >index dda320749c65..33496397a74f 100644
>> >--- a/drivers/gpu/drm/i915/gvt/handlers.c
>> >+++ b/drivers/gpu/drm/i915/gvt/handlers.c
>> >@@ -3342,9 +3342,9 @@ static int init_skl_mmio_info(struct intel_gvt *gvt)
>> > MMIO_D(_MMIO(_PLANE_SURF_3_A), D_SKL_PLUS);
>> > MMIO_D(_MMIO(_PLANE_SURF_3_B), D_SKL_PLUS);
>> >
>> >- MMIO_D(CSR_SSP_BASE, D_SKL_PLUS);
>> >- MMIO_D(CSR_HTP_SKL, D_SKL_PLUS);
>> >- MMIO_D(CSR_LAST_WRITE, D_SKL_PLUS);
>> >+ MMIO_D(DMC_SSP_BASE, D_SKL_PLUS);
>> >+ MMIO_D(DMC_HTP_SKL, D_SKL_PLUS);
>> >+ MMIO_D(DMC_LAST_WRITE, D_SKL_PLUS);
>> >
>> > MMIO_DFH(BDW_SCRATCH1, D_SKL_PLUS, F_CMD_ACCESS, NULL, NULL);
>> >
>> >@@ -3655,7 +3655,7 @@ void intel_gvt_clean_mmio_info(struct intel_gvt *gvt)
>> > * otherwise, need to update cmd_reg_handler in cmd_parser.c
>> > */
>> > static struct gvt_mmio_block mmio_blocks[] = {
>> >- {D_SKL_PLUS, _MMIO(CSR_MMIO_START_RANGE), 0x3000, NULL, NULL},
>> >+ {D_SKL_PLUS, _MMIO(DMC_MMIO_START_RANGE), 0x3000, NULL, NULL},
>> > {D_ALL, _MMIO(MCHBAR_MIRROR_BASE_SNB), 0x40000, NULL, NULL},
>> > {D_ALL, _MMIO(VGT_PVINFO_PAGE), VGT_PVINFO_SIZE,
>> > pvinfo_mmio_read, pvinfo_mmio_write},
>> >--
>> >2.25.0
>> >
>> >_______________________________________________
>> >Intel-gfx mailing list
>> >Intel-gfx@lists.freedesktop.org
>> >https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gvt: Add missing macro name changes
2021-05-21 18:12 Anusha Srivatsa
@ 2021-05-24 5:59 ` Zhenyu Wang
0 siblings, 0 replies; 8+ messages in thread
From: Zhenyu Wang @ 2021-05-24 5:59 UTC (permalink / raw)
To: Anusha Srivatsa; +Cc: intel-gfx, intel-gvt-dev
[-- Attachment #1.1: Type: text/plain, Size: 1759 bytes --]
On 2021.05.21 11:12:29 -0700, Anusha Srivatsa wrote:
> Propagate changes to macros name containing CSR_*
> to DMC_* from display side.
>
> Cc: intel-gvt-dev@lists.freedesktop.org
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
> drivers/gpu/drm/i915/gvt/handlers.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
> index dda320749c65..33496397a74f 100644
> --- a/drivers/gpu/drm/i915/gvt/handlers.c
> +++ b/drivers/gpu/drm/i915/gvt/handlers.c
> @@ -3342,9 +3342,9 @@ static int init_skl_mmio_info(struct intel_gvt *gvt)
> MMIO_D(_MMIO(_PLANE_SURF_3_A), D_SKL_PLUS);
> MMIO_D(_MMIO(_PLANE_SURF_3_B), D_SKL_PLUS);
>
> - MMIO_D(CSR_SSP_BASE, D_SKL_PLUS);
> - MMIO_D(CSR_HTP_SKL, D_SKL_PLUS);
> - MMIO_D(CSR_LAST_WRITE, D_SKL_PLUS);
> + MMIO_D(DMC_SSP_BASE, D_SKL_PLUS);
> + MMIO_D(DMC_HTP_SKL, D_SKL_PLUS);
> + MMIO_D(DMC_LAST_WRITE, D_SKL_PLUS);
>
> MMIO_DFH(BDW_SCRATCH1, D_SKL_PLUS, F_CMD_ACCESS, NULL, NULL);
>
> @@ -3655,7 +3655,7 @@ void intel_gvt_clean_mmio_info(struct intel_gvt *gvt)
> * otherwise, need to update cmd_reg_handler in cmd_parser.c
> */
> static struct gvt_mmio_block mmio_blocks[] = {
> - {D_SKL_PLUS, _MMIO(CSR_MMIO_START_RANGE), 0x3000, NULL, NULL},
> + {D_SKL_PLUS, _MMIO(DMC_MMIO_START_RANGE), 0x3000, NULL, NULL},
> {D_ALL, _MMIO(MCHBAR_MIRROR_BASE_SNB), 0x40000, NULL, NULL},
> {D_ALL, _MMIO(VGT_PVINFO_PAGE), VGT_PVINFO_SIZE,
> pvinfo_mmio_read, pvinfo_mmio_write},
> --
Sorry that I missed your fix before sending mine...
Reviewed-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Thanks!
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: 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] 8+ messages in thread
* [Intel-gfx] [PATCH] drm/i915/gvt: Add missing macro name changes
@ 2021-05-21 18:12 Anusha Srivatsa
2021-05-24 5:59 ` Zhenyu Wang
0 siblings, 1 reply; 8+ messages in thread
From: Anusha Srivatsa @ 2021-05-21 18:12 UTC (permalink / raw)
To: intel-gfx; +Cc: intel-gvt-dev
Propagate changes to macros name containing CSR_*
to DMC_* from display side.
Cc: intel-gvt-dev@lists.freedesktop.org
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
drivers/gpu/drm/i915/gvt/handlers.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
index dda320749c65..33496397a74f 100644
--- a/drivers/gpu/drm/i915/gvt/handlers.c
+++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@ -3342,9 +3342,9 @@ static int init_skl_mmio_info(struct intel_gvt *gvt)
MMIO_D(_MMIO(_PLANE_SURF_3_A), D_SKL_PLUS);
MMIO_D(_MMIO(_PLANE_SURF_3_B), D_SKL_PLUS);
- MMIO_D(CSR_SSP_BASE, D_SKL_PLUS);
- MMIO_D(CSR_HTP_SKL, D_SKL_PLUS);
- MMIO_D(CSR_LAST_WRITE, D_SKL_PLUS);
+ MMIO_D(DMC_SSP_BASE, D_SKL_PLUS);
+ MMIO_D(DMC_HTP_SKL, D_SKL_PLUS);
+ MMIO_D(DMC_LAST_WRITE, D_SKL_PLUS);
MMIO_DFH(BDW_SCRATCH1, D_SKL_PLUS, F_CMD_ACCESS, NULL, NULL);
@@ -3655,7 +3655,7 @@ void intel_gvt_clean_mmio_info(struct intel_gvt *gvt)
* otherwise, need to update cmd_reg_handler in cmd_parser.c
*/
static struct gvt_mmio_block mmio_blocks[] = {
- {D_SKL_PLUS, _MMIO(CSR_MMIO_START_RANGE), 0x3000, NULL, NULL},
+ {D_SKL_PLUS, _MMIO(DMC_MMIO_START_RANGE), 0x3000, NULL, NULL},
{D_ALL, _MMIO(MCHBAR_MIRROR_BASE_SNB), 0x40000, NULL, NULL},
{D_ALL, _MMIO(VGT_PVINFO_PAGE), VGT_PVINFO_SIZE,
pvinfo_mmio_read, pvinfo_mmio_write},
--
2.25.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-05-24 9:20 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-21 17:40 [Intel-gfx] [PATCH] drm/i915/gvt: Add missing macro name changes Anusha Srivatsa
2021-05-21 17:51 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2021-05-21 18:24 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-05-22 6:43 ` [Intel-gfx] [PATCH] " Lucas De Marchi
2021-05-23 19:17 ` Dave Airlie
2021-05-24 9:19 ` Jani Nikula
2021-05-21 18:12 Anusha Srivatsa
2021-05-24 5:59 ` Zhenyu Wang
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.