From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH 2/3] drm/i915: Introduce new intel_output_name() Date: Wed, 08 Jan 2014 11:51:00 +0200 Message-ID: <87r48iby4b.fsf@intel.com> References: <1389113755-2021-1-git-send-email-przanoni@gmail.com> <1389113755-2021-2-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id EBA9DFB1E7 for ; Wed, 8 Jan 2014 01:47:58 -0800 (PST) In-Reply-To: <1389113755-2021-2-git-send-email-przanoni@gmail.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: Paulo Zanoni , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Tue, 07 Jan 2014, Paulo Zanoni wrote: > From: Damien Lespiau > > That we can use for debugging purposes. > > Reviewed-by: Paulo Zanoni > Signed-off-by: Damien Lespiau > --- > drivers/gpu/drm/i915/intel_display.c | 13 +++++++++++++ > drivers/gpu/drm/i915/intel_drv.h | 1 + > 2 files changed, 14 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 7cc67b3..034952c 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -10253,6 +10253,19 @@ static bool has_edp_a(struct drm_device *dev) > return true; > } > > +const char *intel_output_name(int output) > +{ > + static const char *names[] = { > + "Unused", "Analog", "DVO", "SDVO", "LVDS", "TV", "HDMI", > + "DisplayPort", "eDP", "DSI", "Unknown" Please initialize this with designated initializers: [INTEL_OUTPUT_UNUSED] = "Unused", [INTEL_OUTPUT_ANALOG] = "Analog", ... > + }; > + > + if (output < 0 || output >= ARRAY_SIZE(names)) and also check for names[output] != NULL here (just to be defensive with the designated initializers). BR, Jani. > + 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.4.2 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center