AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-21 19:19:57 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

- R-Car DU fixes

Browse Source 
- Misc. DRM cleanups
 -----BEGIN PGP SIGNATURE-----
 
 iQJWBAABCgBAFiEEvZRkio5H7O2/GZsYYiVdKZ4oCyQFAl1WsK4iHGxhdXJlbnQu
 cGluY2hhcnRAaWRlYXNvbmJvYXJkLmNvbQAKCRBiJV0pnigLJPfCD/9Y4M0ZQX0N
 be9CwhOuJrYoEGWygw8LAKmEs3JyCVu4GVXUyl1FrSFMuizAPA7cmFEE1BwQcjrb
 bFQHxEAk9u7i5DdBPHtU7An1iHmUhXzmru3ufVcbXIvxC8erGcbiMimrAiwsJwKu
 reQKgGj6Vfwf4vMA7cwToHE0QCL+eumRjKDD6VDgbni09a9o45Su1GVRUa9j4WuB
 sv/P5yxlUT9BLBjIw/TkPhm3ZsG65KkP4zyJZOlY1bad52em716t6fqRWXKmCjLz
 AEWxjfkJO/K5eKyfa+UTvmeEmBn94Zc1ISH57oLDF6LJZ7YMuQRsaA3ANWZ3HnBm
 FMatLFsargki5IGZAiBrxUFdzdmI7NquRQ9oOp2f1tMVyCMjlBHZTw3RZldqCtgq
 5iWc/cvMeSzXLpQPHJGJqeQiNiNboBxjFmt7DmT77AdHjnz99jIbmSaoW1w3VBi8
 XCNYQGXDmWUtZKL5fEFk6Pn0TgMnPvR6v1d1VW4I3yxBwP2eyNX+QTXZp1RRmZ8X
 VUs+O9rHkw+f6LBu6vaiSovuqGaPSMGTBgvZjrikxBZ0cSSfWRUmQi8jSirL84Un
 4NYWZlw6UHWUxV5wrBX16IEg3hv2G6SdyKuopdtXKUHREfi0OxbrKI4Ww8nV/Ehh
 8fxivomJfhujC4DAXuWsTfBH6DHpJgUC1A==
 =Lpho
 -----END PGP SIGNATURE-----

Merge tag 'du-next-20190816' of git://linuxtv.org/pinchartl/media into drm-next

- R-Car DU fixes
- Misc. DRM cleanups

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190816133500.GJ5020@pendragon.ideasonboard.com
This commit is contained in:
Dave Airlie 2019-08-22 13:06:50 +10:00
commit c011b93c1a
4 changed files with 5 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
View File

@ -27,7 +27,6 @@
#include <drm/bridge/dw_hdmi.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_edid.h>
#include <drm/drm_encoder_slave.h>
#include <drm/drm_of.h>
#include <drm/drm_print.h>
#include <drm/drm_probe_helper.h>

32
drivers/gpu/drm/drm_crtc_helper.c
View File

@ -159,14 +159,10 @@ drm_encoder_disable(struct drm_encoder *encoder)
if (!encoder_funcs)
return;
drm_bridge_disable(encoder->bridge);
if (encoder_funcs->disable)
(*encoder_funcs->disable)(encoder);
else if (encoder_funcs->dpms)
(*encoder_funcs->dpms)(encoder, DRM_MODE_DPMS_OFF);
drm_bridge_post_disable(encoder->bridge);
}
static void __drm_helper_disable_unused_functions(struct drm_device *dev)
@ -326,13 +322,6 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
if (!encoder_funcs)
continue;
ret = drm_bridge_mode_fixup(encoder->bridge,
mode, adjusted_mode);
if (!ret) {
DRM_DEBUG_KMS("Bridge fixup failed\n");
goto done;
}
encoder_funcs = encoder->helper_private;
if (encoder_funcs->mode_fixup) {
if (!(ret = encoder_funcs->mode_fixup(encoder, mode,
@ -364,13 +353,9 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
if (!encoder_funcs)
continue;
drm_bridge_disable(encoder->bridge);
/* Disable the encoders as the first thing we do. */
if (encoder_funcs->prepare)
encoder_funcs->prepare(encoder);
drm_bridge_post_disable(encoder->bridge);
}
drm_crtc_prepare_encoders(dev);
@ -397,8 +382,6 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
encoder->base.id, encoder->name, mode->name);
if (encoder_funcs->mode_set)
encoder_funcs->mode_set(encoder, mode, adjusted_mode);
drm_bridge_mode_set(encoder->bridge, mode, adjusted_mode);
}
/* Now enable the clocks, plane, pipe, and connectors that we set up. */
@ -413,12 +396,8 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
if (!encoder_funcs)
continue;
drm_bridge_pre_enable(encoder->bridge);
if (encoder_funcs->commit)
encoder_funcs->commit(encoder);
drm_bridge_enable(encoder->bridge);
}
/* Calculate and store various constants which
@ -817,25 +796,14 @@ static int drm_helper_choose_encoder_dpms(struct drm_encoder *encoder)
/* Helper which handles bridge ordering around encoder dpms */
static void drm_helper_encoder_dpms(struct drm_encoder *encoder, int mode)
{
struct drm_bridge *bridge = encoder->bridge;
const struct drm_encoder_helper_funcs *encoder_funcs;
encoder_funcs = encoder->helper_private;
if (!encoder_funcs)
return;
if (mode == DRM_MODE_DPMS_ON)
drm_bridge_pre_enable(bridge);
else
drm_bridge_disable(bridge);
if (encoder_funcs->dpms)
encoder_funcs->dpms(encoder, mode);
if (mode == DRM_MODE_DPMS_ON)
drm_bridge_enable(bridge);
else
drm_bridge_post_disable(bridge);
}
static int drm_helper_choose_crtc_dpms(struct drm_crtc *crtc)

2
drivers/gpu/drm/imx/dw_hdmi-imx.c
View File

@ -16,7 +16,7 @@
#include <drm/bridge/dw_hdmi.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_edid.h>
#include <drm/drm_encoder_slave.h>
#include <drm/drm_encoder.h>
#include <drm/drm_of.h>
#include "imx-drm.h"

8
drivers/gpu/drm/rcar-du/rcar_lvds.c
View File

@ -71,11 +71,11 @@ struct rcar_lvds {
bool dual_link;
};
#define bridge_to_rcar_lvds(bridge) \
container_of(bridge, struct rcar_lvds, bridge)
#define bridge_to_rcar_lvds(b) \
container_of(b, struct rcar_lvds, bridge)
#define connector_to_rcar_lvds(connector) \
container_of(connector, struct rcar_lvds, connector)
#define connector_to_rcar_lvds(c) \
container_of(c, struct rcar_lvds, connector)
static void rcar_lvds_write(struct rcar_lvds *lvds, u32 reg, u32 data)
{