Commit eff70dac authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: pass dev_priv explicitly to PIPEGCMAX 



Avoid the implicit dev_priv local variable use, and pass dev_priv
explicitly to the PIPEGCMAX register macro.

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/5fdc8562fe7b8d26e1ec1bb8f9a221348246bbe1.1716469091.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 1572fc31

drivers/gpu/drm/i915/display/intel_color.c

+6 −6
Original line number Diff line number Diff line
@@ -1284,9 +1284,9 @@ static void i965_load_lut_10p6(struct intel_crtc *crtc, 
				  i965_lut_10p6_udw(&lut[i]));

	}



	intel_de_write_fw(dev_priv, PIPEGCMAX(pipe, 0), lut[i].red);

	intel_de_write_fw(dev_priv, PIPEGCMAX(pipe, 1), lut[i].green);

	intel_de_write_fw(dev_priv, PIPEGCMAX(pipe, 2), lut[i].blue);

	intel_de_write_fw(dev_priv, PIPEGCMAX(dev_priv, pipe, 0), lut[i].red);

	intel_de_write_fw(dev_priv, PIPEGCMAX(dev_priv, pipe, 1), lut[i].green);

	intel_de_write_fw(dev_priv, PIPEGCMAX(dev_priv, pipe, 2), lut[i].blue);

}



static void i965_load_luts(const struct intel_crtc_state *crtc_state)
@@ -3239,9 +3239,9 @@ static struct drm_property_blob *i965_read_lut_10p6(struct intel_crtc *crtc) 
		i965_lut_10p6_pack(&lut[i], ldw, udw);

	}



	lut[i].red = i965_lut_11p6_max_pack(intel_de_read_fw(dev_priv, PIPEGCMAX(pipe, 0)));

	lut[i].green = i965_lut_11p6_max_pack(intel_de_read_fw(dev_priv, PIPEGCMAX(pipe, 1)));

	lut[i].blue = i965_lut_11p6_max_pack(intel_de_read_fw(dev_priv, PIPEGCMAX(pipe, 2)));

	lut[i].red = i965_lut_11p6_max_pack(intel_de_read_fw(dev_priv, PIPEGCMAX(dev_priv, pipe, 0)));

	lut[i].green = i965_lut_11p6_max_pack(intel_de_read_fw(dev_priv, PIPEGCMAX(dev_priv, pipe, 1)));

	lut[i].blue = i965_lut_11p6_max_pack(intel_de_read_fw(dev_priv, PIPEGCMAX(dev_priv, pipe, 2)));



	return blob;

}

drivers/gpu/drm/i915/display/intel_color_regs.h

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
/* i965/g4x/vlv/chv */

#define  _PIPEAGCMAX			0x70010

#define  _PIPEBGCMAX			0x71010

#define PIPEGCMAX(pipe, i)     _MMIO_PIPE2(dev_priv, pipe, _PIPEAGCMAX + (i) * 4) /* u1.16 */

#define PIPEGCMAX(dev_priv, pipe, i)	_MMIO_PIPE2(dev_priv, pipe, _PIPEAGCMAX + (i) * 4) /* u1.16 */



/* ilk+ palette */

#define _LGC_PALETTE_A           0x4a000