devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lucas Stach <l.stach@pengutronix.de>
To: Philipp Zabel <p.zabel@pengutronix.de>, Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>,
	devicetree@vger.kernel.org, kernel@pengutronix.de,
	dri-devel@lists.freedesktop.org, patchwork-lst@pengutronix.de
Subject: [PATCH v2 7/9] gpu: ipu-v3: only set non-zero AXI ID for IC when PRG is absent
Date: Wed,  8 Mar 2017 12:13:19 +0100	[thread overview]
Message-ID: <20170308111321.3035-7-l.stach@pengutronix.de> (raw)
In-Reply-To: <20170308111321.3035-1-l.stach@pengutronix.de>

Using non-zero AXI IDs for anything other than the display channels
collides with the PRG AXI snooping, so only do this if there is no
PRG present.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/gpu/ipu-v3/ipu-image-convert.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/ipu-v3/ipu-image-convert.c b/drivers/gpu/ipu-v3/ipu-image-convert.c
index 805b6fa7b5f4..524a717ab28e 100644
--- a/drivers/gpu/ipu-v3/ipu-image-convert.c
+++ b/drivers/gpu/ipu-v3/ipu-image-convert.c
@@ -671,7 +671,12 @@ static void init_idmac_channel(struct ipu_image_convert_ctx *ctx,
 	ipu_ic_task_idma_init(chan->ic, channel, width, height,
 			      burst_size, rot_mode);
 
-	ipu_cpmem_set_axi_id(channel, 1);
+	/*
+	 * Setting a non-zero AXI ID collides with the PRG AXI snooping, so
+	 * only do this when there is no PRG present.
+	 */
+	if (!channel->ipu->prg_priv)
+		ipu_cpmem_set_axi_id(channel, 1);
 
 	ipu_idmac_set_double_buffer(channel, ctx->double_buffering);
 }
-- 
2.11.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2017-03-08 11:13 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-08 11:13 [PATCH v2 1/9] gpu: ipu-v3: add DT binding for the Prefetch Resolve Engine Lucas Stach
2017-03-08 11:13 ` [PATCH v2 2/9] gpu: ipu-v3: add driver for " Lucas Stach
2017-03-08 11:13 ` [PATCH v2 3/9] gpu: ipu-v3: add DT binding for the Prefetch Resolve Gasket Lucas Stach
2017-03-08 11:13 ` [PATCH v2 4/9] gpu: ipu-v3: add driver for " Lucas Stach
2017-03-08 11:13 ` [PATCH v2 5/9] gpu: ipu-v3: document valid IPUv3 compatibles and extend for i.MX6 QuadPlus Lucas Stach
2017-03-08 11:13 ` [PATCH v2 6/9] gpu: ipu-v3: hook up PRG unit Lucas Stach
2017-03-08 11:13 ` Lucas Stach [this message]
2017-03-08 11:13 ` [PATCH v2 8/9] drm/imx: enable/disable PRG on CRTC enable/disable Lucas Stach
2017-03-08 11:13 ` [PATCH v2 9/9] drm/imx: use PRG/PRE when possible Lucas Stach
2017-03-13 14:45 ` [PATCH v2 1/9] gpu: ipu-v3: add DT binding for the Prefetch Resolve Engine Philipp Zabel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170308111321.3035-7-l.stach@pengutronix.de \
    --to=l.stach@pengutronix.de \
    --cc=devicetree@vger.kernel.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=kernel@pengutronix.de \
    --cc=mark.rutland@arm.com \
    --cc=p.zabel@pengutronix.de \
    --cc=patchwork-lst@pengutronix.de \
    --cc=robh+dt@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).