| Message ID | 20200118005848.20382-1-vivek.kasireddy@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/dsi: Ensure that the ACPI adapter lookup overrides the bus num | expand |
On Fri, 17 Jan 2020, Vivek Kasireddy <vivek.kasireddy@intel.com> wrote: > Remove the i2c_bus_num >= 0 check from the adapter lookup function > as this would prevent ACPI bus number override. This check was mainly > there to return early if the bus number has already been found but we > anyway return in the next line if the slave address does not match. Hans, could I trouble you to check this on your collection of BYT DSI devices please? BR, Jani. > > Fixes: 8cbf89db2941 ("drm/i915/dsi: Parse the I2C element from the VBT MIPI sequence block (v3)") > Cc: Hans de Goede <hdegoede@redhat.com> > Cc: Nabendu Maiti <nabendu.bikash.maiti@intel.com> > Cc: Matt Roper <matthew.d.roper@intel.com> > Cc: Bob Paauwe <bob.j.paauwe@intel.com> > Cc: Jani Nikula <jani.nikula@intel.com> > Signed-off-by: Vivek Kasireddy <vivek.kasireddy@intel.com> > --- > drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c > index 6ec35d975bd7..04f953ba8f00 100644 > --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c > +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c > @@ -394,8 +394,7 @@ static int i2c_adapter_lookup(struct acpi_resource *ares, void *data) > acpi_handle adapter_handle; > acpi_status status; > > - if (intel_dsi->i2c_bus_num >= 0 || > - !i2c_acpi_get_i2c_resource(ares, &sb)) > + if (!i2c_acpi_get_i2c_resource(ares, &sb)) > return 1; > > if (lookup->slave_addr != sb->slave_address)
On Sun, 19 Jan 2020, Jani Nikula <jani.nikula@intel.com> wrote: > On Fri, 17 Jan 2020, Vivek Kasireddy <vivek.kasireddy@intel.com> wrote: >> Remove the i2c_bus_num >= 0 check from the adapter lookup function >> as this would prevent ACPI bus number override. This check was mainly >> there to return early if the bus number has already been found but we >> anyway return in the next line if the slave address does not match. > > Hans, could I trouble you to check this on your collection of BYT DSI > devices please? I went ahead and pushed the patch. Thanks. BR, Jani. > > BR, > Jani. > > >> >> Fixes: 8cbf89db2941 ("drm/i915/dsi: Parse the I2C element from the VBT MIPI sequence block (v3)") >> Cc: Hans de Goede <hdegoede@redhat.com> >> Cc: Nabendu Maiti <nabendu.bikash.maiti@intel.com> >> Cc: Matt Roper <matthew.d.roper@intel.com> >> Cc: Bob Paauwe <bob.j.paauwe@intel.com> >> Cc: Jani Nikula <jani.nikula@intel.com> >> Signed-off-by: Vivek Kasireddy <vivek.kasireddy@intel.com> >> --- >> drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c >> index 6ec35d975bd7..04f953ba8f00 100644 >> --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c >> +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c >> @@ -394,8 +394,7 @@ static int i2c_adapter_lookup(struct acpi_resource *ares, void *data) >> acpi_handle adapter_handle; >> acpi_status status; >> >> - if (intel_dsi->i2c_bus_num >= 0 || >> - !i2c_acpi_get_i2c_resource(ares, &sb)) >> + if (!i2c_acpi_get_i2c_resource(ares, &sb)) >> return 1; >> >> if (lookup->slave_addr != sb->slave_address)
diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c index 6ec35d975bd7..04f953ba8f00 100644 --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -394,8 +394,7 @@ static int i2c_adapter_lookup(struct acpi_resource *ares, void *data) acpi_handle adapter_handle; acpi_status status; - if (intel_dsi->i2c_bus_num >= 0 || - !i2c_acpi_get_i2c_resource(ares, &sb)) + if (!i2c_acpi_get_i2c_resource(ares, &sb)) return 1; if (lookup->slave_addr != sb->slave_address)
Remove the i2c_bus_num >= 0 check from the adapter lookup function as this would prevent ACPI bus number override. This check was mainly there to return early if the bus number has already been found but we anyway return in the next line if the slave address does not match. Fixes: 8cbf89db2941 ("drm/i915/dsi: Parse the I2C element from the VBT MIPI sequence block (v3)") Cc: Hans de Goede <hdegoede@redhat.com> Cc: Nabendu Maiti <nabendu.bikash.maiti@intel.com> Cc: Matt Roper <matthew.d.roper@intel.com> Cc: Bob Paauwe <bob.j.paauwe@intel.com> Cc: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Vivek Kasireddy <vivek.kasireddy@intel.com> --- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)