From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexandru Gheorghe Subject: [PATCH 06/10] drm/imx: Use __drm_atomic_helper_plane_reset instead of copying the logic Date: Fri, 20 Jul 2018 22:15:05 +0100 Message-ID: <20180720211509.23605-7-alexandru-cosmin.gheorghe@arm.com> References: <20180713161407.GQ20303@art_vandelay> <20180720211509.23605-1-alexandru-cosmin.gheorghe@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180720211509.23605-1-alexandru-cosmin.gheorghe@arm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: seanpaul@chromium.org, airlied@linux.ie, dri-devel@lists.freedesktop.org, liviu.dudau@arm.com, brian.starkey@arm.com, malidp@foss.arm.com, ville.syrjala@linux.intel.com, daniel@ffwll.ch, gustavo@padovan.org, maarten.lankhorst@linux.intel.com, alexander.deucher@amd.com, christian.koenig@amd.com, David1.Zhou@amd.com, harry.wentland@amd.com, andrey.grodzovsky@amd.com, Tony.Cheng@amd.com, sunpeng.li@amd.com, shirish.s@amd.com, boris.brezillon@bootlin.com, nicolas.ferre@microchip.com, alexandre.belloni@bootlin.com, inki.dae@samsung.com, jy0922.shim@samsung.com, sw0312.kim@samsung.com, kyungmin.park@samsung.com, kgene@kernel.org, krzk@kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, p.zabel@pengutronix.de, laurent.pinchart@ideasonboard.com, maxime.ripard@bootlin.com, wens@csie.org, eric@anholt.net, linux-graphics-maintainer@vmware.com, syeh@ Cc: nd@arm.com, Alexandru Gheorghe List-Id: linux-samsung-soc@vger.kernel.org U2lnbmVkLW9mZi1ieTogQWxleGFuZHJ1IEdoZW9yZ2hlIDxhbGV4YW5kcnUtY29zbWluLmdoZW9y Z2hlQGFybS5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2lteC9pcHV2My1wbGFuZS5jIHwgOCAr KystLS0tLQogMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaW14L2lwdXYzLXBsYW5lLmMgYi9kcml2ZXJz L2dwdS9kcm0vaW14L2lwdXYzLXBsYW5lLmMKaW5kZXggMjAzZjI0N2Q0ODU0Li4xYmQ0ZGUwM2Nl OWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pbXgvaXB1djMtcGxhbmUuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaW14L2lwdXYzLXBsYW5lLmMKQEAgLTI4MSwxNiArMjgxLDE0IEBAIHN0 YXRpYyB2b2lkIGlwdV9wbGFuZV9zdGF0ZV9yZXNldChzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkK IAkJaXB1X3N0YXRlID0gdG9faXB1X3BsYW5lX3N0YXRlKHBsYW5lLT5zdGF0ZSk7CiAJCV9fZHJt X2F0b21pY19oZWxwZXJfcGxhbmVfZGVzdHJveV9zdGF0ZShwbGFuZS0+c3RhdGUpOwogCQlrZnJl ZShpcHVfc3RhdGUpOworCQlwbGFuZS0+c3RhdGUgPSBOVUxMOwogCX0KIAogCWlwdV9zdGF0ZSA9 IGt6YWxsb2Moc2l6ZW9mKCppcHVfc3RhdGUpLCBHRlBfS0VSTkVMKTsKIAotCWlmIChpcHVfc3Rh dGUpIHsKLQkJaXB1X3N0YXRlLT5iYXNlLnBsYW5lID0gcGxhbmU7Ci0JCWlwdV9zdGF0ZS0+YmFz ZS5yb3RhdGlvbiA9IERSTV9NT0RFX1JPVEFURV8wOwotCX0KKwlpZiAoaXB1X3N0YXRlKQorCQlf X2RybV9hdG9taWNfaGVscGVyX3BsYW5lX3Jlc2V0KHBsYW5lLCAmaXB1X3N0YXRlLT5iYXNlKTsK IAotCXBsYW5lLT5zdGF0ZSA9ICZpcHVfc3RhdGUtPmJhc2U7CiB9CiAKIHN0YXRpYyBzdHJ1Y3Qg ZHJtX3BsYW5lX3N0YXRlICoKLS0gCjIuMTguMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: alexandru-cosmin.gheorghe@arm.com (Alexandru Gheorghe) Date: Fri, 20 Jul 2018 22:15:05 +0100 Subject: [PATCH 06/10] drm/imx: Use __drm_atomic_helper_plane_reset instead of copying the logic In-Reply-To: <20180720211509.23605-1-alexandru-cosmin.gheorghe@arm.com> References: <20180713161407.GQ20303@art_vandelay> <20180720211509.23605-1-alexandru-cosmin.gheorghe@arm.com> Message-ID: <20180720211509.23605-7-alexandru-cosmin.gheorghe@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Signed-off-by: Alexandru Gheorghe --- drivers/gpu/drm/imx/ipuv3-plane.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c index 203f247d4854..1bd4de03ce9e 100644 --- a/drivers/gpu/drm/imx/ipuv3-plane.c +++ b/drivers/gpu/drm/imx/ipuv3-plane.c @@ -281,16 +281,14 @@ static void ipu_plane_state_reset(struct drm_plane *plane) ipu_state = to_ipu_plane_state(plane->state); __drm_atomic_helper_plane_destroy_state(plane->state); kfree(ipu_state); + plane->state = NULL; } ipu_state = kzalloc(sizeof(*ipu_state), GFP_KERNEL); - if (ipu_state) { - ipu_state->base.plane = plane; - ipu_state->base.rotation = DRM_MODE_ROTATE_0; - } + if (ipu_state) + __drm_atomic_helper_plane_reset(plane, &ipu_state->base); - plane->state = &ipu_state->base; } static struct drm_plane_state * -- 2.18.0