All of lore.kernel.org
 help / color / mirror / Atom feed
From: Inki Dae <inki.dae@samsung.com>
To: Andrzej Hajda <a.hajda@samsung.com>
Cc: linux-samsung-soc@vger.kernel.org,
	Marek Szyprowski <m.szyprowski@samsung.com>,
	Krzysztof Kozlowski <krzk@kernel.org>,
	dri-devel@lists.freedesktop.org,
	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Subject: Re: [PATCH v2 RESEND 00/24] drm/exynos: add support for GSCALER planes on Exynos5433
Date: Mon, 25 Mar 2019 12:12:50 +0900	[thread overview]
Message-ID: <328194c1-d382-f9b1-90fe-bc12f34ebc25@samsung.com> (raw)
In-Reply-To: <20190320130707.25161-1-a.hajda@samsung.com>

Hi Andrzej,

Merge conflict. Could you rebase this patch series on top of exynos-drm-next?

Thanks,
Inki Dae

19. 3. 20. 오후 10:06에 Andrzej Hajda 이(가) 쓴 글:
> Hi Inki,
> 
> GSCALERs in Exynos SoCs support conversion between wide range of image formats,
> plus scaling and rotation.
> Driver already supports mem2mem mode - via ExynosDRM IPP framework.
> This patchset adds support for mem to display mode - framebuffers can
> be converted, scaled and send directly to Display Controller. From DRM
> framework's point of view every GSCALER exposes drm_plane which can be connected
> to display controller (display panel or TV).
> The feature is not well documented so the development was quite difficult -
> a process of trial and error, vendor code analysis, guessing from datasheets.
> Hopefully most of the issues were solved. I have developed and tested it on
> TM2 device with panel and TV paths.
> 
> The patchset contains three parts:
> 1. Preparatory patches - mostly cleanup and refactoring of drm_crtc and drm_plane
>    related structures, to allow usage of planes which are not physically bound
>    to crtcs (01-13).
> 2. Adding local path support to GSCALER and DECON (14-20).
> 3. Few fixes of bugs existing already in the code but discovered due to added
>    local path support (21-23).
> 
> The patchset is based on exynos_drm_next plus my patchset adding zpos to DECON
> and FIMD - 'drm/exynos: add support for dynamic zpos in DECON and FIMD' - it is
> required to allow set z-pos position of GSCALER planes.
> To simplify tests I have also created branch containing all required patches:
> Repo: https://git.tizen.org/cgit/platform/kernel/linux-exynos
> Branch: sandbox/ahajda/dev/exynos-drm-local-path
> 
> This is v2 version of the patchset. In this version I have moved code setting
> cursor plane in crtc to separate patch together with code disabling fast cursor
> updates - hardware does not support it. To keep bisectability DTS patches should
> be applied before subsequent ones.
> 
> Regards
> Andrzej
> 
> 
> Andrzej Hajda (24):
>   drm/exynos: remove exynos_drm_plane.h header
>   drm/exynos: remove spare macro
>   drm/exynos: drop exynos_drm_plane_config structure
>   drm/exynos: add exynos_drm_crtc_init function
>   drm/exynos/decon5433: embed exynos_drm_crtc directly into context
>   drm/exynos/decon7: embed exynos_drm_crtc directly into context
>   drm/exynos/fimd: embed exynos_drm_crtc directly into context
>   drm/exynos/mixer: embed exynos_drm_crtc directly into context
>   drm/exynos/vidi: embed exynos_drm_crtc directly into context
>   drm/exynos: remove standalone exynos_drm_crtc leftovers
>   drm/exynos/vidi: remove encoder_to_vidi helper
>   drm/exynos: unify plane type assignment
>   drm/exynos: set primary plane in exynos_drm_crtc_init
>   drm/exynos: set cursor plane in exynos_drm_crtc_init
>   drm/exynos: add plane update/disable callbacks for planes
>   drm/exynos: add GSCALER plane capability
>   drm/exynos/gscaler: fix id assignement
>   arm64: dts: exynos: configure GSCALER related clocks
>   arm64: dts: exynos: add DSD/GSD clocks to DECONs and GSCALERs
>   drm/exynos/gscaler: add local path support
>   drm/exynos/decon5433: add local path support
>   drm/exynos/decon5433: wait for finish previous update
>   drm/exynos/gscaler: change supported color format BGRX8888 to XBGR8888
>   drm/exynos/gscaler: fix handling YVU420 pixel format
> 
>  .../dts/exynos/exynos5433-tm2-common.dtsi     |   6 +
>  arch/arm64/boot/dts/exynos/exynos5433-tm2.dts |   6 +-
>  arch/arm64/boot/dts/exynos/exynos5433.dtsi    |  25 +-
>  drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 162 ++++++++-----
>  drivers/gpu/drm/exynos/exynos7_drm_decon.c    |  66 +++--
>  drivers/gpu/drm/exynos/exynos_drm_crtc.c      |  46 ++--
>  drivers/gpu/drm/exynos/exynos_drm_crtc.h      |   7 +-
>  drivers/gpu/drm/exynos/exynos_drm_drv.c       |   1 -
>  drivers/gpu/drm/exynos/exynos_drm_drv.h       |  50 ++--
>  drivers/gpu/drm/exynos/exynos_drm_fb.c        |  10 +-
>  drivers/gpu/drm/exynos/exynos_drm_fimd.c      |  85 +++----
>  drivers/gpu/drm/exynos/exynos_drm_gsc.c       | 229 ++++++++++++++----
>  drivers/gpu/drm/exynos/exynos_drm_plane.c     |  84 ++++---
>  drivers/gpu/drm/exynos/exynos_drm_plane.h     |  14 --
>  drivers/gpu/drm/exynos/exynos_drm_vidi.c      |  48 ++--
>  drivers/gpu/drm/exynos/exynos_mixer.c         |  95 +++-----
>  drivers/gpu/drm/exynos/regs-decon5433.h       |   6 +
>  drivers/gpu/drm/exynos/regs-gsc.h             |   6 +
>  18 files changed, 538 insertions(+), 408 deletions(-)
>  delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_plane.h
> 
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2019-03-25  3:12 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CGME20190320130711eucas1p2b9f18d009647652b4bb912fdd40c9f74@eucas1p2.samsung.com>
2019-03-20 13:06 ` [PATCH v2 RESEND 00/24] drm/exynos: add support for GSCALER planes on Exynos5433 Andrzej Hajda
     [not found]   ` <CGME20190320130712eucas1p2c98ef5f0f42d422dc711c222fa4da11b@eucas1p2.samsung.com>
