From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Jindal, Sonika" Subject: Re: [PATCH 1/6] drm: Renaming DP training vswing/pre-emph defines Date: Tue, 05 Aug 2014 17:03:56 +0530 Message-ID: <53E0C124.7080907@intel.com> References: <1407236902-11326-1-git-send-email-sonika.jindal@intel.com> <1407236902-11326-2-git-send-email-sonika.jindal@intel.com> <20140805111535.GH8727@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20140805111535.GH8727@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org 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 >> >> Renaming defines to have levels instead of nominal values. >> >> Signed-off-by: Sonika Jindal > > 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. >> --- >> 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 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx >