| Message ID | 1407236902-11326-2-git-send-email-sonika.jindal@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tuesday, August 05, 2014 8:08 PM, Sonika Jindal wrote: > > From: Sonika Jindal <sonika.jindal@intel.com> > > Renaming defines to have levels instead of nominal values. (+cc Daniel Vetter) Hi Sonika Jindal, Thank you for sending the patch. However, please add the reason to this commit message, as you said at '[PATCH 0/6] Rename DP training vswing/pre-emph defines'. Best regards. Jingoo Han > > Signed-off-by: Sonika Jindal <sonika.jindal@intel.com> > --- > include/drm/drm_dp_helper.h | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h > index a21568b..70f362b 100644 > --- a/include/drm/drm_dp_helper.h > +++ b/include/drm/drm_dp_helper.h > @@ -190,16 +190,16 @@ > # define DP_TRAIN_VOLTAGE_SWING_MASK 0x3 > # define DP_TRAIN_VOLTAGE_SWING_SHIFT 0 > # define DP_TRAIN_MAX_SWING_REACHED (1 << 2) > -# define DP_TRAIN_VOLTAGE_SWING_400 (0 << 0) > -# define DP_TRAIN_VOLTAGE_SWING_600 (1 << 0) > -# define DP_TRAIN_VOLTAGE_SWING_800 (2 << 0) > -# define DP_TRAIN_VOLTAGE_SWING_1200 (3 << 0) > +# define DP_TRAIN_VOLTAGE_SWING_LEVEL_0 (0 << 0) > +# define DP_TRAIN_VOLTAGE_SWING_LEVEL_1 (1 << 0) > +# define DP_TRAIN_VOLTAGE_SWING_LEVEL_2 (2 << 0) > +# define DP_TRAIN_VOLTAGE_SWING_LEVEL_3 (3 << 0) > > # define DP_TRAIN_PRE_EMPHASIS_MASK (3 << 3) > -# define DP_TRAIN_PRE_EMPHASIS_0 (0 << 3) > -# define DP_TRAIN_PRE_EMPHASIS_3_5 (1 << 3) > -# define DP_TRAIN_PRE_EMPHASIS_6 (2 << 3) > -# define DP_TRAIN_PRE_EMPHASIS_9_5 (3 << 3) > +# define DP_TRAIN_PRE_EMPHASIS_LEVEL_0 (0 << 3) > +# define DP_TRAIN_PRE_EMPHASIS_LEVEL_1 (1 << 3) > +# define DP_TRAIN_PRE_EMPHASIS_LEVEL_2 (2 << 3) > +# define DP_TRAIN_PRE_EMPHASIS_LEVEL_3 (3 << 3) > > # define DP_TRAIN_PRE_EMPHASIS_SHIFT 3 > # define DP_TRAIN_MAX_PRE_EMPHASIS_REACHED (1 << 5) > -- > 1.7.10.4
On 8/5/2014 6:00 PM, Daniel Vetter wrote: > On Tue, Aug 5, 2014 at 1:33 PM, Jindal, Sonika <sonika.jindal@intel.com> wrote: >> >> >> On 8/5/2014 4:45 PM, Daniel Vetter wrote: >>> >>> On Tue, Aug 05, 2014 at 04:38:17PM +0530, sonika.jindal@intel.com wrote: >>>> >>>> From: Sonika Jindal <sonika.jindal@intel.com> >>>> >>>> Renaming defines to have levels instead of nominal values. >>>> >>>> Signed-off-by: Sonika Jindal <sonika.jindal@intel.com> >>> >>> >>> You can't split up patches like this since this will break compilation. >>> For larger stuff (and imo this is right above the cutoff) you first need >>> to add the new functions/defines, then convert everyone over. And only >>> when all the drivers are converted can we apply the patch to remove the >>> old functions/defines. >>> -Daniel >>> >> Got your concern. So, I will repost the first patch keeping both the defines >> and an additional last patch for removing the extra defines. > > Yeah. Btw for the actual replacement I highly recommend to do it with > a semantic patch and cocci. There's unfortunately not a hole lot of > good documentation around, but we recently started and it helps a lot > with regenerating patches (e.g. for newly merged drm drivers) and > avoiding mistakes for manual conversions. If we do a cocci patch we > put it into the commit message, grep for @@. > -Daniel > I need to find out about cocci. Can we go ahead with this patch series only? -Sonika
diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h index a21568b..70f362b 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -190,16 +190,16 @@ # define DP_TRAIN_VOLTAGE_SWING_MASK 0x3 # define DP_TRAIN_VOLTAGE_SWING_SHIFT 0 # define DP_TRAIN_MAX_SWING_REACHED (1 << 2) -# define DP_TRAIN_VOLTAGE_SWING_400 (0 << 0) -# define DP_TRAIN_VOLTAGE_SWING_600 (1 << 0) -# define DP_TRAIN_VOLTAGE_SWING_800 (2 << 0) -# define DP_TRAIN_VOLTAGE_SWING_1200 (3 << 0) +# define DP_TRAIN_VOLTAGE_SWING_LEVEL_0 (0 << 0) +# define DP_TRAIN_VOLTAGE_SWING_LEVEL_1 (1 << 0) +# define DP_TRAIN_VOLTAGE_SWING_LEVEL_2 (2 << 0) +# define DP_TRAIN_VOLTAGE_SWING_LEVEL_3 (3 << 0) # define DP_TRAIN_PRE_EMPHASIS_MASK (3 << 3) -# define DP_TRAIN_PRE_EMPHASIS_0 (0 << 3) -# define DP_TRAIN_PRE_EMPHASIS_3_5 (1 << 3) -# define DP_TRAIN_PRE_EMPHASIS_6 (2 << 3) -# define DP_TRAIN_PRE_EMPHASIS_9_5 (3 << 3) +# define DP_TRAIN_PRE_EMPHASIS_LEVEL_0 (0 << 3) +# define DP_TRAIN_PRE_EMPHASIS_LEVEL_1 (1 << 3) +# define DP_TRAIN_PRE_EMPHASIS_LEVEL_2 (2 << 3) +# define DP_TRAIN_PRE_EMPHASIS_LEVEL_3 (3 << 3) # define DP_TRAIN_PRE_EMPHASIS_SHIFT 3 # define DP_TRAIN_MAX_PRE_EMPHASIS_REACHED (1 << 5)