From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH 2/3 v2] drm/i915: Introduce new intel_output_name() Date: Wed, 08 Jan 2014 16:38:49 +0200 Message-ID: <87fvoybksm.fsf@intel.com> References: <87r48iby4b.fsf@intel.com> <1389190703-2978-1-git-send-email-damien.lespiau@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 6062EFB001 for ; Wed, 8 Jan 2014 06:35:50 -0800 (PST) In-Reply-To: <1389190703-2978-1-git-send-email-damien.lespiau@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Damien Lespiau , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Wed, 08 Jan 2014, Damien Lespiau wrote: > That we can use for debugging purposes. > > v2: Use designated initializers for the 'names' array (Paulo Zanoni, > Jani Nikula). > Add a check in case the array has a hole (which can now remain > unnoticed with designated initializers) (Jani Nikula) > Reviewed-by: Jani Nikula > Reviewed-by: Paulo Zanoni (for v1) > Signed-off-by: Damien Lespiau > --- > drivers/gpu/drm/i915/intel_display.c | 22 ++++++++++++++++++++++ > drivers/gpu/drm/i915/intel_drv.h | 1 + > 2 files changed, 23 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index ba9d62e..40a6247 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -10261,6 +10261,28 @@ static bool has_edp_a(struct drm_device *dev) > return true; > } > > +const char *intel_output_name(int output) > +{ > + static const char *names[] = { > + [INTEL_OUTPUT_UNUSED] = "Unused", > + [INTEL_OUTPUT_ANALOG] = "Analog", > + [INTEL_OUTPUT_DVO] = "DVO", > + [INTEL_OUTPUT_SDVO] = "SDVO", > + [INTEL_OUTPUT_LVDS] = "LVDS", > + [INTEL_OUTPUT_TVOUT] = "TV", > + [INTEL_OUTPUT_HDMI] = "HDMI", > + [INTEL_OUTPUT_DISPLAYPORT] = "DisplayPort", > + [INTEL_OUTPUT_EDP] = "eDP", > + [INTEL_OUTPUT_DSI] = "DSI", > + [INTEL_OUTPUT_UNKNOWN] = "Unknown", > + }; > + > + if (output < 0 || output >= ARRAY_SIZE(names) || !names[output]) > + return "Invalid"; > + > + return names[output]; > +} > + > static void intel_setup_outputs(struct drm_device *dev) > { > struct drm_i915_private *dev_priv = dev->dev_private; > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index 46aea6c..25bbbb5 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -625,6 +625,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder, > > > /* intel_display.c */ > +const char *intel_output_name(int output); > int intel_pch_rawclk(struct drm_device *dev); > void intel_mark_busy(struct drm_device *dev); > void intel_mark_fb_busy(struct drm_i915_gem_object *obj, > -- > 1.8.3.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center