From: Jani Nikula <jani.nikula@linux.intel.com> To: Koba Ko <koba.ko@canonical.com>, intel-gfx@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Subject: Re: [Intel-gfx] [PATCH 1/2] drm: i915: move intel_pch.h to include/drm Date: Wed, 25 Aug 2021 12:10:49 +0300 [thread overview] Message-ID: <8735qxga92.fsf@intel.com> (raw) In-Reply-To: <20210825043522.346512-1-koba.ko@canonical.com> On Wed, 25 Aug 2021, Koba Ko <koba.ko@canonical.com> wrote: > Because AMD GPU have a issue on RKL platform, > driver needs to determine which intel platfomr is and > if the platform is RKL, disable PCIE_DPM for AMD polaris-series GPUs. > > Move intel_pch.h to includ/drm I don't know what the root cause is, or whether this is the right course of action. However, if you do end up needing PCH ids outside of i915, I think it's too much to move the entire intel_pch.h under include/drm. Instead, I suggest adding include/drm/i915_pchids.h (or similar, analoguous to i915_pciids.h) which would only have the macros: #define INTEL_PCH_DEVICE_ID_MASK 0xff80 #define INTEL_PCH_*_DEVICE_ID_TYPE * and nothing more. intel_pch.h is too i915 specific to expose and does not have enough namespacing prefixes in the other macros and enums either. Then intel_pch.h would include i915_pchids.h. BR, Jani. > > Ref: https://lists.freedesktop.org/archives/amd-gfx/2021-August/067413.html > Signed-off-by: Koba Ko <koba.ko@canonical.com> > --- > drivers/gpu/drm/i915/i915_drv.h | 4 +++- > drivers/gpu/drm/i915/intel_pch.c | 2 +- > {drivers/gpu/drm/i915 => include/drm}/intel_pch.h | 2 -- > 3 files changed, 4 insertions(+), 4 deletions(-) > rename {drivers/gpu/drm/i915 => include/drm}/intel_pch.h (98%) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 106f218cec2b..7d091927d9b4 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -60,6 +60,7 @@ > #include <drm/drm_connector.h> > #include <drm/i915_mei_hdcp_interface.h> > #include <drm/ttm/ttm_device.h> > +#include <drm/intel_pch.h> > > #include "i915_params.h" > #include "i915_reg.h" > @@ -89,7 +90,6 @@ > > #include "intel_device_info.h" > #include "intel_memory_region.h" > -#include "intel_pch.h" > #include "intel_runtime_pm.h" > #include "intel_step.h" > #include "intel_uncore.h" > @@ -1336,6 +1336,8 @@ static inline struct drm_i915_private *pdev_to_i915(struct pci_dev *pdev) > (drm_WARN_ON(&(__i915)->drm, INTEL_GT_STEP(__i915) == STEP_NONE), \ > INTEL_GT_STEP(__i915) >= (since) && INTEL_GT_STEP(__i915) < (until)) > > +void intel_detect_pch(struct drm_i915_private *dev_priv); > + > static __always_inline unsigned int > __platform_mask_index(const struct intel_runtime_info *info, > enum intel_platform p) > diff --git a/drivers/gpu/drm/i915/intel_pch.c b/drivers/gpu/drm/i915/intel_pch.c > index d1d4b97b86f5..43162d1338bc 100644 > --- a/drivers/gpu/drm/i915/intel_pch.c > +++ b/drivers/gpu/drm/i915/intel_pch.c > @@ -4,7 +4,7 @@ > */ > > #include "i915_drv.h" > -#include "intel_pch.h" > +#include <drm/intel_pch.h> > > /* Map PCH device id to PCH type, or PCH_NONE if unknown. */ > static enum intel_pch > diff --git a/drivers/gpu/drm/i915/intel_pch.h b/include/drm/intel_pch.h > similarity index 98% > rename from drivers/gpu/drm/i915/intel_pch.h > rename to include/drm/intel_pch.h > index 7c0d83d292dc..168c83c836b4 100644 > --- a/drivers/gpu/drm/i915/intel_pch.h > +++ b/include/drm/intel_pch.h > @@ -84,6 +84,4 @@ enum intel_pch { > #define HAS_PCH_NOP(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_NOP) > #define HAS_PCH_SPLIT(dev_priv) (INTEL_PCH_TYPE(dev_priv) != PCH_NONE) > > -void intel_detect_pch(struct drm_i915_private *dev_priv); > - > #endif /* __INTEL_PCH__ */ -- Jani Nikula, Intel Open Source Graphics Center
WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <jani.nikula@linux.intel.com> To: Koba Ko <koba.ko@canonical.com>, intel-gfx@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Subject: Re: [PATCH 1/2] drm: i915: move intel_pch.h to include/drm Date: Wed, 25 Aug 2021 12:10:49 +0300 [thread overview] Message-ID: <8735qxga92.fsf@intel.com> (raw) In-Reply-To: <20210825043522.346512-1-koba.ko@canonical.com> On Wed, 25 Aug 2021, Koba Ko <koba.ko@canonical.com> wrote: > Because AMD GPU have a issue on RKL platform, > driver needs to determine which intel platfomr is and > if the platform is RKL, disable PCIE_DPM for AMD polaris-series GPUs. > > Move intel_pch.h to includ/drm I don't know what the root cause is, or whether this is the right course of action. However, if you do end up needing PCH ids outside of i915, I think it's too much to move the entire intel_pch.h under include/drm. Instead, I suggest adding include/drm/i915_pchids.h (or similar, analoguous to i915_pciids.h) which would only have the macros: #define INTEL_PCH_DEVICE_ID_MASK 0xff80 #define INTEL_PCH_*_DEVICE_ID_TYPE * and nothing more. intel_pch.h is too i915 specific to expose and does not have enough namespacing prefixes in the other macros and enums either. Then intel_pch.h would include i915_pchids.h. BR, Jani. > > Ref: https://lists.freedesktop.org/archives/amd-gfx/2021-August/067413.html > Signed-off-by: Koba Ko <koba.ko@canonical.com> > --- > drivers/gpu/drm/i915/i915_drv.h | 4 +++- > drivers/gpu/drm/i915/intel_pch.c | 2 +- > {drivers/gpu/drm/i915 => include/drm}/intel_pch.h | 2 -- > 3 files changed, 4 insertions(+), 4 deletions(-) > rename {drivers/gpu/drm/i915 => include/drm}/intel_pch.h (98%) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 106f218cec2b..7d091927d9b4 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -60,6 +60,7 @@ > #include <drm/drm_connector.h> > #include <drm/i915_mei_hdcp_interface.h> > #include <drm/ttm/ttm_device.h> > +#include <drm/intel_pch.h> > > #include "i915_params.h" > #include "i915_reg.h" > @@ -89,7 +90,6 @@ > > #include "intel_device_info.h" > #include "intel_memory_region.h" > -#include "intel_pch.h" > #include "intel_runtime_pm.h" > #include "intel_step.h" > #include "intel_uncore.h" > @@ -1336,6 +1336,8 @@ static inline struct drm_i915_private *pdev_to_i915(struct pci_dev *pdev) > (drm_WARN_ON(&(__i915)->drm, INTEL_GT_STEP(__i915) == STEP_NONE), \ > INTEL_GT_STEP(__i915) >= (since) && INTEL_GT_STEP(__i915) < (until)) > > +void intel_detect_pch(struct drm_i915_private *dev_priv); > + > static __always_inline unsigned int > __platform_mask_index(const struct intel_runtime_info *info, > enum intel_platform p) > diff --git a/drivers/gpu/drm/i915/intel_pch.c b/drivers/gpu/drm/i915/intel_pch.c > index d1d4b97b86f5..43162d1338bc 100644 > --- a/drivers/gpu/drm/i915/intel_pch.c > +++ b/drivers/gpu/drm/i915/intel_pch.c > @@ -4,7 +4,7 @@ > */ > > #include "i915_drv.h" > -#include "intel_pch.h" > +#include <drm/intel_pch.h> > > /* Map PCH device id to PCH type, or PCH_NONE if unknown. */ > static enum intel_pch > diff --git a/drivers/gpu/drm/i915/intel_pch.h b/include/drm/intel_pch.h > similarity index 98% > rename from drivers/gpu/drm/i915/intel_pch.h > rename to include/drm/intel_pch.h > index 7c0d83d292dc..168c83c836b4 100644 > --- a/drivers/gpu/drm/i915/intel_pch.h > +++ b/include/drm/intel_pch.h > @@ -84,6 +84,4 @@ enum intel_pch { > #define HAS_PCH_NOP(dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_NOP) > #define HAS_PCH_SPLIT(dev_priv) (INTEL_PCH_TYPE(dev_priv) != PCH_NONE) > > -void intel_detect_pch(struct drm_i915_private *dev_priv); > - > #endif /* __INTEL_PCH__ */ -- Jani Nikula, Intel Open Source Graphics Center
next prev parent reply other threads:[~2021-08-25 9:10 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-25 4:35 [Intel-gfx] [PATCH 1/2] drm: i915: move intel_pch.h to include/drm Koba Ko 2021-08-25 4:35 ` Koba Ko 2021-08-25 4:35 ` [Intel-gfx] [PATCH 2/2] drm/amdgpu: Disable PCIE_DPM on Intel RKL Platform Koba Ko 2021-08-25 4:35 ` Koba Ko 2021-08-25 9:22 ` [Intel-gfx] " Jani Nikula 2021-08-25 9:22 ` Jani Nikula 2021-08-25 10:08 ` [Intel-gfx] " Koba Ko 2021-08-25 10:08 ` Koba Ko 2021-08-25 10:24 ` [Intel-gfx] " Jani Nikula 2021-08-25 10:24 ` Jani Nikula 2021-08-25 11:16 ` [Intel-gfx] " Koba Ko 2021-08-25 11:16 ` Koba Ko 2021-08-25 14:21 ` Lazar, Lijo 2021-08-25 14:21 ` [Intel-gfx] " Lazar, Lijo 2021-08-25 14:32 ` Alex Deucher 2021-08-25 14:32 ` Alex Deucher 2021-08-25 16:34 ` [Intel-gfx] " Koba Ko 2021-08-25 16:34 ` Koba Ko 2021-08-28 1:41 ` [Intel-gfx] " kernel test robot 2021-08-28 1:41 ` kernel test robot 2021-08-25 6:30 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/2] drm: i915: move intel_pch.h to include/drm Patchwork 2021-08-25 6:31 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2021-08-25 7:03 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2021-08-25 9:10 ` Jani Nikula [this message] 2021-08-25 9:10 ` [PATCH 1/2] " Jani Nikula 2021-08-25 12:53 ` [Intel-gfx] ✓ Fi.CI.IGT: success for series starting with [1/2] " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=8735qxga92.fsf@intel.com \ --to=jani.nikula@linux.intel.com \ --cc=amd-gfx@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=koba.ko@canonical.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.