Message ID | 1427189930-410-2-git-send-email-tjaalton@ubuntu.com |
---|---|
State | New |
Headers | show |
On Tue, Mar 24, 2015 at 11:38:50AM +0200, Timo Aaltonen wrote: > From: Ben Widawsky <benjamin.widawsky@intel.com> > > BugLink: http://bugs.launchpad.net/bugs/1430855 > > The same register exists for querying and programming eDRAM AKA eLLC. So > we can simply use it. For now, use all the same defaults as we had > for Haswell, since like Haswell, I have no further details. > > I do not actually have a part with eDRAM, so I cannot test this. > > Signed-off-by: Ben Widawsky <ben@bwidawsk.net> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> > Reviewed-by: Brad Volkin <bradley.d.volkin@intel.com> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > (backport from commit 1d2866baf71e222308345ec745c20cbdb279f325) > Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com> > --- > ubuntu/i915/intel_uncore.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/ubuntu/i915/intel_uncore.c b/ubuntu/i915/intel_uncore.c > index d0c7577..aaf11fb 100644 > --- a/ubuntu/i915/intel_uncore.c > +++ b/ubuntu/i915/intel_uncore.c > @@ -374,7 +374,7 @@ void intel_uncore_early_sanitize(struct drm_device *dev) > if (HAS_FPGA_DBG_UNCLAIMED(dev)) > __raw_i915_write32(dev_priv, FPGA_DBG, FPGA_DBG_RM_NOCLAIM); > > - if (IS_HASWELL(dev) && > + if ((IS_HASWELL(dev) || IS_BROADWELL(dev)) && > (__raw_i915_read32(dev_priv, HSW_EDRAM_PRESENT) == 1)) { > /* The docs do not explain exactly how the calculation can be > * made. It is somewhat guessable, but for now, it's always > -- Acked-by: Andy Whitcroft <apw@canonical.com> -apw
On Tue, Mar 24, 2015 at 11:38:50AM +0200, Timo Aaltonen wrote: > From: Ben Widawsky <benjamin.widawsky@intel.com> > > BugLink: http://bugs.launchpad.net/bugs/1430855 > > The same register exists for querying and programming eDRAM AKA eLLC. So > we can simply use it. For now, use all the same defaults as we had > for Haswell, since like Haswell, I have no further details. > > I do not actually have a part with eDRAM, so I cannot test this. > > Signed-off-by: Ben Widawsky <ben@bwidawsk.net> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> > Reviewed-by: Brad Volkin <bradley.d.volkin@intel.com> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > (backport from commit 1d2866baf71e222308345ec745c20cbdb279f325) > Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com> Simple, straightforward, and verified to fix a problem. Ack.
On Tue, Mar 24, 2015 at 11:38:50AM +0200, Timo Aaltonen wrote: > From: Ben Widawsky <benjamin.widawsky@intel.com> > > BugLink: http://bugs.launchpad.net/bugs/1430855 > > The same register exists for querying and programming eDRAM AKA eLLC. So > we can simply use it. For now, use all the same defaults as we had > for Haswell, since like Haswell, I have no further details. > > I do not actually have a part with eDRAM, so I cannot test this. > > Signed-off-by: Ben Widawsky <ben@bwidawsk.net> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> > Reviewed-by: Brad Volkin <bradley.d.volkin@intel.com> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> > (backport from commit 1d2866baf71e222308345ec745c20cbdb279f325) > Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com> > --- > ubuntu/i915/intel_uncore.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/ubuntu/i915/intel_uncore.c b/ubuntu/i915/intel_uncore.c > index d0c7577..aaf11fb 100644 > --- a/ubuntu/i915/intel_uncore.c > +++ b/ubuntu/i915/intel_uncore.c > @@ -374,7 +374,7 @@ void intel_uncore_early_sanitize(struct drm_device *dev) > if (HAS_FPGA_DBG_UNCLAIMED(dev)) > __raw_i915_write32(dev_priv, FPGA_DBG, FPGA_DBG_RM_NOCLAIM); > > - if (IS_HASWELL(dev) && > + if ((IS_HASWELL(dev) || IS_BROADWELL(dev)) && > (__raw_i915_read32(dev_priv, HSW_EDRAM_PRESENT) == 1)) { > /* The docs do not explain exactly how the calculation can be > * made. It is somewhat guessable, but for now, it's always > -- > 2.1.4 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team Applied to Trusty master-next
diff --git a/ubuntu/i915/intel_uncore.c b/ubuntu/i915/intel_uncore.c index d0c7577..aaf11fb 100644 --- a/ubuntu/i915/intel_uncore.c +++ b/ubuntu/i915/intel_uncore.c @@ -374,7 +374,7 @@ void intel_uncore_early_sanitize(struct drm_device *dev) if (HAS_FPGA_DBG_UNCLAIMED(dev)) __raw_i915_write32(dev_priv, FPGA_DBG, FPGA_DBG_RM_NOCLAIM); - if (IS_HASWELL(dev) && + if ((IS_HASWELL(dev) || IS_BROADWELL(dev)) && (__raw_i915_read32(dev_priv, HSW_EDRAM_PRESENT) == 1)) { /* The docs do not explain exactly how the calculation can be * made. It is somewhat guessable, but for now, it's always