Skip to content

Commit

Permalink
drm/exynos/hdmi: stop using display->ctx pointer
Browse files Browse the repository at this point in the history
The patch replaces accesses to display->ctx pointer by container_of
construct. It will allow to remove ctx field in the future.

Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
  • Loading branch information
Andrzej Hajda authored and Inki Dae committed Nov 24, 2014
1 parent 930865f commit 0d8424f
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions drivers/gpu/drm/exynos/exynos_hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,11 @@ struct hdmi_context {
enum hdmi_type type;
};

static inline struct hdmi_context *display_to_hdmi(struct exynos_drm_display *d)
{
return container_of(d, struct hdmi_context, display);
}

struct hdmiphy_config {
int pixel_clock;
u8 conf[32];
Expand Down Expand Up @@ -1123,7 +1128,7 @@ static struct drm_connector_helper_funcs hdmi_connector_helper_funcs = {
static int hdmi_create_connector(struct exynos_drm_display *display,
struct drm_encoder *encoder)
{
struct hdmi_context *hdata = display->ctx;
struct hdmi_context *hdata = display_to_hdmi(display);
struct drm_connector *connector = &hdata->connector;
int ret;

Expand Down Expand Up @@ -2000,7 +2005,7 @@ static void hdmi_v14_mode_set(struct hdmi_context *hdata,
static void hdmi_mode_set(struct exynos_drm_display *display,
struct drm_display_mode *mode)
{
struct hdmi_context *hdata = display->ctx;
struct hdmi_context *hdata = display_to_hdmi(display);
struct drm_display_mode *m = mode;

DRM_DEBUG_KMS("xres=%d, yres=%d, refresh=%d, intl=%s\n",
Expand All @@ -2019,7 +2024,7 @@ static void hdmi_mode_set(struct exynos_drm_display *display,

static void hdmi_commit(struct exynos_drm_display *display)
{
struct hdmi_context *hdata = display->ctx;
struct hdmi_context *hdata = display_to_hdmi(display);

mutex_lock(&hdata->hdmi_mutex);
if (!hdata->powered) {
Expand All @@ -2033,7 +2038,7 @@ static void hdmi_commit(struct exynos_drm_display *display)

static void hdmi_poweron(struct exynos_drm_display *display)
{
struct hdmi_context *hdata = display->ctx;
struct hdmi_context *hdata = display_to_hdmi(display);
struct hdmi_resources *res = &hdata->res;

mutex_lock(&hdata->hdmi_mutex);
Expand Down Expand Up @@ -2064,7 +2069,7 @@ static void hdmi_poweron(struct exynos_drm_display *display)

static void hdmi_poweroff(struct exynos_drm_display *display)
{
struct hdmi_context *hdata = display->ctx;
struct hdmi_context *hdata = display_to_hdmi(display);
struct hdmi_resources *res = &hdata->res;

mutex_lock(&hdata->hdmi_mutex);
Expand Down Expand Up @@ -2099,7 +2104,7 @@ static void hdmi_poweroff(struct exynos_drm_display *display)

static void hdmi_dpms(struct exynos_drm_display *display, int mode)
{
struct hdmi_context *hdata = display->ctx;
struct hdmi_context *hdata = display_to_hdmi(display);
struct drm_encoder *encoder = hdata->encoder;
struct drm_crtc *crtc = encoder->crtc;
struct drm_crtc_helper_funcs *funcs = NULL;
Expand Down Expand Up @@ -2476,7 +2481,6 @@ static int hdmi_probe(struct platform_device *pdev)
}

pm_runtime_enable(dev);
hdata->display.ctx = hdata;

ret = component_add(&pdev->dev, &hdmi_component_ops);
if (ret)
Expand Down

0 comments on commit 0d8424f

Please sign in to comment.