diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-09-11 10:52:08 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-09-11 10:52:08 +1000 |
| commit | 91b6fc02a258422bf342992add24cfe70a029eca (patch) | |
| tree | 55c7c5a1fc361b23e5cbfd8a042c301194748831 /drivers/gpu/drm/i915/intel_csr.c | |
| parent | bd3e1c7c6de9f5f70d97cdb6c817151c0477c5e3 (diff) | |
| parent | 824257857fd81f5e749831ff9cd63566b5a86abe (diff) | |
| download | talos-op-linux-91b6fc02a258422bf342992add24cfe70a029eca.tar.gz talos-op-linux-91b6fc02a258422bf342992add24cfe70a029eca.zip | |
Merge tag 'drm-intel-next-fixes-2015-09-10' of git://anongit.freedesktop.org/drm-intel into drm-next
Fixes headed for v4.3-rc1, including Maarten's DP MST state checker fix
you requested.
* tag 'drm-intel-next-fixes-2015-09-10' of git://anongit.freedesktop.org/drm-intel:
drm/i915: Allow DSI dual link to be configured on any pipe
drm/i915: Don't try to use DDR DVFS on CHV when disabled in the BIOS
drm/i915: Fix CSR MMIO address check
drm/i915: Limit the number of loops for reading a split 64bit register
drm/i915: Fix broken mst get_hw_state.
drm/i915: Pass hpd_status_i915[] to intel_get_hpd_pins() in pre-g4x
uapi/drm/i915_drm.h: fix userspace compilation.
drm/i915: Always mark the object as dirty when used by the GPU
Diffstat (limited to 'drivers/gpu/drm/i915/intel_csr.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_csr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c index ba1ae031e6fd..d0f1b8d833cd 100644 --- a/drivers/gpu/drm/i915/intel_csr.c +++ b/drivers/gpu/drm/i915/intel_csr.c @@ -350,7 +350,7 @@ static void finish_csr_load(const struct firmware *fw, void *context) } csr->mmio_count = dmc_header->mmio_count; for (i = 0; i < dmc_header->mmio_count; i++) { - if (dmc_header->mmioaddr[i] < CSR_MMIO_START_RANGE && + if (dmc_header->mmioaddr[i] < CSR_MMIO_START_RANGE || dmc_header->mmioaddr[i] > CSR_MMIO_END_RANGE) { DRM_ERROR(" Firmware has wrong mmio address 0x%x\n", dmc_header->mmioaddr[i]); |
