| Message ID | 1549696387-28268-22-git-send-email-ramalingam.c@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Implement HDCP2.2 | expand |
On Sat, Feb 09, 2019 at 12:42:50PM +0530, Ramalingam C wrote: > From: Tomas Winkler <tomas.winkler@intel.com> > > Add icelake mei device id. > > Cc: <stable@vger.kernel.org> > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cherry-picked from git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc-linus > --- > drivers/misc/mei/hw-me-regs.h | 2 ++ > drivers/misc/mei/pci-me.c | 2 ++ > 2 files changed, 4 insertions(+) Why are you sending us patches that are already applied?
> > On Sat, Feb 09, 2019 at 12:42:50PM +0530, Ramalingam C wrote: > > From: Tomas Winkler <tomas.winkler@intel.com> > > > > Add icelake mei device id. > > > > Cc: <stable@vger.kernel.org> > > Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > Cherry-picked from > > git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git > > char-misc-linus > > --- > > drivers/misc/mei/hw-me-regs.h | 2 ++ > > drivers/misc/mei/pci-me.c | 2 ++ > > 2 files changed, 4 insertions(+) > > Why are you sending us patches that are already applied? They're unslinging it for GFX CI so they need it in their queue, it was not merged into the master branch at the time. Thanks Tomas
Hi,
[This is an automated email]
This commit has been processed because it contains a -stable tag.
The stable tag indicates that it's relevant for the following trees: all
The bot has tested the following trees: v4.20.7, v4.19.20, v4.14.98, v4.9.155, v4.4.173, v3.18.134.
v4.20.7: Build OK!
v4.19.20: Build OK!
v4.14.98: Build failed! Errors:
drivers/misc/mei/pci-me.c:108:37: error: ‘MEI_ME_PCH12_CFG’ undeclared here (not in a function); did you mean ‘MEI_ME_PCH8_CFG’?
v4.9.155: Failed to apply! Possible dependencies:
f8f4aa68a8ae ("mei: me: add cannon point device ids")
v4.4.173: Failed to apply! Possible dependencies:
f8f4aa68a8ae ("mei: me: add cannon point device ids")
v3.18.134: Build failed! Errors:
drivers/misc/mei/pci-me.c:86:37: error: ‘MEI_ME_PCH12_CFG’ undeclared here (not in a function)
How should we proceed with this patch?
--
Thanks,
Sasha
diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h index 23739a60517f..bb1ee9834a02 100644 --- a/drivers/misc/mei/hw-me-regs.h +++ b/drivers/misc/mei/hw-me-regs.h @@ -139,6 +139,8 @@ #define MEI_DEV_ID_CNP_H 0xA360 /* Cannon Point H */ #define MEI_DEV_ID_CNP_H_4 0xA364 /* Cannon Point H 4 (iTouch) */ +#define MEI_DEV_ID_ICP_LP 0x34E0 /* Ice Lake Point LP */ + /* * MEI HW Section */ diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index e89497f858ae..3ab946ad3257 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c @@ -105,6 +105,8 @@ static const struct pci_device_id mei_me_pci_tbl[] = { {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H, MEI_ME_PCH12_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H_4, MEI_ME_PCH8_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP, MEI_ME_PCH12_CFG)}, + /* required last entry */ {0, } };