From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH 1/6] drm/i915: make the intel_display_power_domain enum compact Date: Fri, 18 Oct 2013 11:48:59 -0700 Message-ID: <20131018114859.3343d170@jbarnes-desktop> References: <1381933553-19529-1-git-send-email-imre.deak@intel.com> <1381933553-19529-2-git-send-email-imre.deak@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from outbound-ss-1194.bluehost.com (outbound-ss-1194.bluehost.com [74.220.211.4]) by gabe.freedesktop.org (Postfix) with SMTP id BBBCEE5E4B for ; Fri, 18 Oct 2013 11:48:44 -0700 (PDT) In-Reply-To: <1381933553-19529-2-git-send-email-imre.deak@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Imre Deak Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Wed, 16 Oct 2013 17:25:48 +0300 Imre Deak wrote: > Upcoming patches will add tracking for a set of power domains via a > bitmask; to make things simple there remove the current gap in the > enum values. > > Signed-off-by: Imre Deak > --- > drivers/gpu/drm/i915/i915_drv.h | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 2ea66f2..9b04d05 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -98,14 +98,16 @@ enum intel_display_power_domain { > POWER_DOMAIN_TRANSCODER_A, > POWER_DOMAIN_TRANSCODER_B, > POWER_DOMAIN_TRANSCODER_C, > - POWER_DOMAIN_TRANSCODER_EDP = POWER_DOMAIN_TRANSCODER_A + 0xF, > + POWER_DOMAIN_TRANSCODER_EDP, > POWER_DOMAIN_VGA, > }; > > #define POWER_DOMAIN_PIPE(pipe) ((pipe) + POWER_DOMAIN_PIPE_A) > #define POWER_DOMAIN_PIPE_PANEL_FITTER(pipe) \ > ((pipe) + POWER_DOMAIN_PIPE_A_PANEL_FITTER) > -#define POWER_DOMAIN_TRANSCODER(tran) ((tran) + POWER_DOMAIN_TRANSCODER_A) > +#define POWER_DOMAIN_TRANSCODER(tran) \ > + ((tran) == TRANSCODER_EDP ? POWER_DOMAIN_TRANSCODER_EDP : \ > + (tran) + POWER_DOMAIN_TRANSCODER_A) > > enum hpd_pin { > HPD_NONE = 0, Reviewed-by: Jesse Barnes -- Jesse Barnes, Intel Open Source Technology Center