| Message ID | 20200129182034.26138-9-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/9] drm/i915/dsb: Replace HAS_DSB check with dsb->cmd_buf check | expand |
On 29-Jan-20 11:50 PM, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > No point in having these drm_device variables around. Get rid of them. Reviewed-by: Swati Sharma <swati2.sharma@intel.com> > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/display/intel_dsb.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_dsb.c b/drivers/gpu/drm/i915/display/intel_dsb.c > index 56790fae6386..c97b64401c23 100644 > --- a/drivers/gpu/drm/i915/display/intel_dsb.c > +++ b/drivers/gpu/drm/i915/display/intel_dsb.c > @@ -57,8 +57,7 @@ static inline bool is_dsb_busy(struct intel_dsb *dsb) > struct intel_dsb * > intel_dsb_get(struct intel_crtc *crtc) > { > - struct drm_device *dev = crtc->base.dev; > - struct drm_i915_private *i915 = to_i915(dev); > + struct drm_i915_private *i915 = to_i915(crtc->base.dev); > struct intel_dsb *dsb = &crtc->dsb; > struct drm_i915_gem_object *obj; > struct i915_vma *vma; > @@ -276,8 +275,7 @@ static u32 intel_dsb_align_tail(struct intel_dsb *dsb) > void intel_dsb_commit(struct intel_dsb *dsb) > { > struct intel_crtc *crtc = container_of(dsb, typeof(*crtc), dsb); > - struct drm_device *dev = crtc->base.dev; > - struct drm_i915_private *dev_priv = to_i915(dev); > + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); > enum pipe pipe = crtc->pipe; > u32 tail; > >
diff --git a/drivers/gpu/drm/i915/display/intel_dsb.c b/drivers/gpu/drm/i915/display/intel_dsb.c index 56790fae6386..c97b64401c23 100644 --- a/drivers/gpu/drm/i915/display/intel_dsb.c +++ b/drivers/gpu/drm/i915/display/intel_dsb.c @@ -57,8 +57,7 @@ static inline bool is_dsb_busy(struct intel_dsb *dsb) struct intel_dsb * intel_dsb_get(struct intel_crtc *crtc) { - struct drm_device *dev = crtc->base.dev; - struct drm_i915_private *i915 = to_i915(dev); + struct drm_i915_private *i915 = to_i915(crtc->base.dev); struct intel_dsb *dsb = &crtc->dsb; struct drm_i915_gem_object *obj; struct i915_vma *vma; @@ -276,8 +275,7 @@ static u32 intel_dsb_align_tail(struct intel_dsb *dsb) void intel_dsb_commit(struct intel_dsb *dsb) { struct intel_crtc *crtc = container_of(dsb, typeof(*crtc), dsb); - struct drm_device *dev = crtc->base.dev; - struct drm_i915_private *dev_priv = to_i915(dev); + struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); enum pipe pipe = crtc->pipe; u32 tail;