* [PATCH 0/2] Fixup patches to fix warnings in recent linux-next
@ 2015-09-24 10:23 Thierry Reding
2015-09-24 10:23 ` [PATCH 1/2] fixup! drm: Stop using linedur_ns and pixeldur_ns for vblank timestamps Thierry Reding
2015-09-24 10:23 ` [PATCH 2/2] fixup! drm/atomic: Make prepare_fb/cleanup_fb only take state, v3 Thierry Reding
0 siblings, 2 replies; 4+ messages in thread
From: Thierry Reding @ 2015-09-24 10:23 UTC (permalink / raw)
To: Daniel Vetter; +Cc: dri-devel
From: Thierry Reding <treding@nvidia.com>
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(-)
--
2.5.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] fixup! drm: Stop using linedur_ns and pixeldur_ns for vblank timestamps
2015-09-24 10:23 [PATCH 0/2] Fixup patches to fix warnings in recent linux-next Thierry Reding
@ 2015-09-24 10:23 ` Thierry Reding
2015-09-24 21:00 ` Ville Syrjälä
2015-09-24 10:23 ` [PATCH 2/2] fixup! drm/atomic: Make prepare_fb/cleanup_fb only take state, v3 Thierry Reding
1 sibling, 1 reply; 4+ messages in thread
From: Thierry Reding @ 2015-09-24 10:23 UTC (permalink / raw)
To: Daniel Vetter; +Cc: dri-devel
From: Thierry Reding <treding@nvidia.com>
---
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(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index e3d70772b531..9b34a3410c32 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -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;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
index 64efe5b52e65..2b03425f9740 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
@@ -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,
--
2.5.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] fixup! drm/atomic: Make prepare_fb/cleanup_fb only take state, v3.
2015-09-24 10:23 [PATCH 0/2] Fixup patches to fix warnings in recent linux-next Thierry Reding
2015-09-24 10:23 ` [PATCH 1/2] fixup! drm: Stop using linedur_ns and pixeldur_ns for vblank timestamps Thierry Reding
@ 2015-09-24 10:23 ` Thierry Reding
1 sibling, 0 replies; 4+ messages in thread
From: Thierry Reding @ 2015-09-24 10:23 UTC (permalink / raw)
To: Daniel Vetter; +Cc: dri-devel
From: Thierry Reding <treding@nvidia.com>
---
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
index 82be6b86a168..d78f8df1fa75 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
@@ -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;
--
2.5.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] fixup! drm: Stop using linedur_ns and pixeldur_ns for vblank timestamps
2015-09-24 10:23 ` [PATCH 1/2] fixup! drm: Stop using linedur_ns and pixeldur_ns for vblank timestamps Thierry Reding
@ 2015-09-24 21:00 ` Ville Syrjälä
0 siblings, 0 replies; 4+ messages in thread
From: Ville Syrjälä @ 2015-09-24 21:00 UTC (permalink / raw)
To: Thierry Reding; +Cc: Daniel Vetter, dri-devel
On Thu, Sep 24, 2015 at 12:23:27PM +0200, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
>
Hmm. I guess I wrote the patch before amdgpu got added.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> 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(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
> index e3d70772b531..9b34a3410c32 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
> @@ -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;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
> index 64efe5b52e65..2b03425f9740 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
> @@ -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,
> --
> 2.5.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Ville Syrjälä
Intel OTC
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-09-24 21:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-24 10:23 [PATCH 0/2] Fixup patches to fix warnings in recent linux-next Thierry Reding
2015-09-24 10:23 ` [PATCH 1/2] fixup! drm: Stop using linedur_ns and pixeldur_ns for vblank timestamps Thierry Reding
2015-09-24 21:00 ` Ville Syrjälä
2015-09-24 10:23 ` [PATCH 2/2] fixup! drm/atomic: Make prepare_fb/cleanup_fb only take state, v3 Thierry Reding
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.