From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751065AbdAVGSW (ORCPT ); Sun, 22 Jan 2017 01:18:22 -0500 Received: from regular1.263xmail.com ([211.150.99.132]:59837 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750770AbdAVGSP (ORCPT ); Sun, 22 Jan 2017 01:18:15 -0500 X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-RL-SENDER: zyw@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: zyw@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: Re: [PATCH v2 04/26] drm/rockchip: dw-mipi-dsi: remove mode_set hook To: John Keeping , Mark Yao References: <20170121163128.22240-1-john@metanate.com> <20170121163128.22240-5-john@metanate.com> Cc: dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org From: Chris Zhong Message-ID: <58844C5B.1090302@rock-chips.com> Date: Sun, 22 Jan 2017 14:08:27 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <20170121163128.22240-5-john@metanate.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi John Reviewed-by: Chris Zhong On 01/22/2017 12:31 AM, John Keeping wrote: > This is not needed since we can access the mode via the CRTC from the > enable hook. Also remove the "mode" field that is no longer used. > > Signed-off-by: John Keeping > --- > New in v2 > --- > drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 13 +------------ > 1 file changed, 1 insertion(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > index cdbd25087e83..bd92e58b64f3 100644 > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > @@ -286,7 +286,6 @@ struct dw_mipi_dsi { > u32 format; > u16 input_div; > u16 feedback_div; > - struct drm_display_mode *mode; > > const struct dw_mipi_dsi_plat_data *pdata; > }; > @@ -816,15 +815,6 @@ static void dw_mipi_dsi_clear_err(struct dw_mipi_dsi *dsi) > dsi_write(dsi, DSI_INT_MSK1, 0); > } > > -static void dw_mipi_dsi_encoder_mode_set(struct drm_encoder *encoder, > - struct drm_display_mode *mode, > - struct drm_display_mode *adjusted_mode) > -{ > - struct dw_mipi_dsi *dsi = encoder_to_dsi(encoder); > - > - dsi->mode = adjusted_mode; > -} > - > static void dw_mipi_dsi_encoder_disable(struct drm_encoder *encoder) > { > struct dw_mipi_dsi *dsi = encoder_to_dsi(encoder); > @@ -854,7 +844,7 @@ static void dw_mipi_dsi_encoder_disable(struct drm_encoder *encoder) > static void dw_mipi_dsi_encoder_enable(struct drm_encoder *encoder) > { > struct dw_mipi_dsi *dsi = encoder_to_dsi(encoder); > - struct drm_display_mode *mode = dsi->mode; > + struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; > int mux = drm_of_encoder_active_endpoint_id(dsi->dev->of_node, encoder); > u32 val; > int ret; > @@ -930,7 +920,6 @@ dw_mipi_dsi_encoder_atomic_check(struct drm_encoder *encoder, > static struct drm_encoder_helper_funcs > dw_mipi_dsi_encoder_helper_funcs = { > .enable = dw_mipi_dsi_encoder_enable, > - .mode_set = dw_mipi_dsi_encoder_mode_set, > .disable = dw_mipi_dsi_encoder_disable, > .atomic_check = dw_mipi_dsi_encoder_atomic_check, > }; From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Zhong Subject: Re: [PATCH v2 04/26] drm/rockchip: dw-mipi-dsi: remove mode_set hook Date: Sun, 22 Jan 2017 14:08:27 +0800 Message-ID: <58844C5B.1090302@rock-chips.com> References: <20170121163128.22240-1-john@metanate.com> <20170121163128.22240-5-john@metanate.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170121163128.22240-5-john@metanate.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: John Keeping , Mark Yao Cc: linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: linux-rockchip.vger.kernel.org SGkgSm9obgoKUmV2aWV3ZWQtYnk6IENocmlzIFpob25nIDx6eXdAcm9jay1jaGlwcy5jb20+CgoK T24gMDEvMjIvMjAxNyAxMjozMSBBTSwgSm9obiBLZWVwaW5nIHdyb3RlOgo+IFRoaXMgaXMgbm90 IG5lZWRlZCBzaW5jZSB3ZSBjYW4gYWNjZXNzIHRoZSBtb2RlIHZpYSB0aGUgQ1JUQyBmcm9tIHRo ZQo+IGVuYWJsZSBob29rLiAgQWxzbyByZW1vdmUgdGhlICJtb2RlIiBmaWVsZCB0aGF0IGlzIG5v IGxvbmdlciB1c2VkLgo+Cj4gU2lnbmVkLW9mZi1ieTogSm9obiBLZWVwaW5nIDxqb2huQG1ldGFu YXRlLmNvbT4KPiAtLS0KPiBOZXcgaW4gdjIKPiAtLS0KPiAgIGRyaXZlcnMvZ3B1L2RybS9yb2Nr Y2hpcC9kdy1taXBpLWRzaS5jIHwgMTMgKy0tLS0tLS0tLS0tLQo+ICAgMSBmaWxlIGNoYW5nZWQs IDEgaW5zZXJ0aW9uKCspLCAxMiBkZWxldGlvbnMoLSkKPgo+IGRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vcm9ja2NoaXAvZHctbWlwaS1kc2kuYyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hp cC9kdy1taXBpLWRzaS5jCj4gaW5kZXggY2RiZDI1MDg3ZTgzLi5iZDkyZTU4YjY0ZjMgMTAwNjQ0 Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3JvY2tjaGlwL2R3LW1pcGktZHNpLmMKPiArKysgYi9k cml2ZXJzL2dwdS9kcm0vcm9ja2NoaXAvZHctbWlwaS1kc2kuYwo+IEBAIC0yODYsNyArMjg2LDYg QEAgc3RydWN0IGR3X21pcGlfZHNpIHsKPiAgIAl1MzIgZm9ybWF0Owo+ICAgCXUxNiBpbnB1dF9k aXY7Cj4gICAJdTE2IGZlZWRiYWNrX2RpdjsKPiAtCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICpt b2RlOwo+ICAgCj4gICAJY29uc3Qgc3RydWN0IGR3X21pcGlfZHNpX3BsYXRfZGF0YSAqcGRhdGE7 Cj4gICB9Owo+IEBAIC04MTYsMTUgKzgxNSw2IEBAIHN0YXRpYyB2b2lkIGR3X21pcGlfZHNpX2Ns ZWFyX2VycihzdHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSkKPiAgIAlkc2lfd3JpdGUoZHNpLCBEU0lf SU5UX01TSzEsIDApOwo+ICAgfQo+ICAgCj4gLXN0YXRpYyB2b2lkIGR3X21pcGlfZHNpX2VuY29k ZXJfbW9kZV9zZXQoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyLAo+IC0JCQkJCXN0cnVjdCBk cm1fZGlzcGxheV9tb2RlICptb2RlLAo+IC0JCQkJCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICph ZGp1c3RlZF9tb2RlKQo+IC17Cj4gLQlzdHJ1Y3QgZHdfbWlwaV9kc2kgKmRzaSA9IGVuY29kZXJf dG9fZHNpKGVuY29kZXIpOwo+IC0KPiAtCWRzaS0+bW9kZSA9IGFkanVzdGVkX21vZGU7Cj4gLX0K PiAtCj4gICBzdGF0aWMgdm9pZCBkd19taXBpX2RzaV9lbmNvZGVyX2Rpc2FibGUoc3RydWN0IGRy bV9lbmNvZGVyICplbmNvZGVyKQo+ICAgewo+ICAgCXN0cnVjdCBkd19taXBpX2RzaSAqZHNpID0g ZW5jb2Rlcl90b19kc2koZW5jb2Rlcik7Cj4gQEAgLTg1NCw3ICs4NDQsNyBAQCBzdGF0aWMgdm9p ZCBkd19taXBpX2RzaV9lbmNvZGVyX2Rpc2FibGUoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVy KQo+ICAgc3RhdGljIHZvaWQgZHdfbWlwaV9kc2lfZW5jb2Rlcl9lbmFibGUoc3RydWN0IGRybV9l bmNvZGVyICplbmNvZGVyKQo+ICAgewo+ICAgCXN0cnVjdCBkd19taXBpX2RzaSAqZHNpID0gZW5j b2Rlcl90b19kc2koZW5jb2Rlcik7Cj4gLQlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSA9 IGRzaS0+bW9kZTsKPiArCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlID0gJmVuY29kZXIt PmNydGMtPnN0YXRlLT5hZGp1c3RlZF9tb2RlOwo+ICAgCWludCBtdXggPSBkcm1fb2ZfZW5jb2Rl cl9hY3RpdmVfZW5kcG9pbnRfaWQoZHNpLT5kZXYtPm9mX25vZGUsIGVuY29kZXIpOwo+ICAgCXUz MiB2YWw7Cj4gICAJaW50IHJldDsKPiBAQCAtOTMwLDcgKzkyMCw2IEBAIGR3X21pcGlfZHNpX2Vu Y29kZXJfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlciwKPiAgIHN0YXRp YyBzdHJ1Y3QgZHJtX2VuY29kZXJfaGVscGVyX2Z1bmNzCj4gICBkd19taXBpX2RzaV9lbmNvZGVy X2hlbHBlcl9mdW5jcyA9IHsKPiAgIAkuZW5hYmxlID0gZHdfbWlwaV9kc2lfZW5jb2Rlcl9lbmFi bGUsCj4gLQkubW9kZV9zZXQgPSBkd19taXBpX2RzaV9lbmNvZGVyX21vZGVfc2V0LAo+ICAgCS5k aXNhYmxlID0gZHdfbWlwaV9kc2lfZW5jb2Rlcl9kaXNhYmxlLAo+ICAgCS5hdG9taWNfY2hlY2sg PSBkd19taXBpX2RzaV9lbmNvZGVyX2F0b21pY19jaGVjaywKPiAgIH07CgoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlz dApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: zyw@rock-chips.com (Chris Zhong) Date: Sun, 22 Jan 2017 14:08:27 +0800 Subject: [PATCH v2 04/26] drm/rockchip: dw-mipi-dsi: remove mode_set hook In-Reply-To: <20170121163128.22240-5-john@metanate.com> References: <20170121163128.22240-1-john@metanate.com> <20170121163128.22240-5-john@metanate.com> Message-ID: <58844C5B.1090302@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi John Reviewed-by: Chris Zhong On 01/22/2017 12:31 AM, John Keeping wrote: > This is not needed since we can access the mode via the CRTC from the > enable hook. Also remove the "mode" field that is no longer used. > > Signed-off-by: John Keeping > --- > New in v2 > --- > drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 13 +------------ > 1 file changed, 1 insertion(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > index cdbd25087e83..bd92e58b64f3 100644 > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > @@ -286,7 +286,6 @@ struct dw_mipi_dsi { > u32 format; > u16 input_div; > u16 feedback_div; > - struct drm_display_mode *mode; > > const struct dw_mipi_dsi_plat_data *pdata; > }; > @@ -816,15 +815,6 @@ static void dw_mipi_dsi_clear_err(struct dw_mipi_dsi *dsi) > dsi_write(dsi, DSI_INT_MSK1, 0); > } > > -static void dw_mipi_dsi_encoder_mode_set(struct drm_encoder *encoder, > - struct drm_display_mode *mode, > - struct drm_display_mode *adjusted_mode) > -{ > - struct dw_mipi_dsi *dsi = encoder_to_dsi(encoder); > - > - dsi->mode = adjusted_mode; > -} > - > static void dw_mipi_dsi_encoder_disable(struct drm_encoder *encoder) > { > struct dw_mipi_dsi *dsi = encoder_to_dsi(encoder); > @@ -854,7 +844,7 @@ static void dw_mipi_dsi_encoder_disable(struct drm_encoder *encoder) > static void dw_mipi_dsi_encoder_enable(struct drm_encoder *encoder) > { > struct dw_mipi_dsi *dsi = encoder_to_dsi(encoder); > - struct drm_display_mode *mode = dsi->mode; > + struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; > int mux = drm_of_encoder_active_endpoint_id(dsi->dev->of_node, encoder); > u32 val; > int ret; > @@ -930,7 +920,6 @@ dw_mipi_dsi_encoder_atomic_check(struct drm_encoder *encoder, > static struct drm_encoder_helper_funcs > dw_mipi_dsi_encoder_helper_funcs = { > .enable = dw_mipi_dsi_encoder_enable, > - .mode_set = dw_mipi_dsi_encoder_mode_set, > .disable = dw_mipi_dsi_encoder_disable, > .atomic_check = dw_mipi_dsi_encoder_atomic_check, > };