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

Commit ee145f66 authored by Zhenyu Wang's avatar Zhenyu Wang
Browse files

drm/i915/gvt: Fix static checker warning on intel_gvt_i2c_handle_aux_ch_write() 



Static checker gave warning on:

drivers/gpu/drm/i915/gvt/edid.c:506 intel_gvt_i2c_handle_aux_ch_write()
warn: odd binop '0x0 & 0xff'

We try to return ACK for I2C reply which is defined with 0. Remove
bit shift which caused misleading bit op.

Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarZhenyu Wang <zhenyuw@linux.intel.com>
parent f4b0c286

drivers/gpu/drm/i915/gvt/edid.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -502,8 +502,7 @@ void intel_gvt_i2c_handle_aux_ch_write(struct intel_vgpu *vgpu, 
	 * ACK of I2C_WRITE

	 * ACK of I2C_WRITE

	 * returned byte if it is READ

	 * returned byte if it is READ

	 */

	 */



	aux_data_for_write |= GVT_AUX_I2C_REPLY_ACK << 24;

	aux_data_for_write |= (GVT_AUX_I2C_REPLY_ACK & 0xff) << 24;

	vgpu_vreg(vgpu, offset + 4) = aux_data_for_write;

	vgpu_vreg(vgpu, offset + 4) = aux_data_for_write;

}

}

drivers/gpu/drm/i915/gvt/edid.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ 
#define GVT_AUX_I2C_READ			0x1

#define GVT_AUX_I2C_READ			0x1

#define GVT_AUX_I2C_STATUS			0x2

#define GVT_AUX_I2C_STATUS			0x2

#define GVT_AUX_I2C_MOT				0x4

#define GVT_AUX_I2C_MOT				0x4

#define GVT_AUX_I2C_REPLY_ACK			(0x0 << 6)

#define GVT_AUX_I2C_REPLY_ACK			0x0





struct intel_vgpu_edid_data {

struct intel_vgpu_edid_data {

	bool data_valid;

	bool data_valid;