mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +00:00
d91f38a99e
Removed upstreamed: generic/backport-6.1/701-v6.5-net-bgmac-postpone-turning-IRQs-off-to-avoid-SoC-han.patch[1] generic/pending-6.1/160-workqueue-fix-enum-type-for-gcc-13.patch[2] qualcommax/patches-6.1/0022-v6.5-soc-qcom-mdt_loader-Fix-unconditional-call-to-scm_pa.patch[3] Manually rebased: bcm27xx/patches-6.1/950-0359-xhci-quirks-add-link-TRB-quirk-for-VL805.patch bcm27xx/patches-6.1/950-0362-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch bcm27xx/patches-6.1/950-0390-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch bcm27xx/patches-6.1/950-0469-usb-xhci-add-XHCI_VLI_HUB_TT_QUIRK.patch bcm53xx/patches-6.1/180-usb-xhci-add-support-for-performing-fake-doorbell.patch All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.40&id=685b57a1221c38ec8b456f968264d2496715820c 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.40&id=2d57a1590f4d8c516f5aaf8fd5bb4f52d67275d8 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.40&id=33f8dff6e1cbba5c2ec85fa5649c0a759a7e685c Build system: x86/64, filogic/xiaomi_redmi-router-ax6000-ubootmod Build-tested: x86/64, filogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: x86/64 Signed-off-by: John Audia <therealgraysky@proton.me>
200 lines
8.4 KiB
Diff
200 lines
8.4 KiB
Diff
From d094cf748495c8c9be15bbbf9801237c8e390c8a Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Wed, 23 Nov 2022 16:25:51 +0100
|
|
Subject: [PATCH] drm/atomic: Constify the old/new state accessors
|
|
|
|
The drm_atomic_get_(old|new)_*_state don't modify the passed
|
|
drm_atomic_state, so we can make it const.
|
|
|
|
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20221123-rpi-kunit-tests-v1-9-051a0bb60a16@cerno.tech
|
|
---
|
|
drivers/gpu/drm/drm_atomic.c | 12 ++++++------
|
|
include/drm/drm_atomic.h | 32 ++++++++++++++++----------------
|
|
2 files changed, 22 insertions(+), 22 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/drm_atomic.c
|
|
+++ b/drivers/gpu/drm/drm_atomic.c
|
|
@@ -889,7 +889,7 @@ EXPORT_SYMBOL(drm_atomic_get_private_obj
|
|
* or NULL if the private_obj is not part of the global atomic state.
|
|
*/
|
|
struct drm_private_state *
|
|
-drm_atomic_get_old_private_obj_state(struct drm_atomic_state *state,
|
|
+drm_atomic_get_old_private_obj_state(const struct drm_atomic_state *state,
|
|
struct drm_private_obj *obj)
|
|
{
|
|
int i;
|
|
@@ -911,7 +911,7 @@ EXPORT_SYMBOL(drm_atomic_get_old_private
|
|
* or NULL if the private_obj is not part of the global atomic state.
|
|
*/
|
|
struct drm_private_state *
|
|
-drm_atomic_get_new_private_obj_state(struct drm_atomic_state *state,
|
|
+drm_atomic_get_new_private_obj_state(const struct drm_atomic_state *state,
|
|
struct drm_private_obj *obj)
|
|
{
|
|
int i;
|
|
@@ -943,7 +943,7 @@ EXPORT_SYMBOL(drm_atomic_get_new_private
|
|
* not connected.
|
|
*/
|
|
struct drm_connector *
|
|
-drm_atomic_get_old_connector_for_encoder(struct drm_atomic_state *state,
|
|
+drm_atomic_get_old_connector_for_encoder(const struct drm_atomic_state *state,
|
|
struct drm_encoder *encoder)
|
|
{
|
|
struct drm_connector_state *conn_state;
|
|
@@ -977,7 +977,7 @@ EXPORT_SYMBOL(drm_atomic_get_old_connect
|
|
* not connected.
|
|
*/
|
|
struct drm_connector *
|
|
-drm_atomic_get_new_connector_for_encoder(struct drm_atomic_state *state,
|
|
+drm_atomic_get_new_connector_for_encoder(const struct drm_atomic_state *state,
|
|
struct drm_encoder *encoder)
|
|
{
|
|
struct drm_connector_state *conn_state;
|
|
@@ -1127,7 +1127,7 @@ EXPORT_SYMBOL(drm_atomic_get_bridge_stat
|
|
* the bridge is not part of the global atomic state.
|
|
*/
|
|
struct drm_bridge_state *
|
|
-drm_atomic_get_old_bridge_state(struct drm_atomic_state *state,
|
|
+drm_atomic_get_old_bridge_state(const struct drm_atomic_state *state,
|
|
struct drm_bridge *bridge)
|
|
{
|
|
struct drm_private_state *obj_state;
|
|
@@ -1149,7 +1149,7 @@ EXPORT_SYMBOL(drm_atomic_get_old_bridge_
|
|
* the bridge is not part of the global atomic state.
|
|
*/
|
|
struct drm_bridge_state *
|
|
-drm_atomic_get_new_bridge_state(struct drm_atomic_state *state,
|
|
+drm_atomic_get_new_bridge_state(const struct drm_atomic_state *state,
|
|
struct drm_bridge *bridge)
|
|
{
|
|
struct drm_private_state *obj_state;
|
|
--- a/include/drm/drm_atomic.h
|
|
+++ b/include/drm/drm_atomic.h
|
|
@@ -515,17 +515,17 @@ struct drm_private_state * __must_check
|
|
drm_atomic_get_private_obj_state(struct drm_atomic_state *state,
|
|
struct drm_private_obj *obj);
|
|
struct drm_private_state *
|
|
-drm_atomic_get_old_private_obj_state(struct drm_atomic_state *state,
|
|
+drm_atomic_get_old_private_obj_state(const struct drm_atomic_state *state,
|
|
struct drm_private_obj *obj);
|
|
struct drm_private_state *
|
|
-drm_atomic_get_new_private_obj_state(struct drm_atomic_state *state,
|
|
+drm_atomic_get_new_private_obj_state(const struct drm_atomic_state *state,
|
|
struct drm_private_obj *obj);
|
|
|
|
struct drm_connector *
|
|
-drm_atomic_get_old_connector_for_encoder(struct drm_atomic_state *state,
|
|
+drm_atomic_get_old_connector_for_encoder(const struct drm_atomic_state *state,
|
|
struct drm_encoder *encoder);
|
|
struct drm_connector *
|
|
-drm_atomic_get_new_connector_for_encoder(struct drm_atomic_state *state,
|
|
+drm_atomic_get_new_connector_for_encoder(const struct drm_atomic_state *state,
|
|
struct drm_encoder *encoder);
|
|
|
|
/**
|
|
@@ -540,7 +540,7 @@ drm_atomic_get_new_connector_for_encoder
|
|
* @drm_atomic_get_new_crtc_state should be used instead.
|
|
*/
|
|
static inline struct drm_crtc_state *
|
|
-drm_atomic_get_existing_crtc_state(struct drm_atomic_state *state,
|
|
+drm_atomic_get_existing_crtc_state(const struct drm_atomic_state *state,
|
|
struct drm_crtc *crtc)
|
|
{
|
|
return state->crtcs[drm_crtc_index(crtc)].state;
|
|
@@ -555,7 +555,7 @@ drm_atomic_get_existing_crtc_state(struc
|
|
* NULL if the CRTC is not part of the global atomic state.
|
|
*/
|
|
static inline struct drm_crtc_state *
|
|
-drm_atomic_get_old_crtc_state(struct drm_atomic_state *state,
|
|
+drm_atomic_get_old_crtc_state(const struct drm_atomic_state *state,
|
|
struct drm_crtc *crtc)
|
|
{
|
|
return state->crtcs[drm_crtc_index(crtc)].old_state;
|
|
@@ -569,7 +569,7 @@ drm_atomic_get_old_crtc_state(struct drm
|
|
* NULL if the CRTC is not part of the global atomic state.
|
|
*/
|
|
static inline struct drm_crtc_state *
|
|
-drm_atomic_get_new_crtc_state(struct drm_atomic_state *state,
|
|
+drm_atomic_get_new_crtc_state(const struct drm_atomic_state *state,
|
|
struct drm_crtc *crtc)
|
|
{
|
|
return state->crtcs[drm_crtc_index(crtc)].new_state;
|
|
@@ -587,7 +587,7 @@ drm_atomic_get_new_crtc_state(struct drm
|
|
* @drm_atomic_get_new_plane_state should be used instead.
|
|
*/
|
|
static inline struct drm_plane_state *
|
|
-drm_atomic_get_existing_plane_state(struct drm_atomic_state *state,
|
|
+drm_atomic_get_existing_plane_state(const struct drm_atomic_state *state,
|
|
struct drm_plane *plane)
|
|
{
|
|
return state->planes[drm_plane_index(plane)].state;
|
|
@@ -602,7 +602,7 @@ drm_atomic_get_existing_plane_state(stru
|
|
* NULL if the plane is not part of the global atomic state.
|
|
*/
|
|
static inline struct drm_plane_state *
|
|
-drm_atomic_get_old_plane_state(struct drm_atomic_state *state,
|
|
+drm_atomic_get_old_plane_state(const struct drm_atomic_state *state,
|
|
struct drm_plane *plane)
|
|
{
|
|
return state->planes[drm_plane_index(plane)].old_state;
|
|
@@ -617,7 +617,7 @@ drm_atomic_get_old_plane_state(struct dr
|
|
* NULL if the plane is not part of the global atomic state.
|
|
*/
|
|
static inline struct drm_plane_state *
|
|
-drm_atomic_get_new_plane_state(struct drm_atomic_state *state,
|
|
+drm_atomic_get_new_plane_state(const struct drm_atomic_state *state,
|
|
struct drm_plane *plane)
|
|
{
|
|
return state->planes[drm_plane_index(plane)].new_state;
|
|
@@ -635,7 +635,7 @@ drm_atomic_get_new_plane_state(struct dr
|
|
* @drm_atomic_get_new_connector_state should be used instead.
|
|
*/
|
|
static inline struct drm_connector_state *
|
|
-drm_atomic_get_existing_connector_state(struct drm_atomic_state *state,
|
|
+drm_atomic_get_existing_connector_state(const struct drm_atomic_state *state,
|
|
struct drm_connector *connector)
|
|
{
|
|
int index = drm_connector_index(connector);
|
|
@@ -655,7 +655,7 @@ drm_atomic_get_existing_connector_state(
|
|
* or NULL if the connector is not part of the global atomic state.
|
|
*/
|
|
static inline struct drm_connector_state *
|
|
-drm_atomic_get_old_connector_state(struct drm_atomic_state *state,
|
|
+drm_atomic_get_old_connector_state(const struct drm_atomic_state *state,
|
|
struct drm_connector *connector)
|
|
{
|
|
int index = drm_connector_index(connector);
|
|
@@ -675,7 +675,7 @@ drm_atomic_get_old_connector_state(struc
|
|
* or NULL if the connector is not part of the global atomic state.
|
|
*/
|
|
static inline struct drm_connector_state *
|
|
-drm_atomic_get_new_connector_state(struct drm_atomic_state *state,
|
|
+drm_atomic_get_new_connector_state(const struct drm_atomic_state *state,
|
|
struct drm_connector *connector)
|
|
{
|
|
int index = drm_connector_index(connector);
|
|
@@ -713,7 +713,7 @@ drm_atomic_get_new_connector_state(struc
|
|
* Read-only pointer to the current plane state.
|
|
*/
|
|
static inline const struct drm_plane_state *
|
|
-__drm_atomic_get_current_plane_state(struct drm_atomic_state *state,
|
|
+__drm_atomic_get_current_plane_state(const struct drm_atomic_state *state,
|
|
struct drm_plane *plane)
|
|
{
|
|
if (state->planes[drm_plane_index(plane)].state)
|
|
@@ -1134,10 +1134,10 @@ struct drm_bridge_state *
|
|
drm_atomic_get_bridge_state(struct drm_atomic_state *state,
|
|
struct drm_bridge *bridge);
|
|
struct drm_bridge_state *
|
|
-drm_atomic_get_old_bridge_state(struct drm_atomic_state *state,
|
|
+drm_atomic_get_old_bridge_state(const struct drm_atomic_state *state,
|
|
struct drm_bridge *bridge);
|
|
struct drm_bridge_state *
|
|
-drm_atomic_get_new_bridge_state(struct drm_atomic_state *state,
|
|
+drm_atomic_get_new_bridge_state(const struct drm_atomic_state *state,
|
|
struct drm_bridge *bridge);
|
|
|
|
#endif /* DRM_ATOMIC_H_ */
|