From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: [PATCH 1/7] drm/i915: Refactor gmch hpd irq handling
Date: Mon, 31 Mar 2014 16:49:28 +0100
Message-ID: <20140331154928.GD7314@nuc-i3427.alporthouse.com>
References: <1396279290-29435-1-git-send-email-ville.syrjala@linux.intel.com>
 <1396279290-29435-2-git-send-email-ville.syrjala@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from fireflyinternet.com (mail.fireflyinternet.com [87.106.93.118])
 by gabe.freedesktop.org (Postfix) with ESMTP id A3F396E35B
 for <intel-gfx@lists.freedesktop.org>; Mon, 31 Mar 2014 08:49:31 -0700 (PDT)
Content-Disposition: inline
In-Reply-To: <1396279290-29435-2-git-send-email-ville.syrjala@linux.intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: ville.syrjala@linux.intel.com
Cc: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On Mon, Mar 31, 2014 at 06:21:24PM +0300, ville.syrjala@linux.intel.com wro=
te:
> From: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>
> =

> Pull all the gmch platform hotplug interrupt handling into one
> function.
> =

> Signed-off-by: Ville Syrj=E4l=E4 <ville.syrjala@linux.intel.com>
> ---
>  drivers/gpu/drm/i915/i915_irq.c | 71 +++++++++++++++++++----------------=
------
>  1 file changed, 32 insertions(+), 39 deletions(-)
> =

> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_=
irq.c
> index 0858189..6d26719 100644
> --- a/drivers/gpu/drm/i915/i915_irq.c
> +++ b/drivers/gpu/drm/i915/i915_irq.c
> @@ -1647,6 +1647,34 @@ static void valleyview_pipestat_irq_handler(struct=
 drm_device *dev, u32 iir)
>  		gmbus_irq_handler(dev);
>  }
>  =

> +static void i9xx_hpd_irq_handler(struct drm_device *dev, u32 iir)
> +{
> +	drm_i915_private_t *dev_priv =3D dev->dev_private;
> +	u32 hotplug_status;
> +
> +	if ((iir & I915_DISPLAY_PORT_INTERRUPT) =3D=3D 0)
> +		return;
> +
> +	hotplug_status =3D I915_READ(PORT_HOTPLUG_STAT);
> +
> +	if (IS_G4X(dev)) {
> +		u32 hotplug_trigger =3D hotplug_status & HOTPLUG_INT_STATUS_G4X;
> +
> +		intel_hpd_irq_handler(dev, hotplug_trigger, hpd_status_g4x);
> +	} else {
> +		u32 hotplug_trigger =3D hotplug_status & HOTPLUG_INT_STATUS_I915;
> +
> +		intel_hpd_irq_handler(dev, hotplug_trigger, hpd_status_i915);
> +	}
> +
> +	if ((IS_G4X(dev) || IS_VALLEYVIEW(dev)) &&
> +	    hotplug_status & DP_AUX_CHANNEL_MASK_INT_STATUS_G4X)
> +		dp_aux_irq_handler(dev);
> +
> +	I915_WRITE(PORT_HOTPLUG_STAT, hotplug_status);
> +	POSTING_READ(PORT_HOTPLUG_STAT);
> +}

Hmm, after some thought I am in favour of the function as a readibility
improvement. However, I would prefer to have the iir check inlined
into the caller.
-Chris

-- =

Chris Wilson, Intel Open Source Technology Centre