From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH 1/2] drm/i915: Propagate PCI read/write errors during vga_set_state() Date: Tue, 17 Dec 2013 11:14:32 +0200 Message-ID: <874n676dqf.fsf@intel.com> References: <1387209888-9117-1-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id CD01DFB615 for ; Tue, 17 Dec 2013 01:11:59 -0800 (PST) In-Reply-To: <1387209888-9117-1-git-send-email-chris@chris-wilson.co.uk> 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: Chris Wilson , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Mon, 16 Dec 2013, Chris Wilson wrote: > This has very little effect other than log the errors in case of failure, > and we then hope for the best. Reviewed-by: Jani Nikula > Signed-off-by: Chris Wilson > --- > drivers/gpu/drm/i915/intel_display.c | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index d0082a025c83..7db292c469af 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -11336,12 +11336,21 @@ int intel_modeset_vga_set_state(struct drm_device *dev, bool state) > struct drm_i915_private *dev_priv = dev->dev_private; > u16 gmch_ctrl; > > - pci_read_config_word(dev_priv->bridge_dev, INTEL_GMCH_CTRL, &gmch_ctrl); > + if (pci_read_config_word(dev_priv->bridge_dev, INTEL_GMCH_CTRL, &gmch_ctrl)) { > + DRM_ERROR("failed to read control word\n"); > + return -EIO; > + } > + > if (state) > gmch_ctrl &= ~INTEL_GMCH_VGA_DISABLE; > else > gmch_ctrl |= INTEL_GMCH_VGA_DISABLE; > - pci_write_config_word(dev_priv->bridge_dev, INTEL_GMCH_CTRL, gmch_ctrl); > + > + if (pci_write_config_word(dev_priv->bridge_dev, INTEL_GMCH_CTRL, gmch_ctrl)) { > + DRM_ERROR("failed to write control word\n"); > + return -EIO; > + } > + > return 0; > } > > -- > 1.8.5.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