Fixup patches to fix warnings in recent linux-next
cover Fixup patches to fix warnings in recent linux-next
From: Thierry Reding <[email protected]>
Hi Daniel,
here are a couple of patches that fixup some warnings that have started to show up in linux-next recently. They are somewhat unconventionally named, but since these are fixups to patches in your topic/drm-misc branch I thought you might find it convenient to just apply them and do a git rebase --autosquash and get them sorted into the proper places automatically.
Thierry
Thierry Reding (2):
fixup! drm: Stop using linedur_ns and pixeldur_ns for vblank
timestamps
fixup! drm/atomic: Make prepare_fb/cleanup_fb only take state, v3.
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 11 ++++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 3 ++- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 -- 3 files changed, 8 insertions(+), 8 deletions(-)
Signature · 6 lines
2.5.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/2 fixup! drm: Stop using linedur_ns and pixeldur_ns for vblank timestamps
From: Thierry Reding <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 11 ++++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +6 -5
@@ -745,7 +745,8 @@ bool amdgpu_crtc_scaling_mode_fixup(struct drm_crtc *crtc,* */ int amdgpu_get_crtc_scanoutpos (struct drm_device *dev,int crtc,unsigned int flags, -int *vpos,int *hpos,ktime_t *stime,ktime_t *etime) +int *vpos,int *hpos,ktime_t *stime,ktime_t *etime, +const struct drm_display_mode *mode) {u32 vbl =0 , position =0 ;int vbl_start, vbl_end, vtotal, ret =0 ;
@@ -781,7 +782,7 @@ int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, int crtc, unsigned int fl }else {/* No: Fake something reasonable which gives at least ok results. */ - vbl_start = adev->mode_info.crtcs[crtc]->base.hwmode.crtc_vdisplay; + vbl_start = mode->crtc_vdisplay; vbl_end =0 ; }
@@ -797,7 +798,7 @@ int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, int crtc, unsigned int fl/* Inside "upper part" of vblank area? Apply corrective offset if so: */ if (in_vbl && (*vpos >= vbl_start)) { - vtotal = adev->mode_info.crtcs[crtc]->base.hwmode.crtc_vtotal; + vtotal = mode->crtc_vtotal; *vpos = *vpos - vtotal; }
@@ -819,8 +820,8 @@ int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, int crtc, unsigned int fl* We only do this if DRM_CALLED_FROM_VBLIRQ. */ if ((flags &DRM_CALLED_FROM_VBLIRQ ) && !in_vbl) { - vbl_start = adev->mode_info.crtcs[crtc]->base.hwmode.crtc_vdisplay; - vtotal = adev->mode_info.crtcs[crtc]->base.hwmode.crtc_vtotal; + vbl_start = mode->crtc_vdisplay; + vtotal = mode->crtc_vtotal;if (vbl_start - *vpos < vtotal /100 ) { *vpos -= vtotal;
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +2 -1
@@ -543,7 +543,8 @@ void amdgpu_encoder_set_active_device(struct drm_encoder *encoder);int amdgpu_get_crtc_scanoutpos (struct drm_device *dev,int crtc,unsigned int flags,int *vpos,int *hpos,ktime_t *stime, -ktime_t *etime); +ktime_t *etime, +const struct drm_display_mode *mode); int amdgpu_framebuffer_init(struct drm_device *dev, struct amdgpu_framebuffer *rfb,
Signature · 6 lines
2.5.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 1/2] fixup! drm: Stop using linedur_ns and pixeldur_ns for vblank timestamps
Quoted 2 lines · Thierry Reding
From: Thierry Reding <[email protected]>
Hmm. I guess I wrote the patch before amdgpu got added.
Quoted 69 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 11 ++++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +6
-5@@ -745,7 +745,8 @@ bool amdgpu_crtc_scaling_mode_fixup(struct drm_crtc *crtc,* */ int amdgpu_get_crtc_scanoutpos (struct drm_device *dev,int crtc,unsigned int flags, -int *vpos,int *hpos,ktime_t *stime,ktime_t *etime) +int *vpos,int *hpos,ktime_t *stime,ktime_t *etime, +const struct drm_display_mode *mode) {u32 vbl =0 , position =0 ;int vbl_start, vbl_end, vtotal, ret =0 ;@@ -781,7 +782,7 @@ int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, int crtc, unsigned int fl }else {/* No: Fake something reasonable which gives at least ok results. */ - vbl_start = adev->mode_info.crtcs[crtc]->base.hwmode.crtc_vdisplay; + vbl_start = mode->crtc_vdisplay; vbl_end =0 ; }@@ -797,7 +798,7 @@ int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, int crtc, unsigned int fl/* Inside "upper part" of vblank area? Apply corrective offset if so: */ if (in_vbl && (*vpos >= vbl_start)) { - vtotal = adev->mode_info.crtcs[crtc]->base.hwmode.crtc_vtotal; + vtotal = mode->crtc_vtotal; *vpos = *vpos - vtotal; }@@ -819,8 +820,8 @@ int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, int crtc, unsigned int fl* We only do this if DRM_CALLED_FROM_VBLIRQ. */ if ((flags &DRM_CALLED_FROM_VBLIRQ ) && !in_vbl) { - vbl_start = adev->mode_info.crtcs[crtc]->base.hwmode.crtc_vdisplay; - vtotal = adev->mode_info.crtcs[crtc]->base.hwmode.crtc_vtotal; + vbl_start = mode->crtc_vdisplay; + vtotal = mode->crtc_vtotal;if (vbl_start - *vpos < vtotal /100 ) { *vpos -= vtotal;drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +2
-1@@ -543,7 +543,8 @@ void amdgpu_encoder_set_active_device(struct drm_encoder *encoder);int amdgpu_get_crtc_scanoutpos (struct drm_device *dev,int crtc,unsigned int flags,int *vpos,int *hpos,ktime_t *stime, -ktime_t *etime); +ktime_t *etime, +const struct drm_display_mode *mode); int amdgpu_framebuffer_init(struct drm_device *dev, struct amdgpu_framebuffer *rfb,Signature · 6 lines
2.5.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/2 fixup! drm/atomic: Make prepare_fb/cleanup_fb only take state, v3.
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
--- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 -- 1 file changed, 2 deletions(-)
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c +0 -2
@@ -190,14 +190,12 @@ set_failed:static void fsl_dcu_drm_plane_cleanup_fb (struct drm_plane *plane, -struct drm_framebuffer *fb,const struct drm_plane_state *new_state) { }static int fsl_dcu_drm_plane_prepare_fb (struct drm_plane *plane, -struct drm_framebuffer *fb,const struct drm_plane_state *new_state) {return 0 ;
Signature · 6 lines
2.5.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel