Commit 1ca582f1 authored by Andrzej Hajda's avatar Andrzej Hajda Committed by Inki Dae
Browse files

drm/exynos: use helper to set possible crtcs 



All encoders share the same code to set encoders possible_crtcs field.
The patch creates helper to abstract out this code.

Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 30b8913f

drivers/gpu/drm/exynos/exynos_dp.c

+5 −10
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static int exynos_dp_bind(struct device *dev, struct device *master, void *data) 
	struct exynos_dp_device *dp = dev_get_drvdata(dev);

	struct drm_encoder *encoder = &dp->encoder;

	struct drm_device *drm_dev = data;

	int pipe, ret;

	int ret;



	/*

	 * Just like the probe function said, we don't need the
@@ -179,20 +179,15 @@ static int exynos_dp_bind(struct device *dev, struct device *master, void *data) 
			return ret;

	}



	pipe = exynos_drm_crtc_get_pipe_from_type(drm_dev,

						  EXYNOS_DISPLAY_TYPE_LCD);

	if (pipe < 0)

		return pipe;



	encoder->possible_crtcs = 1 << pipe;



	DRM_DEBUG_KMS("possible_crtcs = 0x%x\n", encoder->possible_crtcs);



	drm_encoder_init(drm_dev, encoder, &exynos_dp_encoder_funcs,

			 DRM_MODE_ENCODER_TMDS, NULL);



	drm_encoder_helper_add(encoder, &exynos_dp_encoder_helper_funcs);



	ret = exynos_drm_set_possible_crtcs(encoder, EXYNOS_DISPLAY_TYPE_LCD);

	if (ret < 0)

		return ret;



	dp->plat_data.encoder = encoder;



	return analogix_dp_bind(dev, dp->drm_dev, &dp->plat_data);

drivers/gpu/drm/exynos/exynos_drm_core.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 */



#include <drm/drmP.h>



#include "exynos_drm_drv.h"

#include "exynos_drm_crtc.h"

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+18 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <drm/drm_crtc_helper.h>

#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_encoder.h>



#include "exynos_drm_crtc.h"

#include "exynos_drm_drv.h"
@@ -191,16 +192,30 @@ err_crtc: 
	return ERR_PTR(ret);

}



int exynos_drm_crtc_get_pipe_from_type(struct drm_device *drm_dev,

struct exynos_drm_crtc *exynos_drm_crtc_get_by_type(struct drm_device *drm_dev,

				       enum exynos_drm_output_type out_type)

{

	struct drm_crtc *crtc;



	drm_for_each_crtc(crtc, drm_dev)

		if (to_exynos_crtc(crtc)->type == out_type)

			return drm_crtc_index(crtc);

			return to_exynos_crtc(crtc);



	return -EPERM;

	return ERR_PTR(-EPERM);

}



int exynos_drm_set_possible_crtcs(struct drm_encoder *encoder,

		enum exynos_drm_output_type out_type)

{

	struct exynos_drm_crtc *crtc = exynos_drm_crtc_get_by_type(encoder->dev,

						out_type);



	if (IS_ERR(crtc))

		return PTR_ERR(crtc);



	encoder->possible_crtcs = drm_crtc_mask(&crtc->base);



	return 0;

}



void exynos_drm_crtc_te_handler(struct drm_crtc *crtc)

drivers/gpu/drm/exynos/exynos_drm_crtc.h

+7 −3
Original line number Diff line number Diff line
@@ -15,19 +15,23 @@ 
#ifndef _EXYNOS_DRM_CRTC_H_

#define _EXYNOS_DRM_CRTC_H_





#include "exynos_drm_drv.h"



struct exynos_drm_crtc *exynos_drm_crtc_create(struct drm_device *drm_dev,

					struct drm_plane *plane,

					enum exynos_drm_output_type type,

					enum exynos_drm_output_type out_type,

					const struct exynos_drm_crtc_ops *ops,

					void *context);

void exynos_drm_crtc_wait_pending_update(struct exynos_drm_crtc *exynos_crtc);

void exynos_drm_crtc_finish_update(struct exynos_drm_crtc *exynos_crtc,

				   struct exynos_drm_plane *exynos_plane);



/* This function gets pipe value to crtc device matched with out_type. */

int exynos_drm_crtc_get_pipe_from_type(struct drm_device *drm_dev,

/* This function gets crtc device matched with out_type. */

struct exynos_drm_crtc *exynos_drm_crtc_get_by_type(struct drm_device *drm_dev,

				       enum exynos_drm_output_type out_type);



int exynos_drm_set_possible_crtcs(struct drm_encoder *encoder,

		enum exynos_drm_output_type out_type);



/*

drivers/gpu/drm/exynos/exynos_drm_dpi.c

+4 −8
Original line number Diff line number Diff line
@@ -202,19 +202,15 @@ int exynos_dpi_bind(struct drm_device *dev, struct drm_encoder *encoder) 
{

	int ret;



	ret = exynos_drm_crtc_get_pipe_from_type(dev, EXYNOS_DISPLAY_TYPE_LCD);

	if (ret < 0)

		return ret;



	encoder->possible_crtcs = 1 << ret;



	DRM_DEBUG_KMS("possible_crtcs = 0x%x\n", encoder->possible_crtcs);



	drm_encoder_init(dev, encoder, &exynos_dpi_encoder_funcs,

			 DRM_MODE_ENCODER_TMDS, NULL);



	drm_encoder_helper_add(encoder, &exynos_dpi_encoder_helper_funcs);



	ret = exynos_drm_set_possible_crtcs(encoder, EXYNOS_DISPLAY_TYPE_LCD);

	if (ret < 0)

		return ret;



	ret = exynos_dpi_create_connector(encoder);

	if (ret) {

		DRM_ERROR("failed to create connector ret = %d\n", ret);

CRA Git | Maintained and supported by SUSTech CRA and CCSE