From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maxime Ripard Subject: [GIT PULL] Allwinner sun4i DRM changes for 4.12 Date: Thu, 6 Apr 2017 09:47:20 +0200 Message-ID: <20170406074720.ur4l4535wdk6hmnm@lukather> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1896333105==" Return-path: Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 28DA26E155 for ; Thu, 6 Apr 2017 07:47:32 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: David Airlie Cc: Chen-Yu Tsai , Maxime Ripard , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org --===============1896333105== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="3kscbfa6eoakuemb" Content-Disposition: inline --3kscbfa6eoakuemb Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Dave, Please pull the following changes for the next merge window. My tree is included in linux-next, so we should be pretty safe there. Thanks! Maxime The following changes since commit ca39b449f6d03e8235969f12f5dd25b8eb4304d6: drm/vc4: Fix OOPSes from trying to cache a partially constructed BO. (201= 7-03-02 09:57:23 -0800) are available in the git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git sunxi-d= rm-for-4.12 for you to fetch changes up to 2da042ac05e91b78e4484b731e8eb335c90385d3: MAINTAINERS: Add sun4i-drm git repo (2017-04-04 17:51:27 +0200) ---------------------------------------------------------------- Allwinner DRM changes for 4.12 Not any functional changes, but a lot of preliminary rework in order to support multiple display pipelines. ---------------------------------------------------------------- Chen-Yu Tsai (24): drm/sun4i: Move drm_mode_config_cleanup call to main driver drm/sun4i: Fix up error path cleanup for master bind function drm/sun4i: Check return value of drm_vblank_init drm/sun4i: Fix kcalloc element size in sun4i_layers_init drm/sun4i: Drop useless assignment in sun4i_layers_init drm/sun4i: Save newly created layer in layers array in sun4i_layers_i= nit drm/sun4i: Make sun4i_crtc_init return ERR_PTR style error codes drm/sun4i: Make sunxi_rgb2yuv_coef constant drm/sun4i: Set drm_crtc.port to the underlying TCON's output port node drm/sun4i: Add end of list element for sun4i_layers_init's returned l= ist drm/sun4i: Move layers from sun4i_drv to sun4i_crtc drm/sun4i: Initialize crtc from tcon bind function drm/sun4i: Drop primary layer pointer from sun4i_drv drm/sun4i: Drop hardcoded .possible_crtcs values from layers drm/sun4i: tv: Switch to drm_of_find_possible_crtcs drm/sun4i: rgb: Pass tcon pointer when initializing RGB encoder drm/sun4i: Add backend pointer to sun4i_layer drm/sun4i: Add backend and tcon pointers to sun4i_crtc drm/sun4i: Fix TCON clock and regmap initialization sequence drm/sun4i: Fix tcon channel 0 comment about backporch =3D backporch += hsync drm/sun4i: Use embedded tcon pointer to get the tcon's output port no= de drm/sun4i: tv: Get tcon and backend pointers from associated crtc drm/sun4i: Pass pointers for associated backend and tcon into crtc in= it drm/sun4i: Pass pointer for underlying backend into layer init Maxime Ripard (2): drm/sun4i: Grab reserved memory region MAINTAINERS: Add sun4i-drm git repo MAINTAINERS | 1 + drivers/gpu/drm/sun4i/Makefile | 4 +- drivers/gpu/drm/sun4i/sun4i_backend.c | 2 +- drivers/gpu/drm/sun4i/sun4i_crtc.c | 70 +++++++++++++++++++++++----= ---- drivers/gpu/drm/sun4i/sun4i_crtc.h | 8 +++- drivers/gpu/drm/sun4i/sun4i_drv.c | 47 +++++++++++---------- drivers/gpu/drm/sun4i/sun4i_drv.h | 4 -- drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 1 - drivers/gpu/drm/sun4i/sun4i_layer.c | 32 +++++++------- drivers/gpu/drm/sun4i/sun4i_layer.h | 4 +- drivers/gpu/drm/sun4i/sun4i_rgb.c | 30 +++++-------- drivers/gpu/drm/sun4i/sun4i_rgb.h | 2 +- drivers/gpu/drm/sun4i/sun4i_tcon.c | 36 +++++++++++----- drivers/gpu/drm/sun4i/sun4i_tcon.h | 3 ++ drivers/gpu/drm/sun4i/sun4i_tv.c | 27 ++++++++---- 15 files changed, 164 insertions(+), 107 deletions(-) --=20 Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com --3kscbfa6eoakuemb Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIcBAEBCAAGBQJY5fKIAAoJEBx+YmzsjxAgFY4P/iCKpGwTGkTwApNKcuQRAUvL LNo2+XqQWbKX1CpKTNG5CGzM6i3sXfpQNsBkmPCsCHdLNbPbl+bQlf70X9FmfYjL ox6mKLU77ENM2B6nnb15FJ2fRe6p7UizqgAWO20dEKuvRkEKokH9fRA0JdnCi3RK jLGR1UEEO6xpOyxeGZ1ZJ3zNM1Noin3Ck7wk47mGv8QF6I//qWUTgqmQPCEbQVGs eMEZPQI2V53rT4GjjZUPhPwAs7We9xQRvz+K+XIRsFgK+1kgRJhjnBZ6Dmq3cwZG CALXE88nAZyS11N5Wx2B1OrNzUbdjykmR575dBsxE3VmVvUTFzJ/KYbbwsCvuSjS HfyIbxkGZWnT2de5NvvpTPixj98yYWTJUf4r3YOqKPsMpV2wMMZUsVKuYX1SgjML u5qjK/GGNiX17OcS6kq4yfbveqM2qogusAW0yKnAWBmcZvRtA6HeUlP1iCTmGZyd SxbhtVVVqYPftkLO4GkYixg4PJkip7SyjYl5sMDCr5n5cn4BNNpwx7YOhcazeSax zGKyu9ZQxgqTrOfvsl+YXyPoQcYkBI+I1Q//ub+zHg7r+xXJ81Ha/jBslQGzWqCT H8H97lmUQnvIwkp+VnKbal0rnz3w9eqBRJI2v4Ua9KR5NBHml9qqX0rDRbR3yORo DfGdG6DP9c5ZpPvqY+1A =H3tf -----END PGP SIGNATURE----- --3kscbfa6eoakuemb-- --===============1896333105== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== --===============1896333105==--