2019-03-20 13:06     ` [PATCH v2 RESEND 01/24] drm/exynos: remove exynos_drm_plane.h header Andrzej Hajda
     [not found]   ` <CGME20190320130712eucas1p2f3735c6c5afd7117f297ce7f495e4479@eucas1p2.samsung.com>
2019-03-20 13:06     ` [PATCH v2 RESEND 02/24] drm/exynos: remove spare macro Andrzej Hajda
     [not found]   ` <CGME20190320130713eucas1p137746c8fcdf13bbe1c897c27a245b22a@eucas1p1.samsung.com>
2019-03-20 13:06     ` [PATCH v2 RESEND 03/24] drm/exynos: drop exynos_drm_plane_config structure Andrzej Hajda
     [not found]   ` <CGME20190320130713eucas1p2dd57732ea0135355863ba26424a8bacf@eucas1p2.samsung.com>
2019-03-20 13:06     ` [PATCH v2 RESEND 04/24] drm/exynos: add exynos_drm_crtc_init function Andrzej Hajda
     [not found]   ` <CGME20190320130714eucas1p1c0b414ed76d7d0d78da56c9c0a6c8973@eucas1p1.samsung.com>
2019-03-20 13:06     ` [PATCH v2 RESEND 05/24] drm/exynos/decon5433: embed exynos_drm_crtc directly into context Andrzej Hajda
     [not found]   ` <CGME20190320130714eucas1p2e4f96fe67486283560c7b6a8627b769c@eucas1p2.samsung.com>
2019-03-20 13:06     ` [PATCH v2 RESEND 06/24] drm/exynos/decon7: " Andrzej Hajda
     [not found]   ` <CGME20190320130714eucas1p1d3ab6fceec849f22bab69df1e46b972d@eucas1p1.samsung.com>
2019-03-20 13:06     ` [PATCH v2 RESEND 07/24] drm/exynos/fimd: " Andrzej Hajda
     [not found]   ` <CGME20190320130715eucas1p250b6b902360896cd36bff8536b6292bf@eucas1p2.samsung.com>
2019-03-20 13:06     ` [PATCH v2 RESEND 08/24] drm/exynos/mixer: " Andrzej Hajda
     [not found]   ` <CGME20190320130715eucas1p2ab0449e8b243fcfa2d63524363eb8544@eucas1p2.samsung.com>
2019-03-20 13:06     ` [PATCH v2 RESEND 09/24] drm/exynos/vidi: " Andrzej Hajda
     [not found]   ` <CGME20190320130715eucas1p1cc35aa50021848a6f3d5459bb0c6d1bf@eucas1p1.samsung.com>
2019-03-20 13:06     ` [PATCH v2 RESEND 10/24] drm/exynos: remove standalone exynos_drm_crtc leftovers Andrzej Hajda
     [not found]   ` <CGME20190320130716eucas1p2fa37979f7715c411e079d146b96628cb@eucas1p2.samsung.com>
