From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [Intel-gfx] [PATCH 09/20] i915: switch from acpi_os_ioremap to memremap Date: Mon, 12 Oct 2015 09:01:02 +0200 Message-ID: <20151012070102.GV26718@phenom.ffwll.local> References: <20151009221537.32203.5867.stgit@dwillia2-desk3.jf.intel.com> <20151009221625.32203.74117.stgit@dwillia2-desk3.jf.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20151009221625.32203.74117.stgit@dwillia2-desk3.jf.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Dan Williams Cc: linux-arch@vger.kernel.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , linux-arm-kernel@lists.infradead.org List-Id: linux-arch.vger.kernel.org T24gRnJpLCBPY3QgMDksIDIwMTUgYXQgMDY6MTY6MjVQTSAtMDQwMCwgRGFuIFdpbGxpYW1zIHdy b3RlOgo+IGk5MTUgZXhwZWN0cyB0aGUgT3BSZWdpb24gdG8gYmUgY2FjaGVkIChpLmUuIG5vdCBf X2lvbWVtKSwgc28gZXhwbGljaXRseQo+IG1hcCBpdCB3aXRoIG1lbXJlbWFwIHJhdGhlciB0aGFu IHRoZSBpbXBsaWVkIGNhY2hlIHNldHRpbmcgb2YKPiBhY3BpX29zX2lvcmVtYXAoKS4KPiAKPiBD YzogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBpbnRlbC5jb20+Cj4gQ2M6IEphbmkgTmlr dWxhIDxqYW5pLm5pa3VsYUBsaW51eC5pbnRlbC5jb20+Cj4gQ2M6IGludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKPiBDYzogRGF2aWQgQWlybGllIDxhaXJsaWVkQGxpbnV4LmllPgo+IENj OiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gU2lnbmVkLW9mZi1ieTogRGFuIFdp bGxpYW1zIDxkYW4uai53aWxsaWFtc0BpbnRlbC5jb20+CgpBc3N1bWluZyB5b3UndmUgcnVuIHNw YXJzZSBvdmVyIHRoaXMgdG8gbWFrZSBzdXJlIHlvdSd2ZSBjYXVnaHQgdGhlbSBhbGwsCmFuZCB3 aXRoIHRoZSBuaXQgYmVsb3cgYWRkcmVzc2VkIHRoaXMgaXMKClJldmlld2VkLWJ5OiBEYW5pZWwg VmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgoKRmVlbCBmcmVlIHRvIHB1bGwgdjIgaW50 byB3aGF0ZXZlciB0cmVlIHlvdSB0aGluayBpdCdzIHN1aXRhYmxlIGZvciAoYnV0CnlvdSBjYW4g YWxzbyByZXNlbmQgYW5kIEknbGwgcGljayBpdCB1cCkuCgo+IGRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wYW5lbC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cGFuZWwuYwo+IGluZGV4IGUyYWIzZjZlZDAyMi4uYzg0NDRkNWY1NDlmIDEwMDY0NAo+IC0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BhbmVsLmMKPiArKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wYW5lbC5jCj4gQEAgLTM4Nyw3ICszODcsNyBAQCBpbnRlbF9wYW5lbF9k ZXRlY3Qoc3RydWN0IGRybV9kZXZpY2UgKmRldikKPiAgCj4gIAkvKiBBc3N1bWUgdGhhdCB0aGUg QklPUyBkb2VzIG5vdCBsaWUgdGhyb3VnaCB0aGUgT3BSZWdpb24uLi4gKi8KPiAgCWlmICghaTkx NS5wYW5lbF9pZ25vcmVfbGlkICYmIGRldl9wcml2LT5vcHJlZ2lvbi5saWRfc3RhdGUpIHsKPiAt CQlyZXR1cm4gaW9yZWFkMzIoZGV2X3ByaXYtPm9wcmVnaW9uLmxpZF9zdGF0ZSkgJiAweDEgPwo+ ICsJCXJldHVybiAqKGRldl9wcml2LT5vcHJlZ2lvbi5saWRfc3RhdGUpICYgMHgxID8KCigpIGFy ZSByZWR1bmRhbnQgbm93IGhlcmUuCi1EYW5pZWwKCj4gIAkJCWNvbm5lY3Rvcl9zdGF0dXNfY29u bmVjdGVkIDoKPiAgCQkJY29ubmVjdG9yX3N0YXR1c19kaXNjb25uZWN0ZWQ7Cj4gIAl9Cj4gCj4g X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPiBJbnRlbC1n ZnggbWFpbGluZyBsaXN0Cj4gSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IGh0dHA6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngKCi0tIApE YW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBDb3Jwb3JhdGlvbgpodHRwOi8v YmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZl bAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f179.google.com ([209.85.212.179]:37882 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750835AbbJLG6J (ORCPT ); Mon, 12 Oct 2015 02:58:09 -0400 Received: by wijq8 with SMTP id q8so42706232wij.0 for ; Sun, 11 Oct 2015 23:58:08 -0700 (PDT) Date: Mon, 12 Oct 2015 09:01:02 +0200 From: Daniel Vetter Subject: Re: [Intel-gfx] [PATCH 09/20] i915: switch from acpi_os_ioremap to memremap Message-ID: <20151012070102.GV26718@phenom.ffwll.local> References: <20151009221537.32203.5867.stgit@dwillia2-desk3.jf.intel.com> <20151009221625.32203.74117.stgit@dwillia2-desk3.jf.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20151009221625.32203.74117.stgit@dwillia2-desk3.jf.intel.com> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Dan Williams Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, David Airlie , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Daniel Vetter , linux-arm-kernel@lists.infradead.org Message-ID: <20151012070102.VtQ-1oysgQ8_RfiPLsVwlV_q2tuEq7N8lHzZdoLOrsw@z> On Fri, Oct 09, 2015 at 06:16:25PM -0400, Dan Williams wrote: > i915 expects the OpRegion to be cached (i.e. not __iomem), so explicitly > map it with memremap rather than the implied cache setting of > acpi_os_ioremap(). > > Cc: Daniel Vetter > Cc: Jani Nikula > Cc: intel-gfx@lists.freedesktop.org > Cc: David Airlie > Cc: dri-devel@lists.freedesktop.org > Signed-off-by: Dan Williams Assuming you've run sparse over this to make sure you've caught them all, and with the nit below addressed this is Reviewed-by: Daniel Vetter Feel free to pull v2 into whatever tree you think it's suitable for (but you can also resend and I'll pick it up). > diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c > index e2ab3f6ed022..c8444d5f549f 100644 > --- a/drivers/gpu/drm/i915/intel_panel.c > +++ b/drivers/gpu/drm/i915/intel_panel.c > @@ -387,7 +387,7 @@ intel_panel_detect(struct drm_device *dev) > > /* Assume that the BIOS does not lie through the OpRegion... */ > if (!i915.panel_ignore_lid && dev_priv->opregion.lid_state) { > - return ioread32(dev_priv->opregion.lid_state) & 0x1 ? > + return *(dev_priv->opregion.lid_state) & 0x1 ? () are redundant now here. -Daniel > connector_status_connected : > connector_status_disconnected; > } > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch