Skip to content

Commit

Permalink
drm/armada: move variant initialisation to CRTC init
Browse files Browse the repository at this point in the history
Move the variant initialisation entirely to the CRTC init function -
the variant support is really about the CRTC properties than the whole
system, and we want to treat each CRTC individually when we support DT.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Jul 3, 2014
1 parent d016540 commit 3ecea26
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 20 deletions.
19 changes: 8 additions & 11 deletions drivers/gpu/drm/armada/armada_510.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,19 @@
#include "armada_drm.h"
#include "armada_hw.h"

static int armada510_init(struct armada_private *priv, struct device *dev)
static int armada510_crtc_init(struct armada_crtc *dcrtc, struct device *dev)
{
priv->extclk[0] = devm_clk_get(dev, "ext_ref_clk_1");
struct clk *clk;

if (IS_ERR(priv->extclk[0]) && PTR_ERR(priv->extclk[0]) == -ENOENT)
priv->extclk[0] = ERR_PTR(-EPROBE_DEFER);
clk = devm_clk_get(dev, "ext_ref_clk_1");
if (IS_ERR(clk))
return PTR_ERR(clk) == -ENOENT ? -EPROBE_DEFER : PTR_ERR(clk);

return PTR_RET(priv->extclk[0]);
}
dcrtc->extclk[0] = clk;

static int armada510_crtc_init(struct armada_crtc *dcrtc)
{
/* Lower the watermark so to eliminate jitter at higher bandwidths */
armada_updatel(0x20, (1 << 11) | 0xff, dcrtc->base + LCD_CFG_RDREG4F);

return 0;
}

Expand All @@ -45,8 +44,7 @@ static int armada510_crtc_init(struct armada_crtc *dcrtc)
static int armada510_crtc_compute_clock(struct armada_crtc *dcrtc,
const struct drm_display_mode *mode, uint32_t *sclk)
{
struct armada_private *priv = dcrtc->crtc.dev->dev_private;
struct clk *clk = priv->extclk[0];
struct clk *clk = dcrtc->extclk[0];
int ret;

if (dcrtc->num == 1)
Expand Down Expand Up @@ -81,7 +79,6 @@ static int armada510_crtc_compute_clock(struct armada_crtc *dcrtc,
const struct armada_variant armada510_ops = {
.has_spu_adv_reg = true,
.spu_adv_reg = ADV_HWC32ENABLE | ADV_HWC32ARGB | ADV_HWC32BLEND,
.init = armada510_init,
.crtc_init = armada510_crtc_init,
.crtc_compute_clock = armada510_crtc_compute_clock,
};
2 changes: 1 addition & 1 deletion drivers/gpu/drm/armada/armada_crtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1108,7 +1108,7 @@ int armada_drm_crtc_create(struct drm_device *dev, struct resource *res,
}

if (priv->variant->crtc_init) {
ret = priv->variant->crtc_init(dcrtc);
ret = priv->variant->crtc_init(dcrtc, dev->dev);
if (ret) {
kfree(dcrtc);
return ret;
Expand Down
1 change: 1 addition & 0 deletions drivers/gpu/drm/armada/armada_crtc.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ struct armada_crtc {
unsigned num;
void __iomem *base;
struct clk *clk;
struct clk *extclk[2];
struct {
uint32_t spu_v_h_total;
uint32_t spu_v_porch;
Expand Down
6 changes: 2 additions & 4 deletions drivers/gpu/drm/armada/armada_drm.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,9 @@ void armada_drm_vbl_event_remove_unlocked(struct armada_crtc *,
struct armada_private;

struct armada_variant {
bool has_spu_adv_reg;
bool has_spu_adv_reg;
uint32_t spu_adv_reg;
int (*init)(struct armada_private *, struct device *);
int (*crtc_init)(struct armada_crtc *);
int (*crtc_init)(struct armada_crtc *, struct device *);
int (*crtc_compute_clock)(struct armada_crtc *,
const struct drm_display_mode *,
uint32_t *);
Expand All @@ -78,7 +77,6 @@ struct armada_private {
struct drm_fb_helper *fbdev;
struct armada_crtc *dcrtc[2];
struct drm_mm linear;
struct clk *extclk[2];
struct drm_property *csc_yuv_prop;
struct drm_property *csc_rgb_prop;
struct drm_property *colorkey_prop;
Expand Down
4 changes: 0 additions & 4 deletions drivers/gpu/drm/armada/armada_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,6 @@ static int armada_drm_load(struct drm_device *dev, unsigned long flags)

priv->variant = (struct armada_variant *)id->driver_data;

ret = priv->variant->init(priv, dev->dev);
if (ret)
return ret;

INIT_WORK(&priv->fb_unref_work, armada_drm_unref_work);
INIT_KFIFO(priv->fb_unref);

Expand Down

0 comments on commit 3ecea26

Please sign in to comment.