mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-11-16 11:44:52 +00:00
drm/nouveau: constify all struct drm_*_helper funcs pointers
They are not to be modified. Generated using the semantic patch: @@ @@ ( const struct drm_crtc_helper_funcs * | - struct drm_crtc_helper_funcs * + const struct drm_crtc_helper_funcs * ) @@ @@ ( const struct drm_encoder_helper_funcs * | - struct drm_encoder_helper_funcs * + const struct drm_encoder_helper_funcs * ) @@ @@ ( const struct drm_connector_helper_funcs * | - struct drm_connector_helper_funcs * + const struct drm_connector_helper_funcs * ) @@ @@ ( const struct drm_plane_helper_funcs * | - struct drm_plane_helper_funcs * + const struct drm_plane_helper_funcs * ) Signed-off-by: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
319d1e1410
commit
d58ded7625
7 changed files with 15 additions and 15 deletions
|
|
@ -703,7 +703,7 @@ static void nv_crtc_prepare(struct drm_crtc *crtc)
|
||||||
struct drm_device *dev = crtc->dev;
|
struct drm_device *dev = crtc->dev;
|
||||||
struct nouveau_drm *drm = nouveau_drm(dev);
|
struct nouveau_drm *drm = nouveau_drm(dev);
|
||||||
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
|
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
|
||||||
struct drm_crtc_helper_funcs *funcs = crtc->helper_private;
|
const struct drm_crtc_helper_funcs *funcs = crtc->helper_private;
|
||||||
|
|
||||||
if (nv_two_heads(dev))
|
if (nv_two_heads(dev))
|
||||||
NVSetOwner(dev, nv_crtc->index);
|
NVSetOwner(dev, nv_crtc->index);
|
||||||
|
|
@ -724,7 +724,7 @@ static void nv_crtc_prepare(struct drm_crtc *crtc)
|
||||||
static void nv_crtc_commit(struct drm_crtc *crtc)
|
static void nv_crtc_commit(struct drm_crtc *crtc)
|
||||||
{
|
{
|
||||||
struct drm_device *dev = crtc->dev;
|
struct drm_device *dev = crtc->dev;
|
||||||
struct drm_crtc_helper_funcs *funcs = crtc->helper_private;
|
const struct drm_crtc_helper_funcs *funcs = crtc->helper_private;
|
||||||
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
|
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
|
||||||
|
|
||||||
nouveau_hw_load_state(dev, nv_crtc->index, &nv04_display(dev)->mode_reg);
|
nouveau_hw_load_state(dev, nv_crtc->index, &nv04_display(dev)->mode_reg);
|
||||||
|
|
|
||||||
|
|
@ -358,7 +358,7 @@ static bool nv04_dac_mode_fixup(struct drm_encoder *encoder,
|
||||||
|
|
||||||
static void nv04_dac_prepare(struct drm_encoder *encoder)
|
static void nv04_dac_prepare(struct drm_encoder *encoder)
|
||||||
{
|
{
|
||||||
struct drm_encoder_helper_funcs *helper = encoder->helper_private;
|
const struct drm_encoder_helper_funcs *helper = encoder->helper_private;
|
||||||
struct drm_device *dev = encoder->dev;
|
struct drm_device *dev = encoder->dev;
|
||||||
int head = nouveau_crtc(encoder->crtc)->index;
|
int head = nouveau_crtc(encoder->crtc)->index;
|
||||||
|
|
||||||
|
|
@ -409,7 +409,7 @@ static void nv04_dac_commit(struct drm_encoder *encoder)
|
||||||
struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
|
struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
|
||||||
struct nouveau_drm *drm = nouveau_drm(encoder->dev);
|
struct nouveau_drm *drm = nouveau_drm(encoder->dev);
|
||||||
struct nouveau_crtc *nv_crtc = nouveau_crtc(encoder->crtc);
|
struct nouveau_crtc *nv_crtc = nouveau_crtc(encoder->crtc);
|
||||||
struct drm_encoder_helper_funcs *helper = encoder->helper_private;
|
const struct drm_encoder_helper_funcs *helper = encoder->helper_private;
|
||||||
|
|
||||||
helper->dpms(encoder, DRM_MODE_DPMS_ON);
|
helper->dpms(encoder, DRM_MODE_DPMS_ON);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -244,7 +244,7 @@ static void nv04_dfp_prepare_sel_clk(struct drm_device *dev,
|
||||||
static void nv04_dfp_prepare(struct drm_encoder *encoder)
|
static void nv04_dfp_prepare(struct drm_encoder *encoder)
|
||||||
{
|
{
|
||||||
struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
|
struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
|
||||||
struct drm_encoder_helper_funcs *helper = encoder->helper_private;
|
const struct drm_encoder_helper_funcs *helper = encoder->helper_private;
|
||||||
struct drm_device *dev = encoder->dev;
|
struct drm_device *dev = encoder->dev;
|
||||||
int head = nouveau_crtc(encoder->crtc)->index;
|
int head = nouveau_crtc(encoder->crtc)->index;
|
||||||
struct nv04_crtc_reg *crtcstate = nv04_display(dev)->mode_reg.crtc_reg;
|
struct nv04_crtc_reg *crtcstate = nv04_display(dev)->mode_reg.crtc_reg;
|
||||||
|
|
@ -445,7 +445,7 @@ static void nv04_dfp_commit(struct drm_encoder *encoder)
|
||||||
{
|
{
|
||||||
struct drm_device *dev = encoder->dev;
|
struct drm_device *dev = encoder->dev;
|
||||||
struct nouveau_drm *drm = nouveau_drm(dev);
|
struct nouveau_drm *drm = nouveau_drm(dev);
|
||||||
struct drm_encoder_helper_funcs *helper = encoder->helper_private;
|
const struct drm_encoder_helper_funcs *helper = encoder->helper_private;
|
||||||
struct nouveau_crtc *nv_crtc = nouveau_crtc(encoder->crtc);
|
struct nouveau_crtc *nv_crtc = nouveau_crtc(encoder->crtc);
|
||||||
struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
|
struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
|
||||||
struct dcb_output *dcbe = nv_encoder->dcb;
|
struct dcb_output *dcbe = nv_encoder->dcb;
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,7 @@ nv04_display_create(struct drm_device *dev)
|
||||||
crtc->funcs->save(crtc);
|
crtc->funcs->save(crtc);
|
||||||
|
|
||||||
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
|
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
|
||||||
struct drm_encoder_helper_funcs *func = encoder->helper_private;
|
const struct drm_encoder_helper_funcs *func = encoder->helper_private;
|
||||||
|
|
||||||
func->save(encoder);
|
func->save(encoder);
|
||||||
}
|
}
|
||||||
|
|
@ -138,7 +138,7 @@ nv04_display_destroy(struct drm_device *dev)
|
||||||
|
|
||||||
/* Restore state */
|
/* Restore state */
|
||||||
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
|
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
|
||||||
struct drm_encoder_helper_funcs *func = encoder->helper_private;
|
const struct drm_encoder_helper_funcs *func = encoder->helper_private;
|
||||||
|
|
||||||
func->restore(encoder);
|
func->restore(encoder);
|
||||||
}
|
}
|
||||||
|
|
@ -169,7 +169,7 @@ nv04_display_init(struct drm_device *dev)
|
||||||
* on suspend too.
|
* on suspend too.
|
||||||
*/
|
*/
|
||||||
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
|
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
|
||||||
struct drm_encoder_helper_funcs *func = encoder->helper_private;
|
const struct drm_encoder_helper_funcs *func = encoder->helper_private;
|
||||||
|
|
||||||
func->restore(encoder);
|
func->restore(encoder);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -122,7 +122,7 @@ static void nv04_tv_prepare(struct drm_encoder *encoder)
|
||||||
{
|
{
|
||||||
struct drm_device *dev = encoder->dev;
|
struct drm_device *dev = encoder->dev;
|
||||||
int head = nouveau_crtc(encoder->crtc)->index;
|
int head = nouveau_crtc(encoder->crtc)->index;
|
||||||
struct drm_encoder_helper_funcs *helper = encoder->helper_private;
|
const struct drm_encoder_helper_funcs *helper = encoder->helper_private;
|
||||||
|
|
||||||
helper->dpms(encoder, DRM_MODE_DPMS_OFF);
|
helper->dpms(encoder, DRM_MODE_DPMS_OFF);
|
||||||
|
|
||||||
|
|
@ -164,7 +164,7 @@ static void nv04_tv_commit(struct drm_encoder *encoder)
|
||||||
struct drm_device *dev = encoder->dev;
|
struct drm_device *dev = encoder->dev;
|
||||||
struct nouveau_drm *drm = nouveau_drm(dev);
|
struct nouveau_drm *drm = nouveau_drm(dev);
|
||||||
struct nouveau_crtc *nv_crtc = nouveau_crtc(encoder->crtc);
|
struct nouveau_crtc *nv_crtc = nouveau_crtc(encoder->crtc);
|
||||||
struct drm_encoder_helper_funcs *helper = encoder->helper_private;
|
const struct drm_encoder_helper_funcs *helper = encoder->helper_private;
|
||||||
|
|
||||||
helper->dpms(encoder, DRM_MODE_DPMS_ON);
|
helper->dpms(encoder, DRM_MODE_DPMS_ON);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -405,7 +405,7 @@ static void nv17_tv_prepare(struct drm_encoder *encoder)
|
||||||
{
|
{
|
||||||
struct drm_device *dev = encoder->dev;
|
struct drm_device *dev = encoder->dev;
|
||||||
struct nouveau_drm *drm = nouveau_drm(dev);
|
struct nouveau_drm *drm = nouveau_drm(dev);
|
||||||
struct drm_encoder_helper_funcs *helper = encoder->helper_private;
|
const struct drm_encoder_helper_funcs *helper = encoder->helper_private;
|
||||||
struct nv17_tv_norm_params *tv_norm = get_tv_norm(encoder);
|
struct nv17_tv_norm_params *tv_norm = get_tv_norm(encoder);
|
||||||
int head = nouveau_crtc(encoder->crtc)->index;
|
int head = nouveau_crtc(encoder->crtc)->index;
|
||||||
uint8_t *cr_lcd = &nv04_display(dev)->mode_reg.crtc_reg[head].CRTC[
|
uint8_t *cr_lcd = &nv04_display(dev)->mode_reg.crtc_reg[head].CRTC[
|
||||||
|
|
@ -583,7 +583,7 @@ static void nv17_tv_commit(struct drm_encoder *encoder)
|
||||||
struct nouveau_drm *drm = nouveau_drm(dev);
|
struct nouveau_drm *drm = nouveau_drm(dev);
|
||||||
struct nouveau_crtc *nv_crtc = nouveau_crtc(encoder->crtc);
|
struct nouveau_crtc *nv_crtc = nouveau_crtc(encoder->crtc);
|
||||||
struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
|
struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
|
||||||
struct drm_encoder_helper_funcs *helper = encoder->helper_private;
|
const struct drm_encoder_helper_funcs *helper = encoder->helper_private;
|
||||||
|
|
||||||
if (get_tv_norm(encoder)->kind == TV_ENC_MODE) {
|
if (get_tv_norm(encoder)->kind == TV_ENC_MODE) {
|
||||||
nv17_tv_update_rescaler(encoder);
|
nv17_tv_update_rescaler(encoder);
|
||||||
|
|
|
||||||
|
|
@ -309,7 +309,7 @@ detect_analog:
|
||||||
nv_encoder = find_encoder(connector, DCB_OUTPUT_TV);
|
nv_encoder = find_encoder(connector, DCB_OUTPUT_TV);
|
||||||
if (nv_encoder && force) {
|
if (nv_encoder && force) {
|
||||||
struct drm_encoder *encoder = to_drm_encoder(nv_encoder);
|
struct drm_encoder *encoder = to_drm_encoder(nv_encoder);
|
||||||
struct drm_encoder_helper_funcs *helper =
|
const struct drm_encoder_helper_funcs *helper =
|
||||||
encoder->helper_private;
|
encoder->helper_private;
|
||||||
|
|
||||||
if (helper->detect(encoder, connector) ==
|
if (helper->detect(encoder, connector) ==
|
||||||
|
|
@ -592,7 +592,7 @@ nouveau_connector_set_property(struct drm_connector *connector,
|
||||||
static struct drm_display_mode *
|
static struct drm_display_mode *
|
||||||
nouveau_connector_native_mode(struct drm_connector *connector)
|
nouveau_connector_native_mode(struct drm_connector *connector)
|
||||||
{
|
{
|
||||||
struct drm_connector_helper_funcs *helper = connector->helper_private;
|
const struct drm_connector_helper_funcs *helper = connector->helper_private;
|
||||||
struct nouveau_drm *drm = nouveau_drm(connector->dev);
|
struct nouveau_drm *drm = nouveau_drm(connector->dev);
|
||||||
struct nouveau_connector *nv_connector = nouveau_connector(connector);
|
struct nouveau_connector *nv_connector = nouveau_connector(connector);
|
||||||
struct drm_device *dev = connector->dev;
|
struct drm_device *dev = connector->dev;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue