| Message ID | 1460040732-31417-4-git-send-email-animesh.manna@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 07 Apr 2016, Animesh Manna <animesh.manna@intel.com> wrote: > Guid is changed for bxt platform, so corrected the guid for bxt. > > Signed-off-by: Ananth Krishna R <ananth.krishna.r@intel.com> > Signed-off-by: Bharath K Veera <bharath.k.veera@intel.com> > Signed-off-by: Animesh Manna <animesh.manna@intel.com> > --- > drivers/gpu/drm/i915/intel_acpi.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c > index 8f3d672..8ba30b3 100644 > --- a/drivers/gpu/drm/i915/intel_acpi.c > +++ b/drivers/gpu/drm/i915/intel_acpi.c > @@ -17,7 +17,7 @@ static struct intel_dsm_priv { > acpi_handle dhandle; > } intel_dsm_priv; > > -static const u8 intel_dsm_guid[] = { > +static u8 intel_dsm_guid[] = { > 0xd3, 0x73, 0xd8, 0x7e, > 0xd0, 0xc2, > 0x4f, 0x4e, > @@ -25,6 +25,9 @@ static const u8 intel_dsm_guid[] = { > 0x0f, 0x13, 0x17, 0xb0, 0x1c, 0x2c > }; > > +static u8 intel_bxt_dsm_guid[] = > + "3E5B41C6-EB1D-4260-9D15-C71FBADAE414"; > + So I want both of these to be either in string form or in binary uuid form, not a mixture. Having them in binary makes the code simpler, so I'd go for that. BR, Jani. > static char *intel_dsm_port_name(u8 id) > { > switch (id) { > @@ -143,6 +146,9 @@ static bool intel_dsm_pci_probe(struct pci_dev *pdev) > > intel_dsm_priv.dhandle = dhandle; > > + if (IS_BROXTON(dev)) > + acpi_str_to_uuid(intel_bxt_dsm_guid, intel_dsm_guid); > + > if (acpi_check_dsm(dhandle, intel_dsm_guid, INTEL_DSM_REVISION_ID, > 1 << INTEL_DSM_FN_PLATFORM_MUX_INFO)) > intel_dsm_platform_mux_info();
On Fri, Apr 08, 2016 at 12:00:22PM +0300, Jani Nikula wrote: > On Thu, 07 Apr 2016, Animesh Manna <animesh.manna@intel.com> wrote: > > Guid is changed for bxt platform, so corrected the guid for bxt. > > > > Signed-off-by: Ananth Krishna R <ananth.krishna.r@intel.com> > > Signed-off-by: Bharath K Veera <bharath.k.veera@intel.com> > > Signed-off-by: Animesh Manna <animesh.manna@intel.com> > > --- > > drivers/gpu/drm/i915/intel_acpi.c | 8 +++++++- > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c > > index 8f3d672..8ba30b3 100644 > > --- a/drivers/gpu/drm/i915/intel_acpi.c > > +++ b/drivers/gpu/drm/i915/intel_acpi.c > > @@ -17,7 +17,7 @@ static struct intel_dsm_priv { > > acpi_handle dhandle; > > } intel_dsm_priv; > > > > -static const u8 intel_dsm_guid[] = { > > +static u8 intel_dsm_guid[] = { > > 0xd3, 0x73, 0xd8, 0x7e, > > 0xd0, 0xc2, > > 0x4f, 0x4e, > > @@ -25,6 +25,9 @@ static const u8 intel_dsm_guid[] = { > > 0x0f, 0x13, 0x17, 0xb0, 0x1c, 0x2c > > }; > > > > +static u8 intel_bxt_dsm_guid[] = > > + "3E5B41C6-EB1D-4260-9D15-C71FBADAE414"; > > + > > So I want both of these to be either in string form or in binary uuid > form, not a mixture. Having them in binary makes the code simpler, so > I'd go for that. I was just gonna suggest the same. Also, isn't this a fix we want merged independently from the HPD-related changes? If so this should submitted separately (or at least be modified so it can be the first patch in the series). Kind regards, David
On 4/8/2016 6:25 PM, David Weinehall wrote: > On Fri, Apr 08, 2016 at 12:00:22PM +0300, Jani Nikula wrote: >> On Thu, 07 Apr 2016, Animesh Manna <animesh.manna@intel.com> wrote: >>> Guid is changed for bxt platform, so corrected the guid for bxt. >>> >>> Signed-off-by: Ananth Krishna R <ananth.krishna.r@intel.com> >>> Signed-off-by: Bharath K Veera <bharath.k.veera@intel.com> >>> Signed-off-by: Animesh Manna <animesh.manna@intel.com> >>> --- >>> drivers/gpu/drm/i915/intel_acpi.c | 8 +++++++- >>> 1 file changed, 7 insertions(+), 1 deletion(-) >>> >>> diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c >>> index 8f3d672..8ba30b3 100644 >>> --- a/drivers/gpu/drm/i915/intel_acpi.c >>> +++ b/drivers/gpu/drm/i915/intel_acpi.c >>> @@ -17,7 +17,7 @@ static struct intel_dsm_priv { >>> acpi_handle dhandle; >>> } intel_dsm_priv; >>> >>> -static const u8 intel_dsm_guid[] = { >>> +static u8 intel_dsm_guid[] = { >>> 0xd3, 0x73, 0xd8, 0x7e, >>> 0xd0, 0xc2, >>> 0x4f, 0x4e, >>> @@ -25,6 +25,9 @@ static const u8 intel_dsm_guid[] = { >>> 0x0f, 0x13, 0x17, 0xb0, 0x1c, 0x2c >>> }; >>> >>> +static u8 intel_bxt_dsm_guid[] = >>> + "3E5B41C6-EB1D-4260-9D15-C71FBADAE414"; >>> + >> So I want both of these to be either in string form or in binary uuid >> form, not a mixture. Having them in binary makes the code simpler, so >> I'd go for that. > I was just gonna suggest the same. Also, isn't this a fix we want > merged independently from the HPD-related changes? If so this > should submitted separately (or at least be modified so it can be > the first patch in the series). Thanks Jani and David for review, will update as per your suggestion. Will post as first patch in the next patch series. > > > Kind regards, David
diff --git a/drivers/gpu/drm/i915/intel_acpi.c b/drivers/gpu/drm/i915/intel_acpi.c index 8f3d672..8ba30b3 100644 --- a/drivers/gpu/drm/i915/intel_acpi.c +++ b/drivers/gpu/drm/i915/intel_acpi.c @@ -17,7 +17,7 @@ static struct intel_dsm_priv { acpi_handle dhandle; } intel_dsm_priv; -static const u8 intel_dsm_guid[] = { +static u8 intel_dsm_guid[] = { 0xd3, 0x73, 0xd8, 0x7e, 0xd0, 0xc2, 0x4f, 0x4e, @@ -25,6 +25,9 @@ static const u8 intel_dsm_guid[] = { 0x0f, 0x13, 0x17, 0xb0, 0x1c, 0x2c }; +static u8 intel_bxt_dsm_guid[] = + "3E5B41C6-EB1D-4260-9D15-C71FBADAE414"; + static char *intel_dsm_port_name(u8 id) { switch (id) { @@ -143,6 +146,9 @@ static bool intel_dsm_pci_probe(struct pci_dev *pdev) intel_dsm_priv.dhandle = dhandle; + if (IS_BROXTON(dev)) + acpi_str_to_uuid(intel_bxt_dsm_guid, intel_dsm_guid); + if (acpi_check_dsm(dhandle, intel_dsm_guid, INTEL_DSM_REVISION_ID, 1 << INTEL_DSM_FN_PLATFORM_MUX_INFO)) intel_dsm_platform_mux_info();