| Message ID | 1401198826-13523-1-git-send-email-shobhit.kumar@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, May 27, 2014 at 07:23:46PM +0530, Shobhit Kumar wrote: > Fix warnings introduced by the following commit - > > commit 9c92da2c7c17eea79b6321b37592df0a002d24df > Author: Shobhit Kumar <shobhit.kumar@intel.com> > Date: Fri May 23 21:35:27 2014 +0530 > > drm/i915: Add support for Generic MIPI panel driver > > Fixed all except the DRM logging which go beyond line 80 > > Signed-off-by: Shobhit Kumar <shobhit.kumar@intel.com> To squash into previous commit? Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
On 5/27/2014 7:49 PM, Damien Lespiau wrote: > On Tue, May 27, 2014 at 07:23:46PM +0530, Shobhit Kumar wrote: >> Fix warnings introduced by the following commit - >> >> commit 9c92da2c7c17eea79b6321b37592df0a002d24df >> Author: Shobhit Kumar <shobhit.kumar@intel.com> >> Date: Fri May 23 21:35:27 2014 +0530 >> >> drm/i915: Add support for Generic MIPI panel driver >> >> Fixed all except the DRM logging which go beyond line 80 >> >> Signed-off-by: Shobhit Kumar <shobhit.kumar@intel.com> > > To squash into previous commit? Can be done. I am not sure how this is handled for queued patches Regards Shobhit
On Tue, May 27, 2014 at 08:04:43PM +0530, Kumar, Shobhit wrote: > On 5/27/2014 7:49 PM, Damien Lespiau wrote: > >On Tue, May 27, 2014 at 07:23:46PM +0530, Shobhit Kumar wrote: > >>Fix warnings introduced by the following commit - > >> > >>commit 9c92da2c7c17eea79b6321b37592df0a002d24df > >>Author: Shobhit Kumar <shobhit.kumar@intel.com> > >>Date: Fri May 23 21:35:27 2014 +0530 > >> > >> drm/i915: Add support for Generic MIPI panel driver > >> > >>Fixed all except the DRM logging which go beyond line 80 > >> > >>Signed-off-by: Shobhit Kumar <shobhit.kumar@intel.com> > > > >To squash into previous commit? > > Can be done. I am not sure how this is handled for queued patches Daniel does a fair bit of this kind of editing when applying patches.
On Tue, May 27, 2014 at 03:39:37PM +0100, Damien Lespiau wrote: > On Tue, May 27, 2014 at 08:04:43PM +0530, Kumar, Shobhit wrote: > > On 5/27/2014 7:49 PM, Damien Lespiau wrote: > > >On Tue, May 27, 2014 at 07:23:46PM +0530, Shobhit Kumar wrote: > > >>Fix warnings introduced by the following commit - > > >> > > >>commit 9c92da2c7c17eea79b6321b37592df0a002d24df > > >>Author: Shobhit Kumar <shobhit.kumar@intel.com> > > >>Date: Fri May 23 21:35:27 2014 +0530 > > >> > > >> drm/i915: Add support for Generic MIPI panel driver > > >> > > >>Fixed all except the DRM logging which go beyond line 80 > > >> > > >>Signed-off-by: Shobhit Kumar <shobhit.kumar@intel.com> > > > > > >To squash into previous commit? > > > > Can be done. I am not sure how this is handled for queued patches > > Daniel does a fair bit of this kind of editing when applying patches. I think I'll keep this one separate, as a cautionary tale ;-) Queued for -next, thanks for the patch. -Daniel
diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c index 21a0d34..47c7584 100644 --- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c +++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c @@ -143,7 +143,7 @@ static u8 *mipi_exec_send_packet(struct intel_dsi *intel_dsi, u8 *data) case MIPI_DSI_DCS_LONG_WRITE: dsi_vc_dcs_write(intel_dsi, vc, data, len); break; - }; + } data += len; @@ -294,7 +294,8 @@ static bool generic_init(struct intel_dsi_device *dsi) intel_dsi->rst_timer_val = mipi_config->device_reset_timer; intel_dsi->init_count = mipi_config->master_init_timer; intel_dsi->bw_timer = mipi_config->dbi_bw_timer; - intel_dsi->video_frmt_cfg_bits = mipi_config->bta_enabled ? DISABLE_VIDEO_BTA : 0; + intel_dsi->video_frmt_cfg_bits = + mipi_config->bta_enabled ? DISABLE_VIDEO_BTA : 0; switch (intel_dsi->escape_clk_div) { case 0: @@ -351,7 +352,8 @@ static bool generic_init(struct intel_dsi_device *dsi) * * prepare count */ - ths_prepare_ns = max(mipi_config->ths_prepare, mipi_config->tclk_prepare); + ths_prepare_ns = max(mipi_config->ths_prepare, + mipi_config->tclk_prepare); prepare_cnt = DIV_ROUND_UP(ths_prepare_ns * ui_den, ui_num * 2); /* exit zero count */
Fix warnings introduced by the following commit - commit 9c92da2c7c17eea79b6321b37592df0a002d24df Author: Shobhit Kumar <shobhit.kumar@intel.com> Date: Fri May 23 21:35:27 2014 +0530 drm/i915: Add support for Generic MIPI panel driver Fixed all except the DRM logging which go beyond line 80 Signed-off-by: Shobhit Kumar <shobhit.kumar@intel.com> --- drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)