* [PATCH] omap drm: fix compile errors where the conversion from omap_timing to videomode was not perfect
@ 2016-12-26 19:23 H. Nikolaus Schaller
2017-01-02 6:40 ` Peter Ujfalusi
2017-01-04 12:03 ` Tomi Valkeinen
0 siblings, 2 replies; 4+ messages in thread
From: H. Nikolaus Schaller @ 2016-12-26 19:23 UTC (permalink / raw)
To: Tomi Valkeinen, David Airlie, Peter Ujfalusi
Cc: dri-devel, linux-kernel, letux-kernel, H. Nikolaus Schaller
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
drivers/gpu/drm/omapdrm/dss/dsi.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index f060bda..f74615d 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -4336,7 +4336,7 @@ static void print_dsi_vm(const char *str,
wc = DIV_ROUND_UP(t->hact * t->bitspp, 8);
pps = DIV_ROUND_UP(wc + 6, t->ndl); /* pixel packet size */
- bl = t->hss + t->hsa + t->hse + t->hbp + t->hfront_porch;
+ bl = t->hss + t->hsa + t->hse + t->hbp + t->hfp;
tot = bl + pps;
#define TO_DSI_T(x) ((u32)div64_u64((u64)x * 1000000000llu, byteclk))
@@ -4345,14 +4345,14 @@ static void print_dsi_vm(const char *str,
"%u/%u/%u/%u/%u/%u = %u + %u = %u\n",
str,
byteclk,
- t->hss, t->hsa, t->hse, t->hbp, pps, t->hfront_porch,
+ t->hss, t->hsa, t->hse, t->hbp, pps, t->hfp,
bl, pps, tot,
TO_DSI_T(t->hss),
TO_DSI_T(t->hsa),
TO_DSI_T(t->hse),
TO_DSI_T(t->hbp),
TO_DSI_T(pps),
- TO_DSI_T(t->hfront_porch),
+ TO_DSI_T(t->hfp),
TO_DSI_T(bl),
TO_DSI_T(pps),
@@ -4367,7 +4367,7 @@ static void print_dispc_vm(const char *str, const struct videomode *vm)
int hact, bl, tot;
hact = vm->hactive;
- bl = vm->hsync_len + vm->hbp + vm->hfront_porch;
+ bl = vm->hsync_len + vm->hback_porch + vm->hfront_porch;
tot = hact + bl;
#define TO_DISPC_T(x) ((u32)div64_u64((u64)x * 1000000000llu, pck))
@@ -4376,10 +4376,10 @@ static void print_dispc_vm(const char *str, const struct videomode *vm)
"%u/%u/%u/%u = %u + %u = %u\n",
str,
pck,
- vm->hsync_len, vm->hbp, hact, vm->hfront_porch,
+ vm->hsync_len, vm->hback_porch, hact, vm->hfront_porch,
bl, hact, tot,
TO_DISPC_T(vm->hsync_len),
- TO_DISPC_T(vm->hbp),
+ TO_DISPC_T(vm->hback_porch),
TO_DISPC_T(hact),
TO_DISPC_T(vm->hfront_porch),
TO_DISPC_T(bl),
@@ -4401,12 +4401,12 @@ static void print_dsi_dispc_vm(const char *str,
dsi_tput = (u64)byteclk * t->ndl * 8;
pck = (u32)div64_u64(dsi_tput, t->bitspp);
dsi_hact = DIV_ROUND_UP(DIV_ROUND_UP(t->hact * t->bitspp, 8) + 6, t->ndl);
- dsi_htot = t->hss + t->hsa + t->hse + t->hbp + dsi_hact + t->hfront_porch;
+ dsi_htot = t->hss + t->hsa + t->hse + t->hbp + dsi_hact + t->hfp;
vm.pixelclock = pck;
vm.hsync_len = div64_u64((u64)(t->hsa + t->hse) * pck, byteclk);
- vm.hbp = div64_u64((u64)t->hbp * pck, byteclk);
- vm.hfront_porch = div64_u64((u64)t->hfront_porch * pck, byteclk);
+ vm.hback_porch = div64_u64((u64)t->hbp * pck, byteclk);
+ vm.hfront_porch = div64_u64((u64)t->hfp * pck, byteclk);
vm.hactive = t->hact;
print_dispc_vm(str, &vm);
--
2.7.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] omap drm: fix compile errors where the conversion from omap_timing to videomode was not perfect
2016-12-26 19:23 [PATCH] omap drm: fix compile errors where the conversion from omap_timing to videomode was not perfect H. Nikolaus Schaller
@ 2017-01-02 6:40 ` Peter Ujfalusi
2017-01-04 12:03 ` Tomi Valkeinen
1 sibling, 0 replies; 4+ messages in thread
From: Peter Ujfalusi @ 2017-01-02 6:40 UTC (permalink / raw)
To: H. Nikolaus Schaller, Tomi Valkeinen, David Airlie
Cc: dri-devel, linux-kernel, letux-kernel
Hi,
On 12/26/2016 09:23 PM, H. Nikolaus Schaller wrote:
> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
I did compile and boot tests after each patch when doing the conversion,
but this certainly skipped because these were 'hidden' by
#ifdef PRINT_VERBOSE_VM_TIMINGS
which is not a Kconfig option and needs to be enabled in the dsi.c on
purpose.
Thank you for finding it and sorry for the inconvenience.
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> ---
> drivers/gpu/drm/omapdrm/dss/dsi.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c
b/drivers/gpu/drm/omapdrm/dss/dsi.c
> index f060bda..f74615d 100644
> --- a/drivers/gpu/drm/omapdrm/dss/dsi.c
> +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
> @@ -4336,7 +4336,7 @@ static void print_dsi_vm(const char *str,
>
> wc = DIV_ROUND_UP(t->hact * t->bitspp, 8);
> pps = DIV_ROUND_UP(wc + 6, t->ndl); /* pixel packet size */
> - bl = t->hss + t->hsa + t->hse + t->hbp + t->hfront_porch;
> + bl = t->hss + t->hsa + t->hse + t->hbp + t->hfp;
> tot = bl + pps;
>
> #define TO_DSI_T(x) ((u32)div64_u64((u64)x * 1000000000llu, byteclk))
> @@ -4345,14 +4345,14 @@ static void print_dsi_vm(const char *str,
> "%u/%u/%u/%u/%u/%u = %u + %u = %u\n",
> str,
> byteclk,
> - t->hss, t->hsa, t->hse, t->hbp, pps, t->hfront_porch,
> + t->hss, t->hsa, t->hse, t->hbp, pps, t->hfp,
> bl, pps, tot,
> TO_DSI_T(t->hss),
> TO_DSI_T(t->hsa),
> TO_DSI_T(t->hse),
> TO_DSI_T(t->hbp),
> TO_DSI_T(pps),
> - TO_DSI_T(t->hfront_porch),
> + TO_DSI_T(t->hfp),
>
> TO_DSI_T(bl),
> TO_DSI_T(pps),
> @@ -4367,7 +4367,7 @@ static void print_dispc_vm(const char *str,
const struct videomode *vm)
> int hact, bl, tot;
>
> hact = vm->hactive;
> - bl = vm->hsync_len + vm->hbp + vm->hfront_porch;
> + bl = vm->hsync_len + vm->hback_porch + vm->hfront_porch;
> tot = hact + bl;
>
> #define TO_DISPC_T(x) ((u32)div64_u64((u64)x * 1000000000llu, pck))
> @@ -4376,10 +4376,10 @@ static void print_dispc_vm(const char *str,
const struct videomode *vm)
> "%u/%u/%u/%u = %u + %u = %u\n",
> str,
> pck,
> - vm->hsync_len, vm->hbp, hact, vm->hfront_porch,
> + vm->hsync_len, vm->hback_porch, hact, vm->hfront_porch,
> bl, hact, tot,
> TO_DISPC_T(vm->hsync_len),
> - TO_DISPC_T(vm->hbp),
> + TO_DISPC_T(vm->hback_porch),
> TO_DISPC_T(hact),
> TO_DISPC_T(vm->hfront_porch),
> TO_DISPC_T(bl),
> @@ -4401,12 +4401,12 @@ static void print_dsi_dispc_vm(const char *str,
> dsi_tput = (u64)byteclk * t->ndl * 8;
> pck = (u32)div64_u64(dsi_tput, t->bitspp);
> dsi_hact = DIV_ROUND_UP(DIV_ROUND_UP(t->hact * t->bitspp, 8) + 6,
t->ndl);
> - dsi_htot = t->hss + t->hsa + t->hse + t->hbp + dsi_hact +
t->hfront_porch;
> + dsi_htot = t->hss + t->hsa + t->hse + t->hbp + dsi_hact + t->hfp;
>
> vm.pixelclock = pck;
> vm.hsync_len = div64_u64((u64)(t->hsa + t->hse) * pck, byteclk);
> - vm.hbp = div64_u64((u64)t->hbp * pck, byteclk);
> - vm.hfront_porch = div64_u64((u64)t->hfront_porch * pck, byteclk);
> + vm.hback_porch = div64_u64((u64)t->hbp * pck, byteclk);
> + vm.hfront_porch = div64_u64((u64)t->hfp * pck, byteclk);
> vm.hactive = t->hact;
>
> print_dispc_vm(str, &vm);
>
--
Péter
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] omap drm: fix compile errors where the conversion from omap_timing to videomode was not perfect
2016-12-26 19:23 [PATCH] omap drm: fix compile errors where the conversion from omap_timing to videomode was not perfect H. Nikolaus Schaller
2017-01-02 6:40 ` Peter Ujfalusi
@ 2017-01-04 12:03 ` Tomi Valkeinen
2017-01-04 12:34 ` H. Nikolaus Schaller
1 sibling, 1 reply; 4+ messages in thread
From: Tomi Valkeinen @ 2017-01-04 12:03 UTC (permalink / raw)
To: H. Nikolaus Schaller, Peter Ujfalusi
Cc: David Airlie, dri-devel, linux-kernel, letux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 316 bytes --]
Hi,
On 26/12/16 21:23, H. Nikolaus Schaller wrote:
> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
> ---
> drivers/gpu/drm/omapdrm/dss/dsi.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
Thanks, I picked this up (after improving the subject and desc).
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] omap drm: fix compile errors where the conversion from omap_timing to videomode was not perfect
2017-01-04 12:03 ` Tomi Valkeinen
@ 2017-01-04 12:34 ` H. Nikolaus Schaller
0 siblings, 0 replies; 4+ messages in thread
From: H. Nikolaus Schaller @ 2017-01-04 12:34 UTC (permalink / raw)
To: Tomi Valkeinen
Cc: Peter Ujfalusi, David Airlie, dri-devel, linux-kernel, letux-kernel
[-- Attachment #1: Type: text/plain, Size: 422 bytes --]
> Am 04.01.2017 um 13:03 schrieb Tomi Valkeinen <tomi.valkeinen@ti.com>:
>
> Hi,
>
> On 26/12/16 21:23, H. Nikolaus Schaller wrote:
>> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
>> ---
>> drivers/gpu/drm/omapdrm/dss/dsi.c | 18 +++++++++---------
>> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> Thanks, I picked this up (after improving the subject and desc).
>
> Tomi
>
Thanks and BR,
Nikolaus
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-01-04 12:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-26 19:23 [PATCH] omap drm: fix compile errors where the conversion from omap_timing to videomode was not perfect H. Nikolaus Schaller
2017-01-02 6:40 ` Peter Ujfalusi
2017-01-04 12:03 ` Tomi Valkeinen
2017-01-04 12:34 ` H. Nikolaus Schaller
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).