diff for duplicates of <1512466342.4977.77.camel@synopsys.com> diff --git a/a/1.txt b/N1/1.txt index 862b3ac..ab98d2a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ Hi Lucas, -On Wed, 2017-11-15@18:56 +0100, Lucas Stach wrote: +On Wed, 2017-11-15 at 18:56 +0100, Lucas Stach wrote: > Am Mittwoch, den 15.11.2017, 17:36 +0000 schrieb Alexey Brodkin: [snip] @@ -34,21 +34,21 @@ index fc9a6a83dfc7..5ad191a605e2 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -678,6 +678,7 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu) -????????????????goto fail; -????????} -? + goto fail; + } + +#ifdef PHYS_OFFSET -????????/* -?????????* Set the GPU linear window to be at the end of the DMA window, where -?????????* the CMA area is likely to reside. This ensures that we are able to + /* + * Set the GPU linear window to be at the end of the DMA window, where + * the CMA area is likely to reside. This ensures that we are able to @@ -699,6 +700,7 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu) -????????????????gpu->memory_base = PHYS_OFFSET; -????????????????gpu->identity.features &= ~chipFeatures_FAST_CLEAR; -????????} + gpu->memory_base = PHYS_OFFSET; + gpu->identity.features &= ~chipFeatures_FAST_CLEAR; + } +#endif -? -????????ret = etnaviv_hw_reset(gpu); -????????if (ret) { + + ret = etnaviv_hw_reset(gpu); + if (ret) { -------------------------------->8-------------------------------- > At least I hope VeriSilicon didn't sell you a MC1.0 part at diff --git a/a/content_digest b/N1/content_digest index 3dd688c..763b07b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,15 +2,20 @@ "ref\01510764243.2835.13.camel@pengutronix.de\0" "ref\01510767395.29843.83.camel@synopsys.com\0" "ref\01510768580.2835.15.camel@pengutronix.de\0" - "From\0Alexey.Brodkin@synopsys.com (Alexey Brodkin)\0" - "Subject\0etnaviv: PHYS_OFFSET usage\0" + "From\0Alexey Brodkin <Alexey.Brodkin@synopsys.com>\0" + "Subject\0Re: etnaviv: PHYS_OFFSET usage\0" "Date\0Tue, 5 Dec 2017 09:32:23 +0000\0" - "To\0linux-snps-arc@lists.infradead.org\0" + "To\0l.stach@pengutronix.de <l.stach@pengutronix.de>\0" + "Cc\0christian.gmeiner@gmail.com <christian.gmeiner@gmail.com>" + Vineet.Gupta1@synopsys.com <Vineet.Gupta1@synopsys.com> + linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> + dri-devel@lists.freedesktop.org <dri-devel@lists.freedesktop.org> + " linux-snps-arc@lists.infradead.org <linux-snps-arc@lists.infradead.org>\0" "\00:1\0" "b\0" "Hi Lucas,\n" "\n" - "On Wed, 2017-11-15@18:56 +0100, Lucas Stach wrote:\n" + "On Wed, 2017-11-15 at 18:56 +0100, Lucas Stach wrote:\n" "> Am Mittwoch, den 15.11.2017, 17:36 +0000 schrieb Alexey Brodkin:\n" "\n" "[snip]\n" @@ -44,21 +49,21 @@ "--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c\n" "+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c\n" "@@ -678,6 +678,7 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu)\n" - "????????????????goto fail;\n" - "????????}\n" - "?\n" + "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240goto fail;\n" + "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240}\n" + "\302\240\n" "+#ifdef PHYS_OFFSET\n" - "????????/*\n" - "?????????* Set the GPU linear window to be at the end of the DMA window, where\n" - "?????????* the CMA area is likely to reside. This ensures that we are able to\n" + "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240/*\n" + "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240* Set the GPU linear window to be at the end of the DMA window, where\n" + "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240* the CMA area is likely to reside. This ensures that we are able to\n" "@@ -699,6 +700,7 @@ int etnaviv_gpu_init(struct etnaviv_gpu *gpu)\n" - "????????????????gpu->memory_base = PHYS_OFFSET;\n" - "????????????????gpu->identity.features &= ~chipFeatures_FAST_CLEAR;\n" - "????????}\n" + "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240gpu->memory_base = PHYS_OFFSET;\n" + "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240gpu->identity.features &= ~chipFeatures_FAST_CLEAR;\n" + "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240}\n" "+#endif\n" - "?\n" - "????????ret = etnaviv_hw_reset(gpu);\n" - "????????if (ret) {\n" + "\302\240\n" + "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240ret = etnaviv_hw_reset(gpu);\n" + "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (ret) {\n" "-------------------------------->8--------------------------------\n" "\n" "> At least I hope VeriSilicon didn't sell you a MC1.0 part at\n" @@ -69,4 +74,4 @@ "\n" -Alexey -ece1dff5cb194fc6573a9bb219998a7cdcc97fd4a9c582a73f29bb4dfac22c9b +ebc9025a4ee9658974b9364dd90d7a28bf248078c5772f08d5f84e0463abde41
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.