| Message ID | 532150999335216b1374c606e1b3c253a6c9fe9d.1454582914.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Feb 04, 2016 at 12:50:54PM +0200, Jani Nikula wrote: > Not needed. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/i915_drv.h | 2 -- > drivers/gpu/drm/i915/i915_reg.h | 1 - > drivers/gpu/drm/i915/intel_sideband.c | 14 -------------- > 3 files changed, 17 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 77227a39f3d5..af601be8b490 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -3483,8 +3483,6 @@ u32 vlv_ccu_read(struct drm_i915_private *dev_priv, u32 reg); > void vlv_ccu_write(struct drm_i915_private *dev_priv, u32 reg, u32 val); > u32 vlv_bunit_read(struct drm_i915_private *dev_priv, u32 reg); > void vlv_bunit_write(struct drm_i915_private *dev_priv, u32 reg, u32 val); > -u32 vlv_gps_core_read(struct drm_i915_private *dev_priv, u32 reg); > -void vlv_gps_core_write(struct drm_i915_private *dev_priv, u32 reg, u32 val); > u32 vlv_dpio_read(struct drm_i915_private *dev_priv, enum pipe pipe, int reg); > void vlv_dpio_write(struct drm_i915_private *dev_priv, enum pipe pipe, int reg, u32 val); > u32 intel_sbi_read(struct drm_i915_private *dev_priv, u16 reg, > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index f3b4b19198b9..c761fa2f3b8b 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -618,7 +618,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) > #define IOSF_PORT_CCK 0x14 > #define IOSF_PORT_DPIO_2 0x1a > #define IOSF_PORT_FLISDSI 0x1b > -#define IOSF_PORT_GPS_CORE 0x48 > #define IOSF_PORT_CCU 0xa9 > #define VLV_IOSF_DATA _MMIO(VLV_DISPLAY_BASE + 0x2104) > #define VLV_IOSF_ADDR _MMIO(VLV_DISPLAY_BASE + 0x2108) > diff --git a/drivers/gpu/drm/i915/intel_sideband.c b/drivers/gpu/drm/i915/intel_sideband.c > index 8831fc579ade..f5b0ab6f5942 100644 > --- a/drivers/gpu/drm/i915/intel_sideband.c > +++ b/drivers/gpu/drm/i915/intel_sideband.c > @@ -171,20 +171,6 @@ void vlv_ccu_write(struct drm_i915_private *dev_priv, u32 reg, u32 val) > SB_CRWRDA_NP, reg, &val); > } > > -u32 vlv_gps_core_read(struct drm_i915_private *dev_priv, u32 reg) > -{ > - u32 val = 0; > - vlv_sideband_rw(dev_priv, PCI_DEVFN(0, 0), IOSF_PORT_GPS_CORE, > - SB_CRRDDA_NP, reg, &val); > - return val; > -} > - > -void vlv_gps_core_write(struct drm_i915_private *dev_priv, u32 reg, u32 val) > -{ > - vlv_sideband_rw(dev_priv, PCI_DEVFN(0, 0), IOSF_PORT_GPS_CORE, > - SB_CRWRDA_NP, reg, &val); > -} > - > u32 vlv_dpio_read(struct drm_i915_private *dev_priv, enum pipe pipe, int reg) > { > u32 val = 0; > -- > 2.1.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Thu, 04 Feb 2016, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote: > On Thu, Feb 04, 2016 at 12:50:54PM +0200, Jani Nikula wrote: >> Not needed. >> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> > > Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Pushed patches 5-6 to dinq, thanks for the review. BR, Jani. > >> --- >> drivers/gpu/drm/i915/i915_drv.h | 2 -- >> drivers/gpu/drm/i915/i915_reg.h | 1 - >> drivers/gpu/drm/i915/intel_sideband.c | 14 -------------- >> 3 files changed, 17 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h >> index 77227a39f3d5..af601be8b490 100644 >> --- a/drivers/gpu/drm/i915/i915_drv.h >> +++ b/drivers/gpu/drm/i915/i915_drv.h >> @@ -3483,8 +3483,6 @@ u32 vlv_ccu_read(struct drm_i915_private *dev_priv, u32 reg); >> void vlv_ccu_write(struct drm_i915_private *dev_priv, u32 reg, u32 val); >> u32 vlv_bunit_read(struct drm_i915_private *dev_priv, u32 reg); >> void vlv_bunit_write(struct drm_i915_private *dev_priv, u32 reg, u32 val); >> -u32 vlv_gps_core_read(struct drm_i915_private *dev_priv, u32 reg); >> -void vlv_gps_core_write(struct drm_i915_private *dev_priv, u32 reg, u32 val); >> u32 vlv_dpio_read(struct drm_i915_private *dev_priv, enum pipe pipe, int reg); >> void vlv_dpio_write(struct drm_i915_private *dev_priv, enum pipe pipe, int reg, u32 val); >> u32 intel_sbi_read(struct drm_i915_private *dev_priv, u16 reg, >> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h >> index f3b4b19198b9..c761fa2f3b8b 100644 >> --- a/drivers/gpu/drm/i915/i915_reg.h >> +++ b/drivers/gpu/drm/i915/i915_reg.h >> @@ -618,7 +618,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) >> #define IOSF_PORT_CCK 0x14 >> #define IOSF_PORT_DPIO_2 0x1a >> #define IOSF_PORT_FLISDSI 0x1b >> -#define IOSF_PORT_GPS_CORE 0x48 >> #define IOSF_PORT_CCU 0xa9 >> #define VLV_IOSF_DATA _MMIO(VLV_DISPLAY_BASE + 0x2104) >> #define VLV_IOSF_ADDR _MMIO(VLV_DISPLAY_BASE + 0x2108) >> diff --git a/drivers/gpu/drm/i915/intel_sideband.c b/drivers/gpu/drm/i915/intel_sideband.c >> index 8831fc579ade..f5b0ab6f5942 100644 >> --- a/drivers/gpu/drm/i915/intel_sideband.c >> +++ b/drivers/gpu/drm/i915/intel_sideband.c >> @@ -171,20 +171,6 @@ void vlv_ccu_write(struct drm_i915_private *dev_priv, u32 reg, u32 val) >> SB_CRWRDA_NP, reg, &val); >> } >> >> -u32 vlv_gps_core_read(struct drm_i915_private *dev_priv, u32 reg) >> -{ >> - u32 val = 0; >> - vlv_sideband_rw(dev_priv, PCI_DEVFN(0, 0), IOSF_PORT_GPS_CORE, >> - SB_CRRDDA_NP, reg, &val); >> - return val; >> -} >> - >> -void vlv_gps_core_write(struct drm_i915_private *dev_priv, u32 reg, u32 val) >> -{ >> - vlv_sideband_rw(dev_priv, PCI_DEVFN(0, 0), IOSF_PORT_GPS_CORE, >> - SB_CRWRDA_NP, reg, &val); >> -} >> - >> u32 vlv_dpio_read(struct drm_i915_private *dev_priv, enum pipe pipe, int reg) >> { >> u32 val = 0; >> -- >> 2.1.4 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 77227a39f3d5..af601be8b490 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -3483,8 +3483,6 @@ u32 vlv_ccu_read(struct drm_i915_private *dev_priv, u32 reg); void vlv_ccu_write(struct drm_i915_private *dev_priv, u32 reg, u32 val); u32 vlv_bunit_read(struct drm_i915_private *dev_priv, u32 reg); void vlv_bunit_write(struct drm_i915_private *dev_priv, u32 reg, u32 val); -u32 vlv_gps_core_read(struct drm_i915_private *dev_priv, u32 reg); -void vlv_gps_core_write(struct drm_i915_private *dev_priv, u32 reg, u32 val); u32 vlv_dpio_read(struct drm_i915_private *dev_priv, enum pipe pipe, int reg); void vlv_dpio_write(struct drm_i915_private *dev_priv, enum pipe pipe, int reg, u32 val); u32 intel_sbi_read(struct drm_i915_private *dev_priv, u16 reg, diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index f3b4b19198b9..c761fa2f3b8b 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -618,7 +618,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) #define IOSF_PORT_CCK 0x14 #define IOSF_PORT_DPIO_2 0x1a #define IOSF_PORT_FLISDSI 0x1b -#define IOSF_PORT_GPS_CORE 0x48 #define IOSF_PORT_CCU 0xa9 #define VLV_IOSF_DATA _MMIO(VLV_DISPLAY_BASE + 0x2104) #define VLV_IOSF_ADDR _MMIO(VLV_DISPLAY_BASE + 0x2108) diff --git a/drivers/gpu/drm/i915/intel_sideband.c b/drivers/gpu/drm/i915/intel_sideband.c index 8831fc579ade..f5b0ab6f5942 100644 --- a/drivers/gpu/drm/i915/intel_sideband.c +++ b/drivers/gpu/drm/i915/intel_sideband.c @@ -171,20 +171,6 @@ void vlv_ccu_write(struct drm_i915_private *dev_priv, u32 reg, u32 val) SB_CRWRDA_NP, reg, &val); } -u32 vlv_gps_core_read(struct drm_i915_private *dev_priv, u32 reg) -{ - u32 val = 0; - vlv_sideband_rw(dev_priv, PCI_DEVFN(0, 0), IOSF_PORT_GPS_CORE, - SB_CRRDDA_NP, reg, &val); - return val; -} - -void vlv_gps_core_write(struct drm_i915_private *dev_priv, u32 reg, u32 val) -{ - vlv_sideband_rw(dev_priv, PCI_DEVFN(0, 0), IOSF_PORT_GPS_CORE, - SB_CRWRDA_NP, reg, &val); -} - u32 vlv_dpio_read(struct drm_i915_private *dev_priv, enum pipe pipe, int reg) { u32 val = 0;
Not needed. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/i915_drv.h | 2 -- drivers/gpu/drm/i915/i915_reg.h | 1 - drivers/gpu/drm/i915/intel_sideband.c | 14 -------------- 3 files changed, 17 deletions(-)