diff mbox

[1/2] Revert "FROM_UPSTREAM [VPG]: drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."

Message ID 1453238331-35864-2-git-send-email-peter.antoine@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Peter Antoine Jan. 19, 2016, 9:18 p.m. UTC 
This reverts commit a92d3f32eafc57cca55e654ecfd916f283100365.
---
 drivers/gpu/drm/i915/i915_drv.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Daniel Vetter Jan. 19, 2016, 9:25 p.m. UTC | #1 
On Tue, Jan 19, 2016 at 09:18:50PM +0000, Peter Antoine wrote:
> This reverts commit a92d3f32eafc57cca55e654ecfd916f283100365.

Shouldnt' this be patch 2/2? Enabling guc loading before it's fixed isn't
awesome.

Either way needs a proper commit message (why is it ok to enable now?)
plus s-o-b.
-Daniel

> ---
>  drivers/gpu/drm/i915/i915_drv.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index af30148..f99a988 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2635,8 +2635,8 @@ struct drm_i915_cmd_table {
>  
>  #define HAS_CSR(dev)	(IS_GEN9(dev))
>  
> -#define HAS_GUC_UCODE(dev)	(IS_GEN9(dev) && !IS_KABYLAKE(dev))
> -#define HAS_GUC_SCHED(dev)	(IS_GEN9(dev) && !IS_KABYLAKE(dev))
> +#define HAS_GUC_UCODE(dev)	(IS_GEN9(dev))
> +#define HAS_GUC_SCHED(dev)	(IS_GEN9(dev))
>  
>  #define HAS_RESOURCE_STREAMER(dev) (IS_HASWELL(dev) || \
>  				    INTEL_INFO(dev)->gen >= 8)
> -- 
> 1.9.1
>
yu.dai@intel.com Jan. 19, 2016, 10:38 p.m. UTC | #2 
On 01/19/2016 01:25 PM, Daniel Vetter wrote:
> On Tue, Jan 19, 2016 at 09:18:50PM +0000, Peter Antoine wrote:
> > This reverts commit a92d3f32eafc57cca55e654ecfd916f283100365.
>
> Shouldnt' this be patch 2/2? Enabling guc loading before it's fixed isn't
> awesome.
>
> Either way needs a proper commit message (why is it ok to enable now?)

This request was from Sean Kelley who is working on some Media features 
for KBL that relies on HuC firmware. HuC loading is done by GuC.

Thanks,
Alex

> > ---
> >  drivers/gpu/drm/i915/i915_drv.h | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> > index af30148..f99a988 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -2635,8 +2635,8 @@ struct drm_i915_cmd_table {
> >
> >  #define HAS_CSR(dev)	(IS_GEN9(dev))
> >
> > -#define HAS_GUC_UCODE(dev)	(IS_GEN9(dev) && !IS_KABYLAKE(dev))
> > -#define HAS_GUC_SCHED(dev)	(IS_GEN9(dev) && !IS_KABYLAKE(dev))
> > +#define HAS_GUC_UCODE(dev)	(IS_GEN9(dev))
> > +#define HAS_GUC_SCHED(dev)	(IS_GEN9(dev))
> >
> >  #define HAS_RESOURCE_STREAMER(dev) (IS_HASWELL(dev) || \
> >  				    INTEL_INFO(dev)->gen >= 8)
> > --
> > 1.9.1
> >
>
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index af30148..f99a988 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2635,8 +2635,8 @@  struct drm_i915_cmd_table {
 
 #define HAS_CSR(dev)	(IS_GEN9(dev))
 
-#define HAS_GUC_UCODE(dev)	(IS_GEN9(dev) && !IS_KABYLAKE(dev))
-#define HAS_GUC_SCHED(dev)	(IS_GEN9(dev) && !IS_KABYLAKE(dev))
+#define HAS_GUC_UCODE(dev)	(IS_GEN9(dev))
+#define HAS_GUC_SCHED(dev)	(IS_GEN9(dev))
 
 #define HAS_RESOURCE_STREAMER(dev) (IS_HASWELL(dev) || \
 				    INTEL_INFO(dev)->gen >= 8)