From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753662AbbCLKYo (ORCPT ); Thu, 12 Mar 2015 06:24:44 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:33489 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753418AbbCLKYl (ORCPT ); Thu, 12 Mar 2015 06:24:41 -0400 Message-ID: <1426155862.14455.19.camel@pengutronix.de> Subject: Re: [PATCH v4 02/15] drm: bridge/dw_hdmi: wrap irq control in fucntions From: Philipp Zabel To: Yakir Yang Cc: djkurtz@chromium.org, dianders@chromium.org, linux-rockchip@lists.infradead.org, David Airlie , Russell King , Andy Yan , Greg Kroah-Hartman , Fabio Estevam , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, mmind00@googlemail.com, marcheu@chromium.org, mark.yao@rock-chips.com Date: Thu, 12 Mar 2015 11:24:22 +0100 In-Reply-To: <1425176927-1784-1-git-send-email-ykk@rock-chips.com> References: <1425175834-24661-1-git-send-email-ykk@rock-chips.com> <1425176927-1784-1-git-send-email-ykk@rock-chips.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.12.9-1+b1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 2001:67c:670:100:96de:80ff:fec2:9969 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Yakir, Am Samstag, den 28.02.2015, 21:28 -0500 schrieb Yakir Yang: > Wrap irq control in functions, and then we can call in > dw_hdmi_bind/dw_hdmi_unbind/dw_hdmi_resume/dw_hdmi_suspend > functions. > > Signed-off-by: Yakir Yang [...] > @@ -1702,17 +1722,8 @@ EXPORT_SYMBOL_GPL(dw_hdmi_unbind); > int dw_hdmi_suspend(struct device *dev) > { > struct dw_hdmi *hdmi = dev_get_drvdata(dev); > - u8 ih_mute; > - > - /* Disable all interrupts */ > - hdmi_writeb(hdmi, ~0, HDMI_IH_MUTE_PHY_STAT0); > - > - /* Disable top level interrupt bits in HDMI block */ > - ih_mute = hdmi_readb(hdmi, HDMI_IH_MUTE) | > - HDMI_IH_MUTE_MUTE_WAKEUP_INTERRUPT | > - HDMI_IH_MUTE_MUTE_ALL_INTERRUPT; > > - hdmi_writeb(hdmi, ih_mute, HDMI_IH_MUTE); > + hdmi_mute_interrupts(hdmi); > > return 0; > } > @@ -1722,19 +1733,7 @@ int dw_hdmi_resume(struct device *dev) > { > struct dw_hdmi *hdmi = dev_get_drvdata(dev); > > - /* > - * Configure registers related to HDMI interrupt > - * generation before registering IRQ. > - */ > - hdmi_writeb(hdmi, HDMI_PHY_HPD, HDMI_PHY_POL0); > - > - /* Clear Hotplug interrupts */ > - hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD, HDMI_IH_PHY_STAT0); > - > - dw_hdmi_fb_registered(hdmi); > - > - /* Unmute interrupts */ > - hdmi_writeb(hdmi, ~HDMI_IH_PHY_STAT0_HPD, HDMI_IH_MUTE_PHY_STAT0); > + hdmi_unmute_interrupts(hdmi); > > return 0; > } Here you remove code added in the previous patch. It would be better to just apply patch 2 first and then rebase patch 1 on top of it. regards Philipp