From mboxrd@z Thu Jan 1 00:00:00 1970 From: maxime.ripard@free-electrons.com (Maxime Ripard) Date: Fri, 30 Sep 2016 16:37:05 +0200 Subject: [PATCH v5 1/5] drm/sun4i: rgb: Remove the bridge enable/disable functions In-Reply-To: <20160930143709.1388-1-maxime.ripard@free-electrons.com> References: <20160930143709.1388-1-maxime.ripard@free-electrons.com> Message-ID: <20160930143709.1388-2-maxime.ripard@free-electrons.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org The atomic helpers already call the drm_bridge_enable on our behalf, there's no need to do it a second time. Reported-by: Sean Paul Signed-off-by: Maxime Ripard --- drivers/gpu/drm/sun4i/sun4i_rgb.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c index 4e4bea6f395c..d198ad7e5323 100644 --- a/drivers/gpu/drm/sun4i/sun4i_rgb.c +++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c @@ -155,9 +155,6 @@ static void sun4i_rgb_encoder_enable(struct drm_encoder *encoder) if (!IS_ERR(tcon->panel)) drm_panel_prepare(tcon->panel); - /* encoder->bridge can be NULL; drm_bridge_enable checks for it */ - drm_bridge_enable(encoder->bridge); - sun4i_tcon_channel_enable(tcon, 0); if (!IS_ERR(tcon->panel)) @@ -177,9 +174,6 @@ static void sun4i_rgb_encoder_disable(struct drm_encoder *encoder) sun4i_tcon_channel_disable(tcon, 0); - /* encoder->bridge can be NULL; drm_bridge_disable checks for it */ - drm_bridge_disable(encoder->bridge); - if (!IS_ERR(tcon->panel)) drm_panel_unprepare(tcon->panel); } -- 2.9.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maxime Ripard Subject: [PATCH v5 1/5] drm/sun4i: rgb: Remove the bridge enable/disable functions Date: Fri, 30 Sep 2016 16:37:05 +0200 Message-ID: <20160930143709.1388-2-maxime.ripard@free-electrons.com> References: <20160930143709.1388-1-maxime.ripard@free-electrons.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20160930143709.1388-1-maxime.ripard@free-electrons.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Rob Herring , Daniel Vetter , David Airlie , Archit Taneja Cc: devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, Chen-Yu Tsai , Maxime Ripard , linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org VGhlIGF0b21pYyBoZWxwZXJzIGFscmVhZHkgY2FsbCB0aGUgZHJtX2JyaWRnZV9lbmFibGUgb24g b3VyIGJlaGFsZiwKdGhlcmUncyBubyBuZWVkIHRvIGRvIGl0IGEgc2Vjb25kIHRpbWUuCgpSZXBv cnRlZC1ieTogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+ClNpZ25lZC1vZmYtYnk6 IE1heGltZSBSaXBhcmQgPG1heGltZS5yaXBhcmRAZnJlZS1lbGVjdHJvbnMuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9zdW40aS9zdW40aV9yZ2IuYyB8IDYgLS0tLS0tCiAxIGZpbGUgY2hhbmdl ZCwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vc3VuNGkvc3Vu NGlfcmdiLmMgYi9kcml2ZXJzL2dwdS9kcm0vc3VuNGkvc3VuNGlfcmdiLmMKaW5kZXggNGU0YmVh NmYzOTVjLi5kMTk4YWQ3ZTUzMjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9zdW40aS9z dW40aV9yZ2IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vc3VuNGkvc3VuNGlfcmdiLmMKQEAgLTE1 NSw5ICsxNTUsNiBAQCBzdGF0aWMgdm9pZCBzdW40aV9yZ2JfZW5jb2Rlcl9lbmFibGUoc3RydWN0 IGRybV9lbmNvZGVyICplbmNvZGVyKQogCWlmICghSVNfRVJSKHRjb24tPnBhbmVsKSkKIAkJZHJt X3BhbmVsX3ByZXBhcmUodGNvbi0+cGFuZWwpOwogCi0JLyogZW5jb2Rlci0+YnJpZGdlIGNhbiBi ZSBOVUxMOyBkcm1fYnJpZGdlX2VuYWJsZSBjaGVja3MgZm9yIGl0ICovCi0JZHJtX2JyaWRnZV9l bmFibGUoZW5jb2Rlci0+YnJpZGdlKTsKLQogCXN1bjRpX3Rjb25fY2hhbm5lbF9lbmFibGUodGNv biwgMCk7CiAKIAlpZiAoIUlTX0VSUih0Y29uLT5wYW5lbCkpCkBAIC0xNzcsOSArMTc0LDYgQEAg c3RhdGljIHZvaWQgc3VuNGlfcmdiX2VuY29kZXJfZGlzYWJsZShzdHJ1Y3QgZHJtX2VuY29kZXIg KmVuY29kZXIpCiAKIAlzdW40aV90Y29uX2NoYW5uZWxfZGlzYWJsZSh0Y29uLCAwKTsKIAotCS8q IGVuY29kZXItPmJyaWRnZSBjYW4gYmUgTlVMTDsgZHJtX2JyaWRnZV9kaXNhYmxlIGNoZWNrcyBm b3IgaXQgKi8KLQlkcm1fYnJpZGdlX2Rpc2FibGUoZW5jb2Rlci0+YnJpZGdlKTsKLQogCWlmICgh SVNfRVJSKHRjb24tPnBhbmVsKSkKIAkJZHJtX3BhbmVsX3VucHJlcGFyZSh0Y29uLT5wYW5lbCk7 CiB9Ci0tIAoyLjkuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRl dmVsCg==