Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 982b0b2d authored by Takashi Iwai's avatar Takashi Iwai Committed by Jani Nikula
Browse files

drm/i915: Fix CSR MMIO address check 



Fix a wrong logical AND (&&) used for the range check of CSR MMIO.

Spotted nicely by gcc -Wlogical-op flag:
  drivers/gpu/drm/i915/intel_csr.c: In function ‘finish_csr_load’:
  drivers/gpu/drm/i915/intel_csr.c:353:41: warning: logical ‘and’ of mutually exclusive tests is always false [-Wlogical-op]

Fixes: eb805623 ('drm/i915/skl: Add support to load SKL CSR firmware.')
Cc: <stable@vger.kernel.org> # v4.2
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarAnimesh Manna <animesh.manna@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent acd29f7b

drivers/gpu/drm/i915/intel_csr.c

+1 −1
Original line number Diff line number Diff line
@@ -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]);