diff mbox series

[v2,4/4] drm/i915/mtl: Add OA support by enabling 32 bit OAG formats for MTL

Message ID 20221201010535.1097741-5-umesh.nerlige.ramappa@intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915/mtl: Add OAG 32 bit format support for MTL | expand

Commit Message

Umesh Nerlige Ramappa Dec. 1, 2022, 1:05 a.m. UTC
Without an entry in oa_init_supported_formats, OA will not be functional
in MTL. Enable OA support by enabling 32 bit OAG formats for MTL.

Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
---
 drivers/gpu/drm/i915/i915_perf.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Dixit, Ashutosh Dec. 1, 2022, 2:14 a.m. UTC | #1
On Wed, 30 Nov 2022 17:05:35 -0800, Umesh Nerlige Ramappa wrote:
>
> Without an entry in oa_init_supported_formats, OA will not be functional
> in MTL. Enable OA support by enabling 32 bit OAG formats for MTL.

Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>

> Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
> ---
>  drivers/gpu/drm/i915/i915_perf.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
> index 8369ae4b850d..a735b9540113 100644
> --- a/drivers/gpu/drm/i915/i915_perf.c
> +++ b/drivers/gpu/drm/i915/i915_perf.c
> @@ -4772,6 +4772,7 @@ static void oa_init_supported_formats(struct i915_perf *perf)
>		break;
>
>	case INTEL_DG2:
> +	case INTEL_METEORLAKE:
>		oa_format_add(perf, I915_OAR_FORMAT_A32u40_A4u32_B8_C8);
>		oa_format_add(perf, I915_OA_FORMAT_A24u40_A14u32_B8_C8);
>		break;
> --
> 2.36.1
>
Umesh Nerlige Ramappa Dec. 8, 2022, 5:08 p.m. UTC | #2
On Wed, Nov 30, 2022 at 05:05:35PM -0800, Umesh Nerlige Ramappa wrote:
>Without an entry in oa_init_supported_formats, OA will not be functional
>in MTL. Enable OA support by enabling 32 bit OAG formats for MTL.
>
Thanks Lionel for sharing the Mesa MR for MTL -
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20228

Regards,
Umesh

>Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
>---
> drivers/gpu/drm/i915/i915_perf.c | 1 +
> 1 file changed, 1 insertion(+)
>
>diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
>index 8369ae4b850d..a735b9540113 100644
>--- a/drivers/gpu/drm/i915/i915_perf.c
>+++ b/drivers/gpu/drm/i915/i915_perf.c
>@@ -4772,6 +4772,7 @@ static void oa_init_supported_formats(struct i915_perf *perf)
> 		break;
>
> 	case INTEL_DG2:
>+	case INTEL_METEORLAKE:
> 		oa_format_add(perf, I915_OAR_FORMAT_A32u40_A4u32_B8_C8);
> 		oa_format_add(perf, I915_OA_FORMAT_A24u40_A14u32_B8_C8);
> 		break;
>-- 
>2.36.1
>
Joonas Lahtinen Dec. 12, 2022, 10:48 a.m. UTC | #3
(Switching to my @linux.intel.com address)

Quoting Umesh Nerlige Ramappa (2022-12-08 19:08:46)
> On Wed, Nov 30, 2022 at 05:05:35PM -0800, Umesh Nerlige Ramappa wrote:
> >Without an entry in oa_init_supported_formats, OA will not be functional
> >in MTL. Enable OA support by enabling 32 bit OAG formats for MTL.
> >
> Thanks Lionel for sharing the Mesa MR for MTL -
> https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20228

We should not merge the userspace changes ahead of the kernel changes.
They should be ready and reviewed, but not merged.

Umesh and Lionel, please re-read the requirements for merging new uAPI:

https://www.kernel.org/doc/html/latest/gpu/drm-uapi.html#open-source-userspace-requirements

The order is clearly documented there:

"The kernel patch can only be merged after all the above requirements are met, but it must be merged to either drm-next or drm-misc-next before the userspace patches land."

To follow that, please revert the Mesa changes for now and follow the right
ordering.

Regards, Joonas

> 
> Regards,
> Umesh
> 
> >Signed-off-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
> >---
> > drivers/gpu/drm/i915/i915_perf.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> >diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
> >index 8369ae4b850d..a735b9540113 100644
> >--- a/drivers/gpu/drm/i915/i915_perf.c
> >+++ b/drivers/gpu/drm/i915/i915_perf.c
> >@@ -4772,6 +4772,7 @@ static void oa_init_supported_formats(struct i915_perf *perf)
> >               break;
> >
> >       case INTEL_DG2:
> >+      case INTEL_METEORLAKE:
> >               oa_format_add(perf, I915_OAR_FORMAT_A32u40_A4u32_B8_C8);
> >               oa_format_add(perf, I915_OA_FORMAT_A24u40_A14u32_B8_C8);
> >               break;
> >-- 
> >2.36.1
> >
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 8369ae4b850d..a735b9540113 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -4772,6 +4772,7 @@  static void oa_init_supported_formats(struct i915_perf *perf)
 		break;
 
 	case INTEL_DG2:
+	case INTEL_METEORLAKE:
 		oa_format_add(perf, I915_OAR_FORMAT_A32u40_A4u32_B8_C8);
 		oa_format_add(perf, I915_OA_FORMAT_A24u40_A14u32_B8_C8);
 		break;