From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 13/14] drm/i915: ibx_write_infoframe can disable AVI Date: Fri, 4 May 2012 22:36:49 +0200 Message-ID: <20120504203649.GH5443@phenom.ffwll.local> References: <1336010154-2946-1-git-send-email-przanoni@gmail.com> <1336162707-3504-1-git-send-email-przanoni@gmail.com> <1336162707-3504-12-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 mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id C4C289E7D0 for ; Fri, 4 May 2012 13:35:43 -0700 (PDT) Received: by werp11 with SMTP id p11so2425947wer.36 for ; Fri, 04 May 2012 13:35:43 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1336162707-3504-12-git-send-email-przanoni@gmail.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: Paulo Zanoni Cc: intel-gfx@lists.freedesktop.org, Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org On Fri, May 04, 2012 at 05:18:25PM -0300, Paulo Zanoni wrote: > From: Paulo Zanoni > > IBX does not need the workaround used in cpt_write_infoframe that > requires the AVI frame to be enabled while being updated. > > Signed-off-by: Paulo Zanoni Minor bikeshed about the way you structure the patch series: Intead of adding this avi-infoframe special case to the ironlake function, then split out the ibx variant and remove it again for it, it's clearer when you split up the functions first and only then add the cpt/ppt special case to that function. But it's just this hunk, so imo a resend is overkill. But for future patch series which involve more fixes (like e.g. the irq_handler split-ups from Chris Wilson I've merged recently) doing things this way is really much better. -Daniel > --- > drivers/gpu/drm/i915/intel_hdmi.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c > index 6c9c901..e49cd22 100644 > --- a/drivers/gpu/drm/i915/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/intel_hdmi.c > @@ -201,13 +201,7 @@ static void ibx_write_infoframe(struct drm_encoder *encoder, > val &= ~(VIDEO_DIP_SELECT_MASK | 0xf); /* clear DIP data offset */ > val |= intel_infoframe_index(frame); > > - /* The DIP control register spec says that we need to update the AVI > - * infoframe without clearing its enable bit */ > - if (frame->type == DIP_TYPE_AVI) > - val |= VIDEO_DIP_ENABLE_AVI; > - else > - val &= ~intel_infoframe_enable(frame); > - > + val &= ~intel_infoframe_enable(frame); > val |= VIDEO_DIP_ENABLE; > > I915_WRITE(reg, val); > -- > 1.7.10 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48