2019-03-20 13:06     ` [PATCH v2 RESEND 11/24] drm/exynos/vidi: remove encoder_to_vidi helper Andrzej Hajda
     [not found]   ` <CGME20190320130716eucas1p121bc6480ad28d1c0c79c195ae943ee55@eucas1p1.samsung.com>
2019-03-20 13:06     ` [PATCH v2 RESEND 12/24] drm/exynos: unify plane type assignment Andrzej Hajda
     [not found]   ` <CGME20190320130717eucas1p2a2a480a8c5d71fc66741410829a0d016@eucas1p2.samsung.com>
2019-03-20 13:06     ` [PATCH v2 RESEND 13/24] drm/exynos: set primary plane in exynos_drm_crtc_init Andrzej Hajda
     [not found]   ` <CGME20190320130717eucas1p2c75749455fa4b34b4d21f9873b3d9cb6@eucas1p2.samsung.com>
2019-03-20 13:06     ` [PATCH v2 RESEND 14/24] drm/exynos: set cursor " Andrzej Hajda
     [not found]   ` <CGME20190320130718eucas1p15d440d88365fa5ea213f592b97e6f226@eucas1p1.samsung.com>
2019-03-20 13:06     ` [PATCH v2 RESEND 15/24] drm/exynos: add plane update/disable callbacks for planes Andrzej Hajda
     [not found]   ` <CGME20190320130718eucas1p1e42feb422bda24a2db733d50eb41ea47@eucas1p1.samsung.com>
2019-03-20 13:06     ` [PATCH v2 RESEND 16/24] drm/exynos: add GSCALER plane capability Andrzej Hajda
     [not found]   ` <CGME20190320130719eucas1p1b411bcd1e32a500202a19a24a4ba92a6@eucas1p1.samsung.com>
2019-03-20 13:07     ` [PATCH v2 RESEND 17/24] drm/exynos/gscaler: fix id assignement Andrzej Hajda
     [not found]   ` <CGME20190320130719eucas1p274be59cfcd798d21ea583bc22f218ff7@eucas1p2.samsung.com>
2019-03-20 13:07     ` [PATCH v2 RESEND 18/24] arm64: dts: exynos: configure GSCALER related clocks Andrzej Hajda
     [not found]   ` <CGME20190320130719eucas1p2e59268e628f6c88db6b632abb153313a@eucas1p2.samsung.com>
2019-03-20 13:07     ` [PATCH v2 RESEND 19/24] arm64: dts: exynos: add DSD/GSD clocks to DECONs and GSCALERs Andrzej Hajda
     [not found]   ` <CGME20190320130720eucas1p1b6f2351c2262d2c89a464fdc10a6a607@eucas1p1.samsung.com>
2019-03-20 13:07     ` [PATCH v2 RESEND 20/24] drm/exynos/gscaler: add local path support Andrzej Hajda
     [not found]   ` <CGME20190320130720eucas1p1f2b27e5d340a50dc710155b37e7b173b@eucas1p1.samsung.com>
2019-03-20 13:07     ` [PATCH v2 RESEND 21/24] drm/exynos/decon5433: " Andrzej Hajda
     [not found]   ` <CGME20190320130721eucas1p2097f22c60919e45a10f9dff6dd678c99@eucas1p2.samsung.com>
2019-03-20 13:07     ` [PATCH v2 RESEND 22/24] drm/exynos/decon5433: wait for finish previous update Andrzej Hajda
     [not found]   ` <CGME20190320130721eucas1p258d3ace8294e90446d369c1d45941dc9@eucas1p2.samsung.com>
2019-03-20 13:07     ` [PATCH v2 RESEND 23/24] drm/exynos/gscaler: change supported color format BGRX8888 to XBGR8888 Andrzej Hajda
     [not found]   ` <CGME20190320130722eucas1p201e6452c3329fdbbc651051da9b14155@eucas1p2.samsung.com>
2019-03-20 13:07     ` [PATCH v2 RESEND 24/24] drm/exynos/gscaler: fix handling YVU420 pixel format Andrzej Hajda
2019-03-25  3:12   ` Inki Dae [this message]
2019-03-25  7:21     ` [PATCH v2 RESEND 00/24] drm/exynos: add support for GSCALER planes on Exynos5433 Andrzej Hajda

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=328194c1-d382-f9b1-90fe-bc12f34ebc25@samsung.com \
    --to=inki.dae@samsung.com \
    --cc=a.hajda@samsung.com \
    --cc=b.zolnierkie@samsung.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=krzk@kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=m.szyprowski@samsung.com \
    /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 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.