[v1,4/4] arm64: dts: sdm845: Add zap shader region for GPU
diff mbox series

Message ID 1552414422-9568-5-git-send-email-jcrouse@codeaurora.org
State New, archived
Headers show
Series
  • drm/msm/a6xx: Add support for zap shader
Related show

Commit Message

Jordan Crouse March 12, 2019, 6:13 p.m. UTC
Some Adreno GPU targets require a special zap shader to bring the GPU
out of secure mode. Define a region to allocate and store the zap
shader.

Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
---

 arch/arm64/boot/dts/qcom/sdm845.dtsi | 11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

Rob Clark March 13, 2019, 3:42 p.m. UTC | #1
On Tue, Mar 12, 2019 at 2:14 PM Jordan Crouse <jcrouse@codeaurora.org> wrote:
>
> Some Adreno GPU targets require a special zap shader to bring the GPU
> out of secure mode. Define a region to allocate and store the zap
> shader.
>
> Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
> ---
>
>  arch/arm64/boot/dts/qcom/sdm845.dtsi | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> index fed7a29..526456d 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> @@ -100,6 +100,11 @@
>                         no-map;
>                 };
>
> +               zap_shader_region: memory@8c415000 {
> +                       reg = <0 0x8c415000 0 0x2000>;
> +                       no-map;
> +               };
> +
>                 mpss_region: memory@8e000000 {
>                         reg = <0 0x8e000000 0 0x7800000>;
>                         no-map;
> @@ -109,6 +114,8 @@
>                         reg = <0 0x96500000 0 0x200000>;
>                         no-map;
>                 };
> +
> +

I guess we don't really need this hunk..

other than that, the series lgtm

BR,
-R

>         };
>
>         cpus {
> @@ -1514,6 +1521,10 @@
>
>                         qcom,gmu = <&gmu>;
>
> +                       zap-shader {
> +                               memory-region = <&zap_shader_region>;
> +                       };
> +
>                         gpu_opp_table: opp-table {
>                                 compatible = "operating-points-v2";
>
> --
> 2.7.4
>
> _______________________________________________
> Freedreno mailing list
> Freedreno@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/freedreno
Bjorn Andersson March 14, 2019, 5:20 a.m. UTC | #2
On Wed 13 Mar 08:42 PDT 2019, Rob Clark wrote:

> On Tue, Mar 12, 2019 at 2:14 PM Jordan Crouse <jcrouse@codeaurora.org> wrote:
> >
> > Some Adreno GPU targets require a special zap shader to bring the GPU
> > out of secure mode. Define a region to allocate and store the zap
> > shader.
> >
> > Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
> > ---
> >
> >  arch/arm64/boot/dts/qcom/sdm845.dtsi | 11 +++++++++++
> >  1 file changed, 11 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> > index fed7a29..526456d 100644
> > --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> > @@ -100,6 +100,11 @@
> >                         no-map;
> >                 };
> >
> > +               zap_shader_region: memory@8c415000 {
> > +                       reg = <0 0x8c415000 0 0x2000>;
> > +                       no-map;
> > +               };
> > +
> >                 mpss_region: memory@8e000000 {
> >                         reg = <0 0x8e000000 0 0x7800000>;
> >                         no-map;
> > @@ -109,6 +114,8 @@
> >                         reg = <0 0x96500000 0 0x200000>;
> >                         no-map;
> >                 };
> > +
> > +
> 
> I guess we don't really need this hunk..
> 

I'll trim that as I pick up the patch.

> other than that, the series lgtm
> 

Will you pick up patch 1-3 and I'll pick patch 4 through Andy's tree?

Regards,
Bjorn

> BR,
> -R
> 
> >         };
> >
> >         cpus {
> > @@ -1514,6 +1521,10 @@
> >
> >                         qcom,gmu = <&gmu>;
> >
> > +                       zap-shader {
> > +                               memory-region = <&zap_shader_region>;
> > +                       };
> > +
> >                         gpu_opp_table: opp-table {
> >                                 compatible = "operating-points-v2";
> >
> > --
> > 2.7.4
> >
> > _______________________________________________
> > Freedreno mailing list
> > Freedreno@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/freedreno
Rob Clark March 14, 2019, 4:59 p.m. UTC | #3
On Thu, Mar 14, 2019 at 1:20 AM Bjorn Andersson
<bjorn.andersson@linaro.org> wrote:
>
> On Wed 13 Mar 08:42 PDT 2019, Rob Clark wrote:
>
> > On Tue, Mar 12, 2019 at 2:14 PM Jordan Crouse <jcrouse@codeaurora.org> wrote:
> > >
> > > Some Adreno GPU targets require a special zap shader to bring the GPU
> > > out of secure mode. Define a region to allocate and store the zap
> > > shader.
> > >
> > > Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
> > > ---
> > >
> > >  arch/arm64/boot/dts/qcom/sdm845.dtsi | 11 +++++++++++
> > >  1 file changed, 11 insertions(+)
> > >
> > > diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> > > index fed7a29..526456d 100644
> > > --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
> > > +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
> > > @@ -100,6 +100,11 @@
> > >                         no-map;
> > >                 };
> > >
> > > +               zap_shader_region: memory@8c415000 {
> > > +                       reg = <0 0x8c415000 0 0x2000>;
> > > +                       no-map;
> > > +               };
> > > +
> > >                 mpss_region: memory@8e000000 {
> > >                         reg = <0 0x8e000000 0 0x7800000>;
> > >                         no-map;
> > > @@ -109,6 +114,8 @@
> > >                         reg = <0 0x96500000 0 0x200000>;
> > >                         no-map;
> > >                 };
> > > +
> > > +
> >
> > I guess we don't really need this hunk..
> >
>
> I'll trim that as I pick up the patch.
>
> > other than that, the series lgtm
> >
>
> Will you pick up patch 1-3 and I'll pick patch 4 through Andy's tree?

yeah, sounds good.

BR,
-R

> Regards,
> Bjorn
>
> > BR,
> > -R
> >
> > >         };
> > >
> > >         cpus {
> > > @@ -1514,6 +1521,10 @@
> > >
> > >                         qcom,gmu = <&gmu>;
> > >
> > > +                       zap-shader {
> > > +                               memory-region = <&zap_shader_region>;
> > > +                       };
> > > +
> > >                         gpu_opp_table: opp-table {
> > >                                 compatible = "operating-points-v2";
> > >
> > > --
> > > 2.7.4
> > >
> > > _______________________________________________
> > > Freedreno mailing list
> > > Freedreno@lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/freedreno

Patch
diff mbox series

diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index fed7a29..526456d 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -100,6 +100,11 @@ 
 			no-map;
 		};
 
+		zap_shader_region: memory@8c415000 {
+			reg = <0 0x8c415000 0 0x2000>;
+			no-map;
+		};
+
 		mpss_region: memory@8e000000 {
 			reg = <0 0x8e000000 0 0x7800000>;
 			no-map;
@@ -109,6 +114,8 @@ 
 			reg = <0 0x96500000 0 0x200000>;
 			no-map;
 		};
+
+
 	};
 
 	cpus {
@@ -1514,6 +1521,10 @@ 
 
 			qcom,gmu = <&gmu>;
 
+			zap-shader {
+				memory-region = <&zap_shader_region>;
+			};
+
 			gpu_opp_table: opp-table {
 				compatible = "operating-points-v2";