| Message ID | 1482184508-18346-1-git-send-email-rodrigo.vivi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Dec 19, 2016 at 01:55:08PM -0800, Rodrigo Vivi wrote: > This macro got useless after commit 8d9c20e1d1e38 > "drm/i915: Remove .is_mobile field from platform struct" > > that removed is_mobile split from VLV definition. > Also this was never reused on any following platform. > > So let's clean up a bit here. > > Cc: Carlos Santa <carlos.santa@intel.com> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/i915/i915_pci.c | 34 ++++++++++++++++------------------ > 1 file changed, 16 insertions(+), 18 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c > index 9885458..7435a73 100644 > --- a/drivers/gpu/drm/i915/i915_pci.c > +++ b/drivers/gpu/drm/i915/i915_pci.c > @@ -265,26 +265,24 @@ > .has_l3_dpf = 1, > }; > > -#define VLV_FEATURES \ > - .gen = 7, .num_pipes = 2, \ > - .is_lp = 1, \ > - .has_psr = 1, \ > - .has_runtime_pm = 1, \ > - .has_rc6 = 1, \ > - .has_gmbus_irq = 1, \ > - .has_hw_contexts = 1, \ > - .has_gmch_display = 1, \ > - .has_hotplug = 1, \ > - .has_aliasing_ppgtt = 1, \ > - .has_full_ppgtt = 1, \ > - .ring_mask = RENDER_RING | BSD_RING | BLT_RING, \ > - .display_mmio_offset = VLV_DISPLAY_BASE, \ > - GEN_DEFAULT_PIPEOFFSETS, \ > - CURSOR_OFFSETS > - > static const struct intel_device_info intel_valleyview_info = { > - VLV_FEATURES, > .platform = INTEL_VALLEYVIEW, > + .gen = 7, > + .is_lp = 1, > + .num_pipes = 2, > + .has_psr = 1, > + .has_runtime_pm = 1, > + .has_rc6 = 1, > + .has_gmbus_irq = 1, > + .has_hw_contexts = 1, > + .has_gmch_display = 1, > + .has_hotplug = 1, > + .has_aliasing_ppgtt = 1, > + .has_full_ppgtt = 1, > + .ring_mask = RENDER_RING | BSD_RING | BLT_RING, > + .display_mmio_offset = VLV_DISPLAY_BASE, > + GEN_DEFAULT_PIPEOFFSETS, > + CURSOR_OFFSETS > }; > > #define HSW_FEATURES \ > -- > 1.9.1 >
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index 9885458..7435a73 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c @@ -265,26 +265,24 @@ .has_l3_dpf = 1, }; -#define VLV_FEATURES \ - .gen = 7, .num_pipes = 2, \ - .is_lp = 1, \ - .has_psr = 1, \ - .has_runtime_pm = 1, \ - .has_rc6 = 1, \ - .has_gmbus_irq = 1, \ - .has_hw_contexts = 1, \ - .has_gmch_display = 1, \ - .has_hotplug = 1, \ - .has_aliasing_ppgtt = 1, \ - .has_full_ppgtt = 1, \ - .ring_mask = RENDER_RING | BSD_RING | BLT_RING, \ - .display_mmio_offset = VLV_DISPLAY_BASE, \ - GEN_DEFAULT_PIPEOFFSETS, \ - CURSOR_OFFSETS - static const struct intel_device_info intel_valleyview_info = { - VLV_FEATURES, .platform = INTEL_VALLEYVIEW, + .gen = 7, + .is_lp = 1, + .num_pipes = 2, + .has_psr = 1, + .has_runtime_pm = 1, + .has_rc6 = 1, + .has_gmbus_irq = 1, + .has_hw_contexts = 1, + .has_gmch_display = 1, + .has_hotplug = 1, + .has_aliasing_ppgtt = 1, + .has_full_ppgtt = 1, + .ring_mask = RENDER_RING | BSD_RING | BLT_RING, + .display_mmio_offset = VLV_DISPLAY_BASE, + GEN_DEFAULT_PIPEOFFSETS, + CURSOR_OFFSETS }; #define HSW_FEATURES \
This macro got useless after commit 8d9c20e1d1e38 "drm/i915: Remove .is_mobile field from platform struct" that removed is_mobile split from VLV definition. Also this was never reused on any following platform. So let's clean up a bit here. Cc: Carlos Santa <carlos.santa@intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> --- drivers/gpu/drm/i915/i915_pci.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-)