aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/files/0575-drm-irq-Use-unsigned-int-pipe-in-public-API.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/files/0575-drm-irq-Use-unsigned-int-pipe-in-public-API.patch')
-rw-r--r--common/recipes-kernel/linux/files/0575-drm-irq-Use-unsigned-int-pipe-in-public-API.patch219
1 files changed, 0 insertions, 219 deletions
diff --git a/common/recipes-kernel/linux/files/0575-drm-irq-Use-unsigned-int-pipe-in-public-API.patch b/common/recipes-kernel/linux/files/0575-drm-irq-Use-unsigned-int-pipe-in-public-API.patch
deleted file mode 100644
index bc3f4baf..00000000
--- a/common/recipes-kernel/linux/files/0575-drm-irq-Use-unsigned-int-pipe-in-public-API.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-From 88e72717c2de4181d8a6de1b04315953ad2bebdf Mon Sep 17 00:00:00 2001
-From: Thierry Reding <treding@nvidia.com>
-Date: Thu, 24 Sep 2015 18:35:31 +0200
-Subject: [PATCH 0575/1565] drm/irq: Use unsigned int pipe in public API
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This continues the pattern started in commit cc1ef118fc09 ("drm/irq:
-Make pipe unsigned and name consistent"). This is applied to the public
-APIs and driver callbacks, so pretty much all drivers need to be updated
-to match the new prototypes.
-
-Cc: Christian König <christian.koenig@amd.com>
-Cc: Alex Deucher <alexander.deucher@amd.com>
-Cc: Russell King <rmk+kernel@arm.linux.org.uk>
-Cc: Inki Dae <inki.dae@samsung.com>
-Cc: Jianwei Wang <jianwei.wang.chn@gmail.com>
-Cc: Alison Wang <alison.wang@freescale.com>
-Cc: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
-Cc: Daniel Vetter <daniel.vetter@intel.com>
-Cc: Jani Nikula <jani.nikula@linux.intel.com>
-Cc: Philipp Zabel <p.zabel@pengutronix.de>
-Cc: David Airlie <airlied@linux.ie>
-Cc: Rob Clark <robdclark@gmail.com>
-Cc: Ben Skeggs <bskeggs@redhat.com>
-Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
-Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Cc: Mark Yao <mark.yao@rock-chips.com>
-Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org>
-Cc: Vincent Abriou <vincent.abriou@st.com>
-Cc: Thomas Hellstrom <thellstrom@vmware.com>
-Signed-off-by: Thierry Reding <treding@nvidia.com>
-Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
-Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 8 +++----
- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 9 ++++----
- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 36 ++++++++++++++---------------
- drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 9 ++++----
- 4 files changed, 31 insertions(+), 31 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-index 6647fb2..5e43178d 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
-@@ -2349,10 +2349,10 @@ void amdgpu_driver_preclose_kms(struct drm_device *dev,
- struct drm_file *file_priv);
- int amdgpu_suspend_kms(struct drm_device *dev, bool suspend, bool fbcon);
- int amdgpu_resume_kms(struct drm_device *dev, bool resume, bool fbcon);
--u32 amdgpu_get_vblank_counter_kms(struct drm_device *dev, int crtc);
--int amdgpu_enable_vblank_kms(struct drm_device *dev, int crtc);
--void amdgpu_disable_vblank_kms(struct drm_device *dev, int crtc);
--int amdgpu_get_vblank_timestamp_kms(struct drm_device *dev, int crtc,
-+u32 amdgpu_get_vblank_counter_kms(struct drm_device *dev, unsigned int pipe);
-+int amdgpu_enable_vblank_kms(struct drm_device *dev, unsigned int pipe);
-+void amdgpu_disable_vblank_kms(struct drm_device *dev, unsigned int pipe);
-+int amdgpu_get_vblank_timestamp_kms(struct drm_device *dev, unsigned int pipe,
- int *max_error,
- struct timeval *vblank_time,
- unsigned flags);
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
-index 9b34a34..de11639 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
-@@ -721,7 +721,7 @@ bool amdgpu_crtc_scaling_mode_fixup(struct drm_crtc *crtc,
- * an optional accurate timestamp of when query happened.
- *
- * \param dev Device to query.
-- * \param crtc Crtc to query.
-+ * \param pipe Crtc to query.
- * \param flags Flags from caller (DRM_CALLED_FROM_VBLIRQ or 0).
- * \param *vpos Location where vertical scanout position should be stored.
- * \param *hpos Location where horizontal scanout position should go.
-@@ -744,8 +744,9 @@ bool amdgpu_crtc_scaling_mode_fixup(struct drm_crtc *crtc,
- * unknown small number of scanlines wrt. real scanout position.
- *
- */
--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 amdgpu_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
-+ unsigned int flags, int *vpos, int *hpos,
-+ ktime_t *stime, ktime_t *etime,
- const struct drm_display_mode *mode)
- {
- u32 vbl = 0, position = 0;
-@@ -760,7 +761,7 @@ int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, int crtc, unsigned int fl
- if (stime)
- *stime = ktime_get();
-
-- if (amdgpu_display_page_flip_get_scanoutpos(adev, crtc, &vbl, &position) == 0)
-+ if (amdgpu_display_page_flip_get_scanoutpos(adev, pipe, &vbl, &position) == 0)
- ret |= DRM_SCANOUTPOS_VALID;
-
- /* Get optional system timestamp after query. */
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
-index 275f1c3..b9faaf8 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
-@@ -600,36 +600,36 @@ void amdgpu_driver_preclose_kms(struct drm_device *dev,
- * amdgpu_get_vblank_counter_kms - get frame count
- *
- * @dev: drm dev pointer
-- * @crtc: crtc to get the frame count from
-+ * @pipe: crtc to get the frame count from
- *
- * Gets the frame count on the requested crtc (all asics).
- * Returns frame count on success, -EINVAL on failure.
- */
--u32 amdgpu_get_vblank_counter_kms(struct drm_device *dev, int crtc)
-+u32 amdgpu_get_vblank_counter_kms(struct drm_device *dev, unsigned int pipe)
- {
- struct amdgpu_device *adev = dev->dev_private;
-
-- if (crtc < 0 || crtc >= adev->mode_info.num_crtc) {
-- DRM_ERROR("Invalid crtc %d\n", crtc);
-+ if (pipe >= adev->mode_info.num_crtc) {
-+ DRM_ERROR("Invalid crtc %u\n", pipe);
- return -EINVAL;
- }
-
-- return amdgpu_display_vblank_get_counter(adev, crtc);
-+ return amdgpu_display_vblank_get_counter(adev, pipe);
- }
-
- /**
- * amdgpu_enable_vblank_kms - enable vblank interrupt
- *
- * @dev: drm dev pointer
-- * @crtc: crtc to enable vblank interrupt for
-+ * @pipe: crtc to enable vblank interrupt for
- *
- * Enable the interrupt on the requested crtc (all asics).
- * Returns 0 on success, -EINVAL on failure.
- */
--int amdgpu_enable_vblank_kms(struct drm_device *dev, int crtc)
-+int amdgpu_enable_vblank_kms(struct drm_device *dev, unsigned int pipe)
- {
- struct amdgpu_device *adev = dev->dev_private;
-- int idx = amdgpu_crtc_idx_to_irq_type(adev, crtc);
-+ int idx = amdgpu_crtc_idx_to_irq_type(adev, pipe);
-
- return amdgpu_irq_get(adev, &adev->crtc_irq, idx);
- }
-@@ -638,14 +638,14 @@ int amdgpu_enable_vblank_kms(struct drm_device *dev, int crtc)
- * amdgpu_disable_vblank_kms - disable vblank interrupt
- *
- * @dev: drm dev pointer
-- * @crtc: crtc to disable vblank interrupt for
-+ * @pipe: crtc to disable vblank interrupt for
- *
- * Disable the interrupt on the requested crtc (all asics).
- */
--void amdgpu_disable_vblank_kms(struct drm_device *dev, int crtc)
-+void amdgpu_disable_vblank_kms(struct drm_device *dev, unsigned int pipe)
- {
- struct amdgpu_device *adev = dev->dev_private;
-- int idx = amdgpu_crtc_idx_to_irq_type(adev, crtc);
-+ int idx = amdgpu_crtc_idx_to_irq_type(adev, pipe);
-
- amdgpu_irq_put(adev, &adev->crtc_irq, idx);
- }
-@@ -663,26 +663,26 @@ void amdgpu_disable_vblank_kms(struct drm_device *dev, int crtc)
- * scanout position. (all asics).
- * Returns postive status flags on success, negative error on failure.
- */
--int amdgpu_get_vblank_timestamp_kms(struct drm_device *dev, int crtc,
-+int amdgpu_get_vblank_timestamp_kms(struct drm_device *dev, unsigned int pipe,
- int *max_error,
- struct timeval *vblank_time,
- unsigned flags)
- {
-- struct drm_crtc *drmcrtc;
-+ struct drm_crtc *crtc;
- struct amdgpu_device *adev = dev->dev_private;
-
-- if (crtc < 0 || crtc >= dev->num_crtcs) {
-- DRM_ERROR("Invalid crtc %d\n", crtc);
-+ if (pipe >= dev->num_crtcs) {
-+ DRM_ERROR("Invalid crtc %u\n", pipe);
- return -EINVAL;
- }
-
- /* Get associated drm_crtc: */
-- drmcrtc = &adev->mode_info.crtcs[crtc]->base;
-+ crtc = &adev->mode_info.crtcs[pipe]->base;
-
- /* Helper routine in DRM core does all the work: */
-- return drm_calc_vbltimestamp_from_scanoutpos(dev, crtc, max_error,
-+ return drm_calc_vbltimestamp_from_scanoutpos(dev, pipe, max_error,
- vblank_time, flags,
-- &drmcrtc->hwmode);
-+ &crtc->hwmode);
- }
-
- const struct drm_ioctl_desc amdgpu_ioctls_kms[] = {
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
-index 2b03425..f6b0299 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
-@@ -540,11 +540,10 @@ bool amdgpu_ddc_probe(struct amdgpu_connector *amdgpu_connector, bool use_aux);
-
- 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,
-- const struct drm_display_mode *mode);
-+int amdgpu_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
-+ unsigned int flags, int *vpos, int *hpos,
-+ ktime_t *stime, ktime_t *etime,
-+ const struct drm_display_mode *mode);
-
- int amdgpu_framebuffer_init(struct drm_device *dev,
- struct amdgpu_framebuffer *rfb,
---
-1.9.1
-
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-26 11:28:30 +0000